13 files changed, 59 insertions, 120 deletions

diff --git a/deskutils/Makefile b/deskutils/Makefile
index 2032cd5539c6..fc3908c7165c 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -94,7 +94,6 @@
     SUBDIR += mcatalog
     SUBDIR += mdh
     SUBDIR += mencal
-    SUBDIR += menueditor
     SUBDIR += metabar
     SUBDIR += mhc
     SUBDIR += mhc-emacs20
@@ -126,6 +125,7 @@
     SUBDIR += rox-memo
     SUBDIR += rubrica
     SUBDIR += sliderule
+    SUBDIR += smeg
     SUBDIR += splashsetter
     SUBDIR += sugarcrm
     SUBDIR += superkaramba
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index 33cb944100d5..969f663e2de8 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -5,37 +5,31 @@
 # $FreeBSD$
 #
 
-PORTNAME=	menueditor
-PORTVERSION=	0.4.3
-CATEGORIES=	deskutils gnome
-MASTER_SITES=	http://dev.realistanew.com/menu-editor/ \
-		http://dev.realistanew.com/menu-editor/old/
-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+PORTNAME=	smeg
+PORTVERSION=	0.7.4
+CATEGORIES=	deskutils
+MASTER_SITES=	http://dev.realistanew.com/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A simple menu editor for GNOME 2.10
+COMMENT=	An editor for the freedesktop.org menu specification
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GMAKE=	yes
-USE_GNOME=	pygtk2 gnomehier
+USE_GNOME=	pygtk2
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|\[(libdir,|\[('share/gnome/menu-editor',|g ; \
-		s|, 'lib/|, 'share/gnome/|g ; \
-		s|'share/pixmaps|'share/gnome/pixmaps|g ; \
-		s|'share/applications|'share/gnome/applications|g ; \
-		s|/usr/share|${X11BASE}/share/gnome|g ; \
-		s|/etc|${X11BASE}/etc|g" \
-			${WRKSRC}/setup.py ${WRKSRC}/bin/menu-editor \
-			${WRKSRC}/lib/menu-editor/menu_handler.py
+	@${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/gnome/menu-editor
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		${PREFIX}/share/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo
index 70d900868633..d9bb7b993055 100644
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@@ -1,2 +1,2 @@
-MD5 (menueditor_0.4.3.orig.tar.gz) = a25e6749a76e806f6eb19ece02b90281
-SIZE (menueditor_0.4.3.orig.tar.gz) = 12221
+MD5 (smeg-0.7.4.tar.gz) = 3611bebd337ce4d4799a1d6887240399
+SIZE (smeg-0.7.4.tar.gz) = 21899
diff --git a/deskutils/alacarte/pkg-descr b/deskutils/alacarte/pkg-descr
index 72cd553d8a92..fdb5e2aafcf2 100644
--- a/deskutils/alacarte/pkg-descr
+++ b/deskutils/alacarte/pkg-descr
@@ -1,4 +1,3 @@
-A simple menu editor for GNOME 2.10 that can edit and add new entries. It
-implements the fd.o menu spec but may or may not work with other DEs.
+Smeg is an editor for the freedesktop.org menu specification.
 
-WWW: http://www.realistanew.com/2005/03/18/gnome-menu-editor/
+WWW: http://www.realistanew.com/projects/smeg/
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index a27895907cbc..a725979f7a3d 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -1,8 +1,12 @@
-bin/menu-editor
-share/doc/menu-editor/AUTHORS
-share/gnome/applications/menueditor.desktop
-share/gnome/menu-editor/menu_handler.py
-share/gnome/menu-editor/menu_handler.pyc
-share/gnome/pixmaps/menu-editor.png
-@dirrm share/gnome/menu-editor
-@dirrm share/doc/menu-editor
+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
diff --git a/deskutils/menueditor/Makefile b/deskutils/menueditor/Makefile
deleted file mode 100644
index 33cb944100d5..000000000000
--- a/deskutils/menueditor/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:	menueditor
-# Date created:				22 March 2005
-# Whom:					FreeBSD GNOME Team
-#
-# $FreeBSD$
-#
-
-PORTNAME=	menueditor
-PORTVERSION=	0.4.3
-CATEGORIES=	deskutils gnome
-MASTER_SITES=	http://dev.realistanew.com/menu-editor/ \
-		http://dev.realistanew.com/menu-editor/old/
-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A simple menu editor for GNOME 2.10
-
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GMAKE=	yes
-USE_GNOME=	pygtk2 gnomehier
-USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|\[(libdir,|\[('share/gnome/menu-editor',|g ; \
-		s|, 'lib/|, 'share/gnome/|g ; \
-		s|'share/pixmaps|'share/gnome/pixmaps|g ; \
-		s|'share/applications|'share/gnome/applications|g ; \
-		s|/usr/share|${X11BASE}/share/gnome|g ; \
-		s|/etc|${X11BASE}/etc|g" \
-			${WRKSRC}/setup.py ${WRKSRC}/bin/menu-editor \
-			${WRKSRC}/lib/menu-editor/menu_handler.py
-
-post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/menu-editor
-
-.include <bsd.port.mk>
diff --git a/deskutils/menueditor/distinfo b/deskutils/menueditor/distinfo
deleted file mode 100644
index 70d900868633..000000000000
--- a/deskutils/menueditor/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (menueditor_0.4.3.orig.tar.gz) = a25e6749a76e806f6eb19ece02b90281
-SIZE (menueditor_0.4.3.orig.tar.gz) = 12221
diff --git a/deskutils/menueditor/pkg-descr b/deskutils/menueditor/pkg-descr
deleted file mode 100644
index 72cd553d8a92..000000000000
--- a/deskutils/menueditor/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A simple menu editor for GNOME 2.10 that can edit and add new entries. It
-implements the fd.o menu spec but may or may not work with other DEs.
-
-WWW: http://www.realistanew.com/2005/03/18/gnome-menu-editor/
diff --git a/deskutils/menueditor/pkg-plist b/deskutils/menueditor/pkg-plist
deleted file mode 100644
index a27895907cbc..000000000000
--- a/deskutils/menueditor/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/menu-editor
-share/doc/menu-editor/AUTHORS
-share/gnome/applications/menueditor.desktop
-share/gnome/menu-editor/menu_handler.py
-share/gnome/menu-editor/menu_handler.pyc
-share/gnome/pixmaps/menu-editor.png
-@dirrm share/gnome/menu-editor
-@dirrm share/doc/menu-editor
diff --git a/deskutils/smeg/Makefile b/deskutils/smeg/Makefile
index 33cb944100d5..969f663e2de8 100644
--- a/deskutils/smeg/Makefile
+++ b/deskutils/smeg/Makefile
@@ -5,37 +5,31 @@
 # $FreeBSD$
 #
 
-PORTNAME=	menueditor
-PORTVERSION=	0.4.3
-CATEGORIES=	deskutils gnome
-MASTER_SITES=	http://dev.realistanew.com/menu-editor/ \
-		http://dev.realistanew.com/menu-editor/old/
-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+PORTNAME=	smeg
+PORTVERSION=	0.7.4
+CATEGORIES=	deskutils
+MASTER_SITES=	http://dev.realistanew.com/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A simple menu editor for GNOME 2.10
+COMMENT=	An editor for the freedesktop.org menu specification
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GMAKE=	yes
-USE_GNOME=	pygtk2 gnomehier
+USE_GNOME=	pygtk2
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|\[(libdir,|\[('share/gnome/menu-editor',|g ; \
-		s|, 'lib/|, 'share/gnome/|g ; \
-		s|'share/pixmaps|'share/gnome/pixmaps|g ; \
-		s|'share/applications|'share/gnome/applications|g ; \
-		s|/usr/share|${X11BASE}/share/gnome|g ; \
-		s|/etc|${X11BASE}/etc|g" \
-			${WRKSRC}/setup.py ${WRKSRC}/bin/menu-editor \
-			${WRKSRC}/lib/menu-editor/menu_handler.py
+	@${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/gnome/menu-editor
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		${PREFIX}/share/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/deskutils/smeg/distinfo b/deskutils/smeg/distinfo
index 70d900868633..d9bb7b993055 100644
--- a/deskutils/smeg/distinfo
+++ b/deskutils/smeg/distinfo
@@ -1,2 +1,2 @@
-MD5 (menueditor_0.4.3.orig.tar.gz) = a25e6749a76e806f6eb19ece02b90281
-SIZE (menueditor_0.4.3.orig.tar.gz) = 12221
+MD5 (smeg-0.7.4.tar.gz) = 3611bebd337ce4d4799a1d6887240399
+SIZE (smeg-0.7.4.tar.gz) = 21899
diff --git a/deskutils/smeg/pkg-descr b/deskutils/smeg/pkg-descr
index 72cd553d8a92..fdb5e2aafcf2 100644
--- a/deskutils/smeg/pkg-descr
+++ b/deskutils/smeg/pkg-descr
@@ -1,4 +1,3 @@
-A simple menu editor for GNOME 2.10 that can edit and add new entries. It
-implements the fd.o menu spec but may or may not work with other DEs.
+Smeg is an editor for the freedesktop.org menu specification.
 
-WWW: http://www.realistanew.com/2005/03/18/gnome-menu-editor/
+WWW: http://www.realistanew.com/projects/smeg/
diff --git a/deskutils/smeg/pkg-plist b/deskutils/smeg/pkg-plist
index a27895907cbc..a725979f7a3d 100644
--- a/deskutils/smeg/pkg-plist
+++ b/deskutils/smeg/pkg-plist
@@ -1,8 +1,12 @@
-bin/menu-editor
-share/doc/menu-editor/AUTHORS
-share/gnome/applications/menueditor.desktop
-share/gnome/menu-editor/menu_handler.py
-share/gnome/menu-editor/menu_handler.pyc
-share/gnome/pixmaps/menu-editor.png
-@dirrm share/gnome/menu-editor
-@dirrm share/doc/menu-editor
+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