From 27e509243af2292a5605af5c92d5cccf3c07f044 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 14 Feb 2008 18:02:10 +0000 Subject: [PATCH] - make it possible to choose between different menu layouts (kde3, gnome) using symlinks instead of being stuck with whatever was installed first ok jasper@ --- x11/gnome/menus/Makefile | 4 ++-- x11/gnome/menus/pkg/MESSAGE | 3 +++ x11/gnome/menus/pkg/PLIST | 6 +++--- x11/kde/libs3/Makefile | 4 ++-- x11/kde/libs3/pkg/MESSAGE-main | 3 +++ x11/kde/libs3/pkg/PLIST-main | 5 +++-- 6 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 x11/gnome/menus/pkg/MESSAGE create mode 100644 x11/kde/libs3/pkg/MESSAGE-main diff --git a/x11/gnome/menus/Makefile b/x11/gnome/menus/Makefile index 54879827590..fd3f501e563 100644 --- a/x11/gnome/menus/Makefile +++ b/x11/gnome/menus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2008/02/06 11:36:54 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2008/02/14 18:02:10 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= implementation of the FreeDesktop Desktop Menu Spec GNOME_PROJECT= gnome-menus GNOME_VERSION= 2.20.3 SHARED_LIBS += gnome-menu 3.11 # .3.19 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 # GPL/LGPL PERMIT_PACKAGE_CDROM= Yes diff --git a/x11/gnome/menus/pkg/MESSAGE b/x11/gnome/menus/pkg/MESSAGE new file mode 100644 index 00000000000..495eded677c --- /dev/null +++ b/x11/gnome/menus/pkg/MESSAGE @@ -0,0 +1,3 @@ +To use the GNOME layout as default for the applications menu, as root: + ln -sf ${SYSCONFDIR}/xdg/menus/gnome-applications.menu \ + ${SYSCONFDIR}/xdg/menus/applications.menu diff --git a/x11/gnome/menus/pkg/PLIST b/x11/gnome/menus/pkg/PLIST index 7b97668a7b8..ed63561ecba 100644 --- a/x11/gnome/menus/pkg/PLIST +++ b/x11/gnome/menus/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2008/02/03 20:45:40 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.10 2008/02/14 18:02:10 ajacoutot Exp $ bin/gmenu-simple-editor bin/gnome-menu-spec-test include/gnome-menus/ @@ -29,7 +29,6 @@ lib/python${MODPY_VERSION}/site-packages/GMenuSimpleEditor/menutreemodel.pyo lib/python${MODPY_VERSION}/site-packages/gmenu.a lib/python${MODPY_VERSION}/site-packages/gmenu.la lib/python${MODPY_VERSION}/site-packages/gmenu.so -share/applications/ share/applications/gmenu-simple-editor.desktop share/desktop-directories/ share/desktop-directories/Accessibility.directory @@ -60,7 +59,7 @@ share/examples/gnome-menus/xdg/ share/examples/gnome-menus/xdg/menus/ @sample ${SYSCONFDIR}/xdg/menus/ share/examples/gnome-menus/xdg/menus/applications.menu -@sample ${SYSCONFDIR}/xdg/menus/applications.menu +@sample ${SYSCONFDIR}/xdg/menus/gnome-applications.menu share/examples/gnome-menus/xdg/menus/preferences.menu @sample ${SYSCONFDIR}/xdg/menus/preferences.menu share/examples/gnome-menus/xdg/menus/settings.menu @@ -159,3 +158,4 @@ share/locale/zh_HK/LC_MESSAGES/gnome-menus.mo share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database +@exec ln -s ${SYSCONFDIR}/xdg/menus/gnome-applications.menu ${SYSCONFDIR}/xdg/menus/applications.menu 2> /dev/null || true diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile index 8a3a0062c1f..ebb756f22da 100644 --- a/x11/kde/libs3/Makefile +++ b/x11/kde/libs3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.89 2008/01/25 17:36:17 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.90 2008/02/14 18:02:10 ajacoutot Exp $ COMMENT-main= K Desktop Environment, libraries COMMENT-cups= K Desktop Environment, cups support @@ -7,7 +7,7 @@ VERSION= 3.5.8 DISTNAME= kdelibs-${VERSION} MASTER_SITES0= ftp://ftp.kde.org/pub/kde/security_patches/ -PKGNAME-main= ${DISTNAME}p2 +PKGNAME-main= ${DISTNAME}p3 PKGNAME-cups= kdecups-${VERSION} MODKDE_VERSION= 3.5.8 SHARED_LIBS += DCOP 7.0 # .6.0 diff --git a/x11/kde/libs3/pkg/MESSAGE-main b/x11/kde/libs3/pkg/MESSAGE-main new file mode 100644 index 00000000000..0665c9d8984 --- /dev/null +++ b/x11/kde/libs3/pkg/MESSAGE-main @@ -0,0 +1,3 @@ +To use the KDE3 layout as default for the applications menu, as root: + ln -sf ${SYSCONFDIR}/xdg/menus/kde3-applications.menu \ + ${SYSCONFDIR}/xdg/menus/applications.menu diff --git a/x11/kde/libs3/pkg/PLIST-main b/x11/kde/libs3/pkg/PLIST-main index 8eabe409060..3442e32c21e 100644 --- a/x11/kde/libs3/pkg/PLIST-main +++ b/x11/kde/libs3/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.6 2008/01/25 17:36:17 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.7 2008/02/14 18:02:10 ajacoutot Exp $ @conflict kdebase-<3.5 @conflict kdeartwork-<3.4 @conflict kdeaddons-<3.4 @@ -1211,7 +1211,7 @@ share/apps/kde-conf-sample/ share/apps/kde-conf-sample/xdg/ share/apps/kde-conf-sample/xdg/menus/ share/apps/kde-conf-sample/xdg/menus/applications.menu -@sample ${SYSCONFDIR}/xdg/menus/applications.menu +@sample ${SYSCONFDIR}/xdg/menus/kde3-applications.menu share/apps/kdeprint/ share/apps/kdeprint/apsdriver1 share/apps/kdeprint/apsdriver2 @@ -5696,3 +5696,4 @@ share/servicetypes/renamedlgplugin.desktop share/servicetypes/scriptinterface.desktop @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database +@exec ln -s ${SYSCONFDIR}/xdg/menus/kde3-applications.menu ${SYSCONFDIR}/xdg/menus/applications.menu 2> /dev/null || true