- Update to 2.1.r3.

- Update MASTER_SITES.
- Makefile cosmetic changes.
- Fix pkg-plist.

PR:		ports/121749
Submitted by:	myself
Approved by:	araujo (mentor), maintainer timeout (> 2 weeks)

4 files changed, 68 insertions, 58 deletions

diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 01c3c7bbb0fb..63fb953215aa 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	qsheff-II
-PORTVERSION=	2.1.r2
-PORTREVISION=	2
+PORTVERSION=	2.1.r3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/qsheff/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+		SF/qsheff
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-r/}
 
 MAINTAINER=	ozkan@enderunix.org
@@ -19,28 +17,32 @@ COMMENT=	A qmail-queue replacement to filter mail traffic
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
 RUN_DEPENDS=	${BUILD_DEPENDS}
-USE_QMAIL=	yes
 
 GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-PORTDOCS=	README COPYING AUTHORS ChangeLog \
-		INSTALL UPGRADE THANKS TODO
+USE_QMAIL=	yes
 
-OPTIONS=	CLAMAV "Integrate with Clam AntiVirus" on \
-			SPAMTAG "Enable Spam Tagging" off \
-			VIRUSTAG "Enable Virus Tagging" off \
-			DISABLELOCAL "Disable Filters For Local Users" off \
-			SYSLOG "Enable Syslog Logging" off \
-			BACKUP "Enable Logging Incoming/Outgoing Mail" off \
-			CUSTOMERROR "Enable Custom Error Patch" off \
-			DEBUG "Enable Debug Messages" off \
+DOCS=		README COPYING AUTHORS ChangeLog INSTALL THANKS TODO
+EXAMPLES=	sample-OK.msg sample-SPAM.msg sample-VIRUS.msg
+CONTRIB=	README qq-custom-error-patch.diff qq-patch.diff \
+		qsheff-patch.diff
+FILES=		handbook.en.txt handbook.tr.txt spamass-qsheff.en.html
 
 CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_PREFIX}
 
+OPTIONS=	CLAMAV "Integrate with Clam AntiVirus" on \
+		SPAMTAG "Enable Spam Tagging" off \
+		VIRUSTAG "Enable Virus Tagging" off \
+		DISABLELOCAL "Disable Filters For Local Users" off \
+		SYSLOG "Enable Syslog Logging" off \
+		BACKUP "Enable Logging Incoming/Outgoing Mail" off \
+		CUSTOMERROR "Enable Custom Error Patch" off \
+		DEBUG "Enable Debug Messages" off
+
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_CLAMAV)
+.if defined(WITH_CLAMAV)
 RUN_DEPENDS+=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
 CONFIGURE_ARGS+=	--with-clamav
