Index: head/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c =================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c (revision 435580) +++ head/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/libexec/poudriere/cached/cached.c.orig 2017-02-20 23:37:27 UTC -+++ src/libexec/poudriere/cached/cached.c -@@ -26,6 +26,7 @@ - - #include - -+#include - #include - #include - #include Property changes on: head/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh =================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh (revision 435580) +++ head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh (nonexistent) @@ -1,35 +0,0 @@ ---- src/share/poudriere/common.sh.orig 2017-02-22 20:34:08 UTC -+++ src/share/poudriere/common.sh -@@ -3216,7 +3216,7 @@ build_pkg() { - - if [ ${TMPFS_LOCALBASE} -eq 1 -o ${TMPFS_ALL} -eq 1 ]; then - if [ -f "${mnt}/${LOCALBASE:-/usr/local}/.mounted" ]; then -- umount -n ${mnt}/${LOCALBASE:-/usr/local} -+ umount -f ${mnt}/${LOCALBASE:-/usr/local} - fi - mnt_tmpfs localbase ${mnt}/${LOCALBASE:-/usr/local} - do_clone "${MASTERMNT}/${LOCALBASE:-/usr/local}" \ -@@ -3322,7 +3322,7 @@ stop_build() { - _my_path mnt - - if [ -f "${mnt}/.npkg_mounted" ]; then -- umount -n "${mnt}/.npkg" -+ umount -f "${mnt}/.npkg" - rm -f "${mnt}/.npkg_mounted" - fi - rm -rf "${PACKAGES}/.npkg/${PKGNAME}" -@@ -4693,12 +4693,12 @@ clean_restricted() { - bset status "clean_restricted:" - # Remount rw - # mount_nullfs does not support mount -u -- umount -n ${MASTERMNT}/packages -+ umount -f ${MASTERMNT}/packages - mount_packages - injail /usr/bin/make -s -C /usr/ports -j ${PARALLEL_JOBS} \ - RM="/bin/rm -fv" ECHO_MSG="true" clean-restricted - # Remount ro -- umount -n ${MASTERMNT}/packages -+ umount -f ${MASTERMNT}/packages - mount_packages -o ro - } - Property changes on: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh =================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh (revision 435580) +++ head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh (nonexistent) @@ -1,20 +0,0 @@ ---- src/share/poudriere/include/fs.sh.orig 2017-02-22 20:34:08 UTC -+++ src/share/poudriere/include/fs.sh -@@ -98,7 +98,7 @@ umountfs() { - - [ -d "${mnt}" ] || return 0 - mnt=$(realpath ${mnt}) -- if ! findmounts "${mnt}" "${pattern}" | xargs umount -n; then -+ if ! findmounts "${mnt}" "${pattern}" | xargs umount -f; then - findmounts "${mnt}" "${pattern}" | xargs umount -fv || : - fi - -@@ -198,7 +198,7 @@ destroyfs() { - umountfs ${mnt} 1 - if [ ${TMPFS_ALL} -eq 1 ]; then - if [ -d "${mnt}" ]; then -- if ! umount -n "${mnt}" 2>/dev/null; then -+ if ! umount -f "${mnt}" 2>/dev/null; then - umount -f "${mnt}" 2>/dev/null || : - fi - fi Property changes on: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/poudriere-devel/Makefile =================================================================== --- head/ports-mgmt/poudriere-devel/Makefile (revision 435580) +++ head/ports-mgmt/poudriere-devel/Makefile (revision 435581) @@ -1,44 +1,57 @@ # $FreeBSD$ PORTNAME= poudriere -DISTVERSION= 3.1.99.20170221 -PORTREVISION= 1 +DISTVERSION= 3.1.99.20170306 +PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH PKGNAMESUFFIX= -devel MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system LICENSE= BSD2CLAUSE CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.0-1822-ge8f0d3e +GH_TAGNAME= 3.0-1957-gb3d3e0c2 #DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME} 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 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: head/ports-mgmt/poudriere-devel/distinfo =================================================================== --- head/ports-mgmt/poudriere-devel/distinfo (revision 435580) +++ head/ports-mgmt/poudriere-devel/distinfo (revision 435581) @@ -1,3 +1,3 @@ -TIMESTAMP = 1487697127 -SHA256 (freebsd-poudriere-3.1.99.20170221-3.0-1822-ge8f0d3e_GH0.tar.gz) = 6f2702bd7f4f753c40a43df6599a46657766d39deda83a2e2df746d1525fb68a -SIZE (freebsd-poudriere-3.1.99.20170221-3.0-1822-ge8f0d3e_GH0.tar.gz) = 2952866 +TIMESTAMP = 1488859216 +SHA256 (freebsd-poudriere-3.1.99.20170306-3.0-1957-gb3d3e0c2_GH0.tar.gz) = f614fea1cb572f290a1606fa18c047ac698004f3879880b37c3c9d0bacf3744b +SIZE (freebsd-poudriere-3.1.99.20170306-3.0-1957-gb3d3e0c2_GH0.tar.gz) = 2968774 Index: head/ports-mgmt/poudriere-devel/pkg-plist =================================================================== --- head/ports-mgmt/poudriere-devel/pkg-plist (revision 435580) +++ head/ports-mgmt/poudriere-devel/pkg-plist (revision 435581) @@ -1,92 +1,96 @@ 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/cachec libexec/poudriere/cached 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%%/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%%/api.sh %%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%%/image.sh -%%DATADIR%%/include/common.sh.dragonfly -%%DATADIR%%/include/common.sh.freebsd %%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%%/include/shared_hash.sh +%%DATADIR%%/include/util.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