From 551a9998abca24695aeaa05cf74f95e6c2f54b8e Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Sat, 4 Jun 2005 11:20:22 +0000
Subject: Fix print-PLIST generation (broken by incorrect regexp in MKDIR
 handling).

---
 misc/XFree86-dirs/dirs.mk | 4 ++--
 misc/gnome1-dirs/dirs.mk  | 4 ++--
 misc/gnome2-dirs/dirs.mk  | 4 ++--
 misc/theme-dirs/dirs.mk   | 4 ++--
 misc/xdg-dirs/dirs.mk     | 4 ++--
 misc/xdg-x11-dirs/dirs.mk | 4 ++--
 misc/xorg-dirs/dirs.mk    | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'misc')

diff --git a/misc/XFree86-dirs/dirs.mk b/misc/XFree86-dirs/dirs.mk
index f8ee89eaa49..194d5fa8a54 100644
--- a/misc/XFree86-dirs/dirs.mk
+++ b/misc/XFree86-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.4 2005/05/31 18:53:32 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.5 2005/06/04 11:20:22 jmmv Exp $
 #
 
 .if !defined(DIRS_XFREE86_MK)
@@ -31,7 +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+=	/^@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 b4ea30cfaba..9af11eb1742 100644
--- a/misc/gnome1-dirs/dirs.mk
+++ b/misc/gnome1-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2005/05/31 18:53:32 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.3 2005/06/04 11:20:22 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -16,7 +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+=	/^@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 7f00889e16c..56b42bab779 100644
--- a/misc/gnome2-dirs/dirs.mk
+++ b/misc/gnome2-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.2 2005/05/31 18:53:32 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.3 2005/06/04 11:20:23 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -21,7 +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+=	/^@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 deb9feca1e2..246648cd5c6 100644
--- a/misc/theme-dirs/dirs.mk
+++ b/misc/theme-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2005/05/31 18:53:32 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -39,7 +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+=	/^@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 32914ba1ff0..5867fba68c5 100644
--- a/misc/xdg-dirs/dirs.mk
+++ b/misc/xdg-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2005/05/31 18:53:32 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -20,7 +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+=	/^@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 3796ab34fca..6292373346f 100644
--- a/misc/xdg-x11-dirs/dirs.mk
+++ b/misc/xdg-x11-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2005/05/31 18:53:32 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -20,7 +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+=	/^@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 79c16a45730..9b9eedcdc5d 100644
--- a/misc/xorg-dirs/dirs.mk
+++ b/misc/xorg-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.3 2005/05/31 18:53:32 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $
 #
 
 .if !defined(DIRS_XORG_MK)
@@ -31,7 +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+=	/^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm ${dir:S|/|\\/|g}$$/ \
 				{ print "@comment in xorg-dirs: "$$0; next; }
 .  endfor
-- 
cgit v1.2.3