@@ -89,14 +91,17 @@ post-build:
 		${WRKSRC}/etc/qsheff.conf-default
 .endif
 
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/THANKS ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	@touch ${DOCSDIR}/UPGRADE
+do-install:
+.if !defined(NOPORTDOCS)
+	@${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
 
 .include <bsd.port.post.mk>
diff --git a/mail/qsheff/distinfo b/mail/qsheff/distinfo
index dc2559fb874b..1b83f6fe24f8 100644
--- a/mail/qsheff/distinfo
+++ b/mail/qsheff/distinfo
@@ -1,2 +1,3 @@
-MD5 (qsheff-II-2.1-r2.tar.gz) = f7f1cd41d22b0b7aaaca7d130d43e852
-SIZE (qsheff-II-2.1-r2.tar.gz) = 132258
+MD5 (qsheff-II-2.1-r3.tar.gz) = 85bd2044ec81248f6c36155c82131caa
+SHA256 (qsheff-II-2.1-r3.tar.gz) = a865f9e520497303b9f57bc53012a590da15a665883d05ff37ca26278af6ffb2
+SIZE (qsheff-II-2.1-r3.tar.gz) = 131802
diff --git a/mail/qsheff/pkg-descr b/mail/qsheff/pkg-descr
index ec8855432ce9..3b3c5e84fca2 100644
--- a/mail/qsheff/pkg-descr
+++ b/mail/qsheff/pkg-descr
@@ -8,12 +8,4 @@ It supports:
 	* white/black list
 	* single line logging for qmail and many features.
 
-Project Page:
 WWW: http://www.enderunix.org/qsheff
-
-Author: 
-
-Baris SIMSEK
-simsek@enderunix.org
-EnderUNIX SDT @ Turkey
-http://www.enderunix.org/simsek/
diff --git a/mail/qsheff/pkg-plist b/mail/qsheff/pkg-plist
index e10ffe12f39f..a81bbac1607b 100644
--- a/mail/qsheff/pkg-plist
+++ b/mail/qsheff/pkg-plist
@@ -1,27 +1,39 @@
 bin/qsheff
-@unexec if cmp -s %D/etc/qsheff-II/qsheff.attach %D/etc/qsheff-II/qsheff.attach-default; then rm -f %D/etc/qsheff-II/qsheff.attach; fi
-etc/qsheff-II/qsheff.attach-default
+@unexec if cmp -s %D/%%ETCDIR%%/qsheff.attach %D/%%ETCDIR%%/qsheff.attach-default; then rm -f %D/%%ETCDIR%%/qsheff.attach; fi
+%%ETCDIR%%/qsheff.attach-default
 @exec [ -f %B/qsheff.attach ] || cp %B/%f %B/qsheff.attach
-@unexec if cmp -s %D/etc/qsheff-II/qsheff.conf %D/etc/qsheff-II/qsheff.conf-default; then rm -f %D/etc/qsheff-II/qsheff.conf; fi
-etc/qsheff-II/qsheff.conf-default
-@unexec if cmp -s %D/etc/qsheff-II/qsheff.rules %D/etc/qsheff-II/qsheff.rules-default; then rm -f %D/etc/qsheff-II/qsheff.rules; fi
-etc/qsheff-II/qsheff.rules-default
+@unexec if cmp -s %D/%%ETCDIR%%/qsheff.conf %D/%%ETCDIR%%/qsheff.conf-default; then rm -f %D/%%ETCDIR%%/qsheff.conf; fi
+%%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
 @exec [ -f %B/qsheff.rules ] || cp %B/%f %B/qsheff.attach
-@unexec if cmp -s %D/etc/qsheff-II/qsheff.ignore %D/etc/qsheff-II/qsheff.ignore-default; then rm -f %D/etc/qsheff-II/qsheff.ignore; fi
-etc/qsheff-II/qsheff.ignore-default
+@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
 @exec [ -f %B/qsheff.ignore ] || cp %B/%f %B/qsheff.attach
-etc/qsheff-II/install-wrapper.sh
-etc/qsheff-II/uninstall-wrapper.sh
-%%PORTDOCS%%%%DOCSDIR%%/spamass-qsheff.en.html
-%%PORTDOCS%%%%DOCSDIR%%/handbook.en.txt
-%%PORTDOCS%%%%DOCSDIR%%/handbook.tr.txt
-%%PORTDOCS%%%%DOCSDIR%%/sample-OK.msg
-%%PORTDOCS%%%%DOCSDIR%%/sample-SPAM.msg
-%%PORTDOCS%%%%DOCSDIR%%/sample-VIRUS.msg
-%%PORTDOCS%%%%DOCSDIR%%/qsheff-patch.diff
-%%PORTDOCS%%%%DOCSDIR%%/qq-custom-error-patch.diff
-%%PORTDOCS%%%%DOCSDIR%%/qq-patch.diff
-@dirrmtry etc/qsheff-II
-@unexec echo
-@unexec echo "Type '%%PREFIX%%/etc/qsheff-II/uninstall-wrapper.sh' to uninstall qSheff completely."
-@unexec echo
+%%ETCDIR%%/install-wrapper.sh
+%%ETCDIR%%/uninstall-wrapper.sh
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%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
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/contrib
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
+@dirrmtry %%ETCDIR%%
+@unexec echo ""
+@unexec echo "Type '%%ETCDIR%%/uninstall-wrapper.sh' to uninstall qSheff completely."
+@unexec echo ""