summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2001-02-15 13:49:04 +0000
committeragc <agc>2001-02-15 13:49:04 +0000
commit8cdaeb0b8b54863dbcbe7237c8142518001fcce7 (patch)
tree298482900885c1a18101212b818faa5cd83709d6
parentaa7ff602c6f7f718e34d55ceed6e963d2498845e (diff)
downloadpkgsrc-8cdaeb0b8b54863dbcbe7237c8142518001fcce7.tar.gz
Make sure we record the RCS Ids of all of the patch files in the
BUILD_VERSION information (pkg_info -b) Correct the English in the licence gripe.
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 99fc4da3a78..c557fdc4600 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.661 2001/02/13 11:47:04 tron Exp $
+# $NetBSD: bsd.pkg.mk,v 1.662 2001/02/15 13:49:04 agc Exp $
#
# This file is in the public domain.
#
@@ -1092,7 +1092,7 @@ _ACCEPTABLE= yes
. endfor # _lic
. endif # ACCEPTABLE_LICENSES
. ifndef _ACCEPTABLE
-IGNORE+= "${PKGNAME} has unacceptable license: ${LICENSE}." \
+IGNORE+= "${PKGNAME} has an unacceptable license: ${LICENSE}." \
" To build this package, add this line to your /etc/mk.conf:" \
" ACCEPTABLE_LICENSES+=${LICENSE}"
. endif # _ACCEPTABLE
@@ -3173,7 +3173,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE}
done; \
if [ -f ${PATCH_SUM_FILE} ]; then \
for f in `${AWK} '$$1 == "MD5" { gsub("[()]", "", $$2); print $$2 }' < ${PATCH_SUM_FILE}`; do \
- if [ -f $$f ]; then \
+ if [ -f ${PATCHDIR}/$$f ]; then \
files="$$files ${PATCHDIR}/$$f"; \
fi; \
done; \