Index: head/ports-mgmt/poudriere/Makefile =================================================================== --- head/ports-mgmt/poudriere/Makefile (revision 504084) +++ head/ports-mgmt/poudriere/Makefile (revision 504085) @@ -1,72 +1,72 @@ # $FreeBSD$ PORTNAME= poudriere DISTVERSION= 3.3.2 -PORTREVISION= 0 +PORTREVISION= 1 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= 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/files/patch-image-pkg1.11 =================================================================== --- head/ports-mgmt/poudriere/files/patch-image-pkg1.11 (nonexistent) +++ head/ports-mgmt/poudriere/files/patch-image-pkg1.11 (revision 504085) @@ -0,0 +1,17 @@ +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/files/patch-image-pkg1.11 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/ports-mgmt/poudriere-devel/Makefile =================================================================== --- head/ports-mgmt/poudriere-devel/Makefile (revision 504084) +++ head/ports-mgmt/poudriere-devel/Makefile (revision 504085) @@ -1,75 +1,75 @@ # $FreeBSD$ PORTNAME= poudriere DISTVERSION= 3.3.99.20190311 -PORTREVISION= 0 +PORTREVISION= 1 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 #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/files/patch-image-pkg1.11 =================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 (nonexistent) +++ head/ports-mgmt/poudriere-devel/files/patch-image-pkg1.11 (revision 504085) @@ -0,0 +1,17 @@ +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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property