Use REQD_DIRS instead of MAKE_DIRS for directories under ${PREFIX} so

that these directories will be conditionally removed (based on reference
counts), regardless of the value of PKG_CONFIG.  Bump the PKGREVISION
for packages that were modified as a result.

6 files changed, 18 insertions, 16 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 0e2eb1d8107..979e0d565f0 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2005/08/10 20:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.90 2005/08/20 19:16:22 jlam Exp $
 #
 
 DISTNAME=		gtk+-2.6.9
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.6/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.6/ \
@@ -43,7 +44,7 @@ PKGCONFIG_OVERRIDE+=	gtk+-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gdk-pixbuf-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
 
-MAKE_DIRS+=		${PREFIX}/libdata/gtk-2.0
+REQD_DIRS+=		${PREFIX}/libdata/gtk-2.0
 
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/demos/gtk-demo
 
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index a22c071471c..1ec21c317f1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2005/07/30 11:04:59 markd Exp $
+# $NetBSD: Makefile,v 1.92 2005/08/20 19:16:22 jlam Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -27,7 +28,7 @@ SGML_CATALOGS+=		${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docboo
 
 LIBS.NetBSD+=			${EXPORT_SYMBOLS_LDFLAGS}
 
-MAKE_DIRS+=	${KDE3_DIRS:O:S/^/${PREFIX}\//}
+REQD_DIRS+=	${KDE3_DIRS:O:S/^/${PREFIX}\//}
 
 REPLACE_PERL= \
 	dcop/dcopidlng/kalyptus \
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 3db25c56af2..9d242d581a5 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2005/06/15 09:00:15 hira Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/20 19:16:22 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 desktop background manager
 
@@ -25,7 +25,7 @@ CONF_FILES+=		${EGDIR}/xfce-registered-categories.xml.${_l} \
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 
-MAKE_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
+REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 72c53c89df4..4f6d08bc0a2 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/06/15 09:01:59 hira Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/20 19:16:22 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-panel-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 panel
 
@@ -23,7 +23,7 @@ CONF_FILES+=		${EGDIR}/contents.xml.${_l} \
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 
-MAKE_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
+REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index bbc1ff18219..09acb7039a9 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 05:49:35 hira Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/20 19:16:22 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-session-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	XFce4 session manager
 
@@ -16,7 +16,7 @@ CONF_FILES=		${EGDIR}/xfce4-session.rc \
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 
-MAKE_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
+REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
 .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 9e02d405960..1ee711ffc14 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2005/06/15 09:04:32 hira Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/20 19:16:23 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-utils-${XFCE4_VERSION}
 PKGNAME=	xfce4-utils-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 utilities
 
@@ -14,7 +14,7 @@ PKG_SYSCONFSUBDIR=	xdg/xfce4
 EGDIR=			${XFCE4_EGBASE}
 CONF_FILES=		${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xinitrc
 
-MAKE_DIRS+=		${EGDIR}
+REQD_DIRS+=		${EGDIR}
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}