- Update to 3.3.0-540-g9f9007eb8

* ports: move away from portsnap as default
* zfs rollback: Try harder to rollback snapshots.
* bulk -n: Don't remove .building dir unless this ran made it
* common.sh: use new URL for base system
* jail: Fix git checkout during jail update to operate within SRC_BASE.
* image: Add -w (swap size) and -b (swap position)
* image: Support pre and post build scripts
* image: remove unneeded vfs.root.mountfrom that might cause problems
* image: Fix usb and usb+mfs
* image: Add pkgbase support
* image: Fix loader.efi name for arm and arm64
* image: Don't install pmbr and gptboot on !x86
* image: Enable zfs in rc.conf
* testport: Support overlay
* jail: Support PKG_REPO_SIGNING_KEY/KERNCONF for pkgbase
* bulk|testport -i: Mount ports rw
* jail -u: Fix git not running from the src dir on update
* MOVED: Support from overlays
* bulk: Always build repo even if no packages build
* distclean: Don't delete .hidden files.
* bulk: Delete FORBIDDEN packages during incremental check.
* pkgclean: Delete FORBIDDEN packages.
* bulk: Delete corrupted packages like pkgclean does.
* bulk -af: Delete unqueued packages like pkgclean.
* Many test improvements
* Many fixes for builtin helpers
* A lot more random stuff

3 files changed, 7 insertions, 18 deletions

diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index a895459d186a..fe3ed2aa7dde 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-DISTVERSION=	3.3.99.20200326
-PORTREVISION=	2
+DISTVERSION=	3.3.99.20210228
+PORTREVISION=	0
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL=	poudriere-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	3.3.0-257-g153d8f14c
+GH_TAGNAME=	3.3.0-540-g9f9007eb8
 #DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
 
 GNU_CONFIGURE=	yes
@@ -54,7 +54,7 @@ PLIST_SUB+=	RM="@comment "
 post-patch:
 	${REINPLACE_CMD} \
 	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
-	    ${WRKSRC}/src/bin/poudriere
+	    ${WRKSRC}/src/bin/poudriere.in
 
 post-install:
 	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo
index bd132b9ca691..4a616deefa0f 100644
--- a/ports-mgmt/poudriere-devel/distinfo
+++ b/ports-mgmt/poudriere-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585254724
-SHA256 (freebsd-poudriere-3.3.99.20200326-3.3.0-257-g153d8f14c_GH0.tar.gz) = 4517cbba27ed909736610bebfb3775ffd3fa3a06fa9085aaa7a02b8844b042e5
-SIZE (freebsd-poudriere-3.3.99.20200326-3.3.0-257-g153d8f14c_GH0.tar.gz) = 4407670
+TIMESTAMP = 1614574702
+SHA256 (freebsd-poudriere-3.3.99.20210228-3.3.0-540-g9f9007eb8_GH0.tar.gz) = 765ac6abff0dae2aafa220541a90a6f61a56651a1485e4242b6bab3d3f51826a
+SIZE (freebsd-poudriere-3.3.99.20210228-3.3.0-540-g9f9007eb8_GH0.tar.gz) = 4176332
diff --git a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh b/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh
deleted file mode 100644
index 051e2477f300..000000000000
--- a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/share/poudriere/jail.sh.orig	2020-11-11 22:16:56 UTC
-+++ src/share/poudriere/jail.sh
-@@ -174,7 +174,7 @@ update_version() {
- 	local version_extra="$1"
- 
- 	if [ -r "${SRC_BASE}/sys/conf/newvers.sh" ]; then
--		eval `grep "^[RB][A-Z]*=" ${SRC_BASE}/sys/conf/newvers.sh `
-+		eval `egrep "^REVISION=|^BRANCH=" ${SRC_BASE}/sys/conf/newvers.sh `
- 		RELEASE=${REVISION}-${BRANCH}
- 	else
- 		RELEASE=$(jget ${JAILNAME} version)