diff options
author | dmcmahill <dmcmahill@pkgsrc.org> | 2006-12-14 14:37:32 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill@pkgsrc.org> | 2006-12-14 14:37:32 +0000 |
commit | ac4d662ef835657702242c47c0480db7b875ec8e (patch) | |
tree | 23fa6efee097669b6facad1a042b0f6e63bc5cd1 | |
parent | afa2891d96ed12412d84229875e7acaa36e765c6 (diff) | |
download | pkgsrc-ac4d662ef835657702242c47c0480db7b875ec8e.tar.gz |
Use '-o' instead of '-or' in find(1) arguments as the former seems to
be more portable (works on at least NetBSD, SunOS-5.9, and Linux).
Addressed PR pkg/35245
-rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 642e81e3967..36b2f0c5ccd 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.129 2006/12/14 14:32:04 dmcmahill Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.130 2006/12/14 14:37:32 dmcmahill Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -301,7 +301,7 @@ bulk-check-uptodate: uptodate=0; \ elif [ "${USE_BULK_TIMESTAMPS}" = "yes" ]; then \ ${SHCOMMENT} "Check files of this package"; \ - newfiles="`${FIND} . \( \( -name CVS -or -name ${WRKDIR_BASENAME} \) -prune \) -or \( -type f -newer "${REF}" ! \( -name README.html -or -name DESCR -or -name COMMENT -or -name '.*' \) \) -print || ${TRUE}`"; \ + newfiles="`${FIND} . \( \( -name CVS -o -name ${WRKDIR_BASENAME} \) -prune \) -o \( -type f -newer "${REF}" ! \( -name README.html -o -name DESCR -o -name COMMENT -o -name '.*' \) \) -print || ${TRUE}`"; \ nnewfiles="`echo $$newfiles | ${WC} -w`"; \ if [ "$$nnewfiles" -gt 0 ]; then \ ${BULK_MSG} 1>&2 "Package ${PKGNAME} ($$newfiles) modified since last 'make package' re-packaging..."; \ |