[pkgsrc/trunk]: pkgsrc/mk In the print-PLIST target, split the expressions fe...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d37f6643a5e
branches:  trunk
changeset: 459935:2d37f6643a5e
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Aug 12 11:35:03 2003 +0000

description:
In the print-PLIST target, split the expressions fed to sed(1) into two
sets, so that this target will work on all native sed programs. The extra
invocation gets lost in amongst all the other sort, grep, sed, and awk
invocations that are there, and is a much more appealling prospect than
installing GNU sed.

diffstat:

 mk/bsd.pkg.mk |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (57 lines):

diff -r 89f4620ef1bd -r 2d37f6643a5e mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Aug 12 08:27:26 2003 +0000
+++ b/mk/bsd.pkg.mk     Tue Aug 12 11:35:03 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1234 2003/08/09 10:24:54 seb Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1235 2003/08/12 11:35:03 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -4234,18 +4234,19 @@
 # Common (system) directories not to generate @dirrm statements for
 # Reads MTREE_FILE and extracts a list of sed commands that will
 # sort out which directories NOT to include into the PLIST @dirrm list
-SUBST_PLIST_REPLACEMENT=\
+SUBST_PLIST_REPLACEMENT1=                                              \
                -e  's@${OPSYS}@\$${OPSYS}@'                            \
                -e  's@${OS_VERSION:S/./\./g}@\$${OS_VERSION}@'         \
                -e  's@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@' \
                -e  's@${MACHINE_ARCH}@\$${MACHINE_ARCH}@'              \
                -e  's@${MACHINE_GNU_ARCH}@\$${MACHINE_GNU_ARCH}@'      \
                -e  's@${LOWER_VENDOR}@\$${LOWER_VENDOR}@'              \
-               -e  's@${LOWER_OPSYS}@\$${LOWER_OPSYS}@'                \
-               -e  's@${LOWER_OS_VERSION:S/./\./g}@\$${LOWER_OS_VERSION}@'     \
-               -e  's@${PKGNAME:S/./\./g}@\$${PKGNAME}@'                       \
+               -e  's@${LOWER_OS_VERSION:S/./\./g}@\$${LOWER_OS_VERSION}@' \
+               -e  's@${LOWER_OPSYS}@\$${LOWER_OPSYS}@'
+SUBST_PLIST_REPLACEMENT2=                                              \
+               -e  's@${PKGNAME:S/./\./g}@\$${PKGNAME}@'               \
                -e  's@${PKGVERSION:S/./\./g}@\$${PKGVERSION}@'         \
-               -e  's@${PKGLOCALEDIR}/locale@\$${PKGLOCALEDIR}/locale@' \
+               -e  's@${PKGLOCALEDIR}/locale@\$${PKGLOCALEDIR}/locale@'
 
 .if make(print-PLIST)
 COMMON_DIRS!=  ${AWK} 'BEGIN  {                                        \
@@ -4292,9 +4293,8 @@
        ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} \! -type d   \
         | ( ${GREP} -v emul/linux/proc || ${TRUE} )                    \
         | ${SORT}                                                      \
-        | ${SED}                                                       \
-               -e  's@${PREFIX}/./@@'                                  \
-               ${SUBST_PLIST_REPLACEMENT}                              \
+        | ${SED} -e 's@${PREFIX}/./@@' ${SUBST_PLIST_REPLACEMENT1}     \
+        | ${SED} ${SUBST_PLIST_REPLACEMENT2}                           \
         | ${AWK} '                                                     \
                /^@/ { print $$0; next }                                \
                /.*\/lib[^\/]+\.so\.[0-9]+\.[0-9]+\.[0-9]+$$/ {         \
@@ -4334,8 +4334,8 @@
                ${ECHO} @dirrm $$i ;                                    \
        done                                                            \
        | ( ${GREP} -v emul/linux/proc || ${TRUE} )                     \
-       | ${SED}                                                        \
-               ${SUBST_PLIST_REPLACEMENT}
+       | ${SED} ${SUBST_PLIST_REPLACEMENT1}                            \
+       | ${SED} ${SUBST_PLIST_REPLACEMENT2}
 .endif # target(print-PLIST)