Implements extended -r syntax.

build.sh:buildp_ast(): only reset package build step state if ${ARG_RESET_PKG} is 1.
etc/{build.usage,README.md}: updated.
etc/build.usage.short, subr/build_init.subr: implement short help screen.
midipix.env: correctly escape multi-line variable assignment expressions.
subr.rtl/rtl_list.subr: updated.
subr.rtl/rtl_state.subr:rtl_state_set(): correctly implement invalidation.
subr.rtl/rtl_state.subr:rtl_state_test(): honour `LAST'.
subr/build_init.subr:buildp_init_getopts(): implements --reset-pkg.
subr/build_init.subr:buildp_{expand_restart_{at,recursive},process_restart_spec}(): initial implementation.
subr/ex_pkg_{dispatch,env}.subr: updated.
subr/ex_pkg_exec.subr:ex_pkg_exec(): honour `ALL' and `LAST'.
vars/gcc.vars: updated.

12 files changed, 466 insertions, 251 deletions

diff --git a/build.sh b/build.sh
index ba06c3e..aa4b4b5 100755
--- a/build.sh
+++ b/build.sh
@@ -20,7 +20,8 @@ buildp_ast() {
 	if [ -n "${_pids}" ]; then
 		rtl_log_msg notice "Killed PID(s): %s" "$(rtl_uniq ${_pids})";
 	fi;
-	if [ -n "${EX_PKG_DISPATCH_WAIT}" ]; then
+	if [ -n "${EX_PKG_DISPATCH_WAIT}" ]\
+	&& [ "${ARG_RESET_PKG}" -eq 1 ]; then
 		for _pkg_name in ${EX_PKG_DISPATCH_WAIT}; do
 			rtl_state_clear "${BUILD_WORKDIR}" "${_pkg_name}";
 		done;
diff --git a/etc/README.md b/etc/README.md
index 06e205f..582a5da 100644
--- a/etc/README.md
+++ b/etc/README.md
@@ -210,6 +210,12 @@ Rebuild set of packages in isolation:
 ./build.sh [ ... ] -r mc,zsh
 ```
   
+Restart the ``@install`` (shorthand alias) step, with implicit ``finish``, of the
+``mc`` and ``zsh`` packages.
+```shell
+./build.sh [ ... ] -r mc,zsh:@install
+```
+  
 Rebuild set of packages along w/ their dependencies, if any, as needed, or forcibly,
 respectively:
 ```shell
@@ -222,10 +228,10 @@ Forcibly rebuild all reverse dependencies of a set of packages:
 ./build.sh [ ... ] -r \*\*\*glib,libflac
 ```
   
-Restart the ``configure``, ``build``, and ``install`` steps of the ``coreutils``
-package:
+Restart the ``@configure``, ``@build``, and ``@install`` (shorthand alias) steps of the
+``coreutils`` package:
 ```shell
-./build.sh -r coreutils:configure,build,install
+./build.sh -r coreutils:@configure,@build,@install
 ```
   
 Rebuild entire build groups including or excluding group dependencies, respectively:
@@ -243,9 +249,9 @@ Rebuild entire build groups including or excluding group dependencies, respectiv
 ```
 usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,..]]
                   [-F ipv4|ipv6|offline]   [-h]   [-p jobs]     [-P]   [-r ALL|LAST]
-                  [-r [*[*[*]]]name[,..][:step,..]] [-R] [-v[v[v[v]]]] [--as-needed]
-                  [--debug-minipix] [--dump-on-abort] [--roar]
-                  [[=]<group>|<variable name>=<variable override>[ ..]]
+                  [-r [*[*[*]]]name[,..][:[^|<|<=|>|>=]step,..]]  [-R] [-v[v[v[v]]]]
+                  [--as-needed] [--debug-minipix] [--dump-on-abort]  [--reset-state]
+                  [--roar]     [[=]<group>|<variable name>=<variable override>[ ..]]
 
         -a nt32|nt64      Selects 32-bit or 64-bit architecture; defaults to nt64.
         -b debug|release  Selects debug or release build kind; defaults to debug.
@@ -269,19 +275,31 @@ usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,
 
         -r ALL|LAST       Restart all packages or the last failed package and resume
                           build, resp.
