From a41909b76a791708bf2a90b88bf77a0a28011c4e Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Tue, 5 Apr 2011 18:23:01 +0000
Subject: Update to 3.0.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15736 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/gnome-menus/Makefile                             |  6 +++---
 x11/gnome-menus/distinfo                             |  4 ++--
 .../files/patch-layout::applications.menu            | 20 +++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'x11/gnome-menus')

diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 25480aabf..aa0029852 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,15 +3,15 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.113 2011/02/02 18:40:42 kwm Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.114 2011/03/07 13:52:08 kwm Exp $
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	2.91.91
+PORTVERSION=	3.0.0
 PORTREVISION=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 06a7cbe48..a4a168aec 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-menus-2.91.91.tar.bz2) = 79bd6a2b5ec048d811a39567ea22d623a37daf06f05a9ed0ac340b673a639452
-SIZE (gnome2/gnome-menus-2.91.91.tar.bz2) = 472885
+SHA256 (gnome3/gnome-menus-3.0.0.tar.bz2) = 4a92233c2f6ce0e5e484ddee33e01ae12b33133651ce486a4d944fd358de8f3b
+SIZE (gnome3/gnome-menus-3.0.0.tar.bz2) = 474564
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index 116dad13f..75fe8586a 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,17 +1,19 @@
---- 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 @@
+--- 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/share/gnome/apps</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>
@@ -104,10 +106,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>Qt</Category></Not>
-+	<Not><Category>KDE</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 -->
@@ -174,7 +176,7 @@
 +
 +    <!-- KEducation -->
 +    <Menu>
-+      <Name>Education</Name>
++     <Name>Education</Name>
 +      <Directory>Education.directory</Directory>
 +      <Include>
 +        <And>
@@ -194,7 +196,7 @@
 +      <Include>
 +        <And>
 +          <Or>
-+            <Category>Qt</Category>
++           <Category>Qt</Category>
 +            <Category>KDE</Category>
 +          </Or>
 +          <Category>Game</Category>
-- 
cgit v1.2.3