From nobody Mon Oct 31 14:01:03 2022 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 4N1FDc0Vtcz4gJ39; Mon, 31 Oct 2022 14:01:04 +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 4N1FDc04tgz3LnP; Mon, 31 Oct 2022 14:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667224864; 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=zdG5qQMCNiY0Z655+zKz7ECn3BK4Y7R5C2uyJQmnUXY=; b=DFtKrjjsefWXk71zhlqIxQd/6r6NceOtyZ7d9+fhf0KNFRVtOIhwxg7k90/7NLvdLBy4Rq rmLTQpPWDtuxbo+RbNiWmCOGDHv8yk2j/8gjYcYu5GVk+5+Lv16auyyKw0N2A/SY0N2Yqf WlB7yPa1PGwCcgK0sCnyFM2Z7lr7DfESbhTsD/W/OZDGHKlg83KQvo6ROkpATncqx9MPE1 mkZHkH84lC1jnX96QGEPox2lXafCADSmC2190Fut9gDUG06JztAD7qrYEvPZZ0wR6t/ZII rEelfgZb10y+lPtaOJhdz0R36lcHx+GiA+W3BVPkzLfclGHs8e25tFYAfRBKcg== 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 4N1FDb6GTHzdwF; Mon, 31 Oct 2022 14:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29VE13TH029326; Mon, 31 Oct 2022 14:01:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29VE13OQ029325; Mon, 31 Oct 2022 14:01:03 GMT (envelope-from git) Date: Mon, 31 Oct 2022 14:01:03 GMT Message-Id: <202210311401.29VE13OQ029325@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 84b31e6165a2 - main - devel/valgrind{,-devel}: Use option helpers; pet port{clippy,fmt} 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: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84b31e6165a2945a3391e00cdb3e5f15f65c8a6d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667224864; 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=zdG5qQMCNiY0Z655+zKz7ECn3BK4Y7R5C2uyJQmnUXY=; b=S1Jdvf7qidTORU9zmVcRpd3tvc50sy8PeNfI+b5yeEsmoKhEjBqTSGJ0K5CD7Dv+FgtoBN Bhyrq4JFZpc4QVOA+zJUofH44J/YSDG9CB0ZiXZymE75G/4qdgKl0Uwzwgm39dOgKDJB+7 UzrirPHW05Xe4303diPHNdUlGNcXdmakAt5gfcqyAeWMIys9FG9ydQj3Pq8DcNBsO0gbFt Kr/thh/5bYGNVaGwQD74nxvxgoo6vkkl7WJzP+rGsCJ8nkXIz7FWR1SQkzQEGoW3pTFF4+ qSdIjaOmDX8FE4TKfoxznNIyp02L4YNW7wL0eTFadrHnEo8MERAvThjQKndTvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667224864; a=rsa-sha256; cv=none; b=wPesFP5UFxa9utPvBFXD6P5JXJvNOv5n8CGez9UHOtbpxRF7M7CgptlQgQPAUv7a8jFtpo 68nytvjE1erwZXf/Nq/SLU2Jym5nSQW9NwISeUi8/4vyqMbn/OxKOJrQRuzQ/W2We7dROb WfYdrTRnipf/ZYyicVZfc06sePnbHO8ZqsN6RM9J/Cpprqs4Qr0eBjm/64SZHHwwn5s5Uh D7QdASNYGo452EFWSGgBLBfFzuOPz2dLq2mG2YU+aJxNBSKD/4ZizPwEUZ0IyztAwpt9IQ 9jgtOHEhT02luQsprW6Um2insrHGxbSWzYIHvDZEy/90BverFBuSGix6Z+dB/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=84b31e6165a2945a3391e00cdb3e5f15f65c8a6d commit 84b31e6165a2945a3391e00cdb3e5f15f65c8a6d Author: Joseph Mingrone AuthorDate: 2022-10-28 20:43:25 +0000 Commit: Joseph Mingrone CommitDate: 2022-10-31 13:44:26 +0000 devel/valgrind{,-devel}: Use option helpers; pet port{clippy,fmt} Approved by: pjfloyd@wanadoo.fr (maintainer) Differential Revision: https://reviews.freebsd.org/D37201 --- devel/valgrind-devel/Makefile | 48 ++++++++++++++++++------------------------- devel/valgrind/Makefile | 39 +++++++++++++++-------------------- 2 files changed, 36 insertions(+), 51 deletions(-) diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile index adbe0bf1bb80..306e0b2647c5 100644 --- a/devel/valgrind-devel/Makefile +++ b/devel/valgrind-devel/Makefile @@ -14,23 +14,20 @@ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 -USES= cpe pathfix pkgconfig gmake perl5 shebangfix autoreconf -USE_PERL5= build - -GNU_CONFIGURE= yes -SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in -SSP_UNSAFE= yes -LIB32_PATH?= /usr/lib32/libc.so - +USES= autoreconf cpe gmake pathfix perl5 pkgconfig shebangfix USE_GITHUB= yes GH_ACCOUNT= paulfloyd GH_PROJECT= freebsd_valgrind GH_TAGNAME= 8d64ffab7 - -CONFLICTS= valgrind - +USE_PERL5= build +SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in +GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_PERL=${PERL} +SSP_UNSAFE= yes +LIB32_PATH?= /usr/lib32/libc.so + +CONFLICTS= valgrind PORTDOCS= html OPTIONS_DEFINE= DOCS MANPAGES MPI @@ -39,7 +36,7 @@ OPTIONS_DEFAULT= MANPAGES .if exists(${LIB32_PATH}) OPTIONS_DEFAULT_amd64= 32BIT .endif -OPTIONS_SUB= yes +OPTIONS_SUB= yes 32BIT_DESC= Enable debugging of 32-bit programs (requires lib32) MPI_DESC= Enable build of MPI wrappers @@ -53,33 +50,28 @@ MPI_LIB_DEPENDS= libmpich.so:net/mpich .include .if ${ARCH} == "amd64" -PLIST_SUB+= AMD64="" +PLIST_SUB+= AMD64="" . if !${PORT_OPTIONS:M32BIT} CONFIGURE_ARGS+= --enable-only64bit -PLIST_SUB+= X86="@comment " +PLIST_SUB+= X86="@comment " . else . if !exists(${LIB32_PATH}) -IGNORE=The lib32 distribution was not found. Please install the lib32\ -distribution or run 'make config' and uncheck 32BIT option +IGNORE= please either install the lib32 distribution or unset the 32BIT option . endif -PLIST_SUB+= X86="" +PLIST_SUB+= X86="" . endif .else -PLIST_SUB+= AMD64="@comment " -PLIST_SUB+= X86="" +PLIST_SUB+= AMD64="@comment " \ + X86="" .endif -.if !${PORT_OPTIONS:MDOCS} -post-patch: +post-patch-DOCS-off: @${RM} -r ${WRKSRC}/docs/html -.endif -post-build: -.if ${PORT_OPTIONS:MMANPAGES} - cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages -.endif -.if ${PORT_OPTIONS:MDOCS} +post-build-DOCS-on: cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs -.endif + +post-build-MANPAGES-on: + cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages .include diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile index 12378e711623..eca7126db466 100644 --- a/devel/valgrind/Makefile +++ b/devel/valgrind/Makefile @@ -13,18 +13,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 -USES= cpe pathfix pkgconfig gmake perl5 shebangfix autoreconf tar:bz2 +USES= autoreconf cpe gmake pathfix perl5 pkgconfig shebangfix tar:bz2 USE_PERL5= build - -GNU_CONFIGURE= yes SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in +GNU_CONFIGURE= yes +CONFIGURE_ENV+= ac_cv_path_PERL=${PERL} + SSP_UNSAFE= yes LIB32_PATH?= /usr/lib32/libc.so CONFLICTS= valgrind-devel - -CONFIGURE_ENV+= ac_cv_path_PERL=${PERL} - PORTDOCS= html OPTIONS_DEFINE= DOCS MANPAGES MPI @@ -33,7 +31,7 @@ OPTIONS_DEFAULT= MANPAGES .if exists(${LIB32_PATH}) OPTIONS_DEFAULT_amd64= 32BIT .endif -OPTIONS_SUB= yes +OPTIONS_SUB= yes 32BIT_DESC= Enable debugging of 32-bit programs (requires lib32) MPI_DESC= Enable build of MPI wrappers @@ -47,33 +45,28 @@ MPI_LIB_DEPENDS= libmpich.so:net/mpich .include .if ${ARCH} == "amd64" -PLIST_SUB+= AMD64="" +PLIST_SUB+= AMD64="" . if !${PORT_OPTIONS:M32BIT} CONFIGURE_ARGS+= --enable-only64bit -PLIST_SUB+= X86="@comment " +PLIST_SUB+= X86="@comment " . else . if !exists(${LIB32_PATH}) -IGNORE=The lib32 distribution was not found. Please install the lib32\ -distribution or run 'make config' and uncheck 32BIT option +IGNORE= please either install the lib32 distribution or unset the 32BIT option . endif -PLIST_SUB+= X86="" +PLIST_SUB+= X86="" . endif .else -PLIST_SUB+= AMD64="@comment " -PLIST_SUB+= X86="" +PLIST_SUB+= AMD64="@comment " \ + X86="" .endif -.if !${PORT_OPTIONS:MDOCS} -post-patch: +post-patch-DOCS-off: @${RM} -r ${WRKSRC}/docs/html -.endif -post-build: -.if ${PORT_OPTIONS:MMANPAGES} - cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages -.endif -.if ${PORT_OPTIONS:MDOCS} +post-build-DOCS-on: cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs -.endif + +post-build-MANPAGES-on: + cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages .include