summaryrefslogtreecommitdiff
path: root/x11/gnome-menus
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnome-menus')
-rw-r--r--x11/gnome-menus/Makefile5
-rw-r--r--x11/gnome-menus/distinfo6
-rw-r--r--x11/gnome-menus/files/patch-layout::applications.menu171
-rw-r--r--x11/gnome-menus/files/patch-layout::preferences.menu41
-rw-r--r--x11/gnome-menus/pkg-plist36
5 files changed, 86 insertions, 173 deletions
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index acc19c213a31..264061e79925 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.74 2008/03/10 23:44:52 ahze Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.88 2008/11/25 17:27:09 mezz Exp $
#
PORTNAME= gnome-menus
-PORTVERSION= 2.22.2
-PORTREVISION= 1
+PORTVERSION= 2.24.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
index 741021ea35d3..7786cd23a623 100644
--- a/x11/gnome-menus/distinfo
+++ b/x11/gnome-menus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-menus-2.22.2.tar.bz2) = 2bb185643632b28f4dba4b8201b8e230
-SHA256 (gnome2/gnome-menus-2.22.2.tar.bz2) = b3ef17eb05308e35e1627e5ca56b6951e9aea69cf112164ef698cdad6f44ed23
-SIZE (gnome2/gnome-menus-2.22.2.tar.bz2) = 465566
+MD5 (gnome2/gnome-menus-2.24.2.tar.bz2) = ca8e25b031fd7024b3f9abe1c6865d2c
+SHA256 (gnome2/gnome-menus-2.24.2.tar.bz2) = c28cc72e69164533e4a64270486d18b58184920ec4f4b288758758a373d45d3c
+SIZE (gnome2/gnome-menus-2.24.2.tar.bz2) = 453261
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
index 85533b6d6c0e..116dad13f19b 100644
--- a/x11/gnome-menus/files/patch-layout::applications.menu
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -1,8 +1,8 @@
---- 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 @@
+--- 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 @@
<Name>Applications</Name>
- <Directory>Applications.directory</Directory>
+ <Directory>X-GNOME-Menu-Applications.directory</Directory>
- <!-- Scan legacy dirs first, as later items take priority -->
- <KDELegacyDirs/>
@@ -12,161 +12,106 @@
<LegacyDir>/usr/share/gnome/apps</LegacyDir>
<!-- Read standard .directory and .desktop file locations -->
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
-- <!-- Read in overrides and child menus from applications-merged/ -->
-- <DefaultMergeDirs/>
--
- <!-- Accessories submenu -->
- <Menu>
- <Name>Accessories</Name>
- <Directory>Accessories.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Utility</Category>
- <Not>
- <Category>System</Category>
-@@ -38,6 +40,12 @@
- <Directory>Accessibility.directory</Directory>
- <Include>
+@@ -31,6 +30,8 @@
+ applications here -->
+ <Not><Category>Accessibility</Category></Not>
+ <Not><Category>System</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessories -->
+@@ -43,6 +44,8 @@
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Accessibility</Category>
- <Not>
- <Category>Settings</Category>
-@@ -52,6 +60,12 @@
- <Directory>Development.directory</Directory>
+ <Not><Category>Settings</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessibility -->
+@@ -54,6 +57,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Development</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
<Filename>emacs.desktop</Filename>
-@@ -64,6 +78,12 @@
- <Directory>Education.directory</Directory>
+ </Include>
+@@ -66,6 +71,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Education</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -75,6 +95,12 @@
- <Directory>Games.directory</Directory>
+ </Menu> <!-- End Education -->
+@@ -77,6 +84,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Game</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -86,6 +112,12 @@
- <Directory>Graphics.directory</Directory>
+ </Menu> <!-- End Games -->
+@@ -88,6 +97,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Graphics</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -97,6 +129,12 @@
- <Directory>Internet.directory</Directory>
+ </Menu> <!-- End Graphics -->
+@@ -99,6 +110,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Network</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -108,6 +146,12 @@
- <Directory>Multimedia.directory</Directory>
+ </Menu> <!-- End Internet -->
+@@ -110,6 +123,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>AudioVideo</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -119,6 +163,12 @@
- <Directory>Office.directory</Directory>
+ </Menu> <!-- End Multimedia -->
+@@ -121,6 +136,8 @@
<Include>
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>Office</Category>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
</Include>
-@@ -130,6 +180,12 @@
- <Directory>System-Tools.directory</Directory>
- <Include>
+ </Menu> <!-- End Office -->
+@@ -133,6 +150,8 @@
<And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
++ <Not><Category>Qt</Category></Not>
++ <Not><Category>KDE</Category></Not>
</And>
-@@ -143,11 +199,204 @@
- <OnlyUnallocated/>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
+ </Include>
+ </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>
</And>
</Include>
</Menu> <!-- End Other -->
-+
+
+ <!-- Read in overrides and child menus from applications-merged/ -->
+ <DefaultMergeDirs/>
+
@@ -353,5 +298,5 @@
+ </Include>
+ </Menu> <!-- End KOther -->
+ </Menu> <!-- KDE -->
-
++
</Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
deleted file mode 100644
index 705e0e6cd2ee..000000000000
--- a/x11/gnome-menus/files/patch-layout::preferences.menu
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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/>
-
-- <!-- Read in overrides and child menus from preferences-merged/ -->
-- <DefaultMergeDirs/>
--
- <!-- Stuff in the toplevel -->
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Settings</Category>
- <Not>
- <Or>
-@@ -36,10 +39,19 @@
- <Directory>Settings-Accessibility.directory</Directory>
- <Include>
- <And>
-+ <Not>
-+ <Or>
-+ <Category>Qt</Category>
-+ <Category>KDE</Category>
-+ </Or>
-+ </Not>
- <Category>Settings</Category>
- <Category>Accessibility</Category>
- </And>
- </Include>
- </Menu>
-+
-+ <!-- Read in overrides and child menus from preferences-merged/ -->
-+ <DefaultMergeDirs/>
-
- </Menu> <!-- End Prefs -->
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 1541e93ecb50..117cf47d31ab 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -1,5 +1,4 @@
etc/xdg/menus/gnome-applications.menu
-etc/xdg/menus/preferences.menu
etc/xdg/menus/settings.menu
include/gnome-menus/gmenu-tree.h
lib/libgnome-menu.a
@@ -10,32 +9,31 @@ lib/libgnome-menu.so.2
%%PYTHON_SITELIBDIR%%/gmenu.la
%%PYTHON_SITELIBDIR%%/gmenu.so
libdata/pkgconfig/libgnome-menu.pc
-share/desktop-directories/Accessibility.directory
-share/desktop-directories/Accessories.directory
-share/desktop-directories/Applications.directory
-share/desktop-directories/Desktop.directory
+share/desktop-directories/AudioVideo.directory
share/desktop-directories/Development.directory
share/desktop-directories/Education.directory
-share/desktop-directories/Games.directory
+share/desktop-directories/Game.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/Network.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-System.directory
share/desktop-directories/Settings.directory
-share/desktop-directories/System-Settings.directory
share/desktop-directories/System-Tools.directory
share/desktop-directories/System.directory
+share/desktop-directories/Utility-Accessibility.directory
+share/desktop-directories/Utility.directory
+share/desktop-directories/X-GNOME-Menu-Applications.directory
+share/desktop-directories/X-GNOME-Menu-System.directory
+share/desktop-directories/X-GNOME-Other.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/ast/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
@@ -65,13 +63,16 @@ 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
+share/locale/hr/LC_MESSAGES/gnome-menus.mo
share/locale/hu/LC_MESSAGES/gnome-menus.mo
share/locale/hy/LC_MESSAGES/gnome-menus.mo
share/locale/id/LC_MESSAGES/gnome-menus.mo
share/locale/io/LC_MESSAGES/gnome-menus.mo
+share/locale/is/LC_MESSAGES/gnome-menus.mo
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/kk/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
@@ -93,6 +94,7 @@ share/locale/oc/LC_MESSAGES/gnome-menus.mo
share/locale/or/LC_MESSAGES/gnome-menus.mo
share/locale/pa/LC_MESSAGES/gnome-menus.mo
share/locale/pl/LC_MESSAGES/gnome-menus.mo
+share/locale/ps/LC_MESSAGES/gnome-menus.mo
share/locale/pt/LC_MESSAGES/gnome-menus.mo
share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
share/locale/ro/LC_MESSAGES/gnome-menus.mo
@@ -103,7 +105,7 @@ share/locale/sk/LC_MESSAGES/gnome-menus.mo
share/locale/sl/LC_MESSAGES/gnome-menus.mo
share/locale/sq/LC_MESSAGES/gnome-menus.mo
share/locale/sr/LC_MESSAGES/gnome-menus.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-menus.mo
share/locale/sv/LC_MESSAGES/gnome-menus.mo
share/locale/ta/LC_MESSAGES/gnome-menus.mo
share/locale/te/LC_MESSAGES/gnome-menus.mo
@@ -131,10 +133,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@@ -147,6 +153,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/io/LC_MESSAGES
@dirrmtry share/locale/io
@dirrmtry share/locale/hy/LC_MESSAGES
@@ -161,5 +169,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as