- Update to checkin f86a423218

Changes:
    * Reduce jail restarting for networking access by now always starting
      2 jails. One with networking support and one without. This allows
      not constantly restarting jails to enable/disable networking, which
      causes a lot of jail lock contention.
    * Color support has been added. This is disabled by any of:
      1. poudriere -N <sub-command>
      2. stdout or stderr NOT in a TTY (piped)
      3. USE_COLORS=no in poudriere.conf
    * Add DURATION_FORMAT and BUILDTIME_FORMAT to allow changing time
      display and default build name.
    * madvise(MADV_PROTECT) the main poudriere process to allow it to cleanup
      on failure from out-of-swap.
    * Running commands as non-root will *auto queue* them to poudriered
      if it is running. See rc.d/poudriered.
    * HTML/Web major changes:
      - Stop polling the server once the build is done.
      - There is now a top-level and jail-level page. The top-level only
        shows the *latest* build for each jail-ports-set combination.
        The jail-level only shows for a specific jail-ports-set combination.
        These pages will only be updated with builds done after upgrading.
        This may change before 3.1 release using a statsd to populate with
        all historical builds as well.
      - The main build page has been majorly reworked.
        * It no longer has 2 columns which overlap each other when zoomed in.
          The site is now much more responsive to zooming and mobile viewing.
        * More links to logs and elapsed times are shown
        * More system and build stats are shown such as "Impulse" which is
          the rate of package building over the last 2-10 minutes. This is
          done in browser/js currently so will reset when reloading the page.
      - The layout for httpd setup has changed. Now instead of duplicating
        the html/assets into every build dir, the html dir from
        /usr/local/share/poudriere/html/ should be served directly
        and the /data dir should be symlinked or aliased to the equivalent
        /usr/local/poudriere/data/logs/bulk/ dir on your system. See
        /usr/local/share/examples/poudriere/nginx.conf.sample for an
        example nginx setup.
     ** Note that this is still being improved for 3.1 and may undergo some
        backwards-incompatible changes before release.
    * status: Major changes.
      - By default only show running builds
      - Use -a to show all builds, not just latest
      - Use -f to show finished builds, only latest
      - Add -c for a more compact format
      - Displaying the SIGINFO/builder output now requires -b.
      - -B/-j/-p/-z can be used to filter the output.
    * Show buildtimes in output now.
    * TIMESTAMP_LOGS has been improved
    * poudriered is no longer installed in sbin/
    * Fix MAX_MEMORY so it actually works. Note that this may break openjdk
      building.
    * Fix incorrect timeout message shown during install phase
    * jail -l, ports -l, status: Auto format width of columns to output
    * jail: Add back -i support to show information about a jail
    * Improvements to fork less often
    * testport: Now default to -n. Add -P to test with custom prefix.
    * testport -I: Fix longstanding bug of displaying wrong jail -k hint.
    * qemu-mips support
    * ports: Allow -B with git method
    * All the fixes from the 3.0.16 release as well:
      * Disable DEVELOPER from make.conf; Poudriere will automatically
        set it when appropriate. This prevents testing of port dependencies
        that were not requested to be tested.
      * distclean: Prevent removing all files by accident.
      * Having PKG_REPO_SIGNING_KEY set but the file missing is now fatal.
      * kern.securelevel >=1 is now fatal.
      * Fix 'kill: No such process' warnings with older /bin/sh (8.x)
      * Fix crash on 8.3 due to bug with $(()) handling of _vars (fixed in
        base r234001)
      * Fix case of packages always rebuilding with "changed options" when
        the port has an OPTION defined multiple times (such as fixed in
        ports r352512)
      * Fix 'Terminated' warning showing at shutdown with older /bin/sh (fixed
        by r218105 but never made it to stable/8)

3 files changed, 73 insertions, 53 deletions

diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index b0da9343caf4..277005a79807 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-PORTVERSION=	3.0.99.20140419
+PORTVERSION=	3.0.99.20140509
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	http://fossil.etoilebsd.net/poudriere/tarball/ \
-		LOCAL/bdrewery/${PORTNAME}/
+MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
+		http://fossil.etoilebsd.net/poudriere/tarball/
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz?uuid=${FSL_CHKIN}
 
@@ -15,7 +15,7 @@ LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere-[0-9]*
 
