Update to 3.6.2.

Submitted by:	Gustau Perez


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

4 files changed, 25 insertions, 18 deletions

diff --git a/x11/gnome-menus3/Makefile b/x11/gnome-menus3/Makefile
index 7e147fd81..32af607f8 100644
--- a/x11/gnome-menus3/Makefile
+++ b/x11/gnome-menus3/Makefile
@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-menus3/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom: ports/x11/gnome-menus3/Makefile,v 1.7 2012/09/18 22:26:57 kwm Exp $
 
 PORTNAME=	gnome-menus
-PORTVERSION=	3.4.2
+PORTVERSION=	3.6.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,8 +17,8 @@ LATEST_LINK=	gnome-menus3
 USES=		gettext pathfix pkgconfig
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehier gnomeprefix intlhack glib20 ltverhack \
-		introspection:build
+USE_GNOME=	glib20 gnomehier gnomeprefix intlhack introspection:build \
+		ltverhack
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
@@ -40,6 +40,7 @@ post-patch:
 	    	${WRKSRC}/util/Makefile.in
 
 post-install:
+	@${MKDIR} -p ${PREFIX}/etc/xdg/menus/ 
 	@${INSTALL_DATA} ${WRKSRC}/layout/applications.menu \
 		${PREFIX}/etc/xdg/menus/gnome-applications.menu
 	@${INSTALL_DATA} ${WRKSRC}/KDE.directory \
diff --git a/x11/gnome-menus3/distinfo b/x11/gnome-menus3/distinfo
index 4d1869db4..98119ce84 100644
--- a/x11/gnome-menus3/distinfo
+++ b/x11/gnome-menus3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-menus-3.4.2.tar.xz) = fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63
-SIZE (gnome3/gnome-menus-3.4.2.tar.xz) = 406316
+SHA256 (gnome3/gnome-menus-3.6.2.tar.xz) = f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f
+SIZE (gnome3/gnome-menus-3.6.2.tar.xz) = 423948
diff --git a/x11/gnome-menus3/files/patch-layout::applications.menu b/x11/gnome-menus3/files/patch-layout::applications.menu
index 75fe8586a..9a0719a38 100644
--- a/x11/gnome-menus3/files/patch-layout::applications.menu
+++ b/x11/gnome-menus3/files/patch-layout::applications.menu
@@ -1,5 +1,5 @@
---- layout/applications.menu.orig	2011-03-31 08:48:41.000000000 +0200
-+++ layout/applications.menu	2011-04-05 20:11:35.000000000 +0200
+--- layout/applications.menu.orig	2012-07-10 01:54:30.000000000 +0000
++++ layout/applications.menu	2013-03-30 10:41:37.311882486 +0000
 @@ -6,10 +6,9 @@
    <Name>Applications</Name>
    <Directory>X-GNOME-Menu-Applications.directory</Directory>
@@ -72,12 +72,12 @@
      <Include>
        <And>
          <Category>Network</Category>
-+	<Not><Category>Qt</Category></Not>
-+	<Not><Category>KDE</Category></Not>
-       </And>
-     </Include>
-   </Menu>   <!-- End Internet -->
-@@ -110,6 +123,8 @@
++        <Not><Category>Qt</Category></Not>
++        <Not><Category>KDE</Category></Not>
+ 	<Not>
+ 	  <Category>X-GNOME-WebApplication</Category>
+ 	</Not>
+@@ -125,6 +138,8 @@
      <Include>
        <And>
          <Category>AudioVideo</Category>
@@ -86,7 +86,7 @@
        </And>
      </Include>
    </Menu>   <!-- End Multimedia -->
-@@ -121,6 +136,8 @@
+@@ -136,6 +151,8 @@
      <Include>
        <And>
          <Category>Office</Category>
@@ -95,7 +95,7 @@
        </And>
      </Include>
    </Menu> <!-- End Office -->
-@@ -133,6 +150,8 @@
+@@ -148,6 +165,8 @@
        <And>
          <Category>System</Category>
          <Not><Category>Settings</Category></Not>
@@ -104,7 +104,7 @@
        </And>
      </Include>
    </Menu>   <!-- End System Tools -->
-@@ -147,8 +166,197 @@
+@@ -162,10 +181,199 @@
          <Not><Category>Core</Category></Not>
          <Not><Category>Screensaver</Category></Not>
          <Not><Category>X-GNOME-Settings-Panel</Category></Not>
@@ -301,4 +301,6 @@
 +    </Menu> <!-- End KOther -->
 +  </Menu> <!-- KDE -->
 +
- </Menu> <!-- End Applications -->
+    <Layout>
+      <Merge type="menus" />
+      <Menuname>Other</Menuname>
diff --git a/x11/gnome-menus3/pkg-plist b/x11/gnome-menus3/pkg-plist
index ab58281e1..d1ca3ae38 100644
--- a/x11/gnome-menus3/pkg-plist
+++ b/x11/gnome-menus3/pkg-plist
@@ -42,6 +42,7 @@ 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/desktop-directories/X-GNOME-WebApplications.directory
 share/gir-1.0/GMenu-3.0.gir
 share/gnome-menus/ui/gmenu-simple-editor.ui
 share/locale/af/LC_MESSAGES/gnome-menus-3.0.mo
@@ -135,6 +136,7 @@ share/locale/sq/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/sr/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/sr@latin/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/sv/LC_MESSAGES/gnome-menus-3.0.mo
+share/locale/szl/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/ta/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/te/LC_MESSAGES/gnome-menus-3.0.mo
 share/locale/th/LC_MESSAGES/gnome-menus-3.0.mo
@@ -170,6 +172,8 @@ share/locale/zu/LC_MESSAGES/gnome-menus-3.0.mo
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrm share/locale/szl/LC_MESSAGES
+@dirrm share/locale/szl
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES