svn commit: r366852 - head/mail/qsheff

[Vanilla I. Shu]

Author: vanilla
Date: Mon Sep  1 09:18:32 2014
New Revision: 366852
URL: http://svnweb.freebsd.org/changeset/ports/366852
QAT: https://qat.redports.org/buildarchive/r366852/

Log:
  1: Stagify.
  2: Fix pkg-plist, bump version.
  3: add DOCS & EXAMPLES to options.

Modified:
  head/mail/qsheff/Makefile
  head/mail/qsheff/pkg-plist

Modified: head/mail/qsheff/Makefile
==============================================================================
--- head/mail/qsheff/Makefile	Mon Sep  1 09:16:02 2014	(r366851)
+++ head/mail/qsheff/Makefile	Mon Sep  1 09:18:32 2014	(r366852)
@@ -3,14 +3,13 @@
 
 PORTNAME=	qsheff-II
 PORTVERSION=	2.1.r3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/qsheff/ \
 		SF/qsheff/qsheff/II-2.1-r3
-
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-r/}
 
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Qmail-queue replacement to filter mail traffic
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
@@ -30,7 +29,7 @@ ETCFILES=	install-wrapper.sh uninstall-w
 
 CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_PREFIX}
 
-OPTIONS_DEFINE=	CLAMAV SPAMTAG VIRUSTAG DISABLELOCAL SYSLOG BACKUP CUSTOMERROR DEBUG
+OPTIONS_DEFINE=	CLAMAV SPAMTAG VIRUSTAG DISABLELOCAL SYSLOG BACKUP CUSTOMERROR DEBUG DOCS EXAMPLES
 OPTIONS_DEFAULT=	CLAMAV
 CLAMAV_DESC=		Integrate with Clam AntiVirus
 SPAMTAG_DESC=		Spam Tagging
@@ -39,8 +38,7 @@ DISABLELOCAL_DESC=	Disable Filters For L
 BACKUP_DESC=		Logging Incoming/Outgoing Mail
 CUSTOMERROR_DESC=	Custom Error Patch
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLAMAV}
 RUN_DEPENDS+=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
@@ -79,11 +77,6 @@ CONFIGURE_ARGS+=	--enable-debug
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CFLAGS =|CFLAGS +=|" ${WRKSRC}/Makefile.in
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's|\(install-data-am: \)install-qsheffdocDATA|\1|g' \
-			  -e 's| contribute$$||g' \
-		${WRKSRC}/Makefile.in
-.endif
 
 post-build:
 .if ! ${PORT_OPTIONS:MCLAMAV}
@@ -92,16 +85,14 @@ post-build:
 .endif
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/doc
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-	@${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/doc/
-	@${MKDIR} ${EXAMPLESDIR}/contrib
-	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/samples/,} ${EXAMPLESDIR}/
-	@${INSTALL_DATA} ${CONTRIB:S,^,${WRKSRC}/contrib/,} ${EXAMPLESDIR}/contrib
-.endif
-	@${MKDIR} ${ETCDIR}
-	@${INSTALL_DATA} ${ETCFILES:S,^,${WRKSRC}/etc/,} ${ETCDIR}/
-	@${INSTALL_SCRIPT} ${WRKSRC}/src/qsheff ${PREFIX}/bin/qsheff
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/doc/
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
+	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/samples/,} ${STAGEDIR}${EXAMPLESDIR}/
+	${INSTALL_DATA} ${CONTRIB:S,^,${WRKSRC}/contrib/,} ${STAGEDIR}${EXAMPLESDIR}/contrib
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${ETCFILES:S,^,${WRKSRC}/etc/,} ${STAGEDIR}${ETCDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/src/qsheff ${STAGEDIR}${PREFIX}/bin/qsheff
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/mail/qsheff/pkg-plist
==============================================================================
--- head/mail/qsheff/pkg-plist	Mon Sep  1 09:16:02 2014	(r366851)
+++ head/mail/qsheff/pkg-plist	Mon Sep  1 09:18:32 2014	(r366852)
@@ -6,10 +6,10 @@ bin/qsheff
 %%ETCDIR%%/qsheff.conf-default
 @unexec if cmp -s %D/%%ETCDIR%%/qsheff.rules %D/%%ETCDIR%%/qsheff.rules-default; then rm -f %D/%%ETCDIR%%/qsheff.rules; fi
 %%ETCDIR%%/qsheff.rules-default
- at exec [ -f %B/qsheff.rules ] || cp %B/%f %B/qsheff.attach
+ at exec [ -f %B/qsheff.rules ] || cp %B/%f %B/qsheff.rules
 @unexec if cmp -s %D/%%ETCDIR%%/qsheff.ignore %D/%%ETCDIR%%/qsheff.ignore-default; then rm -f %D/%%ETCDIR%%/qsheff.ignore; fi
 %%ETCDIR%%/qsheff.ignore-default
- at exec [ -f %B/qsheff.ignore ] || cp %B/%f %B/qsheff.attach
+ at exec [ -f %B/qsheff.ignore ] || cp %B/%f %B/qsheff.ignore
 %%ETCDIR%%/install-wrapper.sh
 %%ETCDIR%%/uninstall-wrapper.sh
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -22,17 +22,17 @@ bin/qsheff
 %%PORTDOCS%%%%DOCSDIR%%/doc/spamass-qsheff.en.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/handbook.en.txt
 %%PORTDOCS%%%%DOCSDIR%%/doc/handbook.tr.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/sample-OK.msg
-%%PORTDOCS%%%%EXAMPLESDIR%%/sample-VIRUS.msg
-%%PORTDOCS%%%%EXAMPLESDIR%%/sample-SPAM.msg
-%%PORTDOCS%%%%EXAMPLESDIR%%/contrib/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/contrib/qq-patch.diff
-%%PORTDOCS%%%%EXAMPLESDIR%%/contrib/qq-custom-error-patch.diff
-%%PORTDOCS%%%%EXAMPLESDIR%%/contrib/qsheff-patch.diff
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-OK.msg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-VIRUS.msg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample-SPAM.msg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/qq-patch.diff
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/qq-custom-error-patch.diff
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/qsheff-patch.diff
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/contrib
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
 @dirrmtry %%ETCDIR%%
 @unexec echo ""
 @unexec echo "Type '%%PREFIX%%/etc/uninstall-wrapper.sh' to uninstall qSheff completely."