From 3839f4a1abafb59d29ba7bd0bcfa98cc27aa75ab Mon Sep 17 00:00:00 2001 From: jmmv Date: Sun, 2 Apr 2006 09:49:00 +0000 Subject: Depend on hicolor-icon-theme to: 1) Handle the shared share/icons/hicolor directory. 2) Properly regenerate the icon theme cache during (de)installation. Bump PKGREVISION. --- x11/xfce4-desktop/Makefile | 5 +++-- x11/xfce4-mcs-manager/Makefile | 5 +++-- x11/xfce4-mcs-plugins/Makefile | 5 +++-- x11/xfce4-panel/Makefile | 5 +++-- x11/xfce4-session/Makefile | 5 +++-- x11/xfce4-utils/Makefile | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) (limited to 'x11') diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index 91caace3407..a202675effd 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.21 2006/02/24 14:15:12 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2006/04/02 09:49:01 jmmv Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfdesktop-${XFCE4_VERSION} PKGNAME= xfce4-desktop-${XFCE4_VERSION} #PKGREVISION= 1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 COMMENT= Xfce desktop background manager @@ -29,6 +29,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} REQD_DIRS+= ${XFCE4_EGBASE:Q} ${EGDIR:Q} +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile index 77193373a6d..cea31b73f53 100644 --- a/x11/xfce4-mcs-manager/Makefile +++ b/x11/xfce4-mcs-manager/Makefile @@ -1,16 +1,17 @@ -# $NetBSD: Makefile,v 1.14 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/04/02 09:49:01 jmmv Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce-mcs-manager-${XFCE4_VERSION} PKGNAME= xfce4-mcs-manager-${XFCE4_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 COMMENT= Xfce settings manager PKGCONFIG_OVERRIDE= xfce-mcs-manager/xfce-mcs-manager.pc.in PTHREAD_AUTO_VARS= yes +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../x11/libxfce4mcs/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile index 7f10407698c..e8c28a06b64 100644 --- a/x11/xfce4-mcs-plugins/Makefile +++ b/x11/xfce4-mcs-plugins/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:46 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/04/02 09:49:01 jmmv Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce-mcs-plugins-${XFCE4_VERSION} PKGNAME= xfce4-mcs-plugins-${XFCE4_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 COMMENT= Xfce settings manager plugins +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-manager/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index 2eeb0fa128b..78acb449954 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.25 2006/02/17 06:49:26 martti Exp $ +# $NetBSD: Makefile,v 1.26 2006/04/02 09:49:01 jmmv Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-panel-${XFCE4_VERSION} #PKGREVISION= 1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 COMMENT= Xfce panel @@ -25,6 +25,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index 1b3cbf88427..cdd0697d082 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2006/02/17 06:49:26 martti Exp $ +# $NetBSD: Makefile,v 1.14 2006/04/02 09:49:01 jmmv Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce4-session-${XFCE4_VERSION} #PKGREVISION= 1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 COMMENT= Xfce session manager @@ -21,5 +21,6 @@ REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} USE_TOOLS+= iceauth:run +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile index 9e078b0079a..85c6d281515 100644 --- a/x11/xfce4-utils/Makefile +++ b/x11/xfce4-utils/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.23 2006/03/20 06:29:09 martti Exp $ +# $NetBSD: Makefile,v 1.24 2006/04/02 09:49:01 jmmv Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce-utils-${XFCE4_VERSION} PKGNAME= xfce4-utils-${XFCE4_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 COMMENT= Xfce utilities @@ -19,5 +19,6 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} .include "options.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3