Index: branches/2017Q4/ports-mgmt/poudriere/Makefile =================================================================== --- branches/2017Q4/ports-mgmt/poudriere/Makefile (revision 452518) +++ branches/2017Q4/ports-mgmt/poudriere/Makefile (revision 452519) @@ -1,59 +1,59 @@ # $FreeBSD$ PORTNAME= poudriere -DISTVERSION= 3.1.19 +DISTVERSION= 3.1.21 PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system LICENSE= BSD2CLAUSE CONFLICTS_INSTALL= poudriere-devel-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d OPTIONS_DEFINE= ZSH QEMU EXAMPLES OPTIONS_DEFAULT=ZSH OPTIONS_SUB= yes RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests QEMU_DESC= Add qemu-user-static to compile ports for non-x86 architectures QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static .include # rm -x support came in 10.0. A bundled rm is used if not supported in base. # While <10 is technically not supported in the Ports Tree, Poudriere # detects this and it being a package build tool it should still be # supported as a user may be installing this to build packages for upgrading # their system to a supported release. .if ${OSVERSION} < 1000000 PLIST_SUB+= RM="" .else PLIST_SUB+= RM="@comment " .endif pre-install: ${REINPLACE_CMD} \ -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \ ${WRKSRC}/src/bin/poudriere post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ ${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \ ${STAGEDIR}${DATADIR}/MANIFESTS .include Index: branches/2017Q4/ports-mgmt/poudriere/distinfo =================================================================== --- branches/2017Q4/ports-mgmt/poudriere/distinfo (revision 452518) +++ branches/2017Q4/ports-mgmt/poudriere/distinfo (revision 452519) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496337832 -SHA256 (freebsd-poudriere-3.1.19_GH0.tar.gz) = 8f48f8f6a5874c85e4bc158e433e33c11bcafa8f348fc9c6cf533612a21445e2 -SIZE (freebsd-poudriere-3.1.19_GH0.tar.gz) = 2860431 +TIMESTAMP = 1507911513 +SHA256 (freebsd-poudriere-3.1.21_GH0.tar.gz) = b05f63580aef1040466e285dc61733d5ee62a57e87f2f6a14b3d56200adcf5dd +SIZE (freebsd-poudriere-3.1.21_GH0.tar.gz) = 2866020 Index: branches/2017Q4/ports-mgmt/poudriere/pkg-plist =================================================================== --- branches/2017Q4/ports-mgmt/poudriere/pkg-plist (revision 452518) +++ branches/2017Q4/ports-mgmt/poudriere/pkg-plist (revision 452519) @@ -1,90 +1,91 @@ bin/poudriere @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/clock libexec/poudriere/cpdup libexec/poudriere/dirempty libexec/poudriere/dirwatch libexec/poudriere/jexecd libexec/poudriere/locked_mkdir libexec/poudriere/nc libexec/poudriere/poudriered libexec/poudriere/ptsort +libexec/poudriere/pwait libexec/poudriere/rename libexec/poudriere/rexec %%RM%%libexec/poudriere/rm libexec/poudriere/sh libexec/poudriere/timeout libexec/poudriere/timestamp libexec/poudriere/tsort man/man8/poudriere.8.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf.sample %%DATADIR%%/MANIFESTS %%DATADIR%%/api.sh %%DATADIR%%/awk/dependency_loop.awk %%DATADIR%%/awk/humanize.awk %%DATADIR%%/awk/json.awk %%DATADIR%%/awk/json_jail.awk %%DATADIR%%/awk/json_top.awk %%DATADIR%%/awk/processonelog2.awk %%DATADIR%%/awk/siginfo_buildtime.awk %%DATADIR%%/bulk.sh %%DATADIR%%/clean.sh %%DATADIR%%/common.sh %%DATADIR%%/daemon.sh %%DATADIR%%/distclean.sh %%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/colors.pre.sh %%DATADIR%%/include/colors.sh %%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/parallel.sh %%DATADIR%%/jail.sh %%DATADIR%%/options.sh %%DATADIR%%/pkgclean.sh %%DATADIR%%/ports.sh %%DATADIR%%/processonelog.sh %%DATADIR%%/queue.sh %%DATADIR%%/status.sh %%DATADIR%%/testport.sh %%ZSH%%share/zsh/site-functions/_poudriere Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 452518) +++ branches/2017Q4 (revision 452519) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r451928,452016