summaryrefslogtreecommitdiffstats
path: root/x11/gnome-menus
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-14 09:21:27 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-03-14 09:21:27 +0800
commit6ea8cdadd34fade98a807bf84429806612c65079 (patch)
treeb7f18e7e629139c395bf0080243a2218963d0301 /x11/gnome-menus
parent857bb773fe0bad1b58fa9c68ece3c326f60613e6 (diff)
downloadmarcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.gz
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.bz2
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.lz
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.xz
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.zst
marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.zip
Remove these ports now that they have been merged into the ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3934 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-menus')
-rw-r--r--x11/gnome-menus/Makefile39
-rw-r--r--x11/gnome-menus/distinfo2
-rw-r--r--x11/gnome-menus/files/KDE.directory5
-rw-r--r--x11/gnome-menus/files/patch-layout::applications.menu349
-rw-r--r--x11/gnome-menus/files/patch-layout::preferences.menu41
-rw-r--r--x11/gnome-menus/files/patch-layout::settings.menu32
-rw-r--r--x11/gnome-menus/files/patch-libmenu::menu-tree.c173
-rw-r--r--x11/gnome-menus/files/patch-libmenu::menu-tree.h14
-rw-r--r--x11/gnome-menus/pkg-descr12
-rw-r--r--x11/gnome-menus/pkg-plist77
10 files changed, 0 insertions, 744 deletions
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
deleted file mode 100644
index 244555afb..000000000
--- a/x11/gnome-menus/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for: gnome-menus
-# Date created: 30 November 2004
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gnome-menus
-PORTVERSION= 2.10.0
-CATEGORIES= x11 gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Implementation of the FreeDesktop Desktop Menu Spec
-
-USE_BZIP2= yes
-USE_X_PREFIX= yes
-USE_REINPLACE= yes
-USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2
-USE_LIBTOOL_VER=15
-INSTALLS_SHLIB= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/usr/share/gnome|${X11BASE}/share/gnome|g' \
- ${WRKSRC}/layout/applications.menu \
- ${WRKSRC}/layout/settings.menu
- @${SED} -e 's|/usr/local|${LOCALBASE}|g' \
- < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
-
-post-install:
- @${MKDIR} ${PREFIX}/share/gnome/desktop-directories
- @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/desktop-directories
-
-.include <bsd.port.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
deleted file mode 100644
index cf1ecb322..000000000
--- a/x11/gnome-menus/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-menus-2.10.0.tar.bz2) = 7c0776f79dcd08de97de2b6f9c17c830
-SIZE (gnome2/gnome-menus-2.10.0.tar.bz2) = 337595
diff --git a/x11/gnome-menus/files/KDE.directory b/x11/gnome-menus/files/KDE.directory
deleted file mode 100644
index 032126bb9..000000000
--- a/x11/gnome-menus/files/KDE.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=KDE
-Comment=Some comment about KDE menu
-Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
-Type=Directory
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
deleted file mode 100644
index 6f8b1fb5a..000000000
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ /dev/null
@@ -1,349 +0,0 @@
---- layout/applications.menu.orig Fri Jan 14 14:17:53 2005
-+++ layout/applications.menu Tue Mar 1 01:28:57 2005
-@@ -15,15 +15,18 @@
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
-- <!-- Read in overrides and child menus from applications-merged/ -->
-- <DefaultMergeDirs/>
--
- <!-- Accessories submenu -->
- <Menu>
- <Name>Accessories</Name>
- <Directory>Accessories.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Utility</Category>
- <Not>
- <Category>System</Category>
-@@ -38,6 +41,12 @@
- <Directory>Accessibility.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Accessibility</Category>
- <Not>
- <Category>Settings</Category>
-@@ -52,6 +61,12 @@
- <Directory>Development.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Development</Category>
- </And>
- <Filename>emacs.desktop</Filename>
-@@ -64,6 +79,12 @@
- <Directory>Edutainment.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Education</Category>
- </And>
- </Include>
-@@ -75,6 +96,12 @@
- <Directory>Games.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Game</Category>
- </And>
- </Include>
-@@ -86,6 +113,12 @@
- <Directory>Graphics.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Graphics</Category>
- </And>
- </Include>
-@@ -97,6 +130,12 @@
- <Directory>Internet.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Network</Category>
- </And>
- </Include>
-@@ -108,6 +147,12 @@
- <Directory>Multimedia.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>AudioVideo</Category>
- </And>
- </Include>
-@@ -119,6 +164,12 @@
- <Directory>Office.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Office</Category>
- </And>
- </Include>
-@@ -130,6 +181,12 @@
- <Directory>System-Tools.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>System</Category>
- <Not><Category>Settings</Category></Not>
- </And>
-@@ -143,11 +200,207 @@
- <OnlyUnallocated/>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Application</Category>
- <Not><Category>Core</Category></Not>
- <Not><Category>Settings</Category></Not>
- </And>
- </Include>
- </Menu> <!-- End Other -->
-+
-+ <!-- Read in overrides and child menus from applications-merged/ -->
-+ <DefaultMergeDirs/>
-+
-+ <!-- KDE -->
-+ <Menu>
-+ <Name>KDE</Name>
-+ <Directory>KDE.directory</Directory>
-+
-+ <!-- KAccessories submenu -->
-+ <Menu>
-+ <Name>Accessories</Name>
-+ <Directory>Accessories.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Utility</Category>
-+ <Not>
-+ <Category>System</Category>
-+ </Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KAccessories -->
-+
-+ <!-- KAccessibility submenu -->
-+ <Menu>
-+ <Name>Accessibility</Name>
-+ <Directory>Accessibility.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Accessibility</Category>
-+ <Not>
-+ <Category>Settings</Category>
-+ </Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KAccessibility -->
-+
-+ <!-- KDevelopment Tools -->
-+ <Menu>
-+ <Name>Development</Name>
-+ <Directory>Development.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Development</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KDevelopment Tools -->
-+
-+ <!-- KEdutainment -->
-+ <Menu>
-+ <Name>Edutainment</Name>
-+ <Directory>Edutainment.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Education</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KEdutainment -->
-+
-+ <!-- KGames -->
-+ <Menu>
-+ <Name>Games</Name>
-+ <Directory>Games.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Game</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KGames -->
-+
-+ <!-- KGraphics -->
-+ <Menu>
-+ <Name>Graphics</Name>
-+ <Directory>Graphics.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Graphics</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KGraphics -->
-+
-+ <!-- KInternet -->
-+ <Menu>
-+ <Name>Internet</Name>
-+ <Directory>Internet.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Network</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KInternet -->
-+
-+ <!-- KMultimedia -->
-+ <Menu>
-+ <Name>Multimedia</Name>
-+ <Directory>Multimedia.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>AudioVideo</Category>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KMultimedia -->
-+
-+ <!-- KOffice -->
-+ <Menu>
-+ <Name>Office</Name>
-+ <Directory>Office.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Or>
-+ <Category>Office</Category>
-+ <Category>Spreadsheet</Category>
-+ <Category>WordProcessor</Category>
-+ <Category>Calendar</Category>
-+ <Category>ProjectManagement</Category>
-+ </Or>
-+ </And>
-+ </Include>
-+ </Menu><!-- End KOffice -->
-+
-+ <!-- KSystem Tools-->
-+ <Menu>
-+ <Name>System</Name>
-+ <Directory>System-Tools.directory</Directory>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>System</Category>
-+ <Not><Category>Settings</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KSystem Tools -->
-+
-+ <!-- KOther -->
-+ <Menu>
-+ <Name>Other</Name>
-+ <Directory>Other.directory</Directory>
-+ <OnlyUnallocated/>
-+ <Include>
-+ <And>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ <Category>Application</Category>
-+ <Not><Category>Core</Category></Not>
-+ <Not><Category>Settings</Category></Not>
-+ </And>
-+ </Include>
-+ </Menu> <!-- End KOther -->
-+ </Menu> <!-- KDE -->
-
- </Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
deleted file mode 100644
index fef1dc0dc..000000000
--- a/x11/gnome-menus/files/patch-layout::preferences.menu
+++ /dev/null
@@ -1,41 +0,0 @@
---- layout/preferences.menu.orig Sat Dec 11 07:58:50 2004
-+++ layout/preferences.menu Tue Mar 1 01:28:57 2005
-@@ -9,12 +9,15 @@
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
-- <!-- Read in overrides and child menus from preferences-merged/ -->
-- <DefaultMergeDirs/>
--
- <!-- Stuff in the toplevel -->
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Settings</Category>
- <Not>
- <Or>
-@@ -36,10 +39,19 @@
- <Directory>Settings-Accessibility.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Settings</Category>
- <Category>Accessibility</Category>
- </And>
- </Include>
- </Menu>
-+
-+ <!-- Read in overrides and child menus from preferences-merged/ -->
-+ <DefaultMergeDirs/>
-
- </Menu> <!-- End Prefs -->
diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu
deleted file mode 100644
index 266678df2..000000000
--- a/x11/gnome-menus/files/patch-layout::settings.menu
+++ /dev/null
@@ -1,32 +0,0 @@
---- layout/settings.menu.orig Wed Jan 5 20:12:16 2005
-+++ layout/settings.menu Tue Mar 1 01:28:57 2005
-@@ -15,9 +15,6 @@
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
-- <!-- Read in overrides and child menus from applications-merged/ -->
-- <DefaultMergeDirs/>
--
- <!-- Merge in these other files as submenus -->
- <Menu>
- <Name>Preferences</Name>
-@@ -30,10 +27,19 @@
- <Directory>System-Settings.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Settings</Category>
- <Category>System</Category>
- </And>
- </Include>
- </Menu> <!-- End System Settings -->
-+
-+ <!-- 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 9bc620214..000000000
--- a/x11/gnome-menus/files/patch-libmenu::menu-tree.c
+++ /dev/null
@@ -1,173 +0,0 @@
---- libmenu/menu-tree.c.orig Tue Mar 1 01:24:07 2005
-+++ libmenu/menu-tree.c Tue Mar 1 01:24:17 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;
-@@ -702,17 +709,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,
-@@ -725,6 +730,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;
-@@ -891,6 +912,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;
-@@ -2267,16 +2289,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 *
-@@ -2290,11 +2317,14 @@
- MenuLayoutNode *layout_iter;
- MenuTreeDirectory *directory;
- DesktopEntrySet *entries;
-+ DesktopEntrySet *excluded_entries;
- DesktopEntrySet *allocated_set;
- gboolean deleted;
- 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);
-
-@@ -2311,6 +2341,7 @@
- dir_dirs = menu_layout_node_menu_get_directory_dirs (layout);
-
- entries = desktop_entry_set_new ();
-+ excluded_entries = desktop_entry_set_new ();
- allocated_set = desktop_entry_set_new ();
-
- layout_iter = menu_layout_node_get_children (layout);
-@@ -2357,6 +2388,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);
- }
-@@ -2389,6 +2421,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);
- }
-
-@@ -2488,15 +2521,28 @@
- if (deleted)
- {
- desktop_entry_set_unref (entries);
-+ desktop_entry_set_unref (excluded_entries);
- menu_tree_directory_unref (directory);
- return NULL;
- }
-
-- directory->entries = 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 e5f5ae766..000000000
--- 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/pkg-descr b/x11/gnome-menus/pkg-descr
deleted file mode 100644
index 3f2b7c336..000000000
--- a/x11/gnome-menus/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This package is free software and is part of the
-GNOME project.
-
-The package contains an implementation of the draft "Desktop
-Menu Specification" from freedesktop.org:
-
- http://www.freedesktop.org/Standards/menu-spec
-
-Also contained here are the GNOME menu layout configuration
-files, .directory files and assorted menu related utility programs.
-
--- gnome-menus README
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
deleted file mode 100644
index 21d744dfa..000000000
--- a/x11/gnome-menus/pkg-plist
+++ /dev/null
@@ -1,77 +0,0 @@
-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
-lib/libgnome-menu.a
-lib/libgnome-menu.so
-lib/libgnome-menu.so.0
-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/Development.directory
-share/gnome/desktop-directories/Edutainment.directory
-share/gnome/desktop-directories/Games.directory
-share/gnome/desktop-directories/Graphics.directory
-share/gnome/desktop-directories/Internet.directory
-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/Settings-Accessibility.directory
-share/gnome/desktop-directories/Settings.directory
-share/gnome/desktop-directories/System-Settings.directory
-share/gnome/desktop-directories/System-Tools.directory
-share/locale/ar/LC_MESSAGES/gnome-menus.mo
-share/locale/bg/LC_MESSAGES/gnome-menus.mo
-share/locale/ca/LC_MESSAGES/gnome-menus.mo
-share/locale/cs/LC_MESSAGES/gnome-menus.mo
-share/locale/cy/LC_MESSAGES/gnome-menus.mo
-share/locale/da/LC_MESSAGES/gnome-menus.mo
-share/locale/de/LC_MESSAGES/gnome-menus.mo
-share/locale/el/LC_MESSAGES/gnome-menus.mo
-share/locale/en_GB/LC_MESSAGES/gnome-menus.mo
-share/locale/en_CA/LC_MESSAGES/gnome-menus.mo
-share/locale/es/LC_MESSAGES/gnome-menus.mo
-share/locale/et/LC_MESSAGES/gnome-menus.mo
-share/locale/eu/LC_MESSAGES/gnome-menus.mo
-share/locale/fa/LC_MESSAGES/gnome-menus.mo
-share/locale/fi/LC_MESSAGES/gnome-menus.mo
-share/locale/fr/LC_MESSAGES/gnome-menus.mo
-share/locale/gu/LC_MESSAGES/gnome-menus.mo
-share/locale/hi/LC_MESSAGES/gnome-menus.mo
-share/locale/hu/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/ms/LC_MESSAGES/gnome-menus.mo
-share/locale/nb/LC_MESSAGES/gnome-menus.mo
-share/locale/ne/LC_MESSAGES/gnome-menus.mo
-share/locale/nl/LC_MESSAGES/gnome-menus.mo
-share/locale/nn/LC_MESSAGES/gnome-menus.mo
-share/locale/no/LC_MESSAGES/gnome-menus.mo
-share/locale/pa/LC_MESSAGES/gnome-menus.mo
-share/locale/pl/LC_MESSAGES/gnome-menus.mo
-share/locale/pt/LC_MESSAGES/gnome-menus.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
-share/locale/ro/LC_MESSAGES/gnome-menus.mo
-share/locale/ru/LC_MESSAGES/gnome-menus.mo
-share/locale/sk/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
-share/locale/sv/LC_MESSAGES/gnome-menus.mo
-share/locale/th/LC_MESSAGES/gnome-menus.mo
-share/locale/tr/LC_MESSAGES/gnome-menus.mo
-share/locale/uk/LC_MESSAGES/gnome-menus.mo
-share/locale/vi/LC_MESSAGES/gnome-menus.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
-@dirrm share/gnome/desktop-directories
-@dirrm include/gnome-menus
-@dirrm etc/xdg/menus
-@dirrm etc/xdg