From nobody Wed Jul 24 12:33:26 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 4WTYMp2HVdz5RtDT;
Wed, 24 Jul 2024 12:33:26 +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 4WTYMp1qfwz4kV5;
Wed, 24 Jul 2024 12:33:26 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1721824406;
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=6vHXCjJyhmqW0cGtYjGstY2DRpyHaVYCY0JdJh33W1c=;
b=TIyfwyoC4VnGIOBUit77u2HOO8PfgBVTCXCtLI3Djpx+GMTe7+/IivXTGz7d1kEOd7gqrD
1XcGb0BxM3AyZvAnJOfcu1Z7NgGRDEm8gatEVlgP8/l4y1wQ03o2wHTVoyEaCRZTCICdcI
4ioJDCZ+/sj6fVJ+dt6ekgs/xGyZJXCbuWpKlaCwmdrX7m1HPuGmJg7x613Yhl4/GxQAzF
JkY/9GEiuwJEcfxEp9XqKNjisoRil+7SaKimi7pdztEJJtTVXfcH5FzJOFVn3KT9Yo/p3L
sIapGXvSncB5jIfZvPTAjzTUjRlnTAfLeCL3QvfZayyURwwHqKbcOgLZ4lz1SQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721824406; a=rsa-sha256; cv=none;
b=VpI95/4s3OzJtveJ66sVu0WNIIi2ao3dFTF9DNCB6e1kTRydn4B21xtAyHKfuUk883UXT5
7nnbIJ+rO6gM9t77GlYJo6sE7VoJoe9/EeEhDKNY07TU46oF5qxi3VOOLH37UpDeKddr9h
DbDkN4s9BKJ6SITx3tcPxtbcmQbse5elSoSHR1xG12xVLgWqk9SeGjttJgvG7mOuMdojLi
pNYWVH94FGnv0yL2SQjiRMvx+M8QaB8w3cLxjFVe8dl9g2Duvp5Aijq7fwyWGL0ILzv1nP
uATAEEbKhNmFlNhE+nvLkftdb1JfjKfmq3GraSftjS8rZLmm3F6Z7ugiMjOQmQ==
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=1721824406;
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=6vHXCjJyhmqW0cGtYjGstY2DRpyHaVYCY0JdJh33W1c=;
b=URtj+kHCXapvCllzWoBh/A1x1fYsiPOu1oRyT5N5TUWbIBmok0Zxj9b7yxy1Qv+NnotoGR
r+wVEzzyDxxA61TnXPWcSoJ7N2BtK/eGVjXz8bIrms6/yw9135Zd5tTJWaJ7/TVJOz49bW
aC7WTtz0P5NQIqyZTvwA1AggZStUh0kMFDrgKO750tBlU+QOJWPOxpNeiSQ1k/rwqRGL8K
UxkqZMYDPcRpjDksxcoUvMWsVBgaI8K48Etlq489SYZkLFdw5d+7cjXSQQec1E72BP391A
91jt73FSCwK9XRr9wLnDX8yi+IDz5bVqbWTxlgk/wtRatvCbTrxnrMO5CXY/Ag==
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 4WTYMp1R1Gz1BMC;
Wed, 24 Jul 2024 12:33:26 +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 46OCXQDB082057;
Wed, 24 Jul 2024 12:33:26 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46OCXQOf082054;
Wed, 24 Jul 2024 12:33:26 GMT
(envelope-from git)
Date: Wed, 24 Jul 2024 12:33:26 GMT
Message-Id: <202407241233.46OCXQOf082054@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Vladimir Druzenko <vvd@FreeBSD.org>
Subject: git: eb893893fa18 - main - devel/pmd: one more use ETCDIR
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
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: eb893893fa1836b271c539b428cca8575622de9a
Auto-Submitted: auto-generated
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=eb893893fa1836b271c539b428cca8575622de9a
commit eb893893fa1836b271c539b428cca8575622de9a
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-07-24 12:32:25 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-07-24 12:32:25 +0000
devel/pmd: one more use ETCDIR
PR: 280379
---
devel/pmd/Makefile | 3 ++-
devel/pmd/files/patch-bin_pmd | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index b2e0b295a882..a39e24085b93 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -23,7 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-bin-${DISTVERSION}
PLIST_SUB+= ETCDIR=${ETCDIR} PORTVERSION=${DISTVERSION}
post-patch:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/bin/${PORTNAME}
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%ETCDIR%%|${ETCDIR}|g' \
+ ${WRKSRC}/bin/${PORTNAME}
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/devel/pmd/files/patch-bin_pmd b/devel/pmd/files/patch-bin_pmd
index 2702c407262e..8106a67775e0 100644
--- a/devel/pmd/files/patch-bin_pmd
+++ b/devel/pmd/files/patch-bin_pmd
@@ -1,7 +1,7 @@
--- bin/pmd.orig 2024-07-21 02:20:21 UTC
+++ bin/pmd
@@ -1,4 +1,4 @@
--#!/usr/local/bin/bash
+-#!/bin/bash
+#!/bin/sh
is_cygwin() {
@@ -40,7 +40,7 @@
- pushd "${script_dir}/../conf" >/dev/null
- readonly CONF_DIR=$(pwd -P)
- popd >/dev/null
-+ readonly CONF_DIR=%%PREFIX%%/etc/pmd
++ readonly CONF_DIR=%%ETCDIR%%
fi
}