diff options
| author | abs <abs> | 2001-11-28 10:21:46 +0000 |
|---|---|---|
| committer | abs <abs> | 2001-11-28 10:21:46 +0000 |
| commit | e9ba1078c494ff90bee0dd260e945704cd94c5c5 (patch) | |
| tree | b02b5aefe90e4535a19203756b3b1e6b0b6e02c0 | |
| parent | 2a83e65c61f19f7ea1cc594b24f6283dddcf4100 (diff) | |
| download | pkgsrc-e9ba1078c494ff90bee0dd260e945704cd94c5c5.tar.gz | |
lose some more pkg/ references
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | mk/bsd.pkg.subdir.mk | 10 | ||||
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index fc96ed5ca4a..fe704936207 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.863 2001/11/26 19:56:06 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.864 2001/11/28 10:21:46 abs Exp $ # # This file is in the public domain. # @@ -3112,7 +3112,7 @@ print-pkg-size-depends: ### ### Usage: ### - make install -### - make print-PLIST | brain >pkg/PLIST +### - make print-PLIST | brain >PLIST ### # Common (system) directories not to generate @dirrm statements for diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk index bcea7019647..77b990923b1 100644 --- a/mk/bsd.pkg.subdir.mk +++ b/mk/bsd.pkg.subdir.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.subdir.mk,v 1.44 2001/10/26 21:42:44 tron Exp $ +# $NetBSD: bsd.pkg.subdir.mk,v 1.45 2001/11/28 10:21:47 abs Exp $ # Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # @@ -151,8 +151,8 @@ README.html: .PRECIOUS .endfor @${SORT} -t '>' +3 -4 $@.tmp > $@.tmp2 @${AWK} '{ ++n } END { print n }' < $@.tmp2 > $@.tmp4 -.if exists(${.CURDIR}/pkg/DESCR) - @${HTMLIFY} ${.CURDIR}/pkg/DESCR > $@.tmp3 +.if exists(${.CURDIR}/DESCR) + @${HTMLIFY} ${.CURDIR}/DESCR > $@.tmp3 .else @> $@.tmp3 .endif @@ -181,8 +181,8 @@ README.html: .PRECIOUS show-comment: @if [ "${COMMENT}" ]; then \ ${ECHO} "${COMMENT:S/"/''/}"; \ - elif [ -f pkg/COMMENT ] ; then \ - ${CAT} pkg/COMMENT; \ + elif [ -f COMMENT ] ; then \ + ${CAT} COMMENT; \ else \ ${ECHO} '(no description)'; \ fi diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 364fb1e5fca..e65c8e7a8cd 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.30 2001/11/07 00:29:20 hubertf Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.31 2001/11/28 10:21:47 abs Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -111,8 +111,8 @@ bulk-check-uptodate: @uptodate=1 ; \ if [ -f "${REF}" ]; then \ ${SHCOMMENT} "Check files of this package" ; \ - newfiles="`find . -type f -newer "${REF}" -print | ${EGREP} -v -e ./work -e pkg/COMMENT -e pkg/DESCR -e README.html -e CVS -e '^\./\.' || true`" ; \ - nnewfiles="`find . -type f -newer "${REF}" -print | ${EGREP} -v -e ./work -e pkg/COMMENT -e pkg/DESCR -e README.html -e CVS -e '^\./\.' | ${WC} -l`" ; \ + newfiles="`find . -type f -newer "${REF}" -print | ${EGREP} -v -e ./work -e COMMENT -e DESCR -e README.html -e CVS -e '^\./\.' || true`" ; \ + nnewfiles="`find . -type f -newer "${REF}" -print | ${EGREP} -v -e ./work -e COMMENT -e DESCR -e README.html -e CVS -e '^\./\.' | ${WC} -l`" ; \ if [ "$$nnewfiles" -gt 0 ]; then \ ${ECHO_MSG} >&2 "BULK> Package ${PKGNAME} ($$newfiles) modified since last 'make package' re-packaging..." ; \ uptodate=0 ; \ |