4 files changed, 51 insertions, 33 deletions

diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 2076baa391e1..ba01b5158c4f 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -5,32 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	smeg
-PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTNAME=	alacarte
+PORTVERSION=	0.8
 CATEGORIES=	deskutils
-MASTER_SITES=	http://dev.realistanew.com/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	http://dev.realistanew.com/${PORTNAME}/releases/${PORTVERSION}/
 
 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
+USE_GNOME=	pygtk2 pygnome2
 USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|libdir, glob|'share/${PORTNAME}', glob|g ; \
-		s|, 'lib/|, 'share/|g ; s|/usr/share|${X11BASE}/share|g" \
-			${WRKSRC}/setup.py ${WRKSRC}/bin/${PORTNAME} \
-			${WRKSRC}/lib/${PORTNAME}/MenuHandler.py \
-			${WRKSRC}/lib/${PORTNAME}/DialogHandler.py
-
-post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/${PORTNAME}
+PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} --install-lib=${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo
index 10fa73e6e3c7..cb69ea50ece3 100644
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@@ -1,2 +1,3 @@
-MD5 (smeg-0.7.5.tar.gz) = 1ac2d76b9443f6d588619419dd9bbed4
-SIZE (smeg-0.7.5.tar.gz) = 22464
+MD5 (alacarte-0.8.tar.gz) = 849fc35c84c81736974217bb810390b1
+SHA256 (alacarte-0.8.tar.gz) = ce641daadef32b6a880571bde315ce2f3dc88e8e62ef47b48c5b4fb5e33a3a62
+SIZE (alacarte-0.8.tar.gz) = 69330
diff --git a/deskutils/alacarte/pkg-descr b/deskutils/alacarte/pkg-descr
index fdb5e2aafcf2..f324e4f41942 100644
--- a/deskutils/alacarte/pkg-descr
+++ b/deskutils/alacarte/pkg-descr
@@ -1,3 +1,6 @@
-Smeg is an editor for the freedesktop.org menu specification.
+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/smeg/
+WWW: http://www.realistanew.com/projects/alacarte/
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index a725979f7a3d..39afb27f4d5c 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -1,12 +1,38 @@
-bin/smeg
-share/applications/smeg-kde.desktop
-share/applications/smeg.desktop
-%%DATADIR%%/DialogHandler.py
-%%DATADIR%%/DialogHandler.pyc
-%%DATADIR%%/MenuHandler.py
-%%DATADIR%%/MenuHandler.pyc
-%%DATADIR%%/config.py
-%%DATADIR%%/config.pyc
-%%DATADIR%%/smeg.glade
-@dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+bin/alacarte
+share/locale/de/LC_MESSAGES/alacarte.mo
+share/locale/es/LC_MESSAGES/alacarte.mo
+share/locale/fr/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
+@unexec rmdir %D/share/applications 2>/dev/null || true
+@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
+@dirrm %%PYTHON_SITELIBDIR%%/Alacarte