Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

5 files changed, 22 insertions, 37 deletions

diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 26c86ecf496d..bde46e8025cc 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.39 2006/10/03 11:32:43 ahze Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.50 2007/03/12 22:36:46 marcus Exp $
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	2.16.1
+PORTVERSION=	2.18.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 40c830018d7e..752542ac91f2 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.16.1.tar.bz2) = a5c467abe68003d23ec09a795ebfd29f
-SHA256 (gnome2/gnome-menus-2.16.1.tar.bz2) = 72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b
-SIZE (gnome2/gnome-menus-2.16.1.tar.bz2) = 416053
+MD5 (gnome2/gnome-menus-2.18.0.tar.bz2) = 746f336d4fd427cb2db1691bc53a49d4
+SHA256 (gnome2/gnome-menus-2.18.0.tar.bz2) = f73372cb9f895ae4cee35d56868fcee3e3182aea52f20ce29ffb2aaf86403f1d
+SIZE (gnome2/gnome-menus-2.18.0.tar.bz2) = 434900
diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
index fef1dc0dca96..705e0e6cd2ee 100644
--- a/x11/gnome-menus/files/patch-layout::preferences.menu
+++ b/x11/gnome-menus/files/patch-layout::preferences.menu
@@ -1,5 +1,5 @@
---- layout/preferences.menu.orig	Sat Dec 11 07:58:50 2004
-+++ layout/preferences.menu	Tue Mar  1 01:28:57 2005
+--- layout/preferences.menu.orig	Tue Feb 13 04:18:01 2007
++++ layout/preferences.menu	Tue Feb 13 16:54:35 2007
 @@ -9,12 +9,15 @@
    <DefaultAppDirs/>
    <DefaultDirectoryDirs/>
@@ -24,11 +24,11 @@
      <Include>
        <And>
 +        <Not>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+        </Not>
++	  <Or>
++	    <Category>Qt</Category>
++	    <Category>KDE</Category>
++	  </Or>
++	</Not>
          <Category>Settings</Category>
          <Category>Accessibility</Category>
        </And>
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 115f03ce7599..000000000000
--- a/x11/gnome-menus/files/patch-layout::settings.menu
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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>
-+        <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/pkg-plist b/x11/gnome-menus/pkg-plist
index 1a63a7cb3952..59cea97cb008 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -19,18 +19,24 @@ 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/locale/ar/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
@@ -44,14 +50,15 @@ share/locale/dz/LC_MESSAGES/gnome-menus.mo
 share/locale/el/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/gn/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/he/LC_MESSAGES/gnome-menus.mo
 share/locale/hi/LC_MESSAGES/gnome-menus.mo
@@ -105,8 +112,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrm include/gnome-menus
 @dirrmtry etc/xdg/menus
 @dirrmtry etc/xdg
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -167,5 +172,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
 @dirrmtry share/locale/ca
 @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/be/LC_MESSAGES
 @dirrmtry share/locale/be