Received: by mail.netbsd.org (Postfix, from userid 605) id 4978384DE8; Mon, 2 Mar 2020 17:07:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C41DD84DD9 for ; Mon, 2 Mar 2020 17:07:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WZwssI7ASx0a for ; Mon, 2 Mar 2020 17:07:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4B78D84DCD for ; Mon, 2 Mar 2020 17:07:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3F6DBFBF4; Mon, 2 Mar 2020 17:07:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158316887838220" MIME-Version: 1.0 Date: Mon, 2 Mar 2020 17:07:58 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/net/nagios-plugin-spamd To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20200302170758.3F6DBFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158316887838220 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_158316887838220 Content-Disposition: inline Content-Length: 1260 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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} --_----------=_158316887838220--