Move the gnome-menus 3.x from x11/gnome-menus to x11/gnome-menus3 then

downgrade the x11/gnome-menu from 3.x to 2.x. The GNOME 2 needs gnome-menu
2.x version for the menu. GNOME 2 and 3 have different menu.


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

16 files changed, 667 insertions, 27 deletions

diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index ce7a2ddc1..30ab8081d 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,21 +3,23 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.115 2011/04/05 18:12:34 kwm Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.110 2010/11/17 11:29:19 kwm Exp $
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	3.0.1
+PORTVERSION=	2.30.5
 PORTREVISION=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
+CONFLICTS=	gnome-menus-3.[0-9]*
+
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -34,7 +36,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
 		${WRKSRC}/util/test-menu-spec.c
 	@${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
-		${WRKSRC}/layout/applications.menu
+		${WRKSRC}/layout/applications.menu \
+		${WRKSRC}/layout/settings.menu
 	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
 		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index f8a0cd1a9..a11734649 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-menus-3.0.1.tar.bz2) = 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0
-SIZE (gnome3/gnome-menus-3.0.1.tar.bz2) = 474839
+SHA256 (gnome2/gnome-menus-2.30.5.tar.bz2) = 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa
+SIZE (gnome2/gnome-menus-2.30.5.tar.bz2) = 471327
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index 75fe8586a..116dad13f 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,19 +1,17 @@
---- layout/applications.menu.orig	2011-03-31 08:48:41.000000000 +0200
-+++ layout/applications.menu	2011-04-05 20:11:35.000000000 +0200
-@@ -6,10 +6,9 @@
+--- layout/applications.menu.orig	2008-04-21 15:49:29.000000000 -0400
++++ layout/applications.menu	2008-04-28 14:51:24.000000000 -0400
+@@ -6,9 +6,8 @@
    <Name>Applications</Name>
    <Directory>X-GNOME-Menu-Applications.directory</Directory>
  
 -  <!-- Scan legacy dirs first, as later items take priority -->
 -  <KDELegacyDirs/>
 -  <LegacyDir>/etc/X11/applnk</LegacyDir>
--  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
 +  <!-- Scan legacy dirs first, as later items take priority
 +  <LegacyDir>/etc/X11/applnk</LegacyDir> -->
-+  <LegacyDir>/usr/local/share/gnome/apps</LegacyDir>
+   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
  
    <!-- Read standard .directory and .desktop file locations -->
-   <DefaultAppDirs/>
 @@ -31,6 +30,8 @@
  	     applications here -->
          <Not><Category>Accessibility</Category></Not>
@@ -106,10 +104,10 @@
    </Menu>   <!-- End System Tools -->
 @@ -147,8 +166,197 @@
          <Not><Category>Core</Category></Not>
+         <Not><Category>Settings</Category></Not>
          <Not><Category>Screensaver</Category></Not>
-         <Not><Category>X-GNOME-Settings-Panel</Category></Not>
-+        <Not><Category>Qt</Category></Not>
-+        <Not><Category>KDE</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
        </And>
      </Include>
    </Menu> <!-- End Other -->
@@ -176,7 +174,7 @@
 +
 +    <!-- KEducation -->
 +    <Menu>
-+     <Name>Education</Name>
++      <Name>Education</Name>
 +      <Directory>Education.directory</Directory>
 +      <Include>
 +        <And>
@@ -196,7 +194,7 @@
 +      <Include>
 +        <And>
 +          <Or>
-+           <Category>Qt</Category>
++            <Category>Qt</Category>
 +            <Category>KDE</Category>
 +          </Or>
 +          <Category>Game</Category>
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index de0e68c32..f94508732 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -1,4 +1,5 @@
 etc/xdg/menus/gnome-applications.menu
+etc/xdg/menus/settings.menu
 include/gnome-menus/gmenu-tree.h
 lib/girepository-1.0/GMenu-2.0.typelib
 lib/libgnome-menu.a
@@ -15,15 +16,20 @@ share/desktop-directories/Education.directory
 share/desktop-directories/Game.directory
 share/desktop-directories/Graphics.directory
 share/desktop-directories/Hardware.directory
+share/desktop-directories/InternetAndNetwork.directory
 share/desktop-directories/KDE.directory
+share/desktop-directories/LookAndFeel.directory
 share/desktop-directories/Network.directory
 share/desktop-directories/Office.directory
 share/desktop-directories/Personal.directory
