- Update to 1.0-r3 and make it fetchable again

- Add MASTER_SITE_SOURCEFORGE on MASTER_SITES

PR:		ports/84505
Submitted by:	maintainer
Reworked by:	myself
Approved by:	portmgr (krion), maintainer

5 files changed, 13 insertions, 40 deletions

diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 3598bf70b9da..32f329530e5d 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	qsheff
-PORTVERSION=	1.0.r1
+PORTVERSION=	1.0.r3
 CATEGORIES=	mail
-MASTER_SITES=	http://www.enderunix.org/qsheff/
-DISTNAME=	${PORTNAME}-1.0-r1
+MASTER_SITES=	http://www.enderunix.org/qsheff/ \
+		${MASTER_SITE_SOURCEFORGE}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-r/}
 
 MAINTAINER=	ozkan@enderunix.org
 COMMENT=	A qmail-queue replacement to filter mail traffic
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
+BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
 		${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
@@ -24,8 +26,6 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 PORTDOCS=	spamass-qsheff.en.html README COPYING AUTHORS ChangeLog \
 		INSTALL UPGRADE THANKS TODO
 
-SUB_FILES=	pkg-message
-
 OPTIONS=	CLAMAV "Integrate with Clam AntiVirus" on
 
 .if exists(${LOCALBASE}/qmail/bin/qmail-queue)
@@ -34,8 +34,6 @@ QMAIL_DIR?=	${LOCALBASE}/qmail
 QMAIL_DIR?=	/var/qmail
 .endif
 
-PREFIX?=	${QMAIL_DIR}
-
 CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_DIR}
 
 .include <bsd.port.pre.mk>
@@ -43,9 +41,6 @@ CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_DIR}
 .if !defined(WITHOUT_CLAMAV)
 RUN_DEPENDS+=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
 .endif
-.if !defined(WITHOUT_FPROT) & defined(WITHOUT_CLAMAV)
-RUN_DEPENDS+=	${LOCALBASE}/bin/f-prot:${PORTSDIR}/security/f-prot
-.endif
 
 post-patch:
 .if defined(NOPORTDOCS)
@@ -60,7 +55,4 @@ post-build:
 		${WRKSRC}/etc/qsheff.conf-default
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/mail/qsheff/distinfo b/mail/qsheff/distinfo
index ac892b790952..75c2243c1e75 100644
--- a/mail/qsheff/distinfo
+++ b/mail/qsheff/distinfo
@@ -1,2 +1,2 @@
-MD5 (qsheff-1.0-r1.tar.gz) = fa9e21cbf2a9014beb05d8a7e55a46d8
-SIZE (qsheff-1.0-r1.tar.gz) = 105460
+MD5 (qsheff-1.0-r3.tar.gz) = 8b38b725c4ebf38764d4660d87d67391
+SIZE (qsheff-1.0-r3.tar.gz) = 106959
diff --git a/mail/qsheff/files/patch-Makefile.in b/mail/qsheff/files/patch-Makefile.in
deleted file mode 100644
index 3e4ca5eea996..000000000000
--- a/mail/qsheff/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Jul 20 08:33:16 2005
-+++ Makefile.in	Wed Jul 20 08:33:21 2005
-@@ -734,8 +734,6 @@
- 	mkdir -p /var/tmp/qsheffq
- 	touch /var/log/qsheff.log
- 	chmod 755 /var/tmp/qsheffq /var/spool/qsheffq
--	if [ -x @QMAILDIR@/bin/qmail-queue ]; then cp -pf @QMAILDIR@/bin/qmail-queue @QMAILDIR@/bin/qmail-queue.orig; rm -f @QMAILDIR@/bin/qmail-queue; fi
--	ln -s @QMAILDIR@/bin/qmail-qsheff @QMAILDIR@/bin/qmail-queue
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/mail/qsheff/files/pkg-message.in b/mail/qsheff/files/pkg-message.in
deleted file mode 100644
index 74978012fa0f..000000000000
--- a/mail/qsheff/files/pkg-message.in
+++ /dev/null
@@ -1,9 +0,0 @@
-
-ATTENTION:
-
-To start to use qmail-qsheff you need to overwrite qmail-queue program.
-Make a backup before do it.
-
-> cp %%PREFIX%%/bin/qmail-queue  %%PREFIX%%/bin/qmail-queue.orig
-> cp %%PREFIX%%/bin/qmail-qsheff  %%PREFIX%%/bin/qmail-queue
-
diff --git a/mail/qsheff/pkg-plist b/mail/qsheff/pkg-plist
index cbf605cee1ae..9ad58a5171a8 100644
--- a/mail/qsheff/pkg-plist
+++ b/mail/qsheff/pkg-plist
@@ -11,14 +11,15 @@ etc/qsheff/qsheff.rules-default
 @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
-%%DATADIR%%/uninstall.sh
 @unexec rmdir %D/etc/qsheff 2>/dev/null || true
 @dirrm %%DATADIR%%
-@unexec echo "ATTENTION:"
-@unexec echo "1) Remember to restore your qmail-queue program on %%PREFIX%%/bin"
-@unexec echo "2) Quarantina directory (/var/spool/qsheffq) not removed. You can remove it manually."
+@unexec echo
+@unexec echo "Type '%%PREFIX%%/etc/qsheff/uninstall-wrapper.sh' to uninstall qSheff completely."
+@unexec echo