pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/tv-derecurse]: pkgsrc/mk sync with HEAD
details: https://anonhg.NetBSD.org/pkgsrc/rev/26c564019a60
branches: tv-derecurse
changeset: 483998:26c564019a60
user: tv <tv%pkgsrc.org@localhost>
date: Wed Mar 02 19:38:26 2005 +0000
description:
sync with HEAD
diffstat:
mk/bsd.pkg.mk | 13 ++++++++-----
mk/bulk/build.conf-example | 4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
diffs (55 lines):
diff -r 96ec8887a6ed -r 26c564019a60 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Fri Feb 25 14:46:51 2005 +0000
+++ b/mk/bsd.pkg.mk Wed Mar 02 19:38:26 2005 +0000
@@ -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 @@
. 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 @@
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 -r 96ec8887a6ed -r 26c564019a60 mk/bulk/build.conf-example
--- a/mk/bulk/build.conf-example Fri Feb 25 14:46:51 2005 +0000
+++ b/mk/bulk/build.conf-example Wed Mar 02 19:38:26 2005 +0000
@@ -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 @@
# 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'.
Home |
Main Index |
Thread Index |
Old Index