pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc Fix print-PLIST generation (broken by incorrect r...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bac3a3a2a314
branches:  trunk
changeset: 495198:bac3a3a2a314
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Jun 04 11:20:22 2005 +0000

description:
Fix print-PLIST generation (broken by incorrect regexp in MKDIR handling).

diffstat:

 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(-)

diffs (126 lines):

diff -r 36f44dc2427e -r bac3a3a2a314 misc/XFree86-dirs/dirs.mk
--- a/misc/XFree86-dirs/dirs.mk Sat Jun 04 11:19:30 2005 +0000
+++ b/misc/XFree86-dirs/dirs.mk Sat Jun 04 11:20:22 2005 +0000
@@ -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 @@
 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 -r 36f44dc2427e -r bac3a3a2a314 misc/gnome1-dirs/dirs.mk
--- a/misc/gnome1-dirs/dirs.mk  Sat Jun 04 11:19:30 2005 +0000
+++ b/misc/gnome1-dirs/dirs.mk  Sat Jun 04 11:20:22 2005 +0000
@@ -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 @@
 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 -r 36f44dc2427e -r bac3a3a2a314 misc/gnome2-dirs/dirs.mk
--- a/misc/gnome2-dirs/dirs.mk  Sat Jun 04 11:19:30 2005 +0000
+++ b/misc/gnome2-dirs/dirs.mk  Sat Jun 04 11:20:22 2005 +0000
@@ -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 @@
 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 -r 36f44dc2427e -r bac3a3a2a314 misc/theme-dirs/dirs.mk
--- a/misc/theme-dirs/dirs.mk   Sat Jun 04 11:19:30 2005 +0000
+++ b/misc/theme-dirs/dirs.mk   Sat Jun 04 11:20:22 2005 +0000
@@ -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 @@
 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 -r 36f44dc2427e -r bac3a3a2a314 misc/xdg-dirs/dirs.mk
--- a/misc/xdg-dirs/dirs.mk     Sat Jun 04 11:19:30 2005 +0000
+++ b/misc/xdg-dirs/dirs.mk     Sat Jun 04 11:20:22 2005 +0000
@@ -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 @@
 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 -r 36f44dc2427e -r bac3a3a2a314 misc/xdg-x11-dirs/dirs.mk
--- a/misc/xdg-x11-dirs/dirs.mk Sat Jun 04 11:19:30 2005 +0000
+++ b/misc/xdg-x11-dirs/dirs.mk Sat Jun 04 11:20:22 2005 +0000
@@ -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 @@
 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 -r 36f44dc2427e -r bac3a3a2a314 misc/xorg-dirs/dirs.mk
--- a/misc/xorg-dirs/dirs.mk    Sat Jun 04 11:19:30 2005 +0000
+++ b/misc/xorg-dirs/dirs.mk    Sat Jun 04 11:20:22 2005 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index