Update to 2.17.5.

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

5 files changed, 23 insertions, 38 deletions

diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 3ea4d1770..5435ef095 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.44 2006/11/26 01:40:51 ahze Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.45 2006/12/14 02:54:05 ahze Exp $
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	2.17.2
+PORTVERSION=	2.17.5
 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 094d20d9b..04bb0590f 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.17.2.tar.bz2) = 4eddca0b934723e41e81df11c69215f7
-SHA256 (gnome2/gnome-menus-2.17.2.tar.bz2) = 00305b05d1119d1332dafd22b7ecc973455ec5ce203299b00c3d6b74ef4f436a
-SIZE (gnome2/gnome-menus-2.17.2.tar.bz2) = 442781
+MD5 (gnome2/gnome-menus-2.17.5.tar.bz2) = 55ddcab03c788c8bc28fcadc81ae61e8
+SHA256 (gnome2/gnome-menus-2.17.5.tar.bz2) = 2e091edc51375419009778e6a35eff4c93f21cce4faebf532b95b944776cb959
+SIZE (gnome2/gnome-menus-2.17.5.tar.bz2) = 426629
diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
index fef1dc0dc..582020423 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 Jan  9 12:51:48 2007
++++ layout/preferences.menu	Thu Jan 11 01:03:56 2007
 @@ -9,12 +9,15 @@
    <DefaultAppDirs/>
    <DefaultDirectoryDirs/>
@@ -19,21 +19,23 @@
        <Category>Settings</Category>
        <Not>
          <Or>
-@@ -36,10 +39,19 @@
-     <Directory>Settings-Accessibility.directory</Directory>
+@@ -88,6 +91,12 @@
+     <Directory>System.directory</Directory>
      <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>
+         <Or>
+           <Category>SystemSettings</Category>
+@@ -106,5 +115,8 @@
        </And>
      </Include>
-   </Menu>
+   </Menu> <!-- End System -->
 +
 +  <!-- Read in overrides and child menus from preferences-merged/ -->
 +  <DefaultMergeDirs/>
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 115f03ce7..000000000
--- 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 5aa58aeee..445b85d7c 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -19,16 +19,21 @@ 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/bg/LC_MESSAGES/gnome-menus.mo