Date: Wed, 24 Jul 2024 12:33:26 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: eb893893fa18 - main - devel/pmd: one more use ETCDIR Message-ID: <202407241233.46OCXQOf082054@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407241233.46OCXQOf082054>