diff options
| author | veego <veego> | 2000-09-15 16:53:30 +0000 |
|---|---|---|
| committer | veego <veego> | 2000-09-15 16:53:30 +0000 |
| commit | f6aad6831a38fa64ca72f318210e4aba70bf0c11 (patch) | |
| tree | 18d38582acef27d2d1a2d46bd4b5e600a2f236c8 | |
| parent | cbad9dbcc5d2418d37f5404a6e077af0d6aa07bb (diff) | |
| download | pkgsrc-f6aad6831a38fa64ca72f318210e4aba70bf0c11.tar.gz | |
Fix a problem with the print-pkg-size-this on Solaris.
It use the wrong ls when you have /usr/ucb before /usr/bin in your PATH.
The usb-ls doesn't print the group field, so the size is the 4th field and
not the 5th one.
Fixed by using the /usr/bin one.
Added and use: ${LS} which points to the correct ls.
Also add a space after the 0 in the AWK part of this target and one after
the '+'. Noticed by Klaus Klein.
Changes reviewed by Hubert Feyrer.
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index bd464d1e5a0..9e372df3d80 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.575 2000/09/15 09:18:21 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.576 2000/09/15 16:53:30 veego Exp $ # # This file is in the public domain. # @@ -525,6 +525,7 @@ ID?= /usr/xpg4/bin/id IDENT?= ${LOCALBASE}/bin/ident LDCONFIG?= /usr/bin/true LN?= /usr/bin/ln +LS?= /usr/bin/ls MKDIR?= /usr/bin/mkdir -p MTREE?= ${LOCALBASE}/bsd/bin/mtree MV?= /usr/bin/mv @@ -569,6 +570,7 @@ ID?= /usr/bin/id IDENT?= /usr/bin/ident LDCONFIG?= /sbin/ldconfig LN?= /bin/ln +LS?= /bin/ls MKDIR?= /bin/mkdir -p MTREE?= ${LOCALBASE}/bsd/bin/mtree MV?= /bin/mv @@ -613,6 +615,7 @@ ID?= /usr/bin/id IDENT?= /usr/bin/ident LDCONFIG?= /sbin/ldconfig LN?= /bin/ln +LS?= /bin/ls MKDIR?= /bin/mkdir -p MTREE?= /usr/sbin/mtree MV?= /bin/mv @@ -2856,9 +2859,9 @@ print-pkg-size-this: <${PLIST} \ | sort -u \ | ${SED} -e 's, ,\\ ,g' \ - | xargs ls -ld \ - | ${AWK} 'BEGIN { print("0"); } \ - { print($$5, " +"); } \ + | xargs ${LS} -ld \ + | ${AWK} 'BEGIN { print("0 "); } \ + { print($$5, " + "); } \ END { print("p"); }' \ | ${DC} @@ -2967,7 +2970,7 @@ print-PLIST: -e '/^${PREFIX:S/\//\\\//g}\/.$$/d' \ | sort -r | ${SED} ${COMMON_DIRS}` ; \ do \ - if [ `ls -la ${PREFIX}/$$i | wc -l` = 3 ]; then \ + if [ `${LS} -la ${PREFIX}/$$i | wc -l` = 3 ]; then \ ${ECHO} @exec /bin/mkdir -p ${PREFIX}/$$i ; \ fi ; \ ${ECHO} @dirrm $$i ; \ |