[Midnightbsd-cvs] mports: x11/gnome-menus: Update to 2.20.3, fix build @magus

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Mar 18 22:06:28 EDT 2008 

Log Message:
-----------
Update to 2.20.3, fix build @magus

Modified Files:
--------------
    mports/x11/gnome-menus:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/x11/gnome-menus/files:
        patch-layout::applications.menu (r1.1 -> r1.2)
        patch-simple-editor_GMenuSimpleEditor_menutreemodel.py (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11/gnome-menus/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/gnome-menus/pkg-plist -L x11/gnome-menus/pkg-plist -u -r1.1 -r1.2
--- x11/gnome-menus/pkg-plist
+++ x11/gnome-menus/pkg-plist
@@ -11,30 +11,32 @@
 %%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/af/LC_MESSAGES/gnome-menus.mo
 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 at latin/LC_MESSAGES/gnome-menus.mo
 share/locale/bg/LC_MESSAGES/gnome-menus.mo
@@ -57,6 +59,7 @@
 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 +71,7 @@
 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 +96,7 @@
 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 +109,13 @@
 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 at 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
- at dirrm share/gnome/desktop-directories
+ at dirrmtry share/desktop-directories
 @dirrm include/gnome-menus
 @dirrmtry etc/xdg/menus
 @dirrmtry etc/xdg
@@ -117,10 +123,14 @@
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+ at dirrmtry share/locale/uz at cyrillic/LC_MESSAGES
+ at dirrmtry share/locale/uz at cyrillic
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+ at dirrmtry share/locale/si/LC_MESSAGES
+ at dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -143,3 +153,5 @@
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be at latin/LC_MESSAGES
 @dirrmtry share/locale/be at latin
+ at dirrmtry share/locale/as/LC_MESSAGES
+ at dirrmtry share/locale/as
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/gnome-menus/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/gnome-menus/Makefile -L x11/gnome-menus/Makefile -u -r1.1 -r1.2
--- x11/gnome-menus/Makefile
+++ x11/gnome-menus/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	gnome-menus
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -48,10 +48,10 @@
 		${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/gnome/desktop-directories
+	@${MKDIR} ${PREFIX}/share/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>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11/gnome-menus/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/gnome-menus/distinfo -L x11/gnome-menus/distinfo -u -r1.1 -r1.2
--- x11/gnome-menus/distinfo
+++ 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.3.tar.bz2) = b8ab05f5edfdc3e6a46662a504934657
+SHA256 (gnome2/gnome-menus-2.20.3.tar.bz2) = 2ce7a6aabed338ca3f65685e7e46149cdacc80fab0a8701c2d827fcb950a9897
+SIZE (gnome2/gnome-menus-2.20.3.tar.bz2) = 446966
Index: patch-layout::applications.menu
===================================================================
RCS file: /home/cvs/mports/x11/gnome-menus/files/patch-layout::applications.menu,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/gnome-menus/files/patch-layout::applications.menu -L x11/gnome-menus/files/patch-layout::applications.menu -u -r1.1 -r1.2
--- x11/gnome-menus/files/patch-layout::applications.menu
+++ 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>
Index: patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
===================================================================
RCS file: /home/cvs/mports/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py -L x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py -u -r1.1 -r1.2
--- x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
+++ 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))

More information about the Midnightbsd-cvs mailing list