From nobody Sat Jul 26 08:39:22 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bpypN0kCTz63FXQ; Sat, 26 Jul 2025 08:39:24 +0000 (UTC) (envelope-from git@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpypM1tHdz3ymk; Sat, 26 Jul 2025 08:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753519163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6lxiBQgL63AxqUpDnffis29/Agjvx95iJaSuA9skPk=; b=U1KV/5cMr9t1I9ZL8fsCPIoaX0rA21OKKxvh58j3TjVnd2Esb7e8L2L3GRiY8Lpf1ZHEAs 3sSnx3BiPz+8ovwKOCeCXlfJecPTr5m10ajfxoBAUBFZX3ntyL6Fw00pINKigTl4EjGCar DA87H6KkUHtIitiNbOdeA4MlF21sSoSkK5Ass1UWcCHPJnDcJUdedkFZbJLY+6dxuDYvtY aPUIvzMcUtN2kqZBEire05oZfzWmcw+EhKZEm2v3REQgI4JtvurrNGylHkze75ovZa+HGN oEs9AedvDUERAHGDTpGQBFWyPTTAPaT/CeCyY6vGffiiOrVhiMRuNZIHJbxDpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753519163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6lxiBQgL63AxqUpDnffis29/Agjvx95iJaSuA9skPk=; b=HT3ESeL9MmpdzZ0mn6yhOg5cRO286xY9KLKFMaHxxCZgdLDWdrOPw5mCiDvbpq6N9hKLRz zTv0Ws5sqQJWCH+1dA5Uq8kgLkB/2mBEl1QWhJOL/qqrsDn4TFu7Dt75oDGVezS006iD5x vDmj4PbodEO8cFZIWFaKsP4HC64YH/nrQStd+aDWy7JG6Ka7oZ+8+c8+0JriSlVws0BNSf irCSljmzDtOLdR0mkoovMiV7Y3kTYs9Z/bHt/APRDU6oOfhZSkoBfQ4pcVXas8xD5Xx8WA il9Ju6lH7utQPfDRNWkmLBOH7CcZgRwwjiNVH2OaQ330OKcSVgL2auZv1Xv94A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753519163; a=rsa-sha256; cv=none; b=pBg8/uJU8a37rPSjHrAIo+dRYLz4tJyFx0EWfco/JYAf1JrVs+UlaEKo/GHR00DBqNlAqR DrlDoTEZzl2vVAXJx+fBQadteBo31eW5Ewdv5MlYZlmzkKUBmba9CedJJ9cTe+XIsm7sGp vndx29iwA6hfStKGNRPUf30HxyZF5eq9slUpOW/x5sT72xCnQjAj5oezGhYFgDSg83ECQr 9/9t4lFFnN0DAIHWx9gOBxsBDzFLsM/CdqaUGr6NKIej03SI7s4NHLueJtfHnKI8uYD7BP 0zC6av3y08G5O9iVj80konsq6MsbJmQYLC7xFUf68ftahVtsqWbjBnuAUKjPNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bpypM0VRxz79V; Sat, 26 Jul 2025 08:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56Q8dMQm006630; Sat, 26 Jul 2025 08:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56Q8dM1N006627; Sat, 26 Jul 2025 08:39:22 GMT (envelope-from git) Date: Sat, 26 Jul 2025 08:39:22 GMT Message-Id: <202507260839.56Q8dM1N006627@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 071398600dc2 - main - p5-*: fix PM_FILTER semantic changes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 071398600dc2c4ddfe0f77ad3691c59eb1711ad6 Auto-Submitted: auto-generated The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=071398600dc2c4ddfe0f77ad3691c59eb1711ad6 commit 071398600dc2c4ddfe0f77ad3691c59eb1711ad6 Author: Mathieu Arnold AuthorDate: 2025-07-13 09:14:11 +0000 Commit: Mathieu Arnold CommitDate: 2025-07-26 08:36:46 +0000 p5-*: fix PM_FILTER semantic changes PR: 288020 --- databases/p5-POE-Component-RRDTool/Makefile | 8 +++++++- .../files/extrapatch-Makefile.PL | 14 ++++++++++++++ print/p5-PDF-Template/Makefile | 8 +++++++- print/p5-PDF-Template/files/extrapatch-Makefile.PL | 15 +++++++++++++++ sysutils/p5-BSD-Sysctl/Makefile | 8 +++++++- sysutils/p5-BSD-Sysctl/files/extrapatch-Makefile.PL | 17 +++++++++++++++++ 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile index 907adc1166d8..e3b22a35fea8 100644 --- a/databases/p5-POE-Component-RRDTool/Makefile +++ b/databases/p5-POE-Component-RRDTool/Makefile @@ -24,4 +24,10 @@ CONFIGURE_ARGS= +.include + +.if ${PERL_LEVEL} >= 504200 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Makefile.PL +.endif + +.include diff --git a/databases/p5-POE-Component-RRDTool/files/extrapatch-Makefile.PL b/databases/p5-POE-Component-RRDTool/files/extrapatch-Makefile.PL new file mode 100644 index 000000000000..f980543c8932 --- /dev/null +++ b/databases/p5-POE-Component-RRDTool/files/extrapatch-Makefile.PL @@ -0,0 +1,14 @@ +fix sh: Syntax error: Unterminated quoted string + Filter command '"sed" "-e" "s\"' failed + +--- Makefile.PL.orig 2025-07-13 08:56:55 UTC ++++ Makefile.PL +@@ -21,7 +21,7 @@ WriteMakefile( + 'PREREQ_PM' => { + 'POE' => '0.22', + }, +- PM_FILTER => "sed -e s\\#__DEFAULT_RRDTOOL__\\#${DEFAULT_RRDTOOL}\\#g -e s\\#__RRDTOOL_VERSION__\\#${RRDTOOL_VERSION}\\#g", ++ PM_FILTER => "sed -e s=__DEFAULT_RRDTOOL__=${DEFAULT_RRDTOOL}=g -e s=__RRDTOOL_VERSION__=${RRDTOOL_VERSION}=g", + (($] ge '5.005') ? + ( 'AUTHOR' => 'Todd Caine ', + 'ABSTRACT' => 'POE interface to Tobias Oetiker\'s RRDTool', diff --git a/print/p5-PDF-Template/Makefile b/print/p5-PDF-Template/Makefile index 25bc08939eba..b96dd7e452b8 100644 --- a/print/p5-PDF-Template/Makefile +++ b/print/p5-PDF-Template/Makefile @@ -16,4 +16,10 @@ RUN_DEPENDS= pdflib-perl>=0:print/pdflib-perl \ USES= perl5 USE_PERL5= configure -.include +.include + +.if ${PERL_LEVEL} >= 504200 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Makefile.PL +.endif + +.include diff --git a/print/p5-PDF-Template/files/extrapatch-Makefile.PL b/print/p5-PDF-Template/files/extrapatch-Makefile.PL new file mode 100644 index 000000000000..88447806c06a --- /dev/null +++ b/print/p5-PDF-Template/files/extrapatch-Makefile.PL @@ -0,0 +1,15 @@ +fix sh: Syntax error: Unterminated quoted string + +--- Makefile.PL.orig 2025-07-13 09:16:55 UTC ++++ Makefile.PL +@@ -28,8 +28,8 @@ my $pm_filter = $use_unicode + } + + my $pm_filter = $use_unicode +- ? q{perl -pi -e "s!UNI_YES ! !g;s!UNI_NO !\\#!g"} +- : q{perl -pi -e "s!UNI_NO ! !g;s!UNI_YES !\\#!g"}; ++ ? q{sed -e "s/UNI_YES//g;s/UNI_NO.*//g"} ++ : q{sed -e "s/UNI_NO//g;s/UNI_YES.*//g"}; + + WriteMakefile( + NAME => 'PDF::Template', diff --git a/sysutils/p5-BSD-Sysctl/Makefile b/sysutils/p5-BSD-Sysctl/Makefile index 18bb5331a4ca..72915e00526f 100644 --- a/sysutils/p5-BSD-Sysctl/Makefile +++ b/sysutils/p5-BSD-Sysctl/Makefile @@ -20,4 +20,10 @@ GH_ACCOUNT= glebius pre-install: ${STRIP_CMD} ${WRKSRC}/blib/arch/auto/BSD/Sysctl/Sysctl.so -.include +.include + +.if ${PERL_LEVEL} >= 504200 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Makefile.PL +.endif + +.include diff --git a/sysutils/p5-BSD-Sysctl/files/extrapatch-Makefile.PL b/sysutils/p5-BSD-Sysctl/files/extrapatch-Makefile.PL new file mode 100644 index 000000000000..d1adb4f11a13 --- /dev/null +++ b/sysutils/p5-BSD-Sysctl/files/extrapatch-Makefile.PL @@ -0,0 +1,17 @@ +--- Makefile.PL.orig 2025-07-26 06:21:52 UTC ++++ Makefile.PL +@@ -51,13 +51,7 @@ WriteMakefile( + PREREQ_PM => { + 'XSLoader' => 0 + }, +- PM_FILTER => 'perl -pe "if (/^\#include (.+)$$/) { \ +- open FILE, \\$$1 or \ +- die \"open \\$$1\"; \ +- while () { print; }; \ +- close FILE; \ +- next; \ +- };"', ++ PM_FILTER => q{perl -pe 'if (/^#include (.+)$$/) { open FILE, \\$$1 or die; while () { print; }; close FILE; next; };'}, + clean => { + FILES => 'bsd-sysctl.h bsd-sysctl.ph', + },