--1SQmhf2mF2YjsYvc
Content-Type: multipart/mixed; boundary="9zSXsLTf0vkW971A"
Content-Disposition: inline


--9zSXsLTf0vkW971A
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Thomas Klausner <wiz@NetBSD.org> wrote:
> On Sun, Nov 26, 2006 at 03:08:24AM +0000, Jan Schaumann wrote:
=20
> > Log Message:
> > - Run a single find(1) command to get the list of new files rather than=
 running
> >   two finds+two greps.
=20
> This broke an important part of the bulk build for me:
> reusing existing, up-to-date packages.

Could you try the attached patch?

-Jan

--=20
Defending Freedom in the Digital World:
   --- Electronic Frontier Foundation -- http://www.eff.org ---

--9zSXsLTf0vkW971A
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: bsd.bulk-pkg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bulk/bsd.bulk-pkg.mk,v
retrieving revision 1.126
diff -b -u -r1.126 bsd.bulk-pkg.mk
--- bsd.bulk-pkg.mk	26 Nov 2006 03:08:24 -0000	1.126
+++ bsd.bulk-pkg.mk	8 Dec 2006 05:20:30 -0000
@@ -301,7 +301,7 @@
 			uptodate=0; \
 		elif [ "${USE_BULK_TIMESTAMPS}" = "yes" ]; then \
 			${SHCOMMENT} "Check files of this package"; \
-			newfiles="`${FIND} . -type f -newer "${REF}" ! \( -name ${WRKDIR_BASE} -or -name README.html -or -name DESCR -or -name COMMENT -or -name Repository -or -name Entries -or -name Root -or -name Tag \) -print || ${TRUE}`"; \
+			newfiles="`${FIND} . \( \( -name CVS -or -name ${WRKDIR_BASE} \) -prune \) -or \( -type f -newer "${REF}" ! \( -name README.html -or -name DESCR -or -name COMMENT -or -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..."; \

--9zSXsLTf0vkW971A--

--1SQmhf2mF2YjsYvc
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (NetBSD)

iD8DBQFFePNgfFtkr68iakwRAq90AKCRDpXty2CyaxW5XwNsoYPZGzxe8wCgqPSY
REMYonO8hbiwB5Eau5Q/A3U=
=9sMj
-----END PGP SIGNATURE-----

--1SQmhf2mF2YjsYvc--