From 71250701793959f358429876679233b5e24f88cf Mon Sep 17 00:00:00 2001
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 9 Jul 2014 14:03:33 +0000
Subject: [PATCH] mail/spamass-ixhash: stage, cleanup, assign maintainer

PR:		191710
Submitted by:	michael@ranner.eu
---
 mail/spamass-ixhash/Makefile             | 39 +++++++++---------------
 mail/spamass-ixhash/files/pkg-message.in |  5 ---
 mail/spamass-ixhash/pkg-plist            |  8 +++++
 3 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 mail/spamass-ixhash/files/pkg-message.in
 create mode 100644 mail/spamass-ixhash/pkg-plist

diff --git a/mail/spamass-ixhash/Makefile b/mail/spamass-ixhash/Makefile
index 3e790e21b4e0..19a8e4d669e5 100644
--- a/mail/spamass-ixhash/Makefile
+++ b/mail/spamass-ixhash/Makefile
@@ -3,47 +3,36 @@
 
 PORTNAME=	iXhash
 PORTVERSION=	1.5.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/ixhash/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 PKGNAMEPREFIX=	spamass-
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER= ports@FreeBSD.org
-COMMENT=	The iXhash plugin for SpamAssassin
+MAINTAINER=	michael@ranner.eu
+COMMENT=	Plugin for SpamAssassin supporting iXhash
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	spamc:${PORTSDIR}/mail/spamassassin \
 		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
 		p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS
 
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-SUB_FILES=	pkg-message
+OPTIONS_DEFINE=	DOCS
 NO_BUILD=	yes
-SPAMASS_CONF=	etc/mail/spamassassin
-SPAMASS_FILES=	iXhash.cf iXhash.pm
-INSTALL_DIR=	${PREFIX}/${SPAMASS_CONF}
 
-PORTDOCS=	CHANGELOG LICENSE WHERE_ARE_THE_OTHER_FILES INSTALL README
-PLIST_FILES=	${SPAMASS_CONF}/iXhash.cf.sample ${SPAMASS_CONF}/iXhash.pm
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s,/etc/mail,${LOCALBASE}/etc/mail," \
 		${WRKSRC}/iXhash/iXhash.cf
 
 do-install:
-	@${MKDIR} ${INSTALL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/iXhash/iXhash.cf ${INSTALL_DIR}/iXhash.cf.sample
-	${INSTALL_DATA} ${WRKSRC}/iXhash/iXhash.pm ${INSTALL_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/
-.	for i in ${PORTDOCS}
-		@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
-.	endfor
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail/spamassassin
+	${INSTALL_DATA} ${WRKSRC}/iXhash/iXhash.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/iXhash.cf.sample
+	${INSTALL_DATA} ${WRKSRC}/iXhash/iXhash.pm ${STAGEDIR}${PREFIX}/etc/mail/spamassassin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in CHANGELOG LICENSE WHERE_ARE_THE_OTHER_FILES INSTALL README
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
+.endfor
 
 .include <bsd.port.mk>
diff --git a/mail/spamass-ixhash/files/pkg-message.in b/mail/spamass-ixhash/files/pkg-message.in
deleted file mode 100644
index f70b8d9c40fe..000000000000
--- a/mail/spamass-ixhash/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-*************************************************************************
-
-iXhash is installed in %%PREFIX%%/etc/mail/spamassassin
-
-*************************************************************************
diff --git a/mail/spamass-ixhash/pkg-plist b/mail/spamass-ixhash/pkg-plist
new file mode 100644
index 000000000000..03beaeaad813
--- /dev/null
+++ b/mail/spamass-ixhash/pkg-plist
@@ -0,0 +1,8 @@
+@sample etc/mail/spamassassin/iXhash.cf.sample
+etc/mail/spamassassin/iXhash.pm
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/WHERE_ARE_THE_OTHER_FILES
+%%PORTDOCS%%@dirrm %%DOCSDIR%%