From owner-svn-ports-all@freebsd.org Fri Nov 13 19:12:33 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6FC7D2EB240; Fri, 13 Nov 2020 19:12:33 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CXp4x2nN8z4mSV; Fri, 13 Nov 2020 19:12:33 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 527AB1D527; Fri, 13 Nov 2020 19:12:33 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ADJCXf2045059; Fri, 13 Nov 2020 19:12:33 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ADJCWoH045057; Fri, 13 Nov 2020 19:12:32 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <202011131912.0ADJCWoH045057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 13 Nov 2020 19:12:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555042 - in head/ports-mgmt/poudriere-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/ports-mgmt/poudriere-devel: . files X-SVN-Commit-Revision: 555042 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2020 19:12:33 -0000 Author: bdrewery Date: Fri Nov 13 19:12:32 2020 New Revision: 555042 URL: https://svnweb.freebsd.org/changeset/ports/555042 Log: Fix bsdgrep support for jail version Modified: head/ports-mgmt/poudriere-devel/Makefile head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Fri Nov 13 19:12:09 2020 (r555041) +++ head/ports-mgmt/poudriere-devel/Makefile Fri Nov 13 19:12:32 2020 (r555042) @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.3.99.20200326 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Modified: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh ============================================================================== --- head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh Fri Nov 13 19:12:09 2020 (r555041) +++ head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_jail.sh Fri Nov 13 19:12:32 2020 (r555042) @@ -5,7 +5,7 @@ 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 ` ++ eval `egrep "^REVISION=|^BRANCH=" ${SRC_BASE}/sys/conf/newvers.sh ` RELEASE=${REVISION}-${BRANCH} else RELEASE=$(jget ${JAILNAME} version)