-FSL_CHKIN=	32a2683eca
+FSL_CHKIN=	f86a423218
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo
index e5e594879b28..426e9ec6c92c 100644
--- a/ports-mgmt/poudriere-devel/distinfo
+++ b/ports-mgmt/poudriere-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poudriere-3.0.99.20140419.tar.gz?uuid=32a2683eca) = e8c1f877d4269afe4eed72cdc26eade50267bd96446002e5f145ba6a323d2471
-SIZE (poudriere-3.0.99.20140419.tar.gz?uuid=32a2683eca) = 2381322
+SHA256 (poudriere-3.0.99.20140509.tar.gz?uuid=f86a423218) = 6599991799b8e53738740fc0a2185353db58ef4f414f3aa3eecf518ec536682a
+SIZE (poudriere-3.0.99.20140509.tar.gz?uuid=f86a423218) = 2683532
diff --git a/ports-mgmt/poudriere-devel/pkg-plist b/ports-mgmt/poudriere-devel/pkg-plist
index 844a1e92b86f..92b11c43b014 100644
--- a/ports-mgmt/poudriere-devel/pkg-plist
+++ b/ports-mgmt/poudriere-devel/pkg-plist
@@ -1,55 +1,74 @@
 bin/poudriere
-etc/poudriere.conf.sample
-etc/poudriered.conf.sample
-etc/rc.d/poudriered
+@sample etc/poudriere.conf.sample
 %%ETCDIR%%/hooks/bulk.sh.sample
 %%ETCDIR%%/hooks/pkgbuild.sh.sample
+@sample etc/poudriered.conf.sample
+etc/rc.d/poudriered
 libexec/poudriere/cpdup
 libexec/poudriere/dirempty
 libexec/poudriere/dirwatch
+libexec/poudriere/jexecd
 libexec/poudriere/nc
+libexec/poudriere/poudriered
 libexec/poudriere/rename
+libexec/poudriere/rexec
+libexec/poudriere/timestamp
 libexec/poudriere/tsort
-sbin/poudriered
 man/man8/poudriere.8.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf.sample
 %%DATADIR%%/awk/dependency_loop.awk
 %%DATADIR%%/awk/humanize.awk
 %%DATADIR%%/awk/json.awk
-%%DATADIR%%/awk/siginfo_buildtime.awk
+%%DATADIR%%/awk/json_jail.awk
+%%DATADIR%%/awk/json_top.awk
 %%DATADIR%%/awk/processonelog2.awk
-%%DATADIR%%/include/common.sh.dragonfly
-%%DATADIR%%/include/common.sh.freebsd
-%%DATADIR%%/include/fs.sh
-%%DATADIR%%/include/hash.sh
-%%DATADIR%%/include/parallel.sh
+%%DATADIR%%/awk/siginfo_buildtime.awk
 %%DATADIR%%/bulk.sh
 %%DATADIR%%/clean.sh
 %%DATADIR%%/common.sh
 %%DATADIR%%/daemon.sh
 %%DATADIR%%/distclean.sh
-%%DATADIR%%/html/assets/bootstrap/css/bootstrap-responsive.min.css
-%%DATADIR%%/html/assets/bootstrap/css/bootstrap.min.css
-%%DATADIR%%/html/assets/bootstrap/img/glyphicons-halflings-white.png
-%%DATADIR%%/html/assets/bootstrap/img/glyphicons-halflings.png
-%%DATADIR%%/html/assets/bootstrap/js/bootstrap.min.js
-%%DATADIR%%/html/assets/dataTables/css/jquery.dataTables.css
-%%DATADIR%%/html/assets/dataTables/images/back_disabled.png
-%%DATADIR%%/html/assets/dataTables/images/back_enabled.png
-%%DATADIR%%/html/assets/dataTables/images/back_enabled_hover.png
-%%DATADIR%%/html/assets/dataTables/images/forward_disabled.png
-%%DATADIR%%/html/assets/dataTables/images/forward_enabled.png
-%%DATADIR%%/html/assets/dataTables/images/forward_enabled_hover.png
-%%DATADIR%%/html/assets/dataTables/images/sort_asc.png
-%%DATADIR%%/html/assets/dataTables/images/sort_asc_disabled.png
-%%DATADIR%%/html/assets/dataTables/images/sort_both.png
-%%DATADIR%%/html/assets/dataTables/images/sort_desc.png
-%%DATADIR%%/html/assets/dataTables/images/sort_desc_disabled.png
-%%DATADIR%%/html/assets/dataTables/js/jquery.dataTables.min.js
-%%DATADIR%%/html/assets/jquery-1.9.1.min.js
-%%DATADIR%%/html/assets/logo.jpg
+%%DATADIR%%/html/assets/DataTables-1.10.0/css/jquery.dataTables.min.css
+%%DATADIR%%/html/assets/DataTables-1.10.0/css/jquery.dataTables_themeroller.min.css
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/back_disabled.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/back_enabled.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/back_enabled_hover.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_disabled.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_enabled.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_enabled_hover.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_asc.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_asc_disabled.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_both.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_desc.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_desc_disabled.png
+%%DATADIR%%/html/assets/DataTables-1.10.0/js/jquery.dataTables.min.js
+%%DATADIR%%/html/assets/bootstrap-3.1.1/css/bootstrap-theme.min.css
+%%DATADIR%%/html/assets/bootstrap-3.1.1/css/bootstrap.min.css
+%%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.eot
+%%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.svg
+%%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.ttf
+%%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.woff
+%%DATADIR%%/html/assets/bootstrap-3.1.1/js/bootstrap.min.js
+%%DATADIR%%/html/assets/favicon.ico
+%%DATADIR%%/html/assets/jquery-1.11.1.js
+%%DATADIR%%/html/assets/jquery-1.11.1.min.js
+%%DATADIR%%/html/assets/jquery-1.11.1.min.map
+%%DATADIR%%/html/assets/jquery.dataTables.rowGrouping-1.2.9.js
+%%DATADIR%%/html/assets/logo.svg
 %%DATADIR%%/html/assets/poudriere.css
 %%DATADIR%%/html/assets/poudriere.js
