pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/nagios-plugin-spamd net/nagios-plugin-spamd: Fix s...

branches:  trunk
changeset: 412242:524e898e32d6
user:      gdt <>
date:      Mon Mar 02 17:07:58 2020 +0000

net/nagios-plugin-spamd: Fix spamc embedded path

Upstream has a hard-coded path to spamc which is not correct in the
pkgsrc context.  Previously there was a SUBST block to change this,
but it was changed to an odd directory with a missing /, and it seems
this could never have worked.  Change the SUBST block to result in
looking for spamc in ${PREFIX}/bin/spamc, which is where the pkgsrc
build of spamassassin puts it.

Add comments explaining why there is both this SUBST block (embedded
spamc path) and REPLACE_PERL (interpreter path).

>From Mike Pumford on pkgsrc-users.


 net/nagios-plugin-spamd/Makefile |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r a5e8a5a6d449 -r 524e898e32d6 net/nagios-plugin-spamd/Makefile
--- a/net/nagios-plugin-spamd/Makefile  Mon Mar 02 10:41:43 2020 +0000
+++ b/net/nagios-plugin-spamd/Makefile  Mon Mar 02 17:07:58 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2019/11/04 08:00:25 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2020/03/02 17:07:58 gdt Exp $
 DISTNAME=      check_spamd-1.6.0
 PKGNAME=       nagios-plugin-${DISTNAME:S/check_//1}
 CATEGORIES=    net mail
@@ -22,15 +22,17 @@
 USE_TOOLS+=            perl:run
+# Fix interpreter line in check_spamd script.
 PLUGIN_DIR=            ${PREFIX}/libexec/nagios
+# Fix embedded path to spamc within check_spamd script.
 SUBST_CLASSES+=                        check_spamd
 SUBST_STAGE.check_spamd=       post-configure
 SUBST_FILES.check_spamd=       ${DISTFILES}
 SUBST_MESSAGE.check_spamd=     Fixing path to spamc.
-SUBST_SED.check_spamd=         -e 's|/usr/local/perl/bin/|${PREFIX}/${PERL5_SUB_INSTALLVENDORBIN}|1'
+SUBST_SED.check_spamd=         -e 's|/usr/local/perl/bin/|${PREFIX}/bin/|1'

Home | Main Index | Thread Index | Old Index