- Update to 2.1r2

- Pass maintainership to submitter

PR:		ports/104208
Submitted by:	Ozkan KIRIK <ozkan@enderunix.org>

3 files changed, 78 insertions, 30 deletions

diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 08eaa631e256..2830035a9799 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	qsheff
-PORTVERSION=	1.0.r4
-PORTREVISION=	1
+PORTNAME=	qsheff-II
+PORTVERSION=	2.1.r2
 CATEGORIES=	mail
-MASTER_SITES=	http://www.enderunix.org/ \
+MASTER_SITES=	http://www.enderunix.org/qsheff/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-r/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ozkan@enderunix.org
 COMMENT=	A qmail-queue replacement to filter mail traffic
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
@@ -24,10 +23,17 @@ USE_QMAIL=	yes
 GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-PORTDOCS=	spamass-qsheff.en.html README COPYING AUTHORS ChangeLog \
+PORTDOCS=	README COPYING AUTHORS ChangeLog \
 		INSTALL UPGRADE THANKS TODO
 
-OPTIONS=	CLAMAV "Integrate with Clam AntiVirus" on
+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 \
 
 CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_PREFIX}
 
@@ -35,6 +41,37 @@ CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_PREFIX}
 
 .if !defined(WITHOUT_CLAMAV)
 RUN_DEPENDS+=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
+CONFIGURE_ARGS+=	--with-clamav
+CONFIGURE_ARGS+=	--with-clamd-socket=/var/run/clamav/clamd
+.endif
+
+.if defined(WITH_SPAMTAG)
+CONFIGURE_ARGS+=	--enable-spam-tag
+.endif
+
+.if defined(WITH_VIRUSTAG)
+CONFIGURE_ARGS+=	--enable-virus-tag
+.endif
+
+.if defined(WITH_SYSLOG)
+CONFIGURE_ARGS+=	--enable-syslog
+.endif
+
+.if defined(WITH_DISABLELOCAL)
+CONFIGURE_ARGS+=	--disable-local-users
+.endif
+
+.if defined(WITH_BACKUP)
+CONFIGURE_ARGS+=	--enable-backup
+.endif
+
+.if defined(WITH_CUSTOMERROR)
+CONFIGURE_ARGS+=	--enable-custom-error
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 post-patch:
@@ -51,4 +88,14 @@ 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
+
 .include <bsd.port.post.mk>
diff --git a/mail/qsheff/distinfo b/mail/qsheff/distinfo
index a67e292ee8b6..dc2559fb874b 100644
--- a/mail/qsheff/distinfo
+++ b/mail/qsheff/distinfo
@@ -1,3 +1,2 @@
-MD5 (qsheff-1.0-r4.tar.gz) = 2c507cf6fc86ef8c9c60575e9fbd701e
-SHA256 (qsheff-1.0-r4.tar.gz) = 6c312b7d5feacc1de47867d3fa538583da3a700c200fdf17c456a25e5ecac632
-SIZE (qsheff-1.0-r4.tar.gz) = 93898
+MD5 (qsheff-II-2.1-r2.tar.gz) = f7f1cd41d22b0b7aaaca7d130d43e852
+SIZE (qsheff-II-2.1-r2.tar.gz) = 132258
diff --git a/mail/qsheff/pkg-plist b/mail/qsheff/pkg-plist
index b53772970a75..e10ffe12f39f 100644
--- a/mail/qsheff/pkg-plist
+++ b/mail/qsheff/pkg-plist
@@ -1,25 +1,27 @@
-@comment $FreeBSD$
 bin/qsheff
-@unexec if cmp -s %D/etc/qsheff/qsheff.attach %D/etc/qsheff/qsheff.attach-default; then rm -f %D/etc/qsheff/qsheff.attach; fi
-etc/qsheff/qsheff.attach-default
+@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
 @exec [ -f %B/qsheff.attach ] || cp %B/%f %B/qsheff.attach
-@unexec if cmp -s %D/etc/qsheff/qsheff.conf %D/etc/qsheff/qsheff.conf-default; then rm -f %D/etc/qsheff/qsheff.conf; fi
-etc/qsheff/qsheff.conf-default
-@unexec if cmp -s %D/etc/qsheff/qsheff.rules %D/etc/qsheff/qsheff.rules-default; then rm -f %D/etc/qsheff/qsheff.rules; fi
-etc/qsheff/qsheff.rules-default
+@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
 @exec [ -f %B/qsheff.rules ] || cp %B/%f %B/qsheff.attach
-@unexec if cmp -s %D/etc/qsheff/qsheff.wblist %D/etc/qsheff/qsheff.wblist-default; then rm -f %D/etc/qsheff/qsheff.wblist; fi
-etc/qsheff/qsheff.wblist-default
-@exec [ -f %B/qsheff.wblist ] || cp %B/%f %B/qsheff.attach
-etc/qsheff/install-wrapper.sh
-etc/qsheff/uninstall-wrapper.sh
-%%DATADIR%%/developer.notes
-%%DATADIR%%/eicar.com.txt
-%%DATADIR%%/sample-OK.msg
-%%DATADIR%%/sample-SPAM.msg
-%%DATADIR%%/sample-VIRUS.msg
-@dirrmtry etc/qsheff
-@dirrm %%DATADIR%%
+@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
+@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/uninstall-wrapper.sh' to uninstall qSheff completely."
+@unexec echo "Type '%%PREFIX%%/etc/qsheff-II/uninstall-wrapper.sh' to uninstall qSheff completely."
 @unexec echo