10 files changed, 61 insertions, 222 deletions

diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index c0415bed871e..5a8ffe48ff43 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,14 +3,15 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#	$MCom: ports/x11/gnome-menus/Makefile,v 1.21 2005/09/08 18:04:51 marcus Exp $
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	2.10.2
+PORTVERSION=	2.12.0
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,8 +21,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomevfs2
-USE_LIBTOOL_VER=15
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomevfs2 ltverhack
+USE_AUTOTOOLS=	libtool:15
+USE_PYTHON=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -32,6 +34,8 @@ post-patch:
 		${WRKSRC}/layout/settings.menu
 	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
 		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+	@${REINPLACE_CMD} -e s'|%%X11BASE%%|${X11BASE}|g' \
+		${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/gnome/desktop-directories
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index e7d3ff4072eb..df5f80bb947d 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-menus-2.10.2.tar.bz2) = 97b0ad03ea219cc8f5c02585db1d237e
-SIZE (gnome2/gnome-menus-2.10.2.tar.bz2) = 350941
+MD5 (gnome2/gnome-menus-2.12.0.tar.bz2) = 615392c4f729f70c03aa3aa7dbe40a95
+SIZE (gnome2/gnome-menus-2.12.0.tar.bz2) = 393280
diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in
new file mode 100644
index 000000000000..510f1140fb48
--- /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/files/patch-bugzilla-312502 b/x11/gnome-menus/files/patch-bugzilla-312502
deleted file mode 100644
index 0fa77890b7a9..000000000000
--- a/x11/gnome-menus/files/patch-bugzilla-312502
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -p -r1.7.4.1 desktop-entries.c
---- libmenu/desktop-entries.c	5 Apr 2005 21:04:31 -0000	1.7.4.1
-+++ libmenu/desktop-entries.c	5 Aug 2005 07:57:37 -0000
-@@ -554,7 +554,7 @@ desktop_entry_add_legacy_category (Deskt
-       for (; entry->categories[i]; i++);
-     }
- 
--  categories = g_new0 (GQuark, i + 1);
-+  categories = g_new0 (GQuark, i + 2);
- 
-   i = 0;
-   if (entry->categories != NULL)
diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu
index ae086261bc6e..115f03ce7599 100644
--- a/x11/gnome-menus/files/patch-layout::settings.menu
+++ b/x11/gnome-menus/files/patch-layout::settings.menu
@@ -1,16 +1,6 @@
---- layout/settings.menu.orig	Tue Jun 28 03:49:13 2005
-+++ layout/settings.menu	Tue Jun 28 03:50:07 2005
-@@ -10,9 +10,6 @@
-   <DefaultAppDirs/>
-   <DefaultDirectoryDirs/>
- 
--  <!-- Read in overrides and child menus from applications-merged/ -->
--  <DefaultMergeDirs/>
--
-   <!-- Merge in these other files as submenus -->
-   <Menu>
-     <Name>Preferences</Name>
-@@ -25,10 +22,19 @@
+--- layout/settings.menu.orig	Thu Apr 14 17:36:13 2005
++++ layout/settings.menu	Tue May 17 18:42:56 2005
+@@ -25,10 +25,19 @@
      <Directory>System-Settings.directory</Directory>
      <Include>
        <And>
@@ -26,7 +16,7 @@
      </Include>
    </Menu>     <!-- End System Settings -->
 +
-+  <!-- Read in overrides and child menus from applications-merged/ -->
++  <!-- Read in overrides and child menus from settings-merged/ -->
 +  <DefaultMergeDirs/>
  
  </Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.c b/x11/gnome-menus/files/patch-libmenu::menu-tree.c