+%%DATADIR%%/html/build.html
 %%DATADIR%%/html/index.html
+%%DATADIR%%/html/jail.html
+%%DATADIR%%/html/robots.txt
+%%DATADIR%%/include/common.sh.dragonfly
+%%DATADIR%%/include/common.sh.freebsd
+%%DATADIR%%/include/display.sh
+%%DATADIR%%/include/fs.sh
+%%DATADIR%%/include/hash.sh
+%%DATADIR%%/include/html.sh
+%%DATADIR%%/include/messages.sh
+%%DATADIR%%/include/parallel.sh
 %%DATADIR%%/jail.sh
 %%DATADIR%%/options.sh
 %%DATADIR%%/pkgclean.sh
@@ -59,21 +78,22 @@ man/man8/poudriere.8.gz
 %%DATADIR%%/status.sh
 %%DATADIR%%/testport.sh
 %%ZSH%%share/zsh/site-functions/_poudriere
-%%ZSH%%@dirrmtry share/zsh/site-functions
-%%ZSH%%@dirrmtry share/zsh/
-@dirrm %%DATADIR%%/awk
-@dirrm %%DATADIR%%/html/assets/dataTables/js
-@dirrm %%DATADIR%%/html/assets/dataTables/images
-@dirrm %%DATADIR%%/html/assets/dataTables/css
-@dirrm %%DATADIR%%/html/assets/dataTables
-@dirrm %%DATADIR%%/html/assets/bootstrap/js
-@dirrm %%DATADIR%%/html/assets/bootstrap/img
-@dirrm %%DATADIR%%/html/assets/bootstrap/css
-@dirrm %%DATADIR%%/html/assets/bootstrap
-@dirrm %%DATADIR%%/html/assets
-@dirrm %%DATADIR%%/html
-@dirrm %%DATADIR%%/include
-@dirrm %%DATADIR%%
-@dirrm libexec/poudriere
-@dirrmtry %%ETCDIR%%
 @dirrmtry %%ETCDIR%%/hooks
+@dirrmtry %%ETCDIR%%
+@dirrmtry libexec/poudriere
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+@dirrmtry %%DATADIR%%/awk
+@dirrmtry %%DATADIR%%/html/assets/DataTables-1.10.0/css
+@dirrmtry %%DATADIR%%/html/assets/DataTables-1.10.0/images
+@dirrmtry %%DATADIR%%/html/assets/DataTables-1.10.0/js
+@dirrmtry %%DATADIR%%/html/assets/DataTables-1.10.0
+@dirrmtry %%DATADIR%%/html/assets/bootstrap-3.1.1/css
+@dirrmtry %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts
+@dirrmtry %%DATADIR%%/html/assets/bootstrap-3.1.1/js
+@dirrmtry %%DATADIR%%/html/assets/bootstrap-3.1.1
+@dirrmtry %%DATADIR%%/html/assets
+@dirrmtry %%DATADIR%%/html
+@dirrmtry %%DATADIR%%/include
+@dirrmtry %%DATADIR%%
+%%ZSH%%@dirrmtry share/zsh/site-functions
+%%ZSH%%@dirrmtry share/zsh