Updating Port: qSheff Fix: rm files/patch-Makefile.in rm files/pkg-message.in
Responsible Changed From-To: freebsd-ports-bugs->garga I'll take it.
State Changed From-To: open->feedback Ask for maintainer approval.
Since I'm here, I propose you the following patch that updates to 1.0.r3, please take a look and let me know if you approve it. --- qsheff.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/mail/qsheff/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 20 Jul 2005 13:39:35 -0000 1.1 +++ Makefile 16 Aug 2005 11:26:27 -0000 @@ -6,16 +6,17 @@ # PORTNAME= qsheff -PORTVERSION= 1.0.r1 +PORTVERSION= 1.0.r3 CATEGORIES= mail MASTER_SITES= http://www.enderunix.org/qsheff/ -DISTNAME= ${PORTNAME}-1.0-r1 +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 +25,6 @@ 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 +33,6 @@ QMAIL_DIR?= /var/qmail .endif -PREFIX?= ${QMAIL_DIR} - CONFIGURE_ARGS+= --with-qmaildir=${QMAIL_DIR} .include <bsd.port.pre.mk> @@ -43,9 +40,6 @@ .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 +54,4 @@ ${WRKSRC}/etc/qsheff.conf-default .endif -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/pcvs/ports/mail/qsheff/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- distinfo 20 Jul 2005 13:39:35 -0000 1.1 +++ distinfo 16 Aug 2005 11:26:27 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/mail/qsheff/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 20 Jul 2005 13:39:35 -0000 1.1 +++ pkg-plist 16 Aug 2005 11:26:27 -0000 @@ -11,14 +11,15 @@ @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 Index: files/patch-Makefile.in =================================================================== RCS file: files/patch-Makefile.in diff -N files/patch-Makefile.in --- files/patch-Makefile.in 20 Jul 2005 13:39:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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: Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- files/pkg-message.in 20 Jul 2005 13:39:35 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 - --- qsheff.patch ends here --- Thanks -- Renato Botelho <garga @ FreeBSD.org> <freebsd @ galle.com.br> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc Why does man kill? He kills for food. And not only food: frequently there must be a beverage. -- Woody Allen, "Without Feathers"
Thanks for your updates. Everything seems Ok. Can you add the following lines to Makefile ? post-build: .if defined(WITHOUT_CLAMAV) @${REINPLACE_CMD} -e 's|enable_virus_prog = 1|enable_virus_prog = 0|g' ${WRKSRC}/etc/qsheff.conf-default .endif Ozkan KIRIK EnderUNIX SDT @ Turkey Software Developer
State Changed From-To: feedback->closed Committed. Thanks!