update trunk ChangeLog.txt

ChangeLog-current.txt

@@ -49,4 +49,7 @@ enhancements:
     multiple renames files.  Thanks to Robby Workman for the suggestion.  Add
     new document README-renames.d that explains how this works.
   * Add support for new *.txz, *.tlz, and *.tbz Slackware package extensions.
+  * Rewrite several portions of the process_queue function in order to
+    properly handle certain items by the caller; clean up and improve the
+    logging displayed during the build process.
 +--------------------------+

src/usr/man/man5/sbopkg.conf.5

@@ -1,4 +1,4 @@
-.TH SBOPKG.CONF 5 "February 2009" sbopkg-SVN ""
+.TH SBOPKG.CONF 5 "May 2009" sbopkg-SVN ""
 .SH NAME
 .B sbopkg.conf
 \- Configuration file for sbopkg
@@ -15,43 +15,38 @@ Slackware packages.  A sample file is provided at
 The different configuration options are:
 
 .TP 5
-.B REPOSITORIES
+.B REPO_NAME
 .br
-This option allows the user to setup the repositories that should be
-available to sbopkg. See the comments inside
-.B sbopkg.conf.new
-for details about adding and removing repositories.
+This option allows the user to choose the repository to use.
+The default options are SBo, SB64 and local.
+The 'local' choice corresponds to a user-maintained repository whose
+structure must be the same as the one used by SlackBuilds.org.
+
+The default value of REPO_NAME is:
+.br
+REPO_NAME=${REPO_NAME:-SBo}.
 
 .TP 5
-.B SLACKVER
+.B REPO_BRANCH
 .br
-This option allows the user to set the default Slackware version in
-order to rsync with the matching SBo repository.  The current options
-are 11.0, 12.0, 12.1, 12.2, SB64, and local.  The 'local' option allows
-the user to maintain a local repository in the style of the SBo
-repository and use sbopkg with it.  This local repository needs be
-maintained at the same directory level as the SBo repos.  For example,
-if $LOCALREPO (see below) is set to /home/sbo, then the Slackware 12.2
-SBo repo would be at /home/sbo/12.2 and the local repo would be at
-/home/sbo/local.  The directory structure inside /local also needs to
-be similar to the style of SBo, including catories, although they do
-not have to be the same categories as at SBo, like this example:
-/home/sbo/local/mystuff/myapp.
+This option allows the user to set the default active repository branch.
+The current options are 11.0, 12.0, 12.1 and 12.2 for the SBo repository,
+master for the SB64 repositort and local for the local repository.
 
-The default value of SLACKVER is:
+The default value of REPO_BRANCH is:
 .br
-SLACKVER=${SLACKVER:-12.2}.
+REPO_BRANCH=${REPO_BRANCH:-12.2}.
 
 .TP 5
-.B LOCALREPO
+.B REPO_ROOT
 .br
-This option allows the user to set the location of the local rsync
-mirror of the SBo repository.  Currently, the size of a local copy of
+This option allows the user to set the location of the local
+mirrors of the remote repositories.  Currently, the size of a local copy of
 the SBo repository is less than 50MB.
 
-The default value of LOCALREPO is:
+The default value of REPO_ROOT is:
 .br
-export LOCALREPO=${LOCALREPO:-/home/sbo}.
+REPO_ROOT=${REPO_ROOT:-/var/lib/sbopkg}.
 
 .TP 5
 .B SRCDIR
@@ -61,15 +56,24 @@ source downloads will be saved.
 
 The default value of SRCDIR is:
 .br
-export SRCDIR=${SRCDIR:-/var/cache/sbopkg}.
+SRCDIR=${SRCDIR:-/var/cache/sbopkg}.
+
+.TP 5
+.B SBOPKGTMP
+.br
+This option sets the default directory where certain working
+files are saved on a temporary basis.
+
+The default value of SBOPKGTMP is:
+.br
+SBOPKGTMP=${SBOPKGTMP:-/tmp/sbopkg}.
 
 .TP 5
 .B TMP
 .br
-This option sets the default directory where certain working
-files are saved on a temporary basis.  TMP must be exported as it is
-also used by the SBo SlackBuilds.  Also note that the default value of
-TMP is therefore the same as in the SBo SlackBuild scripts.
+This option sets the default directory where built packages should be stored.
+TMP must be exported as it is used by the SlackBuilds.  Also note that the
+default value of TMP is the same as in the SBo SlackBuild scripts.
 
 The default value of TMP is:
 .br
