Disable gmenu-simple-editor. We will use gnome-menu-editor instead.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4793 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 14 insertions, 26 deletions

diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index a0eb9ea95..31be1f86c 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#	$MCom: ports/x11/gnome-menus/Makefile,v 1.19 2005/09/06 15:00:12 marcus Exp $
+#	$MCom: ports/x11/gnome-menus/Makefile,v 1.20 2005/09/06 17:38:41 mezz Exp $
 #
 
 PORTNAME=	gnome-menus
 PORTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
@@ -20,7 +21,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomevfs2 ltverhack pygtk2
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomevfs2 ltverhack
 USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in
new file mode 100644
index 000000000..510f1140f
--- /dev/null
+++ b/x11/gnome-menus/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Sep  8 13:59:53 2005
++++ Makefile.in	Thu Sep  8 14:00:08 2005
+@@ -205,7 +205,7 @@
+ target_alias = @target_alias@
+ NULL = 
+ 
+-@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python simple-editor
++@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python
+ 
+ ALL_SUBDIRS = \
+ 	po 			\
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index aff380fc4..82b691c29 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -1,4 +1,3 @@
-bin/gmenu-simple-editor
 bin/gnome-menu-spec-test
 etc/xdg/menus/applications.menu
 etc/xdg/menus/preferences.menu
@@ -7,27 +6,8 @@ include/gnome-menus/gmenu-tree.h
 lib/libgnome-menu.a
 lib/libgnome-menu.so
 lib/libgnome-menu.so.2
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/__init__.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/config.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/main.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/maindialog.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menufilewriter.pyo
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.py
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.pyc
-%%PYTHON_SITELIBDIR%%/GMenuSimpleEditor/menutreemodel.pyo
 %%PYTHON_SITELIBDIR%%/gmenu.so
 libdata/pkgconfig/libgnome-menu.pc
-share/gnome/applications/gmenu-simple-editor.desktop
 share/gnome/desktop-directories/Accessibility.directory
 share/gnome/desktop-directories/Accessories.directory
 share/gnome/desktop-directories/Applications.directory
@@ -46,7 +26,6 @@ share/gnome/desktop-directories/Settings-Accessibility.directory
 share/gnome/desktop-directories/Settings.directory
 share/gnome/desktop-directories/System-Settings.directory
 share/gnome/desktop-directories/System-Tools.directory
-share/gnome/gnome-menus/glade/gmenu-simple-editor.glade
 share/locale/ar/LC_MESSAGES/gnome-menus.mo
 share/locale/bg/LC_MESSAGES/gnome-menus.mo
 share/locale/ca/LC_MESSAGES/gnome-menus.mo
@@ -109,10 +88,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @unexec rmdir %D/share/locale/mr 2> /dev/null || true
 @unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/hy 2> /dev/null || true
-@dirrm share/gnome/gnome-menus/glade
-@dirrm share/gnome/gnome-menus
 @dirrm share/gnome/desktop-directories
-@dirrm %%PYTHON_SITELIBDIR%%/GMenuSimpleEditor
 @dirrm include/gnome-menus
 @dirrm etc/xdg/menus
 @dirrm etc/xdg