From fd18c8c4eb29d2c8ac9b6ef1fe7e686d9f97bd31 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 20 Nov 2015 14:32:55 +0000
Subject: Directory and file name of spamreport don't agree, so introduce a new
 variable and use that to get the correct installation.

---
 mail/claws-mail-spamreport/Makefile | 5 +++--
 mail/claws-mail/PLIST.plugins       | 4 ++--
 mail/claws-mail/plugins.mk          | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 98e1cab4418..cff5eca0dcf 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2015/10/31 18:54:47 nros Exp $
+# $NetBSD: Makefile,v 1.46 2015/11/20 14:32:55 joerg Exp $
 #
 
-PLUGIN_NAME=    spam_report
+PLUGIN_NAME=		spam_report
+PLUGIN_FILE=		spamreport
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail/PLIST.plugins b/mail/claws-mail/PLIST.plugins
index f9342e759c9..c64d73c709c 100644
--- a/mail/claws-mail/PLIST.plugins
+++ b/mail/claws-mail/PLIST.plugins
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.plugins,v 1.2 2009/06/14 20:45:11 joerg Exp $
-lib/claws-mail/plugins/${PLUGIN_NAME}.la
+@comment $NetBSD: PLIST.plugins,v 1.3 2015/11/20 14:32:55 joerg Exp $
+lib/claws-mail/plugins/${PLUGIN_FILE}.la
diff --git a/mail/claws-mail/plugins.mk b/mail/claws-mail/plugins.mk
index cf72355da64..45eb0a69949 100644
--- a/mail/claws-mail/plugins.mk
+++ b/mail/claws-mail/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.6 2014/04/09 06:35:53 obache Exp $
+# $NetBSD: plugins.mk,v 1.7 2015/11/20 14:32:55 joerg Exp $
 #
 # used by mail/claws-mail-archive/Makefile
 # used by mail/claws-mail-attachwarner/Makefile
@@ -23,6 +23,7 @@
 
 PKGNAME=	claws-mail-${PLUGIN_NAME:S/_/-/}-${CLAWS_VERSION}
 
+PLUGIN_FILE?=	${PLUGIN_NAME}
 CONFIGURE_DIRS=	.
 BUILD_DIRS=	src/plugins/${PLUGIN_NAME}
 INSTALL_DIRS=	src/plugins/${PLUGIN_NAME}
@@ -32,6 +33,6 @@ LIBTOOL_OVERRIDE=	../../../libtool
 #.include "../../mail/claws-mail/options.mk"
 
 PLIST_SRC=	${.CURDIR}/../../mail/claws-mail/PLIST.plugins
-PLIST_SUBST+=	PLUGIN_NAME=${PLUGIN_NAME:Q}
+PLIST_SUBST+=	PLUGIN_FILE=${PLUGIN_FILE:Q}
 
 MESSAGE_SRC+=	${.CURDIR}/../../mail/claws-mail/MESSAGE.plugins
-- 
cgit v1.2.3