deleted file mode 100644
index bd405098f5fa..000000000000
--- a/x11/gnome-menus/files/patch-libmenu::menu-tree.c
+++ /dev/null
@@ -1,172 +0,0 @@
---- libmenu/menu-tree.c.orig	Tue Jun 28 04:05:19 2005
-+++ libmenu/menu-tree.c	Tue Jun 28 04:05:42 2005
-@@ -67,6 +67,12 @@
-   gpointer            user_data;
- } MenuTreeMonitor;
- 
-+typedef struct
-+{
-+  MenuTreeDirectory *directory;
-+  GSList            *list;
-+} MenuTreeListifyForeachData;
-+
- struct MenuTreeDirectory
- {
-   MenuTreeDirectory *parent;
-@@ -75,6 +81,7 @@
-   char         *name;
- 
-   GSList *entries;
-+  GSList *excluded_entries;
-   GSList *subdirs;
- 
-   guint refcount : 24;
-@@ -750,17 +757,15 @@
-     }
- }
- 
--GSList *
--menu_tree_directory_get_entries (MenuTreeDirectory *directory)
-+static GSList *
-+copy_and_ref_entry_list (GSList *list)
- {
-   GSList *retval;
-   GSList *tmp;
- 
--  g_return_val_if_fail (directory != NULL, NULL);
--
-   retval = NULL;
- 
--  tmp = directory->entries;
-+  tmp = list;
-   while (tmp != NULL)
-     {
-       retval = g_slist_prepend (retval,
-@@ -773,6 +778,22 @@
- }
- 
- GSList *
-+menu_tree_directory_get_entries (MenuTreeDirectory *directory)
-+{
-+  g_return_val_if_fail (directory != NULL, NULL);
-+
-+  return copy_and_ref_entry_list (directory->entries);
-+}
-+
-+GSList *
-+menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory)
-+{
-+  g_return_val_if_fail (directory != NULL, NULL);
-+
-+  return copy_and_ref_entry_list (directory->excluded_entries);
-+}
-+
-+GSList *
- menu_tree_directory_get_subdirs (MenuTreeDirectory *directory)
- {
-   GSList *retval;
-@@ -939,6 +960,7 @@
-   retval->name             = g_strdup (name);
-   retval->directory_entry  = NULL;
-   retval->entries          = NULL;
-+  retval->excluded_entries = NULL;
-   retval->subdirs          = NULL;
-   retval->only_unallocated = FALSE;
-   retval->refcount         = 1;
-@@ -2554,16 +2576,21 @@
- }
- 
- static void
--entries_listify_foreach (const char        *desktop_file_id,
--                         DesktopEntry      *desktop_entry,
--                         MenuTreeDirectory *directory)
-+entries_listify_foreach (const char                 *desktop_file_id,
-+                         DesktopEntry               *desktop_entry,
-+                         MenuTreeListifyForeachData *foreach_data)
- {
-   MenuTreeEntry *entry;
- 
--  entry = menu_tree_entry_new (directory, desktop_entry, desktop_file_id);
-+  g_return_if_fail (foreach_data);
-+  g_return_if_fail (foreach_data->directory);
-+
-+  entry = menu_tree_entry_new (foreach_data->directory,
-+		  	       desktop_entry,
-+			       desktop_file_id);
- 
--  directory->entries = g_slist_prepend (directory->entries,
--                                        entry);
-+  foreach_data->list = g_slist_prepend (foreach_data->list,
-+		  			entry);
- }
- 
- static MenuTreeDirectory *
-@@ -2576,11 +2603,14 @@
-   MenuTreeDirectory  *directory;
-   DesktopEntrySet    *entry_pool;
-   DesktopEntrySet    *entries;
-+  DesktopEntrySet    *excluded_entries;
-   gboolean            deleted;
-   DesktopEntrySet    *allocated_set;
-   gboolean            only_unallocated;
-   GSList             *tmp;
- 
-+  MenuTreeListifyForeachData foreach_data;
-+
-   g_assert (menu_layout_node_get_type (layout) == MENU_LAYOUT_NODE_MENU);
-   g_assert (menu_layout_node_menu_get_name (layout) != NULL);
- 
-@@ -2594,6 +2624,7 @@
-   only_unallocated = FALSE;
- 
-   entries = desktop_entry_set_new ();
-+  excluded_entries = desktop_entry_set_new ();
-   allocated_set = desktop_entry_set_new ();
- 
-   entry_pool = desktop_entry_set_new ();
-@@ -2644,6 +2675,7 @@
-                 if (rule_set != NULL)
-                   {
-                     desktop_entry_set_union (entries, rule_set);
-+                    desktop_entry_set_subtract (excluded_entries, rule_set);
-                     desktop_entry_set_union (allocated_set, rule_set);
-                     desktop_entry_set_unref (rule_set);
-                   }
-@@ -2676,6 +2708,7 @@
-                 if (rule_set != NULL)
-                   {
-                     desktop_entry_set_subtract (entries, rule_set);
-+                    desktop_entry_set_union (excluded_entries, rule_set);
-                     desktop_entry_set_unref (rule_set);
-                   }
- 
-@@ -2775,14 +2808,28 @@
-   if (deleted)
-     {
-       desktop_entry_set_unref (entries);
-+      desktop_entry_set_unref (excluded_entries);
-       menu_tree_directory_unref (directory);
-       return NULL;
-     }
- 
-+  foreach_data.directory = directory;
-+  foreach_data.list = NULL;
-   desktop_entry_set_foreach (entries,
-                              (DesktopEntrySetForeachFunc) entries_listify_foreach,
--                             directory);
-+                             &foreach_data);
-   desktop_entry_set_unref (entries);
-+
-+  directory->entries = foreach_data.list;
-+
-+  foreach_data.directory = directory;
-+  foreach_data.list = NULL;
-+  desktop_entry_set_foreach (excluded_entries,
-+		  	     (DesktopEntrySetForeachFunc) entries_listify_foreach,
-+			     &foreach_data);
-+  desktop_entry_set_unref (excluded_entries);
-+
-+  directory->excluded_entries = foreach_data.list;
- 
-   tmp = directory->entries;
-   while (tmp != NULL)
diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.h b/x11/gnome-menus/files/patch-libmenu::menu-tree.h
deleted file mode 100644
index e5f5ae76691d..000000000000
--- a/x11/gnome-menus/files/patch-libmenu::menu-tree.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmenu/menu-tree.h.orig	Wed Jan 12 15:23:52 2005
-+++ libmenu/menu-tree.h	Tue Mar  1 01:24:17 2005
-@@ -44,8 +44,9 @@
- MenuTreeDirectory *menu_tree_get_directory_from_path (MenuTree   *tree,
- 						      const char *path);
- 
--GSList *menu_tree_directory_get_entries (MenuTreeDirectory *directory);
--GSList *menu_tree_directory_get_subdirs (MenuTreeDirectory *directory);
-+GSList *menu_tree_directory_get_entries          (MenuTreeDirectory *directory);
-+GSList *menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory);
-+GSList *menu_tree_directory_get_subdirs          (MenuTreeDirectory *directory);
- 
- MenuTreeDirectory *menu_tree_directory_ref   (MenuTreeDirectory *directory);
- void               menu_tree_directory_unref (MenuTreeDirectory *directory);
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
new file mode 100644
index 000000000000..2306f060952e
--- /dev/null
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -0,0 +1,20 @@
+--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig	Mon Apr 11 05:36:04 2005
++++ simple-editor/GMenuSimpleEditor/menutreemodel.py	Tue Sep  6 11:04:46 2005
+@@ -29,7 +29,7 @@
+     if os.environ.has_key ("XDG_CONFIG_DIRS"):
+         conf_dirs = os.environ["XDG_CONFIG_DIRS"]
+     if not conf_dirs:
+-        conf_dirs = "/etc/xdg"
++	conf_dirs = "%%X11BASE%%/etc/xdg"
+ 
+     for conf_dir in conf_dirs.split (":"):
+         menu_file_path = os.path.join (conf_dir, "menus", menu_file)
+@@ -51,7 +51,7 @@
+     if os.environ.has_key ("XDG_DATA_DIRS"):
+         data_dirs = os.environ["XDG_DATA_DIRS"]
+     if not data_dirs:
+-        data_dirs = "/usr/local/share/:/usr/share/"
++	data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"
+ 
+     for data_dir in data_dirs.split (":"):
+         retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value))
diff --git a/x11/gnome-menus/pkg-descr b/x11/gnome-menus/pkg-descr
index 3f2b7c336c7f..7b27b4e2e339 100644
--- a/x11/gnome-menus/pkg-descr
+++ b/x11/gnome-menus/pkg-descr
@@ -10,3 +10,5 @@ Also contained here are the GNOME menu layout configuration
 files, .directory files and assorted menu related utility programs.
 
 -- gnome-menus README
