CVS commit: pkgsrc/net/nagios-plugin-spamd

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Mar  2 17:07:58 UTC 2020

Modified Files:
        pkgsrc/net/nagios-plugin-spamd: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/nagios-plugin-spamd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nagios-plugin-spamd/Makefile
diff -u pkgsrc/net/nagios-plugin-spamd/Makefile:1.16 pkgsrc/net/nagios-plugin-spamd/Makefile:1.17
--- pkgsrc/net/nagios-plugin-spamd/Makefile:1.16        Mon Nov  4 08:00:25 2019
+++ pkgsrc/net/nagios-plugin-spamd/Makefile     Mon Mar  2 17:07:58 2020
@@ -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}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net mail
 MASTER_SITES=  # http://exchange.nagios.org/components/com_mtree/
 EXTRACT_SUFX=  .pl
@@ -22,15 +22,17 @@ NO_BUILD=           yes
 
 USE_TOOLS+=            perl:run
 
+# Fix interpreter line in check_spamd script.
 REPLACE_PERL+=         ${DISTFILES}
 
 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'
 
 INSTALLATION_DIRS+=    ${PLUGIN_DIR}