@@ -95,7 +99,7 @@ be kept.
 
 The default value of QUEUEDIR is:
 .br
-QUEUEDIR=$TMP/queues.
+QUEUEDIR=${QUEUEDIR:-/var/lib/sbopkg/queues}.
 
 .TP 5
 .B KEEPLOG
@@ -104,17 +108,19 @@ This option should be set to YES or NO.  This option allows the user
 to choose whether to keep a permanent log of packages that are built
 with sbopkg in order to go back and review the build, and any errors,
 after exiting sbopkg.  If set to YES, this permanent log is saved at
-$TMP/sbopkg-build-log.
+$LOGDIR/sbopkg-build-log.
 
 The default value of KEEPLOG is: YES.
 
 .TP 5
-.B LOGFILE
+.B LOGDIR
 .br
 This option sets the location for the sbopkg permanent log if KEEPLOG
 is set to YES (see previous paragraph).
 
-The default value of LOGFILE is: $TMP/sbopkg-build-log.
+The default value of LOGDIR is:
+.br
+LOGDIR=${LOGDIR:-/var/log/sbopkg}.
 
 .TP 5
 .B DEBUG
@@ -125,12 +131,7 @@ set to 0, then only potential updated packages are listed.  This was
 the default output prior to the DEBUG variable.  When DEBUG is set to
 1, then potential updates plus packages not in the repo and packages
 that are newer than the repo are listed.  Changing DEBUG to 1 may be
-helpful if it appears the updatelist might be missing an update.  When
-DEBUG is set to 2 (the highest level), then, in addition to the output
-at level 1, the update list displays each SBo package that is
-installed, even if there is no update, and also prints out extra
-debugging information useful in fixing bugs.  Level 2 really should
-only be used when sending in an update list bug report.
+helpful if it appears the updatelist might be missing an update.
 
 The default value of DEBUG is: 0.
 
@@ -195,26 +196,19 @@ file:
 
 export TMP=${TMP:-/tmp/SBo}
 
-This sets $TMP to /tmp/SBo for sbopkg purposes (i.e. where sbopkg logs
-are kept) and also for building SBo packages within sbopkg (which is
+This sets $TMP to /tmp/SBo for building SBo packages within sbopkg (which is
 current default for SBo SlackBuilds already).  Since this variable is
 exported, it could be changed for both sbopkg and for building SBo
 packages within sbopkg.  For example, changing this line so it reads:
 
 export TMP=${TMP:-/home/sbo/tmp}
 
-would then set $TMP to /home/sbo/tmp for sbopkg and for building SBo
+would then set $TMP to /home/sbo/tmp for building SBo
 packages.  OUTPUT can also be changed to save compiled packages in a
 location other than the default of /tmp.
 
 You can also export variables in sbopkg.conf that are not used by
 sbopkg at all.
 
-As you can probably see, by making a few changes to these variables,
-you could have a completely separated sandbox for SBo purposes -- the
-repo at /home/sbo, the $TMP directory at /home/sbo/tmp, the source
-cache directory at /home/sbo/cache, and the $OUTPUT directory where
-compiled packages are saved at /home/sbo/packages.
-
 .SH "SEE ALSO"
 .BR sbopkg (8)

src/usr/man/man8/sbopkg.8

@@ -1,4 +1,4 @@
-.TH SBOPKG 8 "February 2009" sbopkg-SVN ""
+.TH SBOPKG 8 "May 2009" sbopkg-SVN ""
 .SH NAME
 .B sbopkg
 \ - The SlackBuilds.org Package Browser
@@ -199,11 +199,18 @@ Check for an update to sbopkg itself and then quit.
 
 .TP 5
 .B -v VERSION
-Set the Slackware version to use for the matching local SBo mirror.
-Current options are 11.0, 12.0, 12.1, 12.2, SB64, and local.  See the
+Set the repository and branch to use.
+.br
+The currently supported repositories are SBo, SB64 and local. Inside these,
+the supported branches are 11.0, 12.0, 12.1 and 12.2 for SBo, master for SB64
+(Slamd64Builds repository) and local for local.  See the
 .B sbopkg.conf (5)
-man page for more information about the 'local'
-repository.
+man page for more information about the 'local' repository.
+.br
+The VERSION format is repository/branch (e.g. SBo/12.2). If the repository is
+omitted, sbopkg will first look for the specified branch in the default
+repository. If that attempt fails, sbopkg will look for the first matching
+branch in any repository.
 
 .SH FILES
 .B /etc/sbopkg/sbopkg.conf