7 files changed, 186 insertions, 74 deletions

diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 9968aed9e613..6f6c3fa91561 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -3,24 +3,37 @@
 # Whom:					FreeBSD GNOME Team
 #
 # $FreeBSD$
-#
+#    $MCom: ports/deskutils/alacarte/Makefile,v 1.10 2006/10/10 18:48:41 marcus Exp $
 
 PORTNAME=	alacarte
-PORTVERSION=	0.8
-PORTREVISION=	1
-CATEGORIES=	deskutils
-MASTER_SITES=	http://dev.realistanew.com/${PORTNAME}/releases/${PORTVERSION}/
+PORTVERSION=	0.10.1
+CATEGORIES=	deskutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An editor for the freedesktop.org menu specification
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
-
-USE_GNOME=	pygtk2 pygnome2
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnomeprefix pygnomedesktop intlhack
+USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} --install-lib=${PYTHON_SITELIBDIR}
+INSTALLS_ICONS=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		GMSGFMT="${LOCALBASE}/bin/msgfmt"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
+		${WRKSRC}/Alacarte/MenuEditor.py
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+	    ${WRKSRC}/Alacarte/DialogHandler.py \
+	    ${WRKSRC}/Alacarte/util.py
+	@${REINPLACE_CMD} -e 's|gmsgfmt|msgfmt|g ; \
+	    	s|python2.4|${PYTHON_VERSION}|g' \
+	    	${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo
index cb69ea50ece3..60944af8d104 100644
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@@ -1,3 +1,3 @@
-MD5 (alacarte-0.8.tar.gz) = 849fc35c84c81736974217bb810390b1
-SHA256 (alacarte-0.8.tar.gz) = ce641daadef32b6a880571bde315ce2f3dc88e8e62ef47b48c5b4fb5e33a3a62
-SIZE (alacarte-0.8.tar.gz) = 69330
+MD5 (gnome2/alacarte-0.10.1.tar.bz2) = 3e425ad3bbfe059699a9996419dc8422
+SHA256 (gnome2/alacarte-0.10.1.tar.bz2) = 7330529a95368ccb4e8f1084c305785e234f15f03e007ffe9383438ec6f9b061
+SIZE (gnome2/alacarte-0.10.1.tar.bz2) = 197077
diff --git a/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py b/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py
new file mode 100644
index 000000000000..5cc05fc614e9
--- /dev/null
+++ b/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py
@@ -0,0 +1,11 @@
+--- Alacarte/DialogHandler.py.orig	Wed Jul 26 20:53:06 2006
++++ Alacarte/DialogHandler.py	Wed Jul 26 20:53:14 2006
+@@ -84,7 +84,7 @@ class DialogHandler:
+ 		if button.icon_path:
+ 			dialog.set_current_folder(button.icon_path.rsplit('/', 1)[0])
+ 		else:
+-			dialog.set_current_folder('/usr/share/icons/')
++			dialog.set_current_folder('/usr/local/share/icons/')
+ 		preview = gtk.VBox()
+ 		preview.set_spacing(8)
+ 		preview.set_size_request(92, 92)
diff --git a/deskutils/alacarte/files/patch-Alacarte_util.py b/deskutils/alacarte/files/patch-Alacarte_util.py
new file mode 100644
index 000000000000..94ad287792de
--- /dev/null
+++ b/deskutils/alacarte/files/patch-Alacarte_util.py
@@ -0,0 +1,29 @@
+--- Alacarte/util.py.orig	Tue Oct  3 15:11:10 2006
++++ Alacarte/util.py	Tue Oct  3 15:12:35 2006
+@@ -141,7 +141,7 @@
+ 			file_path = os.path.join(system_path, 'applications', file_id)
+ 			if os.path.isfile(file_path):
+ 				return file_path
+-	file_path = os.path.join('/', 'usr', 'share', 'applications', file_id)
++	file_path = os.path.join('/', '/usr/local', 'share', 'gnome', 'applications', file_id)
+ 	if os.path.isfile(file_path):
+ 		return file_path
+ 	return False
+@@ -166,7 +166,7 @@
+ 			file_path = os.path.join(system_path, 'desktop-directories', file_id)
+ 			if os.path.isfile(file_path):
+ 				return file_path
+-	file_path = os.path.join('/', 'usr', 'share', 'desktop-directories', file_id)
++	file_path = os.path.join('/', '/usr/local', 'share', 'gnome', 'desktop-directories', file_id)
+ 	if os.path.isfile(file_path):
+ 		return file_path
+ 	return False
+@@ -187,7 +187,7 @@
+ 			file_path = os.path.join(system_path, 'menus', file_name)
+ 			if os.path.isfile(file_path):
+ 				return file_path
+-	file_path = os.path.join('/', 'etc', 'xdg', 'menus', file_name)
++	file_path = os.path.join('/', '/usr/local', 'etc', 'xdg', 'menus', file_name)
+ 	if os.path.isfile(file_path):
+ 		return file_path
+ 	return False
diff --git a/deskutils/alacarte/files/patch-GnomeDialogHandler.py b/deskutils/alacarte/files/patch-GnomeDialogHandler.py
deleted file mode 100644
index 87e3221c7837..000000000000
--- a/deskutils/alacarte/files/patch-GnomeDialogHandler.py
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/Alacarte/GnomeDialogHandler.py.orig	Tue Oct 25 22:13:44 2005
-+++ src/Alacarte/GnomeDialogHandler.py	Mon Dec 26 02:44:14 2005
-@@ -212,7 +212,10 @@
- 			)
- 		commandEntry.gtk_entry().set_completion(self.completion)
- 		iconButton = self.tree.get_widget('eiconbutton')
--		iconButton.set_pixmap_subdir(item.iconPath)
-+		if item.iconPath == None:
-+			iconButton.set_pixmap_subdir('')
-+		else:
-+			iconButton.set_pixmap_subdir(item.iconPath)
- 		termCheck = self.tree.get_widget('etermcheck')
- 		originalValues = (
- 			item.getKey('Name'), item.getKey('Comment'), item.getKey('Exec'),
-@@ -221,7 +224,10 @@
- 		nameEntry.set_text(item.getKey('Name'))
- 		commentEntry.set_text(item.getKey('Comment'))
- 		commandEntry.set_filename(item.getKey('Exec'))
--		iconButton.set_filename(item.iconPath)
-+		if item.iconPath == None:
-+			iconButton.set_filename('')
-+		else:
-+			iconButton.set_filename(item.iconPath)
- 		if item.getKey('Terminal') == 'true':
- 			termCheck.set_active(1)
- 		self.setupEntry = False
diff --git a/deskutils/alacarte/pkg-descr b/deskutils/alacarte/pkg-descr
index f324e4f41942..da883f8ed36b 100644
--- a/deskutils/alacarte/pkg-descr
+++ b/deskutils/alacarte/pkg-descr
@@ -1,6 +1,6 @@
-Alacarte is a simple freedesktop.org compliant menu editor 
-for GNOME that lets you change your menus, simply and 
-quickly. Just click and type to edit, add, and delete any 
+Alacarte is a simple freedesktop.org compliant menu editor
+for GNOME that lets you change your menus, simply and
+quickly. Just click and type to edit, add, and delete any
 menu entry.
 
 WWW: http://www.realistanew.com/projects/alacarte/
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index 073e075d3c8d..35c1a54b8dbf 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -1,38 +1,123 @@
 bin/alacarte
+%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.py
+%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.py
+%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/MenuEditor.py
+%%PYTHON_SITELIBDIR%%/Alacarte/MenuEditor.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/MenuEditor.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/__init__.py
+%%PYTHON_SITELIBDIR%%/Alacarte/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/config.py
+%%PYTHON_SITELIBDIR%%/Alacarte/config.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/config.pyo
+%%PYTHON_SITELIBDIR%%/Alacarte/util.py
+%%PYTHON_SITELIBDIR%%/Alacarte/util.pyc
+%%PYTHON_SITELIBDIR%%/Alacarte/util.pyo
+share/gnome/alacarte/alacarte.glade
+share/gnome/alacarte/logo.svg
+share/gnome/applications/alacarte.desktop
+share/icons/hicolor/22x22/apps/alacarte.png
+share/icons/hicolor/icon-theme.cache
+share/icons/hicolor/scalable/apps/alacarte.svg
+share/locale/as/LC_MESSAGES/alacarte.mo
+share/locale/bg/LC_MESSAGES/alacarte.mo
+share/locale/bn/LC_MESSAGES/alacarte.mo
+share/locale/bn_IN/LC_MESSAGES/alacarte.mo
+share/locale/ca/LC_MESSAGES/alacarte.mo
+share/locale/cs/LC_MESSAGES/alacarte.mo
+share/locale/da/LC_MESSAGES/alacarte.mo
 share/locale/de/LC_MESSAGES/alacarte.mo
+share/locale/dz/LC_MESSAGES/alacarte.mo
+share/locale/el/LC_MESSAGES/alacarte.mo
+share/locale/en_GB/LC_MESSAGES/alacarte.mo
 share/locale/es/LC_MESSAGES/alacarte.mo
+share/locale/et/LC_MESSAGES/alacarte.mo
+share/locale/eu/LC_MESSAGES/alacarte.mo
+share/locale/fa/LC_MESSAGES/alacarte.mo
+share/locale/fi/LC_MESSAGES/alacarte.mo
 share/locale/fr/LC_MESSAGES/alacarte.mo
+share/locale/gl/LC_MESSAGES/alacarte.mo
+share/locale/gu/LC_MESSAGES/alacarte.mo
+share/locale/hi/LC_MESSAGES/alacarte.mo
+share/locale/hu/LC_MESSAGES/alacarte.mo
+share/locale/it/LC_MESSAGES/alacarte.mo
+share/locale/ja/LC_MESSAGES/alacarte.mo
+share/locale/ka/LC_MESSAGES/alacarte.mo
+share/locale/ko/LC_MESSAGES/alacarte.mo
+share/locale/ku/LC_MESSAGES/alacarte.mo
+share/locale/lt/LC_MESSAGES/alacarte.mo
+share/locale/lv/LC_MESSAGES/alacarte.mo
+share/locale/mk/LC_MESSAGES/alacarte.mo
+share/locale/ml/LC_MESSAGES/alacarte.mo
+share/locale/mn/LC_MESSAGES/alacarte.mo
+share/locale/mr/LC_MESSAGES/alacarte.mo
 share/locale/nb/LC_MESSAGES/alacarte.mo
 share/locale/nl/LC_MESSAGES/alacarte.mo
-share/locale/no/LC_MESSAGES/alacarte.mo
-share/applications/alacarte.desktop
-@dirrmtry share/applications
-@cwd %%LOCALBASE%%
-%%PYTHON_SITELIBDIR%%/Alacarte/MenuHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGMenuHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/__init__.py
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeFront.py
-%%PYTHON_SITELIBDIR%%/Alacarte/IconHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGIconHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/config.py
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeDialogHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/alacarte.glade
-%%PYTHON_SITELIBDIR%%/Alacarte/images/alacarte.svg
-%%PYTHON_SITELIBDIR%%/Alacarte/MenuHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGMenuHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeFront.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/IconHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGIconHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/config.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeDialogHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/MenuHandler.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGMenuHandler.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeFront.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/IconHandler.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGIconHandler.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/config.pyo
-%%PYTHON_SITELIBDIR%%/Alacarte/GnomeDialogHandler.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/Alacarte/images
+share/locale/or/LC_MESSAGES/alacarte.mo
+share/locale/pa/LC_MESSAGES/alacarte.mo
+share/locale/pl/LC_MESSAGES/alacarte.mo
+share/locale/pt/LC_MESSAGES/alacarte.mo
+share/locale/pt_BR/LC_MESSAGES/alacarte.mo
+share/locale/ru/LC_MESSAGES/alacarte.mo
+share/locale/si/LC_MESSAGES/alacarte.mo
+share/locale/sl/LC_MESSAGES/alacarte.mo
+share/locale/sr/LC_MESSAGES/alacarte.mo
+share/locale/sr@Latn/LC_MESSAGES/alacarte.mo
+share/locale/sv/LC_MESSAGES/alacarte.mo
+share/locale/ta/LC_MESSAGES/alacarte.mo
+share/locale/te/LC_MESSAGES/alacarte.mo
+share/locale/th/LC_MESSAGES/alacarte.mo
+share/locale/tr/LC_MESSAGES/alacarte.mo
+share/locale/uk/LC_MESSAGES/alacarte.mo
+share/locale/vi/LC_MESSAGES/alacarte.mo
+share/locale/zh_CN/LC_MESSAGES/alacarte.mo
+share/locale/zh_HK/LC_MESSAGES/alacarte.mo
+share/locale/zh_TW/LC_MESSAGES/alacarte.mo
+@dirrm share/gnome/alacarte
 @dirrm %%PYTHON_SITELIBDIR%%/Alacarte
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as