+share/desktop-directories/Settings-System.directory
+share/desktop-directories/Settings.directory
 share/desktop-directories/System-Tools.directory
 share/desktop-directories/System.directory
 share/desktop-directories/Utility-Accessibility.directory
 share/desktop-directories/Utility.directory
 share/desktop-directories/X-GNOME-Menu-Applications.directory
+share/desktop-directories/X-GNOME-Menu-System.directory
 share/desktop-directories/X-GNOME-Other.directory
 share/gir-1.0/GMenu-2.0.gir
 share/gnome-menus/examples/gnome-menus-ls.py
@@ -84,7 +90,6 @@ share/locale/kn/LC_MESSAGES/gnome-menus.mo
 share/locale/ko/LC_MESSAGES/gnome-menus.mo
 share/locale/ku/LC_MESSAGES/gnome-menus.mo
 share/locale/ky/LC_MESSAGES/gnome-menus.mo
-share/locale/lo/LC_MESSAGES/gnome-menus.mo
 share/locale/lt/LC_MESSAGES/gnome-menus.mo
 share/locale/lv/LC_MESSAGES/gnome-menus.mo
 share/locale/mai/LC_MESSAGES/gnome-menus.mo
@@ -166,8 +171,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
-@dirrmtry share/locale/lo/LC_MESSAGES
-@dirrmtry share/locale/lo
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
diff --git a/x11/gnome-menus3/Makefile b/x11/gnome-menus3/Makefile
new file mode 100644
index 000000000..3bde5b04d
--- /dev/null
+++ b/x11/gnome-menus3/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for:	gnome-menus
+# Date created:				30 November 2004
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.116 2011/04/27 21:12:21 kwm Exp $
+#
+
+PORTNAME=	gnome-menus
+PORTVERSION=	3.0.1
+PORTREVISION=	0
+CATEGORIES=	x11 gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome3
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
+
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+
+CONFLICTS=	gnome-menus-2.[0-9]*
+
+LATEST_LINK=	gnome-menus3
+USE_GETTEXT=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
+USE_AUTOTOOLS=	libtool
+USE_PYTHON=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|applications.menu||' \
+		${WRKSRC}/layout/Makefile.in
+	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
+		${WRKSRC}/util/test-menu-spec.c
+	@${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \
+		${WRKSRC}/layout/applications.menu
+	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
+		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+	    	${WRKSRC}/util/Makefile.in
+
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
+		${PREFIX}/etc/xdg/menus/gnome-applications.menu
+	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
+		${PREFIX}/share/desktop-directories
+
+.include <bsd.port.mk>
diff --git a/x11/gnome-menus3/distinfo b/x11/gnome-menus3/distinfo
new file mode 100644
index 000000000..f8a0cd1a9
--- /dev/null
+++ b/x11/gnome-menus3/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/gnome-menus-3.0.1.tar.bz2) = 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0
+SIZE (gnome3/gnome-menus-3.0.1.tar.bz2) = 474839
diff --git a/x11/gnome-menus3/files/KDE.directory b/x11/gnome-menus3/files/KDE.directory
new file mode 100644
index 000000000..d8cacb750
--- /dev/null
+++ b/x11/gnome-menus3/files/KDE.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/default.kde/48x48/apps/kmenu.png
+Type=Directory
diff --git a/x11/gnome-menus3/files/patch-Makefile.in b/x11/gnome-menus3/files/patch-Makefile.in
new file mode 100644
index 000000000..915e1b5a1
--- /dev/null
+++ b/x11/gnome-menus3/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2010-09-27 14:11:42.000000000 +0000
++++ Makefile.in	2010-09-27 14:12:05.000000000 +0000
+@@ -33,7 +33,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@HAVE_PYTHON_TRUE@am__append_1 = python simple-editor
++@HAVE_PYTHON_TRUE@am__append_1 = python
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
diff --git a/x11/gnome-menus3/files/patch-layout::applications.menu b/x11/gnome-menus3/files/patch-layout::applications.menu
new file mode 100644
index 000000000..75fe8586a
--- /dev/null
+++ b/x11/gnome-menus3/files/patch-layout::applications.menu
@@ -0,0 +1,304 @@
+--- layout/applications.menu.orig	2011-03-31 08:48:41.000000000 +0200
++++ layout/applications.menu	2011-04-05 20:11:35.000000000 +0200
+@@ -6,10 +6,9 @@
+   <Name>Applications</Name>
+   <Directory>X-GNOME-Menu-Applications.directory</Directory>
+ 
+-  <!-- Scan legacy dirs first, as later items take priority -->
+-  <KDELegacyDirs/>
+-  <LegacyDir>/etc/X11/applnk</LegacyDir>
+-  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
++  <!-- Scan legacy dirs first, as later items take priority
++  <LegacyDir>/etc/X11/applnk</LegacyDir> -->
++  <LegacyDir>/usr/local/share/gnome/apps</LegacyDir>
+ 
+   <!-- Read standard .directory and .desktop file locations -->
+   <DefaultAppDirs/>
+@@ -31,6 +30,8 @@
+ 	     applications here -->
+         <Not><Category>Accessibility</Category></Not>
+         <Not><Category>System</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Accessories -->
+@@ -43,6 +44,8 @@
+       <And>
+         <Category>Accessibility</Category>
+         <Not><Category>Settings</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Accessibility -->
+@@ -54,6 +57,8 @@
+     <Include>
+       <And>
+         <Category>Development</Category>
++        <Not><Category>Qt</Category></Not>
++        <Not><Category>KDE</Category></Not>
+       </And>
+       <Filename>emacs.desktop</Filename>
+     </Include>
+@@ -66,6 +71,8 @@
+     <Include>
+       <And>
+         <Category>Education</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Education -->
+@@ -77,6 +84,8 @@
+     <Include>
+       <And>
+         <Category>Game</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Games -->
+@@ -88,6 +97,8 @@
+     <Include>
+       <And>
+         <Category>Graphics</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Graphics -->
+@@ -99,6 +110,8 @@
+     <Include>
+       <And>
+         <Category>Network</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End Internet -->
+@@ -110,6 +123,8 @@
+     <Include>
+       <And>
+         <Category>AudioVideo</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End Multimedia -->
+@@ -121,6 +136,8 @@
+     <Include>
+       <And>
+         <Category>Office</Category>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Office -->
+@@ -133,6 +150,8 @@
+       <And>
+         <Category>System</Category>
+         <Not><Category>Settings</Category></Not>
++	<Not><Category>Qt</Category></Not>
++	<Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu>   <!-- End System Tools -->
+@@ -147,8 +166,197 @@
+         <Not><Category>Core</Category></Not>
+         <Not><Category>Screensaver</Category></Not>
+         <Not><Category>X-GNOME-Settings-Panel</Category></Not>
++        <Not><Category>Qt</Category></Not>
++        <Not><Category>KDE</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
+ 
++  <!-- Read in overrides and child menus from applications-merged/ -->
++  <DefaultMergeDirs/>
++
++  <!-- KDE -->
++  <Menu>
++    <KDELegacyDirs/>
++    <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 -->
++
++    <!-- KEducation -->
++    <Menu>
++     <Name>Education</Name>
++      <Directory>Education.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Education</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KEducation -->
++
++    <!-- 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>
++          </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-menus3/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus3/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
new file mode 100644
index 000000000..b134a5817
--- /dev/null
+++ b/x11/gnome-menus3/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 = "%%LOCALBASE%%/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 = "%%LOCALBASE%%/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-menus3/files/patch-util_Makefile.in b/x11/gnome-menus3/files/patch-util_Makefile.in
new file mode 100644
index 000000000..658861905
--- /dev/null
+++ b/x11/gnome-menus3/files/patch-util_Makefile.in
@@ -0,0 +1,10 @@
+--- util/Makefile.in.orig	2010-09-27 14:12:22.000000000 +0000
++++ util/Makefile.in	2010-09-27 14:13:51.000000000 +0000
+@@ -298,6 +298,7 @@
+ 	test-menu-spec.c
+ 
+ gnome_menu_spec_test_LDADD = \
++	%%PTHREAD_LIBS%% \
+ 	$(GLIB_LIBS)			\
+ 	../libmenu/libgnome-menu.la
+ 
diff --git a/x11/gnome-menus3/pkg-descr b/x11/gnome-menus3/pkg-descr
new file mode 100644
index 000000000..7b27b4e2e
--- /dev/null
+++ b/x11/gnome-menus3/pkg-descr
@@ -0,0 +1,14 @@
+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
+
+WWW: http://www.freedesktop.org/Standards/menu-spec
diff --git a/x11/gnome-menus3/pkg-plist b/x11/gnome-menus3/pkg-plist
new file mode 100644
index 000000000..de0e68c32
--- /dev/null
+++ b/x11/gnome-menus3/pkg-plist
@@ -0,0 +1,214 @@
+etc/xdg/menus/gnome-applications.menu
+include/gnome-menus/gmenu-tree.h
+lib/girepository-1.0/GMenu-2.0.typelib
+lib/libgnome-menu.a
+lib/libgnome-menu.la
+lib/libgnome-menu.so
+lib/libgnome-menu.so.2
+%%PYTHON_SITELIBDIR%%/gmenu.a
+%%PYTHON_SITELIBDIR%%/gmenu.la
+%%PYTHON_SITELIBDIR%%/gmenu.so
+libdata/pkgconfig/libgnome-menu.pc
+share/desktop-directories/AudioVideo.directory
+share/desktop-directories/Development.directory
+share/desktop-directories/Education.directory
+share/desktop-directories/Game.directory
+share/desktop-directories/Graphics.directory
+share/desktop-directories/Hardware.directory
+share/desktop-directories/KDE.directory
+share/desktop-directories/Network.directory
+share/desktop-directories/Office.directory
+share/desktop-directories/Personal.directory
+share/desktop-directories/System-Tools.directory
+share/desktop-directories/System.directory
+share/desktop-directories/Utility-Accessibility.directory
+share/desktop-directories/Utility.directory
+share/desktop-directories/X-GNOME-Menu-Applications.directory
+share/desktop-directories/X-GNOME-Other.directory
+share/gir-1.0/GMenu-2.0.gir
+share/gnome-menus/examples/gnome-menus-ls.py
+share/locale/af/LC_MESSAGES/gnome-menus.mo
+share/locale/an/LC_MESSAGES/gnome-menus.mo
+share/locale/ar/LC_MESSAGES/gnome-menus.mo
+share/locale/as/LC_MESSAGES/gnome-menus.mo
+share/locale/ast/LC_MESSAGES/gnome-menus.mo
+share/locale/be/LC_MESSAGES/gnome-menus.mo
+share/locale/be@latin/LC_MESSAGES/gnome-menus.mo
+share/locale/bg/LC_MESSAGES/gnome-menus.mo
+share/locale/bn/LC_MESSAGES/gnome-menus.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-menus.mo
+share/locale/br/LC_MESSAGES/gnome-menus.mo
+share/locale/ca/LC_MESSAGES/gnome-menus.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-menus.mo
+share/locale/crh/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/dv/LC_MESSAGES/gnome-menus.mo
+share/locale/dz/LC_MESSAGES/gnome-menus.mo
+share/locale/el/LC_MESSAGES/gnome-menus.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-menus.mo
+share/locale/en_CA/LC_MESSAGES/gnome-menus.mo
+share/locale/en_GB/LC_MESSAGES/gnome-menus.mo
+share/locale/eo/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/fur/LC_MESSAGES/gnome-menus.mo
+share/locale/fy/LC_MESSAGES/gnome-menus.mo
+share/locale/ga/LC_MESSAGES/gnome-menus.mo
+share/locale/gl/LC_MESSAGES/gnome-menus.mo
+share/locale/gn/LC_MESSAGES/gnome-menus.mo
+share/locale/gu/LC_MESSAGES/gnome-menus.mo
+share/locale/gv/LC_MESSAGES/gnome-menus.mo
+share/locale/ha/LC_MESSAGES/gnome-menus.mo
+share/locale/he/LC_MESSAGES/gnome-menus.mo
+share/locale/hi/LC_MESSAGES/gnome-menus.mo
+share/locale/hr/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/ig/LC_MESSAGES/gnome-menus.mo
+share/locale/io/LC_MESSAGES/gnome-menus.mo
+share/locale/is/LC_MESSAGES/gnome-menus.mo
+share/locale/it/LC_MESSAGES/gnome-menus.mo
+share/locale/ja/LC_MESSAGES/gnome-menus.mo
+share/locale/ka/LC_MESSAGES/gnome-menus.mo
+share/locale/kg/LC_MESSAGES/gnome-menus.mo
+share/locale/kk/LC_MESSAGES/gnome-menus.mo
+share/locale/kn/LC_MESSAGES/gnome-menus.mo
+share/locale/ko/LC_MESSAGES/gnome-menus.mo
+share/locale/ku/LC_MESSAGES/gnome-menus.mo
+share/locale/ky/LC_MESSAGES/gnome-menus.mo
+share/locale/lo/LC_MESSAGES/gnome-menus.mo
+share/locale/lt/LC_MESSAGES/gnome-menus.mo
+share/locale/lv/LC_MESSAGES/gnome-menus.mo
+share/locale/mai/LC_MESSAGES/gnome-menus.mo
+share/locale/mg/LC_MESSAGES/gnome-menus.mo
+share/locale/mk/LC_MESSAGES/gnome-menus.mo
+share/locale/ml/LC_MESSAGES/gnome-menus.mo
+share/locale/mn/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/nds/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/oc/LC_MESSAGES/gnome-menus.mo
+share/locale/or/LC_MESSAGES/gnome-menus.mo
+share/locale/pa/LC_MESSAGES/gnome-menus.mo
+share/locale/pl/LC_MESSAGES/gnome-menus.mo
+share/locale/ps/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/rw/LC_MESSAGES/gnome-menus.mo
+share/locale/si/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@latin/LC_MESSAGES/gnome-menus.mo
+share/locale/sv/LC_MESSAGES/gnome-menus.mo
+share/locale/ta/LC_MESSAGES/gnome-menus.mo
+share/locale/te/LC_MESSAGES/gnome-menus.mo
+share/locale/th/LC_MESSAGES/gnome-menus.mo
+share/locale/tr/LC_MESSAGES/gnome-menus.mo
+share/locale/ug/LC_MESSAGES/gnome-menus.mo
+share/locale/uk/LC_MESSAGES/gnome-menus.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus.mo
+share/locale/vi/LC_MESSAGES/gnome-menus.mo
+share/locale/xh/LC_MESSAGES/gnome-menus.mo
+share/locale/yo/LC_MESSAGES/gnome-menus.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
+@dirrm share/gnome-menus/examples
+@dirrm share/gnome-menus
+@dirrmtry share/desktop-directories
+@dirrm include/gnome-menus
+@dirrmtry share/gir-1.0
+@dirrmtry lib/girepository-1.0
+@dirrmtry etc/xdg/menus
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/lo/LC_MESSAGES
+@dirrmtry share/locale/lo
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/kg/LC_MESSAGES
+@dirrmtry share/locale/kg
+@dirrmtry share/locale/io/LC_MESSAGES
+@dirrmtry share/locale/io
+@dirrmtry share/locale/ig/LC_MESSAGES
+@dirrmtry share/locale/ig
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/ha/LC_MESSAGES
+@dirrmtry share/locale/ha
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/gn/LC_MESSAGES
+@dirrmtry share/locale/gn
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/dv/LC_MESSAGES
+@dirrmtry share/locale/dv
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
diff --git a/x11/gnome-panel3/Makefile b/x11/gnome-panel3/Makefile
index 588279f95..43add4597 100644
--- a/x11/gnome-panel3/Makefile
+++ b/x11/gnome-panel3/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel3/Makefile,v 1.17 2011/04/25 21:58:25 mezz Exp $
+#   $MCom: ports/x11/gnome-panel3/Makefile,v 1.18 2011/05/28 10:49:14 kwm Exp $
 #
 
 PORTNAME=	gnome-panel
 PORTVERSION=	3.0.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -35,7 +35,7 @@ INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop3 librsvg2 libwnck3 \
