diff options
Diffstat (limited to 'x11/gnome-menus')
| -rw-r--r-- | x11/gnome-menus/Makefile | 11 | ||||
| -rw-r--r-- | x11/gnome-menus/distinfo | 4 | ||||
| -rw-r--r-- | x11/gnome-menus/files/patch-layout::applications.menu | 20 | ||||
| -rw-r--r-- | x11/gnome-menus/pkg-plist | 9 |
4 files changed, 24 insertions, 20 deletions
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index ce7a2ddc1..30ab8081d 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,21 +3,23 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.115 2011/04/05 18:12:34 kwm Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.110 2010/11/17 11:29:19 kwm Exp $ # PORTNAME= gnome-menus -PORTVERSION= 3.0.1 +PORTVERSION= 2.30.5 PORTREVISION= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the FreeDesktop Desktop Menu Spec BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +CONFLICTS= gnome-menus-3.[0-9]* + USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes @@ -34,7 +36,8 @@ post-patch: @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \ ${WRKSRC}/util/test-menu-spec.c @${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \ - ${WRKSRC}/layout/applications.menu + ${WRKSRC}/layout/applications.menu \ + ${WRKSRC}/layout/settings.menu @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index f8a0cd1a9..a11734649 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gnome-menus-3.0.1.tar.bz2) = 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0 -SIZE (gnome3/gnome-menus-3.0.1.tar.bz2) = 474839 +SHA256 (gnome2/gnome-menus-2.30.5.tar.bz2) = 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa +SIZE (gnome2/gnome-menus-2.30.5.tar.bz2) = 471327 diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu index 75fe8586a..116dad13f 100644 --- a/x11/gnome-menus/files/patch-layout::applications.menu +++ b/x11/gnome-menus/files/patch-layout::applications.menu @@ -1,19 +1,17 @@ ---- 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 @@ +--- 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>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/local/share/gnome/apps</LegacyDir> + <LegacyDir>/usr/share/gnome/apps</LegacyDir> <!-- Read standard .directory and .desktop file locations --> - <DefaultAppDirs/> @@ -31,6 +30,8 @@ applications here --> <Not><Category>Accessibility</Category></Not> @@ -106,10 +104,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>X-GNOME-Settings-Panel</Category></Not> -+ <Not><Category>Qt</Category></Not> -+ <Not><Category>KDE</Category></Not> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> </Include> </Menu> <!-- End Other --> @@ -176,7 +174,7 @@ + + <!-- KEducation --> + <Menu> -+ <Name>Education</Name> ++ <Name>Education</Name> + <Directory>Education.directory</Directory> + <Include> + <And> @@ -196,7 +194,7 @@ + <Include> + <And> + <Or> -+ <Category>Qt</Category> ++ <Category>Qt</Category> + <Category>KDE</Category> + </Or> + <Category>Game</Category> diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index de0e68c32..f94508732 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -1,4 +1,5 @@ etc/xdg/menus/gnome-applications.menu +etc/xdg/menus/settings.menu include/gnome-menus/gmenu-tree.h lib/girepository-1.0/GMenu-2.0.typelib lib/libgnome-menu.a @@ -15,15 +16,20 @@ share/desktop-directories/Education.directory share/desktop-directories/Game.directory share/desktop-directories/Graphics.directory share/desktop-directories/Hardware.directory +share/desktop-directories/InternetAndNetwork.directory share/desktop-directories/KDE.directory +share/desktop-directories/LookAndFeel.directory share/desktop-directories/Network.directory share/desktop-directories/Office.directory share/desktop-directories/Personal.directory +share/desktop-directories/Settings-System.directory +share/desktop-directories/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/gir-1.0/GMenu-2.0.gir share/gnome-menus/examples/gnome-menus-ls.py @@ -84,7 +90,6 @@ 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 -share/locale/lo/LC_MESSAGES/gnome-menus.mo share/locale/lt/LC_MESSAGES/gnome-menus.mo share/locale/lv/LC_MESSAGES/gnome-menus.mo share/locale/mai/LC_MESSAGES/gnome-menus.mo @@ -166,8 +171,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/mg @dirrmtry share/locale/mai/LC_MESSAGES @dirrmtry share/locale/mai -@dirrmtry share/locale/lo/LC_MESSAGES -@dirrmtry share/locale/lo @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES |