pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk print-PLIST target change:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/04b8fc549e37
branches:  trunk
changeset: 459942:04b8fc549e37
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Aug 12 15:51:29 2003 +0000

description:
print-PLIST target change:
Make COMMON_DIRS generating an awk script instead of sed expressions hence
use awk instead of sed to deal with the mtree file.

This get ride of the annoying 'sed: Too many commands' message making
print-PLIST unusable with Solaris' seds.

diffstat:

 mk/bsd.pkg.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 85b74e2e2e07 -r 04b8fc549e37 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Aug 12 14:55:42 2003 +0000
+++ b/mk/bsd.pkg.mk     Tue Aug 12 15:51:29 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1236 2003/08/12 14:55:42 seb Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1237 2003/08/12 15:51:29 seb Exp $
 #
 # This file is in the public domain.
 #
@@ -4222,12 +4222,13 @@
                                if ( i == 0 ){                          \
                                        cwd = $$1 ;                     \
                                } else {                                \
-                                       cwd = cwd "\\\\/" $$1 ;         \
+                                       cwd = cwd "\\/" $$1 ;   \
                                }                                       \
-                               print "-e \"/^" cwd "$$$$/d\"";         \
+                               print "/^" cwd "$$$$/ { next; }";       \
                                i=i+1 ;                                 \
                        }                                               \
                }                                                       \
+               END { print "{ print $$$$0; }"; }                       \
        ' <${MTREE_FILE}
 .endif
 
@@ -4284,7 +4285,7 @@
                        | ${SED}                                        \
                                -e 's@${PREFIX}/./@@'                   \
                                -e '/^${PREFIX:S/\//\\\//g}\/.$$/d'     \
-                       | ${SORT} -r | ${SED} ${COMMON_DIRS}` ;         \
+                       | ${SORT} -r | ${AWK} '${COMMON_DIRS}'` ;       \
        do                                                              \
                if [ `${LS} -la ${PREFIX}/$$i | ${WC} -l` = 3 ]; then   \
                        ${ECHO} @exec \$${MKDIR} %D/$$i ;               \



Home | Main Index | Thread Index | Old Index