From owner-svn-ports-head@freebsd.org Fri Feb 21 04:01:02 2020 Return-Path: Delivered-To: svn-ports-head@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 DBC9624F627; Fri, 21 Feb 2020 04:01:02 +0000 (UTC) (envelope-from kevans@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) server-signature RSA-PSS (4096 bits) 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 48NyRy5Xlhz4p5j; Fri, 21 Feb 2020 04:01:02 +0000 (UTC) (envelope-from kevans@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 B31774DA1; Fri, 21 Feb 2020 04:01:02 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01L412ha047315; Fri, 21 Feb 2020 04:01:02 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01L412M7047314; Fri, 21 Feb 2020 04:01:02 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202002210401.01L412M7047314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 21 Feb 2020 04:01:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526604 - head/www/p5-Gantry X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/www/p5-Gantry X-SVN-Commit-Revision: 526604 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Feb 2020 04:01:02 -0000 Author: kevans Date: Fri Feb 21 04:01:02 2020 New Revision: 526604 URL: https://svnweb.freebsd.org/changeset/ports/526604 Log: www/p5-Gantry: correctly escape $ In make(1), "$$" is the escaped version of "$", rather than the expected "\$". this expression was getting passed through to ${REINPLACE_CMD} as "s,\NV{..." rathern than the expected "s,$ENV{..." -- bug #229925 makes \N an illegal expression, as ordinary characters will be disallowed from being escaped in preparation for future changes to grant some of these escape sequences GNU-extended behavior. PR: 240310 Approved by: koobs (mentor), bapt (mentor) Approved by: portmgr (maintainer timeout: 4 months, blanket: bugfix) MFH: 2020Q1 (blanket: bugfix) Differential Revision: https://reviews.freebsd.org/D23701 Modified: head/www/p5-Gantry/Makefile Modified: head/www/p5-Gantry/Makefile ============================================================================== --- head/www/p5-Gantry/Makefile Fri Feb 21 03:02:21 2020 (r526603) +++ head/www/p5-Gantry/Makefile Fri Feb 21 04:01:02 2020 (r526604) @@ -41,7 +41,7 @@ WWWDIR= ${PREFIX}/www/${PORTNAME:tl} post-patch: ${REINPLACE_CMD} -e 's,/home/httpd/html/gantry,${WWWDIR},g' \ - -e 's,\$ENV{'GANTRY_TEMPLATE_PATH'},${WWWDIR},g' \ + -e 's,$$ENV{'GANTRY_TEMPLATE_PATH'},${WWWDIR},g' \ ${WRKSRC}/Build.PL .include