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.

8 files changed, 24 insertions, 16 deletions

diff --git a/misc/XFree86-dirs/Makefile b/misc/XFree86-dirs/Makefile
index bfb2d3474aa..82dfa738e6c 100644
--- a/misc/XFree86-dirs/Makefile
+++ b/misc/XFree86-dirs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/04/28 22:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/20 19:16:21 jlam Exp $
 #
 
 DISTNAME=	XFree86-dirs-1.1
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -23,7 +24,7 @@ XFREE86_ONLY_DIRS=	# defined
 .include "../../mk/bsd.prefs.mk"
 .include "dirs.mk"
 
-MAKE_DIRS+=	${XFREE86_DIRS:O:S/^/${X11ROOT}\//:C/\/\/\/*/\//g}
+REQD_DIRS+=	${XFREE86_DIRS:O:S/^/${X11ROOT}\//:C/\/\/\/*/\//g}
 
 do-install:	# nothing
 
diff --git a/misc/gnome-dirs/Makefile b/misc/gnome-dirs/Makefile
index c8c640efec5..d1c41644c05 100644
--- a/misc/gnome-dirs/Makefile
+++ b/misc/gnome-dirs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/04/28 23:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/20 19:16:21 jlam Exp $
 #
 
 DISTNAME=	gnome-dirs-1.5
+PKGREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -22,7 +23,7 @@ NO_BUILD=	# defined
 .include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_DIRS+=	${GNOME_DIRS:O:S/^/${PREFIX}\//}
+REQD_DIRS+=	${GNOME_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:	# nothing
 
diff --git a/misc/gnome1-dirs/Makefile b/misc/gnome1-dirs/Makefile
index 03ce5dd6ad8..996450ae185 100644
--- a/misc/gnome1-dirs/Makefile
+++ b/misc/gnome1-dirs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/04/28 23:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/20 19:16:21 jlam Exp $
 #
 
 DISTNAME=	gnome1-dirs-1.5
+PKGREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -25,7 +26,7 @@ NO_BUILD=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 ALL_GNOME_DIRS=	${GNOME_DIRS} ${GNOME1_DIRS}
-MAKE_DIRS+=	${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//}
+REQD_DIRS+=	${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:	# nothing
 
diff --git a/misc/gnome2-dirs/Makefile b/misc/gnome2-dirs/Makefile
index ea504ed6ab1..386abee8528 100644
--- a/misc/gnome2-dirs/Makefile
+++ b/misc/gnome2-dirs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/04/28 23:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/08/20 19:16:21 jlam Exp $
 #
 
 DISTNAME=	gnome2-dirs-1.5
+PKGREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -28,7 +29,7 @@ ALL_GNOME_DIRS=	${GNOME2_DIRS}
 ALL_GNOME_DIRS=	${GNOME_DIRS} ${GNOME2_DIRS}
 .endif
 
-MAKE_DIRS+=	${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//}
+REQD_DIRS+=	${ALL_GNOME_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:	# nothing
 
diff --git a/misc/theme-dirs/Makefile b/misc/theme-dirs/Makefile
index e3c1f29a366..34cfaf184c5 100644
--- a/misc/theme-dirs/Makefile
+++ b/misc/theme-dirs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/05/10 20:21:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/20 19:16:21 jlam Exp $
 #
 
 DISTNAME=	theme-dirs-1.1
+PKGREVISION=	1
 CATEGORIES=	misc gnome kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -22,7 +23,7 @@ WRKSRC=		${WRKDIR}
 .include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_DIRS+=	${THEME_DIRS:O:S/^/${PREFIX}\//}
+REQD_DIRS+=	${THEME_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:	# nothing
 
diff --git a/misc/xdg-dirs/Makefile b/misc/xdg-dirs/Makefile
index 53b78ee3ff2..ac9a7cfd03d 100644
--- a/misc/xdg-dirs/Makefile
+++ b/misc/xdg-dirs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/04/28 23:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/20 19:16:21 jlam Exp $
 #
 
 DISTNAME=	xdg-dirs-1.2
+PKGREVISION=	1
 CATEGORIES=	misc gnome kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -23,7 +24,7 @@ WRKSRC=		${WRKDIR}
 .include "dirs.mk"
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_DIRS+=	${XDG_DIRS:O:S/^/${PREFIX}\//}
+REQD_DIRS+=	${XDG_DIRS:O:S/^/${PREFIX}\//}
 
 do-install:	# nothing
 
diff --git a/misc/xdg-x11-dirs/Makefile b/misc/xdg-x11-dirs/Makefile
index c41d8a1abff..15b0aebc6cf 100644
--- a/misc/xdg-x11-dirs/Makefile
+++ b/misc/xdg-x11-dirs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/20 19:16:21 jlam Exp $
 #
 
 DISTNAME=	xdg-x11-dirs-1.2
+PKGREVISION=	1
 CATEGORIES=	misc gnome kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -27,7 +28,7 @@ WRKSRC=		${WRKDIR}
 .if ${X11PREFIX} == ${LOCALBASE}
 DEPENDS+=	xdg-dirs>=1.1:../../misc/xdg-dirs
 .else
-MAKE_DIRS+=	${XDG_X11_DIRS:O:S/^/${PREFIX}\//}
+REQD_DIRS+=	${XDG_X11_DIRS:O:S/^/${PREFIX}\//}
 .endif
 
 do-install:	# nothing
diff --git a/misc/xorg-dirs/Makefile b/misc/xorg-dirs/Makefile
index 82613eb8b79..db9ca57aab8 100644
--- a/misc/xorg-dirs/Makefile
+++ b/misc/xorg-dirs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/04/28 23:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/20 19:16:21 jlam Exp $
 #
 
 DISTNAME=	xorg-dirs-1.1
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -23,7 +24,7 @@ XORG_ONLY_DIRS=		# defined
 .include "../../mk/bsd.prefs.mk"
 .include "dirs.mk"
 
-MAKE_DIRS+=	${XORG_DIRS:O:S/^/${X11ROOT}\//}
+REQD_DIRS+=	${XORG_DIRS:O:S/^/${X11ROOT}\//}
 
 do-install:	# nothing