diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 8bfb4181cd06..ee9c8a2ad0bb 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,93 +1,93 @@ PORTNAME= poudriere -DISTVERSION= 3.4.99.20240419 +DISTVERSION= 3.4.99.20240424 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 WWW= https://github.com/freebsd/poudriere/wiki LICENSE= BSD2CLAUSE CONFLICTS_INSTALL= poudriere USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-1744-g3f33775b09 +GH_TAGNAME= 3.3.0-1748-gd75f4e1dc4 GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d OPTIONS_DEFINE= BASH MANIFESTS PORTCONFIG EXAMPLES QEMU ZSH OPTIONS_DEFAULT=BASH MANIFESTS PORTCONFIG ZSH OPTIONS_SUB= yes MANIFESTS_DESC= Install manifests for jail creation MANIFESTS_RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests PORTCONFIG_DESC= Install portconfig for options command PORTCONFIG_RUN_DEPENDS= portconfig>0:ports-mgmt/portconfig QEMU_DESC= Add qemu-user-static for non-x86 architectures QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static # gmake is not strictly needed but handles test jobs better TEST_DEPENDS= gmake>0:devel/gmake TEST_ENV= MAKE=gmake .if make(test) MAKE_CMD= gmake .endif TEST_TARGET= check TEST_ARGS= -s TEST_ARGS+= ${_MAKE_JOBS} # ccache passthrough helps for building pkg a few hundred times. # ccache not added as a dependency because it is only used if setup # and provided in the env already. # XXX: Passthrough local PKGREPOSITORY dir for fetch support ccache_vars= CCACHE_DIR_NON_ROOT_SAFE CCACHE_GROUP \ CCACHE_GID CCACHE_STATIC_PREFIX CCACHE_TEMPDIR \ CCACHE_DIR CCACHE_NLEVELS .for _cv in ${ccache_vars} . if !empty(${_cv}) TEST_ENV+= ${_cv}=${${_cv}} . endif .endfor .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: ${REINPLACE_CMD} \ -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \ ${WRKSRC}/src/bin/poudriere.in 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 diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index 51c10f74e2e1..bab079fb69da 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713567367 -SHA256 (freebsd-poudriere-3.4.99.20240419-3.3.0-1744-g3f33775b09_GH0.tar.gz) = 8965c4dead0981bd818fdf4328b0e45d6a43c6e8a59d77d2aa78729e083a4223 -SIZE (freebsd-poudriere-3.4.99.20240419-3.3.0-1744-g3f33775b09_GH0.tar.gz) = 5783005 +TIMESTAMP = 1713973208 +SHA256 (freebsd-poudriere-3.4.99.20240424-3.3.0-1748-gd75f4e1dc4_GH0.tar.gz) = 9f1b2f32fa4885819085ed623d91215f63754b9cde8b8da297b8ad0db8756280 +SIZE (freebsd-poudriere-3.4.99.20240424-3.3.0-1748-gd75f4e1dc4_GH0.tar.gz) = 5732259 diff --git a/ports-mgmt/poudriere-devel/files/patch-test_common.sh b/ports-mgmt/poudriere-devel/files/patch-test_common.sh deleted file mode 100644 index bd79c439750f..000000000000 --- a/ports-mgmt/poudriere-devel/files/patch-test_common.sh +++ /dev/null @@ -1,19 +0,0 @@ -commit a94cfcd734a0ac81cf157378b77732a3de6b9463 -Author: Bryan Drewery -Date: Tue Apr 23 06:29:13 2024 -0700 - - tests: Don't run git-log from 'make test' for Poudriere in ports - - This results in a very long lookup that returns nothing - ---- test/common.sh.orig 2024-04-20 03:48:57 UTC -+++ test/common.sh -@@ -550,6 +550,7 @@ msg_debug "getpid: $$" - - msg_debug "getpid: $$" - --if git_get_hash_and_dirty "${abs_top_srcdir}" git_hash git_dirty; then -+if [ -r "${abs_top_srcdir}/.git" ] && -+ git_get_hash_and_dirty "${abs_top_srcdir}" git_hash git_dirty; then - msg "Source git hash: ${git_hash} modified: ${git_dirty}" - fi >&2