Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

5 files changed, 50 insertions, 40 deletions

diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index f7a92dc1551d..4767ebecfee7 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.50 2007/03/12 22:36:46 marcus Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.64 2007/10/15 21:09:56 mezz Exp $
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -47,10 +47,9 @@ post-patch:
 		${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/gnome/desktop-directories
 	@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
 		${PREFIX}/etc/xdg/menus/gnome-applications.menu
 	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
-		${PREFIX}/share/gnome/desktop-directories
+		${PREFIX}/share/desktop-directories
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index c67b66ede9b9..5e0997dd714e 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.18.3.tar.bz2) = e2b97b01b33b9744baf26982a8ad588a
-SHA256 (gnome2/gnome-menus-2.18.3.tar.bz2) = c6c0b9a93426dbdcb47fb7e586b9d910e2dbc0e9c894c0f322d08971a7b70933
-SIZE (gnome2/gnome-menus-2.18.3.tar.bz2) = 437539
+MD5 (gnome2/gnome-menus-2.20.1.tar.bz2) = ad141dc4d5e485e613b68f9fa58bae5f
+SHA256 (gnome2/gnome-menus-2.20.1.tar.bz2) = f6c147983b8c2a6ed0798667d9bd2f58a47b6e6b8e4ab850f83db82beda6badb
+SIZE (gnome2/gnome-menus-2.20.1.tar.bz2) = 450569
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index a3644747b8dc..85533b6d6c0e 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,5 +1,5 @@
---- layout/applications.menu.orig	Wed Mar  9 11:49:53 2005
-+++ layout/applications.menu	Fri Mar 25 11:45:09 2005
+--- layout/applications.menu.orig	Sun Jul  8 18:04:11 2007
++++ layout/applications.menu	Sun Jul  8 18:04:35 2007
 @@ -6,24 +6,26 @@
    <Name>Applications</Name>
    <Directory>Applications.directory</Directory>
@@ -60,7 +60,7 @@
        </And>
        <Filename>emacs.desktop</Filename>
 @@ -64,6 +78,12 @@
-     <Directory>Edutainment.directory</Directory>
+     <Directory>Education.directory</Directory>
      <Include>
        <And>
 +        <Not>
@@ -160,9 +160,9 @@
 +            <Category>KDE</Category>
 +          </Or>
 +        </Not>
-         <Category>Application</Category>
          <Not><Category>Core</Category></Not>
          <Not><Category>Settings</Category></Not>
+         <Not><Category>Screensaver</Category></Not>
        </And>
      </Include>
    </Menu> <!-- End Other -->
@@ -227,10 +227,10 @@
 +      </Include>
 +    </Menu> <!-- End KDevelopment Tools -->
 +
-+    <!-- KEdutainment -->
++    <!-- KEducation -->
 +    <Menu>
-+      <Name>Edutainment</Name>
-+      <Directory>Edutainment.directory</Directory>
++      <Name>Education</Name>
++      <Directory>Education.directory</Directory>
 +      <Include>
 +        <And>
 +          <Or>
@@ -240,7 +240,7 @@
 +          <Category>Education</Category>
 +        </And>
 +      </Include>
-+    </Menu> <!-- End KEdutainment -->
++    </Menu> <!-- End KEducation -->
 +
 +    <!-- KGames -->
 +    <Menu>
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
index 5272bec03af4..b134a5817e56 100644
--- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -14,7 +14,7 @@
          data_dirs = os.environ["XDG_DATA_DIRS"]
      if not data_dirs:
 -        data_dirs = "/usr/local/share/:/usr/share/"
-+	data_dirs = "%%LOCALBASE%%/share/gnome/:%%LOCALBASE%%/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-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 6aaf768d7018..793995388be1 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -11,30 +11,31 @@ lib/libgnome-menu.so.2
 %%PYTHON_SITELIBDIR%%/gmenu.la
 %%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/Education.directory
-share/gnome/desktop-directories/Games.directory
-share/gnome/desktop-directories/Graphics.directory
-share/gnome/desktop-directories/Hardware.directory
-share/gnome/desktop-directories/Internet.directory
-share/gnome/desktop-directories/InternetAndNetwork.directory
-share/gnome/desktop-directories/KDE.directory
-share/gnome/desktop-directories/LookAndFeel.directory
-share/gnome/desktop-directories/Multimedia.directory
-share/gnome/desktop-directories/Office.directory
-share/gnome/desktop-directories/Other.directory
-share/gnome/desktop-directories/Personal.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
-share/gnome/desktop-directories/System-Tools.directory
-share/gnome/desktop-directories/System.directory
+share/desktop-directories/Accessibility.directory
+share/desktop-directories/Accessories.directory
+share/desktop-directories/Applications.directory
+share/desktop-directories/Desktop.directory
+share/desktop-directories/Development.directory
+share/desktop-directories/Education.directory
+share/desktop-directories/Games.directory
+share/desktop-directories/Graphics.directory
+share/desktop-directories/Hardware.directory
+share/desktop-directories/Internet.directory
+share/desktop-directories/InternetAndNetwork.directory
+share/desktop-directories/KDE.directory
+share/desktop-directories/LookAndFeel.directory
+share/desktop-directories/Multimedia.directory
+share/desktop-directories/Office.directory
+share/desktop-directories/Other.directory
+share/desktop-directories/Personal.directory
+share/desktop-directories/Preferences.directory
+share/desktop-directories/Settings-Accessibility.directory
+share/desktop-directories/Settings.directory
+share/desktop-directories/System-Settings.directory
+share/desktop-directories/System-Tools.directory
+share/desktop-directories/System.directory
 share/locale/ar/LC_MESSAGES/gnome-menus.mo
+share/locale/as/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
@@ -57,6 +58,7 @@ 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/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
@@ -68,6 +70,7 @@ 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/ka/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
@@ -92,6 +95,7 @@ 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
@@ -104,12 +108,13 @@ 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/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/desktop-directories
+@dirrmtry share/desktop-directories
 @dirrm include/gnome-menus
 @dirrmtry etc/xdg/menus
 @dirrmtry etc/xdg
@@ -117,10 +122,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrmtry share/locale/zh_HK
 @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/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -143,3 +152,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as