diff options
| author | rillig <rillig> | 2005-11-24 12:14:32 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-11-24 12:14:32 +0000 |
| commit | 32d4bf2f5e36f7f114bd5ef3140b332e2c0e5831 (patch) | |
| tree | 2f43ee471d0bbfa000e5d80c0a1a1fbdd21f7515 /mk/bulk | |
| parent | 51fe2881b79162c40a346aeceb53ad97c5983e4a (diff) | |
| download | pkgsrc-32d4bf2f5e36f7f114bd5ef3140b332e2c0e5831.tar.gz | |
1. Added section headers in the part of the user-settable variables.
2. Reindented two "if" statements that looked like this:
if long_long_command; then :; else
else_commands
fi
By just scanning the beginnings of the lines, which is a common way of
reading source code, one may easily miss the "hidden" "then" branch at
the end of the line. I have changed it to:
if long_long_command; then :;
else
else_commands
fi
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 827541a960f..bde56864439 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.106 2005/11/23 20:45:11 rillig Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.107 2005/11/24 12:14:32 rillig Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -84,6 +84,10 @@ BULK_ID?= .${MACHINE_ARCH} BULK_ID?= .endif +# +# Package-specific files +# + # This file exists to mark a package as broken BROKENFILE?= .broken${BULK_ID}.html @@ -97,6 +101,10 @@ FORCEBROKENFILE?= .forcebroken # This file is where the log of the build goes BUILDLOG?= .make${BULK_ID} +# +# Top level databases and log files +# + # This is the directory in which all temporary files and log files from the # bulk build are kept. # It defaults to ${PKGSRCDIR}, but may be better suited to another directory @@ -480,7 +488,8 @@ bulk-package: ${ECHO} "Please view the <a href=\"../../${PKGPATH}/${BROKENFILE}\">build log for ${PKGNAME}</a>.<br />"; \ } >> "$${pkg_brokenfile}"; \ nbrokenby=`expr $$nbrokenby + 1`;\ - if ${GREP} -q " $$pkgdir/${BROKENFILE}" ${BULKFILESDIR:Q}/${BROKENFILE:Q} ; then :; else \ + if ${GREP} -q " $$pkgdir/${BROKENFILE}" ${BULKFILESDIR:Q}/${BROKENFILE:Q} ; then :; \ + else \ ${ECHO} " $$pkgerr $$pkgdir/${BROKENFILE} 0 " >> ${BULKFILESDIR:Q}/${BROKENFILE:Q} ;\ fi ;\ done ;\ @@ -511,7 +520,8 @@ bulk-package: # been modified and need rebuilding. bulk-install: @if [ `${MAKE} bulk-check-uptodate REF=${PKGFILE}` = 1 ]; then \ - if ${PKG_INFO} -qe ${PKGNAME} ; then :; else \ + if ${PKG_INFO} -qe ${PKGNAME} ; then :; \ + else \ ${DO} ${MAKE} install-depends ; \ ${BULK_MSG} ${PKG_ADD} ${PKG_ARGS_ADD} ${PKGFILE} ; \ ${DO} ${PKG_ADD} ${PKG_ARGS_ADD} ${PKGFILE} ; \ |