-        -r [*[*[*]]]name[,..][:step,..]
-                          Restart the specified comma-separated package(s) completely or
-                          at optionally specified comma-separated list of build steps.
-
-                          Prepend w/ `*' to automatically include dependencies, `**' to
-                          forcibly rebuild all dependencies, and `***` to forcibly rebuild
-                          all packages that depend on the specified package(s).
+        -r [*[*[*]]]name[,..][:ALL|LAST|[^|<|<=|>|>=]step,..]
+                          Restart the specified comma-separated package(s) w/ inhibition
+                          of package build step state resetting completely (`ALL',) starting
+                          at the resp. last successfully executed build steps (`LAST',) or the
+                          specified comma-separated list of build steps, optionally subject
+                          concerning package name(s) and/or build step(s) to the below modifiers:
+
+                          Prepend name w/ `*' to automatically include dependencies, `**'
+                          to forcibly rebuild all dependencies, and `***` to forcibly
+                          rebuild all packages that depend on the specified package(s).
+
+                          Prepend step w/ `^' to filter build steps with, `<' or `<='
+                          to constrain build steps to below or below or equal with, resp.,
+                          `>' or `>=' to constrain build steps to above or above or equal
+                          with, resp.
 
                           Currently defined build steps are:
-                          fetch_wget, fetch_git, fetch_extract, configure_patch_pre,
+                          fetch_download, fetch_extract, configure_patch_pre,
                           configure_autotools, configure_patch, configure, build,
                           install_subdirs, install_make, install_files, install_libs,
-                          install, and install_rpm.
+                          install, install_rpm, and clean.
+
+                          Additionally, the following shorthand aliases and pseudo-steps are provided:
+                          @fetch, @configure, @build, @install, and @clean, and
+                          start and finish.
 
         -R                Ignore build failures, skip printing package logs, and continue
                           building (relaxed mode.)
@@ -292,6 +310,7 @@ usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,
         --debug-minipix   Don't strip(1) minipix binaries to facilitate debugging minipix.
         --dump-on-abort   Produce package environment dump files on build failure to be
                           used in conjuction with pkg_shell.sh script (excludes -R.)
+        --reset-state     Reset package build step state on exit.
         <group>[ ..]      One of: dev_packages, dist, host_deps, host_deps_rpm,
                           host_toolchain, host_tools, minipix, native_packages,
                           native_runtime, native_toolchain, native_tools.
@@ -384,26 +403,78 @@ for a list of package build steps and how they are overriden.
 ## 3.5. ``pkgtool.sh``
 
 ```
-usage: ./pkgtool.sh [-a nt32|nt64] [-b debug|release] [-i|-m <dname> -M <dname>|-r|-s|-t] [-v]
-                    [<variable name>=<variable override>[ ..]] name
-
-        -a nt32|nt64          Selects 32-bit or 64-bit architecture; defaults to nt64.
-        -b debug|release      Selects debug or release build kind; defaults to debug.
-        -i                    List package variables and dependencies of single named package.
-        -m <dname>            Setup package archives mirror in <dname> and/or
-        -M <dname>            Setup Git repositories mirror in <dname>
-        -r                    List reverse dependencies of single named package.
-        -s                    Enter interactive package build shell environment for single
-                              named package; requires a package dump file. If the package
-                              has not been built yet or built successfully, it will be rebuilt
-                              at build steps up until, by default, the `build' build step and
-                              forcibly aborted and dumped prior to enterting the shell.
-        -t                    Produce tarball of package build root directory and build log
-                              file for the purpose of distribution given build failure.
-        -v                    Increase verbosity.
+usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,..]]
+                  [-F ipv4|ipv6|offline] [-h|--help|  [-p jobs]  [-P]  [-r ALL|LAST]
+                  [-r [*[*[*]]]name[,..][:[^|<|<=|>|>=]step,..]]  [-R] [-v[v[v[v]]]]
+                  [--as-needed] [--debug-minipix] [--dump-on-abort]  [--reset-state]
+                  [--roar]     [[=]<group>|<variable name>=<variable override>[ ..]]
+
+        -a nt32|nt64      Selects 32-bit or 64-bit architecture; defaults to nt64.
+        -b debug|release  Selects debug or release build kind; defaults to debug.
+        -C dir[,..]       Clean build directory (build,) ${PREFIX} before processing build
+                          scripts (prefix,) source directory (src,) and/or destination
+                          directory (dest) after successful package builds.
+        -D kind[,..]      Produce minimal midipix distribution directory (minipix,) RPM
+                          binary packages (rpm,) and/or deployable distribution ZIP
+                          archive (zipdist.) zipdist implies minipix.
+        -F ipv4|ipv6|offline
+                          Force IPv4 (ipv4) or IPv6 (ipv6) when downloading package
+                          archives and/or Git repositories or don't download either at all
+                          (offline.)
+        -h|--help         Show short/full help screen, respectively.
+        -p jobs           Enables parallelisation at group-level, whenever applicable.
+        -P                The maximum count of jobs defaults to the number of logical
+                          processors on the host system divided by two (2.)
+
+                          If -R is not specified and at least one (1) package fails to
+                          build, all remaining package builds will be forcibly aborted.
+
+        -r ALL|LAST       Restart all packages or the last failed package and resume
+                          build, resp.
+        -r [*[*[*]]]name[,..][:ALL|LAST|[^|<|<=|>|>=]step,..]
+                          Restart the specified comma-separated package(s) w/ inhibition
+                          of package build step state resetting completely (`ALL',) starting
+                          at the resp. last successfully executed build steps (`LAST',) or the
+                          specified comma-separated list of build steps, optionally subject
+                          concerning package name(s) and/or build step(s) to the below modifiers:
+
+                          Prepend name w/ `*' to automatically include dependencies, `**'
+                          to forcibly rebuild all dependencies, and `***` to forcibly
+                          rebuild all packages that depend on the specified package(s).
+
+                          Prepend step w/ `^' to filter build steps with, `<' or `<='
+                          to constrain build steps to below or below or equal with, resp.,
+                          `>' or `>=' to constrain build steps to above or above or equal
+                          with, resp.
+
+                          Currently defined build steps are:
+                          fetch_download, fetch_extract, configure_patch_pre,
+                          configure_autotools, configure_patch, configure, build,
+                          install_subdirs, install_make, install_files, install_libs,
+                          install, install_rpm, and clean.
+
+                          Additionally, the following shorthand aliases and pseudo-steps are provided:
+                          @fetch, @configure, @build, @install, and @clean, and
+                          start and finish.
+
+        -R                Ignore build failures, skip printing package logs, and continue
+                          building (relaxed mode.)
+        -v[v[v[v]]]       Be verbose; -vv: always print package logs; -vvv: set xtrace
+                          during package builds; -vvvv: logs fileops.
+        --as-needed       Don't build unless the midipix_build repository has received
+                          new commits.
+        --debug-minipix   Don't strip(1) minipix binaries to facilitate debugging minipix.
+        --dump-on-abort   Produce package environment dump files on build failure to be
+                          used in conjuction with pkg_shell.sh script (excludes -R.)
+        --reset-state     Reset package build step state on exit.
+        <group>[ ..]      One of: dev_packages, dist, host_deps, host_deps_rpm,
+                          host_toolchain, host_tools, minipix, native_packages,
+                          native_runtime, native_toolchain, native_tools.
+
+                          Prepend w/ `=' to inhibit group-group dependency expansion.
 
         <variable name>=<variable override>[ ..]
-                              Override build variable.
+                          Override build or package variable.
 ```
   
 > N.B. When using ``pkgtool.sh`` on a build w/ build variables (see section [4](#4-build-variables))
diff --git a/etc/build.usage b/etc/build.usage
index 1537bb3..aeb775b 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -1,8 +1,8 @@
 usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,..]]
-                  [-F ipv4|ipv6|offline]   [-h]   [-p jobs]     [-P]   [-r ALL|LAST]
-                  [-r [*[*[*]]]name[,..][:step,..]] [-R] [-v[v[v[v]]]] [--as-needed]
-                  [--debug-minipix] [--dump-on-abort] [--roar]
-                  [[=]<group>|<variable name>=<variable override>[ ..]]
+                  [-F ipv4|ipv6|offline] [-h|--help|  [-p jobs]  [-P]  [-r ALL|LAST]
+                  [-r [*[*[*]]]name[,..][:[^|<|<=|>|>=]step,..]]  [-R] [-v[v[v[v]]]]
+                  [--as-needed] [--debug-minipix] [--dump-on-abort]  [--reset-state]
+                  [--roar]     [[=]<group>|<variable name>=<variable override>[ ..]]
 
         -a nt32|nt64      Selects 32-bit or 64-bit architecture; defaults to nt64.
         -b debug|release  Selects debug or release build kind; defaults to debug.
@@ -16,7 +16,7 @@ usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,
                           Force IPv4 (ipv4) or IPv6 (ipv6) when downloading package
                           archives and/or Git repositories or don't download either at all
                           (offline.)
-        -h                Show this screen.
+        -h|--help         Show short/full help screen, respectively.
         -p jobs           Enables parallelisation at group-level, whenever applicable.
         -P                The maximum count of jobs defaults to the number of logical
                           processors on the host system divided by two (2.)
@@ -26,19 +26,31 @@ usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,
 
         -r ALL|LAST       Restart all packages or the last failed package and resume
                           build, resp.
-        -r [*[*[*]]]name[,..][:step,..]
-                          Restart the specified comma-separated package(s) completely or
-                          at optionally specified comma-separated list of build steps.
+        -r [*[*[*]]]name[,..][:ALL|LAST|[^|<|<=|>|>=]step,..]
+                          Restart the specified comma-separated package(s) w/ inhibition
+                          of package build step state resetting completely (`ALL',) starting
+                          at the resp. last successfully executed build steps (`LAST',) or the
+                          specified comma-separated list of build steps, optionally subject
+                          concerning package name(s) and/or build step(s) to the below modifiers:
 
-                          Prepend w/ `*' to automatically include dependencies, `**' to
-                          forcibly rebuild all dependencies, and `***` to forcibly rebuild
-                          all packages that depend on the specified package(s).
+                          Prepend name w/ `*' to automatically include dependencies, `**'
+                          to forcibly rebuild all dependencies, and `***` to forcibly
+                          rebuild all packages that depend on the specified package(s).
+
+                          Prepend step w/ `^' to filter build steps with, `<' or `<='
+                          to constrain build steps to below or below or equal with, resp.,
+                          `>' or `>=' to constrain build steps to above or above or equal
+                          with, resp.
 
                           Currently defined build steps are:
-                          fetch_wget, fetch_git, fetch_extract, configure_patch_pre,
+                          fetch_download, fetch_extract, configure_patch_pre,
                           configure_autotools, configure_patch, configure, build,
                           install_subdirs, install_make, install_files, install_libs,
-                          install, and install_rpm.
+                          install, install_rpm, and clean.
+
+                          Additionally, the following shorthand aliases and pseudo-steps are provided:
+                          @fetch, @configure, @build, @install, and @clean, and
+                          start and finish.
 
         -R                Ignore build failures, skip printing package logs, and continue
                           building (relaxed mode.)
@@ -49,6 +61,7 @@ usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,
         --debug-minipix   Don't strip(1) minipix binaries to facilitate debugging minipix.
         --dump-on-abort   Produce package environment dump files on build failure to be
                           used in conjuction with pkg_shell.sh script (excludes -R.)
+        --reset-state     Reset package build step state on exit.
         <group>[ ..]      One of: dev_packages, dist, host_deps, host_deps_rpm,
                           host_toolchain, host_tools, minipix, native_packages,
                           native_runtime, native_toolchain, native_tools.
diff --git a/etc/build.usage.short b/etc/build.usage.short
new file mode 100644
index 0000000..f89b75f
--- /dev/null
+++ b/etc/build.usage.short
@@ -0,0 +1,17 @@
+usage: ./build.sh [-a nt32|nt64]  [-b debug|release]   [-C dir[,..]]  [-D kind[,..]]
+                  [-F ipv4|ipv6|offline] [-h|--help|  [-p jobs]  [-P]  [-r ALL|LAST]
+                  [-r [*[*[*]]]name[,..][:[^|<|<=|>|>=]step,..]]  [-R] [-v[v[v[v]]]]
+                  [--as-needed] [--debug-minipix] [--dump-on-abort]  [--reset-state]
+                  [--roar]     [[=]<group>|<variable name>=<variable override>[ ..]]
+
+        -h|--help         Show short/full help screen, respectively.
+        -v[v[v[v]]]       Be verbose; -vv: always print package logs; -vvv: set xtrace
+
+        <group>[ ..]      One of: dev_packages, dist, host_deps, host_deps_rpm,
+                          host_toolchain, host_tools, minipix, native_packages,
+                          native_runtime, native_toolchain, native_tools.
+
+                          Prepend w/ `=' to inhibit group-group dependency expansion.
+
+        <variable name>=<variable override>[ ..]
+                          Override build or package variable.
diff --git a/midipix.env b/midipix.env
index 7a1ebb4..f023398 100644
--- a/midipix.env
+++ b/midipix.env
@@ -9,29 +9,32 @@
 #
 
 # Build {step,variable}s
-DEFAULT_BUILD_STEPS="
-	fetch_download fetch_extract 							\
-	configure_patch_pre configure_autotools configure_patch configure		\
-	build										\
-	install_subdirs install_make install_files install_libs install install_rpm clean";
-DEFAULT_BUILD_VARS="
-	AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE				\
-	CC CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE				\
-	CFLAGS_CONFIGURE_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA				\
-	CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA		\
-	CXX CXXFLAGS_CONFIGURE CXXFLAGS_CONFIGURE_EXTRA					\
-	DEPENDS DESTDIR DESTDIR_HOST DISABLED ENV_VARS_EXTRA				\
-	FNAME FORCE_AUTORECONF GITROOT INHERIT_FROM INSTALL_FILES			\
-	INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET		\
-	INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE		\
-	LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME				\
-	MAKE_SUBDIRS MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA				\
-	MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA MAKEFLAGS_VERBOSITY			\
-	MIRRORS MIRRORS_GIT SOFORT_FORCE SOFORT_NATIVE_CC SOFORT_NATIVE_CFLAGS		\
-	SOFORT_NATIVE_CFLAGS_EXTRA SOFORT_NATIVE_CXX SOFORT_NATIVE_CXXFLAGS		\
-	SOFORT_NATIVE_CXXFLAGS_EXTRA SOFORT_NATIVE_LD SOFORT_NATIVE_LDFLAGS		\
-	SOFORT_NATIVE_LDFLAGS_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS		\
-	PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX	\
+DEFAULT_BUILD_STEPS="										\
+	start											\
+	fetch_download fetch_extract 								\
+	configure_patch_pre configure_autotools configure_patch configure			\
+	build											\
+	install_subdirs install_make install_files install_libs install install_rpm		\
+	clean											\
+	finish";
+DEFAULT_BUILD_VARS="										\
+	AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE					\
+	CC CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE					\
+	CFLAGS_CONFIGURE_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA					\
+	CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA			\
+	CXX CXXFLAGS_CONFIGURE CXXFLAGS_CONFIGURE_EXTRA						\
+	DEPENDS DESTDIR DESTDIR_HOST DISABLED ENV_VARS_EXTRA					\
+	FNAME FORCE_AUTORECONF GITROOT INHERIT_FROM INSTALL_FILES				\
+	INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET			\
+	INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE			\
+	LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME					\
+	MAKE_SUBDIRS MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA					\
+	MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA MAKEFLAGS_VERBOSITY				\
+	MIRRORS MIRRORS_GIT SOFORT_FORCE SOFORT_NATIVE_CC SOFORT_NATIVE_CFLAGS			\
+	SOFORT_NATIVE_CFLAGS_EXTRA SOFORT_NATIVE_CXX SOFORT_NATIVE_CXXFLAGS			\
+	SOFORT_NATIVE_CXXFLAGS_EXTRA SOFORT_NATIVE_LD SOFORT_NATIVE_LDFLAGS			\
+	SOFORT_NATIVE_LDFLAGS_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS			\
+	PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX		\
 	RANLIB RPM_DISABLE SHA256SUM SUBDIR TARGET URL URLS_GIT VERSION";
 
 # Path names
@@ -45,36 +48,36 @@ DEFAULT_BUILD_VARS="
 : ${BUILD_DLCACHEDIR:="${PREFIX_ROOT}/dlcache"};
 : ${BUILD_WORKDIR:="${PREFIX}/tmp"};
 : ${DEFAULT_CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS BUILD_DLCACHEDIR BUILD_WORKDIR"};
-: ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:="
-	HOME PATH TERM USER								\
-	ARCH BUILD_KIND									\
-	BUILD_DLCACHEDIR BUILD_HNAME BUILD_WORKDIR					\
+: ${DEFAULT_CLEAR_ENV_VARS_EXCEPT:="								\
+	HOME PATH TERM USER									\
+	ARCH BUILD_KIND										\
+	BUILD_DLCACHEDIR BUILD_HNAME BUILD_WORKDIR						\
 	PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX PREFIX_NATIVE PREFIX_ROOT PREFIX_RPM"};
 : ${DEFAULT_CLEAR_PREFIX_PATHS:="
 	bin i686-nt32-midipix doc include info lib lib64 libexec man minipix minipix_dist native
 	rpm sbin share tmp usr x86_64-nt64-midipix x86_64-w64-mingw32 pkglist.cross pkglist.host
 	pkglist.native SHA256SUMS SHA256SUMS.last"};
-: ${DEFAULT_INSTALL_FILES_DESTDIR:="
-	/=bin /=include /=lib /=lib/pkgconfig /=sbin
-	/=share /=share/doc /=share/info /=share/man
-	/=share/man/man1 /=share/man/man2 /=share/man/man3 /=share/man/man4 /=share/man/man5
-	/=share/man/man6 /=share/man/man7 /=share/man/man8 /=share/man/man9
-	@share/doc=doc
-	@share/info=info
-	@lib=lib64
-	@share/man=man
-	@../lib/pkgconfig=share/pkgconfig
+: ${DEFAULT_INSTALL_FILES_DESTDIR:="								\
+	/=bin /=include /=lib /=lib/pkgconfig /=sbin						\
+	/=share /=share/doc /=share/info /=share/man						\
+	/=share/man/man1 /=share/man/man2 /=share/man/man3 /=share/man/man4 /=share/man/man5	\
+	/=share/man/man6 /=share/man/man7 /=share/man/man8 /=share/man/man9			\
+	@share/doc=doc										\
+	@share/info=info									\
+	@lib=lib64										\
+	@share/man=man										\
+	@../lib/pkgconfig=share/pkgconfig							\
 	@.=usr"};
-: ${DEFAULT_LOG_ENV_VARS:="
-	ARCH BUILD_KIND BUILD_DLCACHEDIR BUILD_WORKDIR DEFAULT_GITROOT
-	HOME PATH PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX
+: ${DEFAULT_LOG_ENV_VARS:="									\
+	ARCH BUILD_KIND BUILD_DLCACHEDIR BUILD_WORKDIR DEFAULT_GITROOT				\
+	HOME PATH PREFIX PREFIX_CROSS PREFIX_MINGW32 PREFIX_MINIPIX				\
 	PREFIX_NATIVE PREFIX_RPM USER"};
-: ${DEFAULT_MIRRORS:="
-https://midipix.org/mirror/
-https://midipix.lucioillanes.de/archives/
+: ${DEFAULT_MIRRORS:="										\
+https://midipix.org/mirror/									\
+https://midipix.lucioillanes.de/archives/							\
 "};
-: ${DEFAULT_MIRRORS_GIT:="
-https://midipix.lucioillanes.de/repos_git/
+: ${DEFAULT_MIRRORS_GIT:="									\
+https://midipix.lucioillanes.de/repos_git/							\
 "};
 
 # Default flags & variables
diff --git a/subr.rtl/rtl_list.subr b/subr.rtl/rtl_list.subr
index 369d3b4..29abef2 100644
--- a/subr.rtl/rtl_list.subr
+++ b/subr.rtl/rtl_list.subr
@@ -1,5 +1,7 @@
 #
 # set +o errexit -o noglob -o nounset is assumed.
+# N.B.	Lists separated by SP, when passed to rtl_l*() w/ explicit IFS,
+#	must specify "<SP><VT>" as IFS.
 #
 
 rtl_lassign() {
diff --git a/subr.rtl/rtl_state.subr b/subr.rtl/rtl_state.subr
index 6d53956..203ec52 100644
--- a/subr.rtl/rtl_state.subr
+++ b/subr.rtl/rtl_state.subr
@@ -11,23 +11,22 @@ rtl_state_clear() {
 };
 
 rtl_state_set() {
-	local _workdir="${1}" _pkg_fname="${2}" _done_fname_pfx="";
-	_done_fname_pfx="${_workdir}/.${_pkg_fname}";
-	shift 2; while [ ${#} -ge 1 ]; do
-		if [ -z "${1}" ]; then
-			shift; continue;
-		elif [ "${1#-}" != "${1}" ]; then
-			rtl_fileop rm "${_done_fname_pfx}.${1#-}";
-		else
-			rtl_fileop touch "${_done_fname_pfx}.${1}";
-		fi;
-	shift; done;
+	local	_workdir="${1}" _pkg_fname="${2}" _build_step="${3}"	\
+		_done_fname_pfx="${1}/.${2}"; shift 3;
+
+	rtl_fileop touch "${_done_fname_pfx}.${_build_step}";
+	while [ ${#} -ge 1 ]; do
+		if [ "${#1}" -gt 0 ]; then
+			rtl_fileop rm "${_done_fname_pfx}.${1}";
+		fi; shift;
+	done;
 };
 
 rtl_state_test() {
 	local _workdir="${1}" _pkg_name="${2}" _build_step="${3}" _restart_at="${4:-}" _done_fname="";
 	_done_fname="${_workdir}/.${_pkg_name}.${_build_step}";
-	if [ -z "${_restart_at}" ]; then
+	if [ -z "${_restart_at}" ]\
+	|| [ "${_restart_at}" = "LAST" ]; then
 		rtl_fileop test "${_done_fname}";
 	elif [ "${_restart_at}" = "ALL" ]; then
 		return 1;
diff --git a/subr/build_init.subr b/subr/build_init.subr
index d3e4ce1..f5894e6 100644
--- a/subr/build_init.subr
+++ b/subr/build_init.subr
@@ -2,10 +2,153 @@
 # set +o errexit -o noglob -o nounset is assumed.
 #
 
+buildp_expand_restart_at() {
+	local _restart_at_spec="${1}" _restart_at="" _restart_at_spec_new="";
+
+	for _restart_at in $(rtl_llift "${_restart_at_spec}" "," " "); do
+		case "${_restart_at}" in
+		@fetch)	_restart_at="fetch_download,fetch_extract"; ;;
+		@configure)
+			_restart_at="configure_patch_pre,configure_autotools,configure_patch,configure"; ;;
+		@build)	_restart_at="build"; ;;
+		@install)
+			_restart_at="install_subdirs,install_make,install_files,install_libs,install,install_rpm"; ;;
+		@clean)
+			_restart_at="clean"; ;;
+		*)	;;
+		esac;
+		_restart_at_spec_new="$(rtl_lconcat "${_restart_at_spec_new}" "${_restart_at}" ",")"
+	done;
+	printf "%s" "${_restart_at_spec_new}";
+};
+
+buildp_expand_restart_recursive() {
+	local _restart_spec="${1}" _last_pkg="" _restart_spec_at="" _restart_spec_recursive=0;
+
+	case "${_restart_spec}" in
+	\*\*\*[a-zA-Z]*)
+			_restart_spec="${_restart_spec#\*\*\*}"; _restart_spec_recursive=3; ;;
+	\*\*[a-zA-Z]*)	_restart_spec="${_restart_spec#\*\*}"; _restart_spec_recursive=2; ;;
+	\*[a-zA-Z]*)	_restart_spec="${_restart_spec#\*}"; _restart_spec_recursive=1; ;;
+	ALL)		_restart_spec_at=ALL; _restart_spec_recursive=2; ;;
+	LAST)		_restart_spec_at=ALL; _restart_spec_recursive=0;
+			if [ -n "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}" ]\
+			&& [ -e "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}" ]; then
+				_last_pkg="$(cat "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}")";
+				rtl_fileop rm "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}";
+				rtl_state_clear "${BUILD_WORKDIR}" "${_last_pkg}";
+				_restart_spec="${_last_pkg}";
+			else
+				_status="cannot rebuild last failed package"; return 1;
+			fi; ;;
+	esac;
+	ARG_RESTART="${_restart_spec}";
+	ARG_RESTART_AT="${_restart_spec_at}";
+	ARG_RESTART_RECURSIVE="${_restart_spec_recursive}";
+	return 0;
+};
+
+buildp_process_restart_spec() {
+	local _restart_spec="${1}" _eqfl=0 _ltfl=0 _restart_spec_at0="" _restart_spec_at="" _step="" _step1=""; _status="";
+
+	buildp_expand_restart_recursive "${_restart_spec}" || return "${?}";
+	_restart_spec="${ARG_RESTART}"; _restart_spec_at="${ARG_RESTART_AT}";
+
+	case "${_restart_spec}" in
+	"")	return 0; ;;
+	*:*)
+		_restart_spec_at="${_restart_spec#*:}"; _restart_spec="${_restart_spec%%:*}";
+		_restart_spec_at0="${_restart_spec_at}"; _restart_spec_at="";
+		case "${_restart_spec_at0}" in
+		ALL|LAST)
+			_restart_spec_at="${_restart_spec_at0}"; ;;
+
+		^*)	_restart_spec_at0="${_restart_spec_at0#^}";
+			_restart_spec_at0="$(buildp_expand_restart_at "${_restart_spec_at0}")";
+			_restart_spec_at="$(rtl_llift "${DEFAULT_BUILD_STEPS}" " 	" ",")";
+			for _restart_at in $(rtl_llift "${_restart_spec_at0}" "," " "); do
+				_restart_spec_at="$(rtl_lfilter "${_restart_spec_at}" "${_restart_at}" ",")";
+			done; _restart_spec_at="$(rtl_lfilter "${_restart_spec_at}" "finish" ",")"; ;;
+
+		\<=*|\<*|\>=*|\>*)
+			[ "${_restart_spec_at0#<}" != "${_restart_spec_at0}" ] && _ltfl=1;
+			if [ "${_restart_spec_at0#[<>]=}" != "${_restart_spec_at0}" ]; then
+				_restart_spec_at0="${_restart_spec_at0#[<>]=}"; _eqfl=1;
+			else
+				_restart_spec_at0="${_restart_spec_at0#[<>]}"; _eqfl=0;
+			fi; _restart_spec_at="";
+			_restart_spec_at0="$(buildp_expand_restart_at "${_restart_spec_at0%%,*}")";
+			if [ \( "${_eqfl}" -eq 1 \) -a \( "${_ltfl}" -eq 1 \) ]\
+			|| [ \( "${_eqfl}" -eq 0 \) -a \( "${_ltfl}" -eq 0 \) ]; then
+				_restart_spec_at0="${_restart_spec_at0##*,}";
+			elif [ \( "${_eqfl}" -eq 1 \) -a \( "${_ltfl}" -eq 0 \) ]\
+			||   [ \( "${_eqfl}" -eq 0 \) -a \( "${_ltfl}" -eq 1 \) ]; then
+				_restart_spec_at0="${_restart_spec_at0%%,*}";
+			fi;
+			for _restart_at in ${DEFAULT_BUILD_STEPS}; do
+				if [ "${_ltfl}" -eq 1 ]; then
+					if [ "${_restart_at}" = "${_restart_spec_at0%%,*}" ]; then
+						if [ "${_eqfl}" -eq 1 ]; then
+							_restart_spec_at="$(rtl_lconcat "${_restart_spec_at}" "${_restart_at}" ",")";
+						fi; break;
+					fi;
+				else
+					if [ "${_restart_at}" = "${_restart_spec_at0%%,*}" ]; then
+						_foundfl=1; [ "${_eqfl}" -eq 0 ] && continue;
+					fi; [ "${_foundfl}" -eq 0 ] && continue;
+				fi;
+				_restart_spec_at="$(rtl_lconcat "${_restart_spec_at}" "${_restart_at}" ",")";
+			done; ;;
+
+		*)	_restart_spec_at="$(buildp_expand_restart_at "${_restart_spec_at0}")"; ;;
+		esac; ;;
+
+	*)	_restart_spec_at=ALL; ;;
+	esac;
+
+	ARG_RESTART="$(rtl_llift "${_restart_spec}" "," " ")";
+	ARG_RESTART_AT="${_restart_spec_at}";
+	if [ "${#ARG_RESTART_AT}" -eq 0 ]; then
+		_status="zero-length build step list"; return 1;
+	elif [ "${ARG_RESTART_AT}" != "ALL" ]\
+	&&   [ "${ARG_RESTART_AT}" != "LAST" ]; then
+		for _restart_at in $(rtl_lfilter "$(rtl_llift "${ARG_RESTART_AT}" "," " ")" "${DEFAULT_BUILD_STEPS}"); do
+			case "${_restart_at}" in
+			start)	;;
+			*)	_status="unknown build step \`${_restart_at}'"; return 1; ;;
+			esac;
+		done;
+	fi;
+	if [ "${#ARG_RESTART_AT}" -gt 0 ]\
+	&& [ "${ARG_RESTART_AT}" != "ALL" ]\
+	&& [ "${ARG_RESTART_AT}" != "LAST" ]; then
+		_restart_spec_at="${ARG_RESTART_AT}"; ARG_RESTART_AT="";
+		for _restart_at in ${DEFAULT_BUILD_STEPS}; do
+			if rtl_lmatch "${_restart_spec_at}" "${_restart_at}" ","; then
+				ARG_RESTART_AT="$(rtl_lconcat "${ARG_RESTART_AT}" "${_restart_at}" ",")";
+			fi;
+		done;
+		if [ "${ARG_RESTART_AT##*,}" != "finish" ]; then
+			_step="$(rtl_lfilter "${ARG_RESTART_AT}" "clean,finish" ",")"; _step="${_step##*,}";
+			_step1="$(rtl_lfilter "${DEFAULT_BUILD_STEPS}" "clean finish")"; _step1="${_step1##* }";
+			if [ "${_step}" = "${_step1}" ]; then
+				ARG_RESTART_AT="$(rtl_lconcat "${ARG_RESTART_AT}" "finish" ",")";
+			fi;
+		fi;
+	fi;
+	return 0;
+};
+
 buildp_init_args() {
-	local	_foundfl=0 _group="" _last_pkg="" _pkg_names_unknown="" _rc=0\
+	local	_eqfl=0 _foundfl=0 _group="" _pkg_names_unknown="" _rc=0	\
 		EX_PKG_BUILD_GROUPS EX_PKG_BUILD_GROUPS_NOAUTO; _status="";
 
+	case "${ARG_FETCH_FORCE}" in
+	ipv4)	DEFAULT_GIT_ARGS="$(rtl_lconcat "-4" "${DEFAULT_GIT_ARGS}")";
+		DEFAULT_WGET_ARGS="$(rtl_lconcat "-4" "${DEFAULT_WGET_ARGS}")"; ;;
+	ipv6)	DEFAULT_GIT_ARGS="$(rtl_lconcat "-6" "${DEFAULT_GIT_ARGS}")";
+		DEFAULT_WGET_ARGS="$(rtl_lconcat "-6" "${DEFAULT_WGET_ARGS}")"; ;;
+	esac;
 	if [ -z "${BUILD_HNAME:-}" ]\
 	&& ! BUILD_HNAME="$(hostname)"; then
 		_rc=1; _status="Error: failed to obtain hostname.";
@@ -16,73 +159,45 @@ buildp_init_args() {
 	&& [ -e "${PREFIX}/build.gitref" ]\
 	&& [ "$(git rev-parse HEAD)" = "$(cat "${PREFIX}/build.gitref")" ]; then
 		_rc=0; _status="Git repository has not changed since last build and --as-needed was specified.";
-	else	case "${ARG_FETCH_FORCE}" in
-		ipv4)	DEFAULT_GIT_ARGS="$(rtl_lconcat "-4" "${DEFAULT_GIT_ARGS}")";
-			DEFAULT_WGET_ARGS="$(rtl_lconcat "-4" "${DEFAULT_WGET_ARGS}")"; ;;
-		ipv6)	DEFAULT_GIT_ARGS="$(rtl_lconcat "-6" "${DEFAULT_GIT_ARGS}")";
-			DEFAULT_WGET_ARGS="$(rtl_lconcat "-6" "${DEFAULT_WGET_ARGS}")"; ;;
-		esac;
-		case "${ARG_RESTART}" in
-		\*\*\*[a-zA-Z]*)
-				ARG_RESTART="${ARG_RESTART#\*\*\*}"; ARG_RESTART_RECURSIVE=3; ;;
-		\*\*[a-zA-Z]*)	ARG_RESTART="${ARG_RESTART#\*\*}"; ARG_RESTART_RECURSIVE=2; ;;
-		\*[a-zA-Z]*)	ARG_RESTART="${ARG_RESTART#\*}"; ARG_RESTART_RECURSIVE=1; ;;
-		ALL)		ARG_RESTART_AT=ALL; ARG_RESTART_RECURSIVE=2; ;;
-		LAST)		ARG_RESTART_AT=ALL; ARG_RESTART_RECURSIVE=0;
-				if [ -n "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}" ]\
-				&& [ -e "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}" ]; then
-					_last_pkg="$(cat "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}")";
-					rtl_fileop rm "${DEFAULT_BUILD_LAST_FAILED_PKG_FNAME}";
-					rtl_state_clear "${BUILD_WORKDIR}" "${_last_pkg}";
-					ARG_RESTART="${_last_pkg}";
-				else
-					_rc=1; _status="Error: cannot rebuild last failed package.";
-				fi; ;;
-		esac;
-		if [ "${_rc:-0}" -eq 0 ]; then
-			case "${ARG_RESTART}" in
-			*:*)		ARG_RESTART_AT="${ARG_RESTART#*:}"; ARG_RESTART="$(rtl_llift "${ARG_RESTART%%:*}" "," " ")"; ;;
-			*)		ARG_RESTART="$(rtl_llift "${ARG_RESTART}" "," " ")"; ARG_RESTART_AT=ALL; ;;
-			esac;
-			if ! ex_pkg_load_groups; then
-				_rc=1; _status="Error: failed to load build groups.";
-			else	if ! rtl_lmatch "${ARG_DIST:-}" "rpm" ","\
-				&& [ -z "${ARG_DUMP_IN:-}" ]\
-				&& [ "${ARG_DUMP_ON_ABORT:-0}" -eq 0 ]; then
-					EX_PKG_BUILD_GROUPS="$(rtl_lfilter "${EX_PKG_BUILD_GROUPS}" "host_deps_rpm")";
-				fi;
-				if [ -z "${BUILD_GROUPS}" ]; then
-					BUILD_GROUPS="${EX_PKG_BUILD_GROUPS}";
-				else	_foundfl=0; for _group in ${BUILD_GROUPS}; do
-						if rtl_lmatch "${EX_PKG_BUILD_GROUPS}" "${_group}"; then
-							_foundfl=1; break;
-						fi;
-					done;
-					if [ "${_foundfl}" -eq 0 ]; then
-						_foundfl=0; for _group in ${BUILD_GROUPS}; do
-							if rtl_lmatch "${EX_PKG_BUILD_GROUPS}" "${_group}"; then
-								_rc=1; _status="Error: unknown build group \`${_group}'."; break;
-							fi;
-						done;
-					fi;
+	elif ! buildp_process_restart_spec "${ARG_RESTART:-}"; then
+		_rc=1; _status="Error: failed to process -r specification: ${_status}.";
+	elif ! ex_pkg_load_groups; then
+		_rc=1; _status="Error: failed to load build groups.";
+	else	if ! rtl_lmatch "${ARG_DIST:-}" "rpm" ","\
+		&& [ -z "${ARG_DUMP_IN:-}" ]\
+		&& [ "${ARG_DUMP_ON_ABORT:-0}" -eq 0 ]; then
+			EX_PKG_BUILD_GROUPS="$(rtl_lfilter "${EX_PKG_BUILD_GROUPS}" "host_deps_rpm")";
+		fi;
+		if [ -z "${BUILD_GROUPS}" ]; then
+			BUILD_GROUPS="${EX_PKG_BUILD_GROUPS}";
+		else	_foundfl=0; for _group in ${BUILD_GROUPS}; do
+				if rtl_lmatch "${EX_PKG_BUILD_GROUPS}" "${_group}"; then
+					_foundfl=1; break;
 				fi;
-				if [ "${_rc:-0}" -eq 0 ]; then
-					if [ -n "${ARG_DIST}" ]; then
-						BUILD_GROUPS="$(rtl_lconcat "$(rtl_lfilter "${BUILD_GROUPS}" "dist")" "dist")";
+			done;
+			if [ "${_foundfl}" -eq 0 ]; then
+				_foundfl=0; for _group in ${BUILD_GROUPS}; do
+					if rtl_lmatch "${EX_PKG_BUILD_GROUPS}" "${_group}"; then
+						_rc=1; _status="Error: unknown build group \`${_group}'."; break;
 					fi;
-					if [ -n "${ARG_RESTART}" ] && ! rtl_lmatch "${ARG_RESTART}" "ALL LAST"; then
-						for _pkg_name in ${ARG_RESTART}; do
-							if ! ex_pkg_find_package "${BUILD_GROUPS}" "${_pkg_name}" >/dev/null; then
-								_pkg_names_unknown="$(rtl_lconcat "${_pkg_names_unknown}" "${_pkg_name}")";
-							fi;
-						done;
-						case "$(rtl_llength "${_pkg_names_unknown}")" in
-						0)	;;
-						1)	_rc=1; _status="Error: unknown package \`${_pkg_names_unknown}'."; ;;
-						*)	_rc=1; _status="Error: unknown packages: $(rtl_subst "${_pkg_names_unknown}" " " ", ")"; ;;
-						esac;
+				done;
+			fi;
+		fi;
+		if [ "${_rc:-0}" -eq 0 ]; then
+			if [ -n "${ARG_DIST}" ]; then
+				BUILD_GROUPS="$(rtl_lconcat "$(rtl_lfilter "${BUILD_GROUPS}" "dist")" "dist")";
+			fi;
+			if [ -n "${ARG_RESTART}" ] && ! rtl_lmatch "${ARG_RESTART}" "ALL LAST"; then
+				for _pkg_name in ${ARG_RESTART}; do
+					if ! ex_pkg_find_package "${BUILD_GROUPS}" "${_pkg_name}" >/dev/null; then
+						_pkg_names_unknown="$(rtl_lconcat "${_pkg_names_unknown}" "${_pkg_name}")";
 					fi;
-				fi;
+				done;
+				case "$(rtl_llength "${_pkg_names_unknown}")" in
+				0)	;;
+				1)	_rc=1; _status="Error: unknown package \`${_pkg_names_unknown}'."; ;;
+				*)	_rc=1; _status="Error: unknown packages: $(rtl_subst "${_pkg_names_unknown}" " " ", ")"; ;;
+				esac;
 			fi;
 		fi;
 	fi; return "${_rc}";
@@ -146,8 +261,8 @@ buildp_init_getopts() {
 	local _arg="" _opt="" _rc=0 _shiftfl=0 OPTIND=0; _status="";
 	: ${ARCH:="nt64"}; : ${BUILD_KIND:="debug"};
 	ARG_AS_NEEDED=0; ARG_CLEAN_BUILDS=""; ARG_DEBUG_MINIPIX=0; ARG_DIST=""; ARG_DUMP_IN="";
-	ARG_DUMP_ON_ABORT=0; ARG_FETCH_FORCE=""; ARG_PARALLEL=1; ARG_RELAXED=0; ARG_RESTART="";
-	ARG_RESTART_AT=""; ARG_RESTART_RECURSIVE=""; ARG_VERBOSE=0;
+	ARG_DUMP_ON_ABORT=0; ARG_FETCH_FORCE=""; ARG_PARALLEL=1; ARG_RELAXED=0; ARG_RESET_PKG=0;
+	ARG_RESTART=""; ARG_RESTART_AT=""; ARG_RESTART_RECURSIVE=""; ARG_VERBOSE=0;
 	while [ "${#}" -gt 0 ]; do
 		case "${1}" in
 		--as-needed)	ARG_AS_NEEDED=1; _shiftfl=1; ;;
@@ -159,6 +274,8 @@ buildp_init_getopts() {
 		--dump-on-abort)
 				ARG_DUMP_ON_ABORT=1; _shiftfl=1; ;;
 		--debug-minipx)	ARG_DEBUG_MINIPIX=1; _shiftfl=1; ;;
+		--help)		cat etc/build.usage; exit 0; ;;
+		--reset-state)	ARG_RESET_PKG=1; _shiftfl=1; ;;
 		-v*)		_opt="${1#-}"; while [ -n "${_opt}" ]; do
 					: $((ARG_VERBOSE+=1)); _opt="${_opt#?}";
 				done; _shiftfl=1; ;;
@@ -190,7 +307,7 @@ buildp_init_getopts() {
 			C)	ARG_CLEAN_BUILDS="${OPTARG}"; ;;
 			D)	ARG_DIST="${OPTARG}"; ;;
 			F)	ARG_FETCH_FORCE="${OPTARG}"; ;;
-			h)	cat etc/build.usage; exit 0; ;;
+			h)	cat etc/build.usage.short; exit 0; ;;
 			p)	ARG_PARALLEL="${OPTARG}"; ;;
 			P)	ARG_PARALLEL="auto";
 				if [ -n "${2:-}" ]\
@@ -199,7 +316,7 @@ buildp_init_getopts() {
 				fi; ;;
 			r)	ARG_RESTART="${OPTARG}"; ;;
 			R)	ARG_RELAXED=1; ;;
-			*)	cat etc/build.usage; exit 1; ;;
+			*)	cat etc/build.usage.short; exit 1; ;;
 			esac; shift $((${OPTIND}-1)); OPTIND=1;
 		else	if rtl_match "${1}" "=*"; then
 				BUILD_GROUPS_INHIBIT_DEPS=1; _arg="${1#=}";
@@ -241,14 +358,6 @@ buildp_init_getopts() {
 	return "${_rc}";
 };
 
-buildp_init_getopts_help() {
-	local _opt="";
-	while getopts a:b:C:D:Fhp:Pr:R _opt 2>/dev/null; do
-	case "${_opt}" in
-	h)	cat etc/build.usage; exit 0; ;;
-	esac; done; shift $((${OPTIND}-1));
-};
-
 buildp_init_prereqs() {
 	if ! rtl_check_prereqs \
 			awk bunzip2 bzip2 cat chmod cmake cp date find flock	\
@@ -268,9 +377,8 @@ buildp_init_prereqs() {
 build_init() {
 	local _rc=0; _status="";
 	if ! buildp_init_env			\
-	|| ! buildp_init_getopts_help "${@}"	\
-	|| ! buildp_init_prereqs		\
 	|| ! buildp_init_getopts "${@}"		\
+	|| ! buildp_init_prereqs		\
 	|| ! ex_pkg_load_vars			\
 	|| ! buildp_init_args			\
 	|| ! buildp_init_files; then
diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr
index f2b78e3..4f6c374 100644
--- a/subr/ex_pkg_dispatch.subr
+++ b/subr/ex_pkg_dispatch.subr
@@ -53,7 +53,7 @@ exp_pkg_dispatch_expand_packages() {
 # @_group_name:			build group name
 # @_njobs_max:			maximum count of simultaneous jobs
 # @_pipe_path:			pathname to build FIFO
-# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL or LAST
 # @_workdir:			pathname to build-specific temporary directory
 #
 # Return:			zero (0) on success, non-zero (>0) on failure, ${EXP_PKG_DISPATCH_COUNT_CUR} may be mutated post-return.
@@ -116,7 +116,7 @@ exp_pkg_dispatch_group() {
 # @_dispatch_fn:		top-level dispatch function name
 # @_group_name:			build group name
 # @_pkg_name:			single package name
-# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL or LAST
 # @_workdir:			pathname to build-specific temporary directory
 #
 # Return:			zero (0) on success, non-zero (>0) on failure, ${EXP_PKG_DISPATCH_NJOBS}, ${EXP_PKG_DISPATCH_COUNT}, ${EX_PKG_NAMES}, and ${EX_PKG_DISPATCH_WAIT} may be mutated post-return.
@@ -158,7 +158,7 @@ exp_pkg_dispatch_package() {
 # @_pipe_path:			pathname to parent-child process FIFO
 # @_pkg_disabled:		list of disabled packages
 # @_pkg_finished:		list of finished packages
-# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL or LAST
 # @_workdir:			pathname to build-specific temporary directory
 #
 # Return:			zero (0) on success, non-zero (>0) on failure, ${EXP_PKG_DISPATCH_NJOBS}, ${EXP_PKG_DISPATCH_COUNT}, ${EX_PKG_NAMES}, and ${EX_PKG_DISPATCH_WAIT} may be mutated post-return.
@@ -198,7 +198,7 @@ exp_pkg_dispatch_packages() {
 # @_njobs_max:			maximum count of simultaneous jobs
 # @_pipe_path:			pathname to build FIFO
 # @_restart:			optional whitespace-separated list of package names to rebuild
-# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL or LAST
 # @_restart_recursive:		optional flag specifiying either no dependency expansion (0,) dependency expansion (1,) dependency expansion and forcibly rebuild (2,) forcibly rebuild reverse dependencies (3.)
 # @_workdir:			pathname to build-specific temporary directory
 #
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr
index d31f01d..5048c93 100644
--- a/subr/ex_pkg_env.subr
+++ b/subr/ex_pkg_env.subr
@@ -136,7 +136,7 @@ ex_pkg_env_sofort() {
 # @_group_name:			build group name
 # @_nounset:			don't clear package variable namespace
 # @_pkg_name:			single package name
-# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:			optional comma-separated list of build steps at which to rebuild or ALL or LAST
 # @_workdir:			pathname to build-specific temporary directory
 #
 # Return:			zero (0) on success, non-zero (>0) on failure
@@ -154,9 +154,9 @@ ex_pkg_env() {
 
 #
 # ex_pkg_state_set() - update build step status for single named package
-# @_workdir:		pathname to temporary build directory
 # @_pkg_name:		single package name
-# @${@}:		list of build steps
+# @_build_step:		build step set status of
+# [@${@}]:		optional list of build steps to invalidate status of
 #
 # Return:		zero (0) on success, non-zero (>0) on failure
 #
@@ -166,10 +166,9 @@ ex_pkg_state_set() {
 
 #
 # ex_pkg_state_test() - test build step status of single named package
-# @_workdir:		pathname to temporary build directory
 # @_pkg_name:		single package name
 # @_build_step:		build step to test status of
-# @_restart_at:		optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:		optional comma-separated list of build steps at which to rebuild or ALL or LAST
 #
 # Return:		zero (0) on success, non-zero (>0) on failure
 #
diff --git a/subr/ex_pkg_exec.subr b/subr/ex_pkg_exec.subr
index 992b7c8..ee49b87 100644
--- a/subr/ex_pkg_exec.subr
+++ b/subr/ex_pkg_exec.subr
@@ -21,7 +21,7 @@ exp_pkg_exec_filter_vars_fn() {
 # exp_pkg_exec_pre() - XXX
 # @_group_name:		build group name
 # @_pkg_name:		single package name
-# @_restart_at:		optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:		optional comma-separated list of build steps at which to rebuild or ALL or LAST
 #
 # Return:		zero (0) on success, non-zero (>0) on failure
 #
@@ -51,7 +51,7 @@ exp_pkg_exec_pre() {
 # exp_pkg_exec_step() - XXX
 # @_group_name:		build group name
 # @_pkg_name:		single package name
-# @_restart_at:		optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:		optional comma-separated list of build steps at which to rebuild or ALL or LAST
 # @_step:		build step to execute
 #
 # Return:		zero (0) on success, non-zero (>0) on failure
@@ -81,47 +81,49 @@ exp_pkg_exec_step() {
 # @_dispatch_fn:	top-level dispatch function name
 # @_group_name:		build group name
 # @_pkg_name:		single package name
-# @_restart_at:		optional comma-separated list of build steps at which to rebuild or ALL
+# @_restart_at:		optional comma-separated list of build steps at which to rebuild or ALL or LAST
 #
 # Return:		zero (0) on success, non-zero (>0) on failure
 #
 ex_pkg_exec() {
 	local	_dispatch_fn="${1}" _group_name="${2}" _pkg_name="${3}" _restart_at="${4}"	\
-		_rc=0 _step="" _step_next="";
-	if exp_pkg_exec_pre "${_group_name}" "${_pkg_name}" "${_restart_at}"\
-	&& "${_dispatch_fn}" start_pkg_child "${_group_name}" "${_pkg_name}"; then
-		if rtl_test_cmd "pkg_${_pkg_name}_all"; then
-			"pkg_${_pkg_name}_all" "${_restart_at}"; _rc="${?}";
-		else	set -- ${PKG_BUILD_STEPS};
-			while [ ${#} -gt 0 ]; do
-				_step="${1}"; _step_next="${2:-}"; shift;
-				if [ "${ARG_DUMP_IN}" = "${_step}" ]; then
-					printf "" > "${BUILD_WORKDIR}/${_pkg_name}.dump";
-					rtl_filter_vars exp_pkg_exec_filter_vars_fn >> "${BUILD_WORKDIR}/${_pkg_name}.dump";
-					export >> "${BUILD_WORKDIR}/${_pkg_name}.dump";
-					exit 1;
-				elif [ "${PKG_FORCE:-0}" -eq 0 ]\
-				&& ex_pkg_state_test "${_pkg_name}" "${_step}" "${_restart_at}"	; then
-					continue;
-				elif ! exp_pkg_exec_step "${_group_name}" "${_pkg_name}" "${_restart_at}" "${_step}"; then
-					_rc=1; break;
-				else
-					printf "step %s %s %s\n" "${_group_name}" "${_pkg_name}" "${_step}" >&3;
-					ex_pkg_state_set "${_pkg_name}" "${_step}" "${_step_next:+-${_step_next}}";
-				fi;
-			done;
-		fi;
-		if [ "${_rc:-0}" -eq 0 ]; then
-			if [ -z "${_restart_at}" ]\
-			|| [ "${_restart_at}" = "ALL" ]; then
-				ex_pkg_state_set "${_pkg_name}" finish;
+		_build_step_last="" _rc=0 _step="";
+
+	if ! exp_pkg_exec_pre "${_group_name}" "${_pkg_name}" "${_restart_at}"\
+	|| ! "${_dispatch_fn}" start_pkg_child "${_group_name}" "${_pkg_name}"; then
+		_rc=1;
+	elif rtl_test_cmd "pkg_${_pkg_name}_all"; then
+		"pkg_${_pkg_name}_all" "${_restart_at}"; _rc="${?}";
+	else	set -- $(rtl_lfilter "${PKG_BUILD_STEPS}" "start");
+		while [ ${#} -gt 0 ]; do
+			_step="${1}"; shift;
+			if [ "${#_restart_at}" -gt 0 ]\
+			&& [ "${_restart_at}" != "ALL" ]\
+			&& [ "${_restart_at}" != "LAST" ]\
+			&& ! rtl_lmatch "${_restart_at}" "${_step}" ","; then
+				continue;
 			fi;
-		elif [ "${_rc:-0}" -ne 0 ]\
-		&&   [ "${ARG_DUMP_ON_ABORT:-0}" -eq 1 ]; then
-			printf "" > "${BUILD_WORKDIR}/${_pkg_name}.dump";
-			rtl_filter_vars exp_pkg_exec_filter_vars_fn >> "${BUILD_WORKDIR}/${_pkg_name}.dump";
-			export >> "${BUILD_WORKDIR}/${_pkg_name}.dump";
-		fi;
+			if [ "${_step}" = "${ARG_DUMP_IN}" ]; then
+				printf "" > "${BUILD_WORKDIR}/${_pkg_name}.dump";
+				rtl_filter_vars exp_pkg_exec_filter_vars_fn >> "${BUILD_WORKDIR}/${_pkg_name}.dump";
+				export >> "${BUILD_WORKDIR}/${_pkg_name}.dump"; exit 1;
+			elif [ "${_step}" = "finish" ]; then
+				ex_pkg_state_set "${_pkg_name}" finish; break;
+			elif [ "${PKG_FORCE:-0}" -eq 0 ]\
+			&&   ex_pkg_state_test "${_pkg_name}" "${_step}" "${_restart_at}"; then
+				continue;
+			elif ! exp_pkg_exec_step "${_group_name}" "${_pkg_name}" "${_restart_at}" "${_step}"; then
+				_rc=1; break;
+			else	printf "step %s %s %s\n" "${_group_name}" "${_pkg_name}" "${_step}" >&3;
+				ex_pkg_state_set "${_pkg_name}" "${_step}" "${@}";
+			fi;
+		done;
+	fi;
+	if [ "${_rc:-0}" -ne 0 ]\
+	&&   [ "${ARG_DUMP_ON_ABORT:-0}" -eq 1 ]; then
+		printf "" > "${BUILD_WORKDIR}/${_pkg_name}.dump";
+		rtl_filter_vars exp_pkg_exec_filter_vars_fn >> "${BUILD_WORKDIR}/${_pkg_name}.dump";
+		export >> "${BUILD_WORKDIR}/${_pkg_name}.dump";
 	fi;
 	return "${_rc}";
 };
diff --git a/vars/gcc.vars b/vars/gcc.vars
index 50794c9..6aa9cb3 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -10,7 +10,7 @@
 pkgp_gcc_build_dir() { PKG_BUILD_DIR="${1}-${2}-${PKG_TARGET}"; };
 pkgp_gcc_state_set() {
 	printf "step unknown %s %s\n" "${PKG_NAME}" "${1}" >&3;
-	ex_pkg_state_set "${PKG_NAME}" ${1} -${2};
+	ex_pkg_state_set "${PKG_NAME}" "${1}" "${2}";
 };
 
 pkgp_gcc_configure() {
@@ -41,7 +41,7 @@ pkgp_gcc_configure() {
 			--with-fpmath=sse; then
 		return 1;
 	else
-		pkgp_gcc_state_set "configure" -"build";
+		pkgp_gcc_state_set "configure" "build";
 	fi;
 };
 
@@ -130,14 +130,14 @@ pkgp_gcc_stage1_all() {
 				"cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; then
 			return 1;
 		else
-			pkgp_gcc_state_set "fetch" -"patch";
+			pkgp_gcc_state_set "fetch" "patch";
 		fi;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
 		if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
 			patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" || return 1;
 		fi;
-		pkgp_gcc_state_set "patch" -"configure";
+		pkgp_gcc_state_set "patch" "configure";
 	fi;
 	pkgp_gcc_setup_vars; pkgp_gcc_setup_env;
 	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
@@ -179,11 +179,11 @@ pkgp_gcc_stage1_all() {
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} "all-gcc" || return 1;
-		pkgp_gcc_state_set "build" -"install_subdirs";
+		pkgp_gcc_state_set "build" "install_subdirs";
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 		pkg_install_subdirs || return 1;
-		pkgp_gcc_state_set "install_subdirs" -"install_make";
+		pkgp_gcc_state_set "install_subdirs" "install_make";
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 		case "${PKG_NAME}" in
@@ -203,12 +203,12 @@ pkgp_gcc_stage1_all() {
 					return 1;
 				fi; ;;
 			esac;
-			pkgp_gcc_state_set "install_make" -"install";
+			pkgp_gcc_state_set "install_make" "install";
 		fi;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		pkg_install || return 1;
-		pkgp_gcc_state_set "install" -"finish";
+		pkgp_gcc_state_set "install" "finish";
 	fi;
 };
 
@@ -227,14 +227,14 @@ pkg_gcc_full_all() {
 				"cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; then
 			return 1;
 		else
-			pkgp_gcc_state_set "fetch" -"patch";
+			pkgp_gcc_state_set "fetch" "patch";
 		fi;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
 		if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
 			patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" || return 1;
 		fi;
-		pkgp_gcc_state_set "patch" -"configure";
+		pkgp_gcc_state_set "patch" "configure";
 	fi;
 	pkgp_gcc_setup_vars; pkgp_gcc_setup_env;
 	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
@@ -264,16 +264,16 @@ pkg_gcc_full_all() {
 		|| ! make ${PKG_MAKEFLAGS_BUILD} "all-target-libgfortran"\
 		|| ! make ${PKG_MAKEFLAGS_BUILD} "all"; then
 			return 1;
-		else	pkgp_gcc_state_set "build" -"install_subdirs";
+		else	pkgp_gcc_state_set "build" "install_subdirs";
 		fi;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 		pkg_install_subdirs || return 1;
-		pkgp_gcc_state_set "install_subdirs" -"install_make";
+		pkgp_gcc_state_set "install_subdirs" "install_make";
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install" || return 1;
-		pkgp_gcc_state_set "install_make" -"install";
+		pkgp_gcc_state_set "install_make" "install";
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		pkg_install || return 1; pkgp_gcc_state_set "install" "finish";
@@ -288,15 +288,15 @@ pkg_gcc_full_host_all() {
 		return 1;
 	else	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 			make ${PKG_MAKEFLAGS_BUILD} || return 1;
-			pkgp_gcc_state_set "build" -"install_subdirs";
+			pkgp_gcc_state_set "build" "install_subdirs";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 			pkg_install_subdirs || return 1;
-			pkgp_gcc_state_set "install_subdirs" -"install_make";
+			pkgp_gcc_state_set "install_subdirs" "install_make";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install" || return 1;
-			pkgp_gcc_state_set "install_make" -"install";
+			pkgp_gcc_state_set "install_make" "install";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 			pkg_install || return 1;
@@ -313,15 +313,15 @@ pkg_gcc_libstdcpp_v3_host_all() {
 		return 1;
 	else	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 			make ${PKG_MAKEFLAGS_BUILD} "all-target-libstdc++-v3" || return 1;
-			pkgp_gcc_state_set "build" -"install_subdirs";
+			pkgp_gcc_state_set "build" "install_subdirs";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 			pkg_install_subdirs || return 1;
-			pkgp_gcc_state_set "install_subdirs" -"install_make";
+			pkgp_gcc_state_set "install_subdirs" "install_make";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-target-libstdc++-v3" || return 1;
-			pkgp_gcc_state_set "install_make" -"install";
+			pkgp_gcc_state_set "install_make" "install";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 			pkg_install || return 1;
@@ -338,15 +338,15 @@ pkg_gcc_runtime_host_all() {
 		return 1;
 	else	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 			make ${PKG_MAKEFLAGS_BUILD} "all-target-libgcc" ${_vis_hide} || return 1;
-			pkgp_gcc_state_set "build" -"install_subdirs";
+			pkgp_gcc_state_set "build" "install_subdirs";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 			pkg_install_subdirs || return 1;
-			pkgp_gcc_state_set "install_subdirs" -"install_make";
+			pkgp_gcc_state_set "install_subdirs" "install_make";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 			make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-target-libgcc" || return 1;
-			pkgp_gcc_state_set "install_make" -"install";
+			pkgp_gcc_state_set "install_make" "install";
 		fi;
 		if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 			pkg_install || return 1;