diff options
| author | jlam <jlam> | 2003-08-14 07:37:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-14 07:37:00 +0000 |
| commit | d28c58f8cdb05927579c5c10ac0750083764ff70 (patch) | |
| tree | 4654e825a6f770fa825cc0f98a3a9d1a683eaa6c /mk/bulk | |
| parent | 2df3d382c1294f4cf33bd7392482816b30644566 (diff) | |
| download | pkgsrc-d28c58f8cdb05927579c5c10ac0750083764ff70.tar.gz | |
Sync to HEAD, primarily for texinfo changes, and prepare for buildlink3.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 6 | ||||
| -rwxr-xr-x | mk/bulk/mksandbox | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index b5ade286a5d..c71314752bc 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.45.2.1 2003/08/01 19:00:36 jlam Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.45.2.2 2003/08/14 07:37:07 jlam Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -161,7 +161,7 @@ bulk-check-uptodate: if [ "$$uptodate" = "1" ]; then \ ${SHCOMMENT} "Check required binary packages" ; \ deps=`${PKG_INFO} -qf ${REF} \ - | ${GREP} ^@pkgdep \ + | ${GREP} '^@pkgdep' \ | ${SED} 's,@pkgdep.,,g'`; \ for dep in $$deps ; do \ ${SHCOMMENT} "check against the binary pkg that pkg_add would pick, too:" ; \ @@ -195,7 +195,7 @@ bulk-package: ${ECHO_MSG} '###' ; \ ${ECHO_MSG} '###' `date`: ; \ ${ECHO_MSG} '### ${MAKE} ${.TARGET} for ${PKGNAME}' ; \ - ${ECHO_MSG} '### Current pkg count: ' `${LS} -l ${PKG_DBDIR} | ${GREP} ^d | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \ + ${ECHO_MSG} '### Current pkg count: ' `${LS} -l ${PKG_DBDIR} | ${GREP} '^d' | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \ ${ECHO_MSG} '###' ; \ fi \ ) 2>&1 | tee -a ${BUILDLOG} diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox index ca43e4a3a89..3b3f6524f76 100755 --- a/mk/bulk/mksandbox +++ b/mk/bulk/mksandbox @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: mksandbox,v 1.20.4.1 2003/08/01 19:00:37 jlam Exp $ +# $NetBSD: mksandbox,v 1.20.4.2 2003/08/14 07:37:07 jlam Exp $ # # # Copyright (c) 2002 Alistair G. Crooks. All rights reserved. @@ -45,7 +45,7 @@ src=/usr/src kernel="" sandboxMountDirs="/bin /sbin /lib /libexec /usr/X11R6 /usr/bin /usr/games /usr/include /usr/lib /usr/libdata /usr/libexec /usr/lkm /usr/share /usr/sbin /var/mail" sandboxEmptyDirs="/var/run /var/log /var/spool/mqueue" -sandboxEmptyFiles="/var/run/utmp /var/run/utmpx /var/log/wtmp /var/log/wtmpx" +sandboxEmptyFiles="/var/run/utmp /var/run/utmpx /var/log/wtmp /var/log/wtmpx /var/log/lastlog /var/log/lastlogx" opsys=`uname -s` case "$opsys" in |