+
+WWW: http://www.freedesktop.org/Standards/menu-spec
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 231a097159a2..82b691c297f3 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -2,16 +2,18 @@ bin/gnome-menu-spec-test
 etc/xdg/menus/applications.menu
 etc/xdg/menus/preferences.menu
 etc/xdg/menus/settings.menu
-include/gnome-menus/menu-tree.h
+include/gnome-menus/gmenu-tree.h
 lib/libgnome-menu.a
 lib/libgnome-menu.so
-lib/libgnome-menu.so.0
+lib/libgnome-menu.so.2
+%%PYTHON_SITELIBDIR%%/gmenu.so
 libdata/pkgconfig/libgnome-menu.pc
 share/gnome/desktop-directories/Accessibility.directory
 share/gnome/desktop-directories/Accessories.directory
 share/gnome/desktop-directories/Applications.directory
+share/gnome/desktop-directories/Desktop.directory
 share/gnome/desktop-directories/Development.directory
-share/gnome/desktop-directories/Edutainment.directory
+share/gnome/desktop-directories/Education.directory
 share/gnome/desktop-directories/Games.directory
 share/gnome/desktop-directories/Graphics.directory
 share/gnome/desktop-directories/Internet.directory
@@ -19,6 +21,7 @@ share/gnome/desktop-directories/KDE.directory
 share/gnome/desktop-directories/Multimedia.directory
 share/gnome/desktop-directories/Office.directory
 share/gnome/desktop-directories/Other.directory
