[pkgsrc/trunk]: pkgsrc/mk/bulk 1. Added section headers in the part of the us...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4309fea4da5e
branches:  trunk
changeset: 503636:4309fea4da5e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 24 12:14:32 2005 +0000

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

 mk/bulk/bsd.bulk-pkg.mk |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r e996258755ce -r 4309fea4da5e mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Thu Nov 24 11:02:09 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Thu Nov 24 12:14:32 2005 +0000
@@ -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@localhost>
@@ -84,6 +84,10 @@
 BULK_ID?=
 .endif
 
+#
+# Package-specific files
+#
+
 # This file exists to mark a package as broken
 BROKENFILE?=   .broken${BULK_ID}.html
 
@@ -97,6 +101,10 @@
 # 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 @@
                                                  ${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 @@
 # 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} ; \