[pkgsrc/trunk]: pkgsrc/mk/bulk Use '-o' instead of '-or' in find(1) arguments...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b0813279ba54
branches:  trunk
changeset: 522600:b0813279ba54
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Thu Dec 14 14:37:32 2006 +0000

description:
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

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 5dca77c9f025 -r b0813279ba54 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Thu Dec 14 14:32:04 2006 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Thu Dec 14 14:37:32 2006 +0000
@@ -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@localhost>
@@ -301,7 +301,7 @@
                        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..."; \