From nobody Tue Jul 23 13:06:36 2024 X-Original-To: dev-commits-ports-all@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 4WSy8Y0cfjz5Rvt9; Tue, 23 Jul 2024 13:06:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSy8X5Z98z4H2F; Tue, 23 Jul 2024 13:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721739996; 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=1lcSfaHZ9jBA/IgpL2Dz5QmQEn0DmBOO3Ld3OwFd9Rs=; b=V86uGWeZGKXXevQGPEkscgpq+kjdmSvtiUUBZUV/81qwyaHvHaYUs1Uq+hHuWEPbgo1HoT IyMzSMR5ymmjv2+KzopmPyj5wQ5ij9u80IyVEP2wZMpnvV35DYP8WF24JyqgEmWxxvkNsO peO50UmBfwSP28RFB4XMCHtwYJk9ZjPOe0/g+tKNH9WEUHrYgUXOJOv6Cd4m7cCwKWUZvZ C5GxiSVUFIDeKN1eJkCfjZ1BlhQUKXSU/HiRatvBJRbVFuxARlVUaxxcVk64ajzFwIeQNh g/6vucdcwsP+Jz+pBmK1KZQxqYuu0IcXvNHdypcOtwmGnwxVC9TNUXP9GUi+kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721739996; a=rsa-sha256; cv=none; b=Er6/i5qowf8WfO4g5nHatBL1IiuY020TzcUHA4BPFSCNrQqSAySOXfGX1m4fD0Z2dA0wdN y9zEPQi5cHS3mD/TvGqUW/fmnuKo42Vduwbr97VdG9RxPnKvM7kTPrld/ZCOK0B37Jt+gx TVs5hMTSqIk0jJgCCbitHxcgNNHpK2xSxF4DBU+m70MxwHi2v8DjYQpRo0UQTeaSsptl79 j7R3cnuXFA+U08lECUA7wwBC3NsWlgvlCv6iElzz3G3y9KNsOvlmpKqgyGnBLrAX8loQIK yU2SIlQdSeBQNfHZ3FlS7a02enX4fAfVvsUFWk4OKiXfT4DyOlCEEtNXAhj8Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721739996; 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=1lcSfaHZ9jBA/IgpL2Dz5QmQEn0DmBOO3Ld3OwFd9Rs=; b=O2e/3tuNiF8U1k9bNQrrHtn47hpNbYg1UVKIjAM0qiZXt5pkoUjpE3jh5XhSAsjKcdaaSB jcktWfn5P+GR5cgXww6ZsVVHEhO3VuWF6OmJKLSBnmtxtSCBRZs8gDM1S30r24k8DUnRTh V+dbTfVhitTlnflYnYNvNawPBRaEiwZk6eFOKsRUZzjzSxM3cNerI1Wc155S3NYrGd57Fm Nw9MwSh34qWV4vpX3VcwH6jX4lOe4rOa7EWMIC7IKGbn7hpObCashpVsAy+3kji4GC27t3 rtJ68FIrIQUTTjOy8KTBnKsv7iKKwgXO1BuH2eQcXTTAUov1FjRTINb321Mjug== 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 4WSy8X542LzVNY; Tue, 23 Jul 2024 13:06:36 +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 46ND6a0m086716; Tue, 23 Jul 2024 13:06:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46ND6aZo086713; Tue, 23 Jul 2024 13:06:36 GMT (envelope-from git) Date: Tue, 23 Jul 2024 13:06:36 GMT Message-Id: <202407231306.46ND6aZo086713@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 39f9b2e1ba93 - main - devel/pmd: use ETCDIR List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39f9b2e1ba93281c5ca5a1d378be5a8a1279cdf1 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=39f9b2e1ba93281c5ca5a1d378be5a8a1279cdf1 commit 39f9b2e1ba93281c5ca5a1d378be5a8a1279cdf1 Author: Vladimir Druzenko AuthorDate: 2024-07-23 13:03:35 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-23 13:04:00 +0000 devel/pmd: use ETCDIR PR: 280379 --- devel/pmd/Makefile | 6 +++--- devel/pmd/pkg-plist | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile index 1c231d0a3f37..b2e0b295a882 100644 --- a/devel/pmd/Makefile +++ b/devel/pmd/Makefile @@ -20,16 +20,16 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_ARCH= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-bin-${DISTVERSION} -PLIST_SUB+= PORTVERSION=${DISTVERSION} +PLIST_SUB+= ETCDIR=${ETCDIR} PORTVERSION=${DISTVERSION} post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/bin/${PORTNAME} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} + ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/conf/simplelogger.properties \ - ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/simplelogger.properties.sample + ${STAGEDIR}${ETCDIR}/simplelogger.properties.sample cd ${WRKSRC} && ${COPYTREE_SHARE} sbom ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR} diff --git a/devel/pmd/pkg-plist b/devel/pmd/pkg-plist index 85ea13ce75ff..e61a7953712f 100644 --- a/devel/pmd/pkg-plist +++ b/devel/pmd/pkg-plist @@ -1,5 +1,5 @@ bin/pmd -@sample etc/pmd/simplelogger.properties.sample +@sample %%ETCDIR%%/simplelogger.properties.sample %%DATADIR%%/Saxon-HE-12.4.jar %%DATADIR%%/antlr4-runtime-4.9.3.jar %%DATADIR%%/apex-ls_2.13-5.2.0.jar