The configuration variables had no apparent order. Now they are sorted

chronologically. First come the common definitions, then updating pkgsrc,
fetching distfiles, building packages and finally uploading them.

1 files changed, 55 insertions, 32 deletions

diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example
index 05938c47e92..8e9ed9c37bb 100644
--- a/mk/bulk/build.conf-example
+++ b/mk/bulk/build.conf-example
@@ -1,24 +1,13 @@
-# build.conf
-# $NetBSD: build.conf-example,v 1.28 2005/03/22 16:42:52 wiz Exp $
+# $NetBSD: build.conf-example,v 1.29 2005/11/05 20:54:38 rillig Exp $
 #
-# config file in /bin/sh syntax for {,pre,post}-build
+# This is an example configuration file for pkgsrc bulk builds.
+# Actually it's a shell script that is sourced in by the pre-build,
+# build and post-build programs.
 #
 
-# List of package directories to build.
-# Defaults to all packages if PKGLIST is empty or undefined.
-#PKGLIST="www/mozilla meta-pkgs/kde3"
-
-# Some paths for output files and paths to log files
-FTPx=`date +%Y%m%d.%H%M`
-FTPURL="pub/NetBSD/pkgstat/${FTPx}"		# relative to ~ftp !
-FTP="/home/ftp/${FTPURL}"			# absolute base path
-FTPHOST="ftp://ftp.machi.ne"			# host for broken.html
-
-# Where build will mail the report
-ADMIN="you@some.whe.re"
-
-# Who the report is signed by
-ADMINSIG="-Your Name"
+#
+# System information
+#
 
 # The OS release this bulk build is happening on
 osrev=`uname -r`
@@ -29,6 +18,11 @@ arch=`uname -m`
 # Where our pkgsrc is located
 USR_PKGSRC="/usr/pkgsrc"
 
+
+#
+# Keeping pkgsrc up-to-date
+#
+
 # As which user to run "cvs updates". Leave empty for no update.
 CVS_USER="yourlogin"
 
@@ -36,34 +30,53 @@ CVS_USER="yourlogin"
 #CVS_FLAGS="-rnetbsd-2005Q1"
 #CVS_FLAGS="-A"				# pkgsrc-current
 
+
+#
+# Getting distfiles
+#
+
 # prune distfiles to remove those which are out of date
 # can be set to 'yes' or 'no'.
 PRUNEDISTFILES=no
 
-# prune binary packages to remove those which are out of date
-# can be set to 'yes' or 'no'.
-PRUNEPACKAGES=yes
+# Proxies (optional):
+#ftp_proxy=http://proxy.machi.ne:3128/
+#http_proxy=http://proxy.machi.ne:3128/
+
+
+#
+# Building packages
+#
+
+# List of package directories to build.
+# Defaults to all packages if PKGLIST is empty or undefined.
+#PKGLIST="www/mozilla meta-pkgs/kde3"
+
+# Nice level for builds
+NICE_LEVEL="nice -n 20"
 
 # whether to cache the lintpkgsrc database for PRUNE* or uploading
 # can be set to 'yes' or 'no'.
 LINTPKGSRC_CACHE=no
 
-# Proxies (optional):
-#ftp_proxy=http://proxy.machi.ne:3128/
-#http_proxy=http://proxy.machi.ne:3128/
+# Where build will mail the report
+ADMIN="you@some.whe.re"
+
+# Who the report is signed by
+ADMINSIG="-Your Name"
 
-# Uploading binary packages:
+
+#
+# Uploading binary packages
+#
 
 # Update vulnerability database before uploading.
 # can be set to 'yes' or 'no'.
 UPDATE_VULNERABILITY_LIST=yes
 
-# Destination for packages and rsync options 
-RSYNC_DST=$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/i386
-RSYNC_OPTS='-e ssh'
-
-# Nice level for builds
-NICE_LEVEL="nice -n 20"
+# prune binary packages to remove those which are out of date
+# can be set to 'yes' or 'no'.
+PRUNEPACKAGES=yes
 
 # Whether or not to create checksum files
 MKSUMS=yes
@@ -71,10 +84,20 @@ MKSUMS=yes
 # If you want to PGP sign the checksum files, set and correct
 #SIGN_AS=username@NetBSD.org
 
+# Destination for packages and rsync options 
+RSYNC_DST=$CVS_USER@ftp.NetBSD.org:/pub/NetBSD/packages/pkgsrc-200xQy/NetBSD-a.b.c/i386
+RSYNC_OPTS='-e ssh'
+
+# Some paths for output files and paths to log files
+FTPx=`date +%Y%m%d.%H%M`
+FTPURL="pub/NetBSD/pkgstat/${FTPx}"		# relative to ~ftp !
+FTP="/home/ftp/${FTPURL}"			# absolute base path
+FTPHOST="ftp://ftp.machi.ne"			# host for broken.html
+
+
 ###########################################################################
 ### No changes should be needed below this line !!!
 ###########################################################################
 
 # Name of the (generated) HTML file which lists all broken pkgs
 REPORT="$FTP/broken.html"
-