During PLIST generation, suppress MKDIR lines that create directories

handled by these packages.  Found by wiz@.

7 files changed, 14 insertions, 7 deletions

diff --git a/misc/XFree86-dirs/dirs.mk b/misc/XFree86-dirs/dirs.mk
index de59d955b11..f8ee89eaa49 100644
--- a/misc/XFree86-dirs/dirs.mk
+++ b/misc/XFree86-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2004/07/30 11:24:38 xtraeme Exp $
+# $NetBSD: dirs.mk,v 1.4 2005/05/31 18:53:32 jmmv Exp $
 #
 
 .if !defined(DIRS_XFREE86_MK)
@@ -31,6 +31,7 @@ XFREE86_DIRS+=		${MISCMAN_DIR}
 DEPENDS+=		XFree86-dirs>=${_USE_XFREE86_DIRS}:../../misc/XFree86-dirs
 
 .  for dir in ${XFREE86_DIRS}
+PRINT_PLIST_AWK+=	/^@exec $${MKDIR} %D/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in XFree86-dirs: "$$0; next; }
 .  endfor
diff --git a/misc/gnome1-dirs/dirs.mk b/misc/gnome1-dirs/dirs.mk
index e00e2a447a2..b4ea30cfaba 100644
--- a/misc/gnome1-dirs/dirs.mk
+++ b/misc/gnome1-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.1 2004/04/14 15:26:41 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.2 2005/05/31 18:53:32 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -16,6 +16,7 @@ GNOME1_DIRS=		# none yet
 DEPENDS+=		gnome1-dirs>=${_USE_GNOME1_DIRS}:../../misc/gnome1-dirs
 
 .  for dir in ${GNOME_DIRS} ${GNOME1_DIRS}
+PRINT_PLIST_AWK+=	/^@exec $${MKDIR} %D/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in gnome1-dirs: " $$0; next; }
 .  endfor
diff --git a/misc/gnome2-dirs/dirs.mk b/misc/gnome2-dirs/dirs.mk
index fcded98ce9d..7f00889e16c 100644
--- a/misc/gnome2-dirs/dirs.mk
+++ b/misc/gnome2-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.1 2004/04/14 15:26:41 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.2 2005/05/31 18:53:32 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -21,6 +21,7 @@ GNOME2_DIRS+=		share/gnome/wm-properties
 DEPENDS+=		gnome2-dirs>=${_USE_GNOME2_DIRS}:../../misc/gnome2-dirs
 
 .  for dir in ${GNOME_DIRS} ${GNOME2_DIRS}
+PRINT_PLIST_AWK+=	/^@exec $${MKDIR} %D/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in gnome2-dirs: " $$0; next; }
 .  endfor
diff --git a/misc/theme-dirs/dirs.mk b/misc/theme-dirs/dirs.mk
index e211a1dc805..deb9feca1e2 100644
--- a/misc/theme-dirs/dirs.mk
+++ b/misc/theme-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2005/05/10 20:21:57 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.3 2005/05/31 18:53:32 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -39,6 +39,7 @@ THEME_DIRS+=		share/themes/Traditional
 DEPENDS+=		theme-dirs>=${_USE_THEME_DIRS}:../../misc/theme-dirs
 
 .  for dir in ${THEME_DIRS}
+PRINT_PLIST_AWK+=	/^@exec $${MKDIR} %D/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in theme-dirs: " $$0; next; }
 .  endfor
diff --git a/misc/xdg-dirs/dirs.mk b/misc/xdg-dirs/dirs.mk
index ed382996496..32914ba1ff0 100644
--- a/misc/xdg-dirs/dirs.mk
+++ b/misc/xdg-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2005/04/19 10:52:26 wiz Exp $
+# $NetBSD: dirs.mk,v 1.3 2005/05/31 18:53:32 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -20,6 +20,7 @@ XDG_DIRS+=		share/themes
 DEPENDS+=		xdg-dirs>=${_USE_XDG_DIRS}:../../misc/xdg-dirs
 
 .  for dir in ${XDG_DIRS}
+PRINT_PLIST_AWK+=	/^@exec $${MKDIR} %D/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in xdg-dirs: " $$0; next; }
 .  endfor
diff --git a/misc/xdg-x11-dirs/dirs.mk b/misc/xdg-x11-dirs/dirs.mk
index b4895b4d59e..3796ab34fca 100644
--- a/misc/xdg-x11-dirs/dirs.mk
+++ b/misc/xdg-x11-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2005/04/19 13:06:49 wiz Exp $
+# $NetBSD: dirs.mk,v 1.3 2005/05/31 18:53:32 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -20,6 +20,7 @@ XDG_X11_DIRS+=		share/themes
 DEPENDS+=		xdg-x11-dirs>=${_USE_XDG_X11_DIRS}:../../misc/xdg-x11-dirs
 
 .  for dir in ${XDG_X11_DIRS}
+PRINT_PLIST_AWK+=	/^@exec $${MKDIR} %D/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in xdg-x11-dirs: " $$0; next; }
 .  endfor
diff --git a/misc/xorg-dirs/dirs.mk b/misc/xorg-dirs/dirs.mk
index 3fa273db6c4..79c16a45730 100644
--- a/misc/xorg-dirs/dirs.mk
+++ b/misc/xorg-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2004/07/30 11:24:38 xtraeme Exp $
+# $NetBSD: dirs.mk,v 1.3 2005/05/31 18:53:32 jmmv Exp $
 #
 
 .if !defined(DIRS_XORG_MK)
@@ -31,6 +31,7 @@ XORG_DIRS+=		${MISCMAN_DIR}
 DEPENDS+=		xorg-dirs>=${_USE_XORG_DIRS}:../../misc/xorg-dirs
 
 .  for dir in ${XORG_DIRS}
+PRINT_PLIST_AWK+=	/^@exec $${MKDIR} %D/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in xorg-dirs: "$$0; next; }
 .  endfor