diff options
| author | tv <tv@pkgsrc.org> | 2005-03-02 19:38:26 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-03-02 19:38:26 +0000 |
| commit | cfe26b0593df8c0f623b442b020aeb081a94c359 (patch) | |
| tree | 5daf70692bb935d418f2280c33c3614fa3852e7a | |
| parent | 70ffad5bdc566ec5a6fab6efac0b3826295dda81 (diff) | |
| download | pkgsrc-cfe26b0593df8c0f623b442b020aeb081a94c359.tar.gz | |
sync with HEAD
| -rw-r--r-- | mk/bsd.pkg.mk | 13 | ||||
| -rw-r--r-- | mk/bulk/build.conf-example | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 668b16ced6f..a3a4374ffcc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1540.2.24 2005/02/25 14:46:51 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1540.2.25 2005/03/02 19:38:26 tv Exp $ # # This file is in the public domain. # @@ -78,11 +78,14 @@ PLIST_SRC+= ${PKGDIR}/PLIST.common . endif . if exists(${PKGDIR}/PLIST.${OPSYS}) PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS} -. elif exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}) +. endif +. if exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}) PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g} -. elif exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}) +. endif +. if exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}) PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g} -. elif exists(${PKGDIR}/PLIST) +. endif +. if exists(${PKGDIR}/PLIST) PLIST_SRC+= ${PKGDIR}/PLIST . endif . if exists(${PKGDIR}/PLIST.common_end) @@ -1991,7 +1994,7 @@ _FETCH_FILE= \ fi; \ if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${bfile} ${FETCH_AFTER_ARGS}; then \ if [ -n "${FAILOVER_FETCH}" -a -f ${DISTINFO_FILE} -a -f ${_DISTDIR}/$$bfile ]; then \ - alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1;}' ${DISTINFO_FILE}`; \ + alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1; exit}' ${DISTINFO_FILE}`; \ if [ -z "$$alg" ]; then \ alg=${PATCH_DIGEST_ALGORITHM};\ fi; \ diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example index f6d6ae6b4ee..3dd48ed3179 100644 --- a/mk/bulk/build.conf-example +++ b/mk/bulk/build.conf-example @@ -1,5 +1,5 @@ # build.conf -# $NetBSD: build.conf-example,v 1.22.4.1 2005/01/24 18:40:01 tv Exp $ +# $NetBSD: build.conf-example,v 1.22.4.2 2005/03/02 19:38:26 tv Exp $ # # config file in /bin/sh syntax for {,pre,post}-build # @@ -34,7 +34,7 @@ CVS_USER="yourlogin" # Flags to pass to 'cvs update', e.g. to get a certain branch #CVS_FLAGS="-rnetbsd-2004Q1" -#CVS_FLAGS="-A" +#CVS_FLAGS="-A" # pkgsrc-current # prune distfiles to remove those which are out of date # can be set to 'yes' or 'no'. |