Date: Wed, 11 Nov 2020 22:20:36 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554917 - in head/ports-mgmt/poudriere-devel: . files Message-ID: <202011112220.0ABMKaDI056522@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Nov 11 22:20:36 2020 New Revision: 554917 URL: https://svnweb.freebsd.org/changeset/ports/554917 Log: - Fix jail creation for 12.2+ seeing sys/param.h error. MFH: 2020Q4 Added: head/ports-mgmt/poudriere-devel/files/ head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh (contents, props changed) Modified: head/ports-mgmt/poudriere-devel/Makefile Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Wed Nov 11 22:20:11 2020 (r554916) +++ head/ports-mgmt/poudriere-devel/Makefile Wed Nov 11 22:20:36 2020 (r554917) @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.3.99.20200326 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -52,11 +52,9 @@ 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.* + ${WRKSRC}/src/bin/poudriere post-install: ${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \ Added: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh Wed Nov 11 22:20:36 2020 (r554917) @@ -0,0 +1,11 @@ +--- 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 `grep "^REVISION=\|^BRANCH=" ${SRC_BASE}/sys/conf/newvers.sh ` + RELEASE=${REVISION}-${BRANCH} + else + RELEASE=$(jget ${JAILNAME} version)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011112220.0ABMKaDI056522>