-		gnomemenus gnomedocutils ltverhack referencehack
+		gnomemenus3 gnomedocutils ltverhack referencehack
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11/gnome-screensaver3/Makefile b/x11/gnome-screensaver3/Makefile
index 71a7d32af..829b8c2e0 100644
--- a/x11/gnome-screensaver3/Makefile
+++ b/x11/gnome-screensaver3/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver3/Makefile,v 1.13 2011/04/09 16:54:20 mezz Exp $
+#   $MCom: ports/x11/gnome-screensaver3/Makefile,v 1.14 2011/04/10 19:41:38 mezz Exp $
 #
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -27,7 +28,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	xtst xxf86vm
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd3 \
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus3 libgnomekbd3 \
 		gnomedesktop3
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index a97caf200..4170dd6bb 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-shell/Makefile,v 1.36 2011/04/27 12:26:58 kwm Exp $
+#   $MCom: ports/x11/gnome-shell/Makefile,v 1.37 2011/05/28 12:31:53 kwm Exp $
 #
 
 PORTNAME=	gnome-shell
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -31,7 +32,7 @@ USE_XORG=	x11 xfixes sm
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gconf2 gnomemenus \
+USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gconf2 gnomemenus3 \
 		gnomedesktop3 evolutiondataserver3 ltverhack
 USE_GSTREAMER=	theora vp8 ogg
 USE_LDCONFIG=	yes