+share/gnome/desktop-directories/Preferences.directory
 share/gnome/desktop-directories/Settings-Accessibility.directory
 share/gnome/desktop-directories/Settings.directory
 share/gnome/desktop-directories/System-Settings.directory
@@ -44,12 +47,14 @@ share/locale/gu/LC_MESSAGES/gnome-menus.mo
 share/locale/he/LC_MESSAGES/gnome-menus.mo
 share/locale/hi/LC_MESSAGES/gnome-menus.mo
 share/locale/hu/LC_MESSAGES/gnome-menus.mo
+share/locale/hy/LC_MESSAGES/gnome-menus.mo
 share/locale/id/LC_MESSAGES/gnome-menus.mo
 share/locale/it/LC_MESSAGES/gnome-menus.mo
 share/locale/ja/LC_MESSAGES/gnome-menus.mo
 share/locale/ko/LC_MESSAGES/gnome-menus.mo
 share/locale/lt/LC_MESSAGES/gnome-menus.mo
 share/locale/mk/LC_MESSAGES/gnome-menus.mo
+share/locale/mr/LC_MESSAGES/gnome-menus.mo
 share/locale/ms/LC_MESSAGES/gnome-menus.mo
 share/locale/nb/LC_MESSAGES/gnome-menus.mo
 share/locale/ne/LC_MESSAGES/gnome-menus.mo
@@ -64,7 +69,6 @@ share/locale/ro/LC_MESSAGES/gnome-menus.mo
 share/locale/ru/LC_MESSAGES/gnome-menus.mo
 share/locale/rw/LC_MESSAGES/gnome-menus.mo
 share/locale/sk/LC_MESSAGES/gnome-menus.mo
-share/locale/sl/LC_MESSAGES/gnome-menus.mo
 share/locale/sq/LC_MESSAGES/gnome-menus.mo
 share/locale/sr/LC_MESSAGES/gnome-menus.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
@@ -80,7 +84,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @unexec rmdir %D/share/locale/xh 2> /dev/null || true
 @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
+@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/desktop-directories
 @dirrm include/gnome-menus
 @dirrm etc/xdg/menus
 @dirrm etc/xdg
+@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true
+@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true