From nobody Mon Aug 21 21:32:26 2023 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 4RV5Kl0vRKz4rKd8; Mon, 21 Aug 2023 21:32:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RV5Kl0Kh4z3CBc; Mon, 21 Aug 2023 21:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692653547; 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=oTR+IiEAhCovf93dL1c+Zx0iptDajFwZwtqtLmaBnKM=; b=wc27wilowmVf0NQDXMl16paEsJogElOKPTLWMYDnvmlGTwWtMkRc+XiM/Yn4mYg9IEMQAr Il4IMXOWb7PrCcE/0a5hQJo/nrwgKPxDE8TN515ASfbC7QUSK6FVjzJbI5s0b/pHOLm8LA NvUr+iyr+iRMuXkafIa/Z07YyXmNomP6M1o4OOiU/M/S8jBzwRKn+bKzsXDBeHD6EQMUqR UmetmkLTwhhIT7ybU+xnX6hGPDZ8vVmn962CHJgZq4cL6QoDFId5+Y6qg6QHx87+lInXW7 B4GIHBzeivZv6PQ2jLiKPv6DqD7mLm/n1jbdIgpUdlPuK6fZVin0YDPSGvoctA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692653547; 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=oTR+IiEAhCovf93dL1c+Zx0iptDajFwZwtqtLmaBnKM=; b=ozYHtPEGd3l3DBWkP3+zNlvaagwlmzCf228h0g6DcjXwHdltdLLncfrqxUZ9+hxk6vJ28u VrtDVjTi0myEb4gabXm/mUK9zQ5h5R/wJt/vKjIAtxD5DIRgCwcJv0Okp3KnDulYJee7QB VFTyWP1kxQvw8JbLNoCuz7XoQlIu5DBqwDJ7lvp5DarXCTd8VQli9y1A3//eWYh3h/6IOf k4+OUs+mPCz5YgQ2E5pr1RoohbX0uRQ4umbaTndg6EyQYsY3YBqaGwKKN6XQ3Q8e28MMJB FrWj6olvEAEY6LVd8ThKjREoKIFq1jA3uQyurU3TjaGAKoS0N/XJGZjjmffEUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692653547; a=rsa-sha256; cv=none; b=n2d2wMpGioEMZQLW3kr2ltfi+n0c/NtTcroMgnJAaUqYDK2ARGKybs5/TBME3o67LRjkEA mjiDjoBc8A/AF4oEHZjiSss8fXFi3y4H6S6h2JgdsVxLFQ2co9U847m1VnnCmU9gecDEPu OJ3MSFBqMFIyktRGkTguqxtop1LGtBluQ/NskqyslXoicuttkZDsYTOHPPHptieUwHtnz+ 6T+rcJdPgaX7HwvSfkc1kS8rw4pQRn7GNoxBtLKfQ3xjHqgpQHbq4O9vaoE2FLMG9z/TTG mZ8+5NdrOkfWW3nF0taS29HWBsBA0oqyPVwt1vCeenmsWften165RznNUAI2IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RV5Kk6SNHzcjV; Mon, 21 Aug 2023 21:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LLWQ12045822; Mon, 21 Aug 2023 21:32:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LLWQGr045819; Mon, 21 Aug 2023 21:32:26 GMT (envelope-from git) Date: Mon, 21 Aug 2023 21:32:26 GMT Message-Id: <202308212132.37LLWQGr045819@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: b253eb3a1ac0 - main - graphics/netpbm: Unbreak build WITH_PIE 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b253eb3a1ac05342e8f9232e8fe8e92ccc4b24a6 Auto-Submitted: auto-generated The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=b253eb3a1ac05342e8f9232e8fe8e92ccc4b24a6 commit b253eb3a1ac05342e8f9232e8fe8e92ccc4b24a6 Author: Craig Leres AuthorDate: 2023-08-21 21:30:59 +0000 Commit: Craig Leres CommitDate: 2023-08-21 21:30:59 +0000 graphics/netpbm: Unbreak build WITH_PIE While we're here fix portlint nit. Reported by: netchild PR: 268982 --- graphics/netpbm/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 8618dbdb26f3..e28f2b2430b3 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -82,6 +82,12 @@ post-patch: @${REINPLACE_CMD} -e 's|pkg-config|false|g' ${WRKSRC}/GNUmakefile @${REINPLACE_CMD} ${_DISABLE_TESTS:@.test.@-e '/${.test.}/d'@} \ ${WRKSRC}/test/Test-Order +.ifdef WITH_PIE +.for dn in buildtools test + @${REINPLACE_CMD} -e '/^all:/s/^/CFLAGS_FOR_BUILD+=${PIE_CFLAGS}\n/' \ + ${WRKSRC}/${dn}/Makefile +.endfor +.endif post-patch-STATIC-on: @${REINPLACE_CMD} -e 's|$$(LD)|$$(LD) -static|g' \ @@ -122,7 +128,7 @@ NETPBM_SERIES= advanced netpbm-version-check: @REV=`svnlite info ${NETPBM_REPO}/${NETPBM_SERIES}/version.mk | ${SED} -n 's/Last Changed Rev: //p'`; \ - VERSION=`(svnlite cat -r$$REV ${NETPBM_REPO}/${NETPBM_SERIES}/version.mk; \ + VERSION=`(svnlite ${CAT} -r$$REV ${NETPBM_REPO}/${NETPBM_SERIES}/version.mk; \ echo 'all:'; \ echo ' @printf "%02d.%02d.%02d" \'; \ echo ' $${NETPBM_MAJOR_RELEASE} \' ; \