From de07c907b5358c4e4123dbd26898aa1eed93579c Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 15 Dec 2007 21:44:24 +0000 Subject: [PATCH] - add update-desktop-database goo - fix WANTLIB --- x11/matchbox/matchbox-desktop/Makefile | 10 ++++++---- x11/matchbox/matchbox-desktop/pkg/PLIST | 4 +++- x11/matchbox/matchbox-panel/Makefile | 8 +++++--- x11/matchbox/matchbox-panel/pkg/PLIST | 11 +++-------- x11/matchbox/matchbox-window-manager/Makefile | 8 +++++--- x11/matchbox/matchbox-window-manager/pkg/PLIST | 4 +++- 6 files changed, 25 insertions(+), 20 deletions(-) diff --git a/x11/matchbox/matchbox-desktop/Makefile b/x11/matchbox/matchbox-desktop/Makefile index 798d141c660..34664220489 100644 --- a/x11/matchbox/matchbox-desktop/Makefile +++ b/x11/matchbox/matchbox-desktop/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2007/09/15 20:04:22 merdely Exp $ +# $OpenBSD: Makefile,v 1.7 2007/12/15 21:44:24 ajacoutot Exp $ COMMENT= pda style application launcher or item browser DISTNAME= matchbox-desktop-0.9.1 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 CATEGORIES= x11 MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/ @@ -18,11 +18,13 @@ USE_LIBTOOL= Yes USE_X11= Yes LIB_DEPENDS= mb.>=1::x11/matchbox/libmatchbox -RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common +RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common \ + :desktop-file-utils-*:devel/desktop-file-utils MODULES= devel/gettext WANTLIB= X11 Xext Xft Xrender c fontconfig freetype m z \ glib-2.0.>=600.0 gmodule-2.0.>=600.0 gobject-2.0.>=600.0 jpeg \ - pango-1.0.>=800.0 pangoft2-1.0.>=800.0 pangoxft-1.0.>=800.0 png + pango-1.0.>=800.0 pangoft2-1.0.>=800.0 pangoxft-1.0.>=800.0 png \ + Xau Xdmcp expat pcre CONFIGURE_STYLE=gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \ diff --git a/x11/matchbox/matchbox-desktop/pkg/PLIST b/x11/matchbox/matchbox-desktop/pkg/PLIST index 9c990c0b0bb..40e02bd192a 100644 --- a/x11/matchbox/matchbox-desktop/pkg/PLIST +++ b/x11/matchbox/matchbox-desktop/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/17 02:57:31 jolan Exp $ +@comment $OpenBSD: PLIST,v 1.2 2007/12/15 21:44:24 ajacoutot Exp $ %%SHARED%% bin/matchbox-desktop include/matchbox-desktop/ @@ -23,3 +23,5 @@ share/examples/matchbox-desktop/ share/examples/matchbox-desktop/mbdesktop_modules @sample ${SYSCONFDIR}/matchbox/mbdesktop_modules share/pixmaps/mbdesktop.png +@exec %D/bin/update-desktop-database +@unexec %D/bin/update-desktop-database diff --git a/x11/matchbox/matchbox-panel/Makefile b/x11/matchbox/matchbox-panel/Makefile index 4ad7434de78..e1827c184cc 100644 --- a/x11/matchbox/matchbox-panel/Makefile +++ b/x11/matchbox/matchbox-panel/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.10 2007/09/15 20:04:22 merdely Exp $ +# $OpenBSD: Makefile,v 1.11 2007/12/15 21:44:24 ajacoutot Exp $ # XXX hardcoded apm list COMMENT= window bar for holding application launchers DISTNAME= matchbox-panel-0.9.3 +PKGNAME= ${DISTNAME}p0 CATEGORIES= x11 MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/ @@ -17,11 +18,12 @@ PERMIT_PACKAGE_FTP= Yes USE_X11= Yes LIB_DEPENDS= mb.>=1::x11/matchbox/libmatchbox -RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common +RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common \ + :desktop-file-utils-*:devel/desktop-file-utils MODULES= devel/gettext WANTLIB= X11 Xext Xft Xrender c fontconfig freetype m z \ glib-2.0.>=600.0 gmodule-2.0.>=600.0 gobject-2.0.>=600.0 jpeg \ - pango-1.0 pangoft2-1.0 pangoxft-1.0 png + pango-1.0 pangoft2-1.0 pangoxft-1.0 png Xau Xdmcp expat CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--enable-nls diff --git a/x11/matchbox/matchbox-panel/pkg/PLIST b/x11/matchbox/matchbox-panel/pkg/PLIST index 8978606f76d..4006f893c57 100644 --- a/x11/matchbox/matchbox-panel/pkg/PLIST +++ b/x11/matchbox/matchbox-panel/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2006/07/20 21:00:11 robert Exp $ +@comment $OpenBSD: PLIST,v 1.4 2007/12/15 21:44:24 ajacoutot Exp $ %%APM%% bin/matchbox-panel bin/mb-applet-clock @@ -11,12 +11,7 @@ share/applications/mb-applet-clock.desktop share/applications/mb-applet-menu-launcher.desktop @comment share/applications/mb-applet-system-monitor.desktop share/applications/mb-launcher-term.desktop -share/locale/ -share/locale/cs/ -share/locale/cs/LC_MESSAGES/ share/locale/cs/LC_MESSAGES/matchbox-panel.mo -share/locale/de/ -share/locale/de/LC_MESSAGES/ share/locale/de/LC_MESSAGES/matchbox-panel.mo share/locale/en_GB/ share/locale/en_GB/LC_MESSAGES/ @@ -30,8 +25,6 @@ share/locale/fi_FI/LC_MESSAGES/matchbox-panel.mo share/locale/fr_FR/ share/locale/fr_FR/LC_MESSAGES/ share/locale/fr_FR/LC_MESSAGES/matchbox-panel.mo -share/locale/zh_TW/ -share/locale/zh_TW/LC_MESSAGES/ share/locale/zh_TW/LC_MESSAGES/matchbox-panel.mo share/pixmaps/broken-0.png share/pixmaps/mbmenu.png @@ -45,3 +38,5 @@ share/pixmaps/signal-1-40.png share/pixmaps/signal-41-60.png share/pixmaps/signal-61-80.png share/pixmaps/signal-81-100.png +@exec %D/bin/update-desktop-database +@unexec %D/bin/update-desktop-database diff --git a/x11/matchbox/matchbox-window-manager/Makefile b/x11/matchbox/matchbox-window-manager/Makefile index 0ef833bff3a..d611a70ca61 100644 --- a/x11/matchbox/matchbox-window-manager/Makefile +++ b/x11/matchbox/matchbox-window-manager/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2007/09/15 20:04:22 merdely Exp $ +# $OpenBSD: Makefile,v 1.8 2007/12/15 21:44:24 ajacoutot Exp $ COMMENT= window manager with a classic pda management policy DISTNAME= matchbox-window-manager-1.0 +PKGNAME= ${DISTNAME}p0 CATEGORIES= x11 MASTER_SITES= http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/ @@ -16,11 +17,12 @@ PERMIT_PACKAGE_FTP= Yes USE_X11= Yes LIB_DEPENDS= mb.>=1::x11/matchbox/libmatchbox -RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common +RUN_DEPENDS= :matchbox-common-*:x11/matchbox/matchbox-common \ + :desktop-file-utils-*:devel/desktop-file-utils MODULES= devel/gettext WANTLIB= ICE SM X11 Xext Xft Xrender c fontconfig freetype m z \ glib-2.0.>=600.0 gmodule-2.0.>=600.0 gobject-2.0.>=600.0 jpeg \ - pango-1.0 pangoft2-1.0 pangoxft-1.0 png + pango-1.0 pangoft2-1.0 pangoxft-1.0 png Xau Xdmcp expat CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--enable-session diff --git a/x11/matchbox/matchbox-window-manager/pkg/PLIST b/x11/matchbox/matchbox-window-manager/pkg/PLIST index 3705737c034..2dd3ab37428 100644 --- a/x11/matchbox/matchbox-window-manager/pkg/PLIST +++ b/x11/matchbox/matchbox-window-manager/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/17 02:57:30 jolan Exp $ +@comment $OpenBSD: PLIST,v 1.2 2007/12/15 21:44:24 ajacoutot Exp $ bin/matchbox-remote bin/matchbox-window-manager share/examples/matchbox/ @@ -44,3 +44,5 @@ share/themes/blondie/matchbox/theme.xml share/themes/blondie/matchbox/titleleft.png share/themes/blondie/matchbox/titleright.png share/themes/blondie/matchbox/titlestrip.png +@exec %D/bin/update-desktop-database +@unexec %D/bin/update-desktop-database