Index: head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 =================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 (revision 507273) +++ head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 (nonexistent) @@ -1,17 +0,0 @@ -diff --git src/share/poudriere/image.sh src/share/poudriere/image.sh -index 5a0f2e2b..e34dc063 100644 ---- src/share/poudriere/image.sh -+++ src/share/poudriere/image.sh -@@ -411,10 +411,12 @@ if [ -n "${PACKAGELIST}" ]; then - FreeBSD: { enabled: false } - local: { url: file:///tmp/packages } - EOF -+ mount -t devfs devfs ${WRKDIR}/world/dev - convert_package_list "${PACKAGELIST}" | \ - xargs chroot "${WRKDIR}/world" env \ - REPOS_DIR=/tmp ASSUME_ALWAYS_YES=yes \ - pkg install -+ umount ${WRKDIR}/world/dev - else - cat > "${WRKDIR}/world/tmp/repo.conf" <<-EOF - FreeBSD: { enabled: false } Property changes on: head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 ___________________________________________________________________ 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 507273) +++ head/ports-mgmt/poudriere-devel/Makefile (revision 507274) @@ -1,75 +1,75 @@ # $FreeBSD$ PORTNAME= poudriere -DISTVERSION= 3.3.99.20190311 -PORTREVISION= 1 +DISTVERSION= 3.3.99.20190724 +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.3.0-62-g5abf90c67 +GH_TAGNAME= 3.3.0-90-gd6f021339 #DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME} GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d OPTIONS_DEFINE= BASH CERTS DIALOG4PORTS EXAMPLES QEMU ZSH OPTIONS_DEFAULT=BASH CERTS DIALOG4PORTS ZSH OPTIONS_SUB= yes CERTS_DESC= Install checksum and SSL certificates for jail creation CERTS_RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss CERTS_RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests DIALOG4PORTS_DESC= Install dialog4ports for options command DIALOG4PORTS_RUN_DEPENDS= dialog4ports>0:ports-mgmt/dialog4ports QEMU_DESC= Add qemu-user-static 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-patch: ${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere ${REINPLACE_CMD} \ -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \ ${WRKSRC}/poudriere ${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.* post-install: ${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \ ${STAGEDIR}${DATADIR}/MANIFESTS post-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ ${INSTALL_DATA} ${WRKSRC}/completions/bash/poudriere \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ post-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ .include Index: head/ports-mgmt/poudriere-devel/distinfo =================================================================== --- head/ports-mgmt/poudriere-devel/distinfo (revision 507273) +++ head/ports-mgmt/poudriere-devel/distinfo (revision 507274) @@ -1,3 +1,3 @@ -TIMESTAMP = 1552335136 -SHA256 (freebsd-poudriere-3.3.99.20190311-3.3.0-62-g5abf90c67_GH0.tar.gz) = c1b9f97bbaf6cf1f90510bc1d7fe91721ba7b929fae88c1b006cd20ea1fd1e97 -SIZE (freebsd-poudriere-3.3.99.20190311-3.3.0-62-g5abf90c67_GH0.tar.gz) = 4381180 +TIMESTAMP = 1563985147 +SHA256 (freebsd-poudriere-3.3.99.20190724-3.3.0-90-gd6f021339_GH0.tar.gz) = e6fc0c303e7020bba732c6ea16bd098ba2b9f92f5d49a82e6bc3c8556f24fa60 +SIZE (freebsd-poudriere-3.3.99.20190724-3.3.0-90-gd6f021339_GH0.tar.gz) = 4397614 Index: head/ports-mgmt/poudriere-devel/pkg-plist =================================================================== --- head/ports-mgmt/poudriere-devel/pkg-plist (revision 507273) +++ head/ports-mgmt/poudriere-devel/pkg-plist (revision 507274) @@ -1,112 +1,112 @@ bin/poudriere @sample etc/poudriere.conf.sample %%ETCDIR%%/hooks/bulk.sh.sample %%ETCDIR%%/hooks/pkgbuild.sh.sample -@sample etc/poudriered.conf.sample +@sample(0,0,0) etc/poudriered.conf.sample etc/rc.d/poudriered -libexec/poudriere/cachec +@comment 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 man/man8/poudriere.8.gz man/man8/poudriere-bulk.8.gz man/man8/poudriere-distclean.8.gz man/man8/poudriere-image.8.gz man/man8/poudriere-jail.8.gz man/man8/poudriere-logclean.8.gz man/man8/poudriere-options.8.gz man/man8/poudriere-pkgclean.8.gz man/man8/poudriere-ports.8.gz man/man8/poudriere-queue.8.gz man/man8/poudriere-status.8.gz man/man8/poudriere-testport.8.gz man/man8/poudriere-version.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/parse_MOVED.awk %%DATADIR%%/awk/processonelog2.awk %%DATADIR%%/awk/siginfo_buildtime.awk %%DATADIR%%/awk/unique_pkgnames_from_flavored_origins.awk %%DATADIR%%/api.sh %%DATADIR%%/bulk.sh %%DATADIR%%/common.sh %%DATADIR%%/daemon.sh %%DATADIR%%/distclean.sh %%DATADIR%%/foreachport.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/cache.sh %%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%%/logclean.sh %%DATADIR%%/options.sh %%DATADIR%%/pkgclean.sh %%DATADIR%%/ports.sh %%DATADIR%%/processonelog.sh %%DATADIR%%/queue.sh %%DATADIR%%/status.sh %%DATADIR%%/testport.sh %%BASH%%share/bash-completion/completions/poudriere %%ZSH%%share/zsh/site-functions/_poudriere