Date: Wed, 3 Aug 2005 10:36:02 +0300 (EEST) From: Ozkan KIRIK <ozkan@enderunix.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: staff@enderunix.org, garga@FreeBSD.org Subject: ports/84505: Updating Port: qSheff Message-ID: <20050803073602.DA2214546C@mail.mersin.edu.tr> Resent-Message-ID: <200508030740.j737eJnJ065527@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84505 >Category: ports >Synopsis: Updating Port: qSheff >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 03 07:40:19 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Ozkan KIRIK >Release: FreeBSD 5.1-RELEASE i386 >Organization: EnderUNIX SDT @ Turkey >Environment: System: FreeBSD 5.1-RELEASE i386 >Description: Updating Port: qSheff >How-To-Repeat: >Fix: rm files/patch-Makefile.in rm files/pkg-message.in --- qsheff_port.diff begins here --- diff -ruN qsheff_old/Makefile qsheff/Makefile --- qsheff_old/Makefile Wed Aug 3 09:24:30 2005 +++ qsheff/Makefile Tue Aug 2 22:40:35 2005 @@ -2,19 +2,19 @@ # Date created: 14 Jul 2005 # Whom: Ozkan KIRIK <ozkan@enderunix.org> # -# $FreeBSD: ports/mail/qsheff/Makefile,v 1.1 2005/07/20 13:39:35 garga Exp $ +# $FreeBSD$ # PORTNAME= qsheff -PORTVERSION= 1.0.r1 +PORTVERSION= 1.0.r2 CATEGORIES= mail MASTER_SITES= http://www.enderunix.org/qsheff/ -DISTNAME= ${PORTNAME}-1.0-r1 +DISTNAME= ${PORTNAME}-1.0-r2 MAINTAINER= ozkan@enderunix.org COMMENT= A qmail-queue replacement to filter mail traffic -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \ +RUN_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \ ${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime USE_REINPLACE= YES @@ -24,28 +24,22 @@ PORTDOCS= spamass-qsheff.en.html README COPYING AUTHORS ChangeLog \ INSTALL UPGRADE THANKS TODO -SUB_FILES= pkg-message - OPTIONS= CLAMAV "Integrate with Clam AntiVirus" on +.include <bsd.port.pre.mk> + .if exists(${LOCALBASE}/qmail/bin/qmail-queue) QMAIL_DIR?= ${LOCALBASE}/qmail .else QMAIL_DIR?= /var/qmail .endif - -PREFIX?= ${QMAIL_DIR} - -CONFIGURE_ARGS+= --with-qmaildir=${QMAIL_DIR} - -.include <bsd.port.pre.mk> +QMAIL_QUEUE= ${QMAIL_DIR}/bin/qmail-queue .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 + +CONFIGURE_ARGS+= --with-qmaildir=${QMAIL_DIR} post-patch: .if defined(NOPORTDOCS) @@ -56,11 +50,7 @@ post-build: .if defined(WITHOUT_CLAMAV) - @${REINPLACE_CMD} -e 's|enable_virus_prog = 1|enable_virus_prog = 0|g' \ - ${WRKSRC}/etc/qsheff.conf-default + @${REINPLACE_CMD} -e 's|enable_virus_prog = 1|enable_virus_prog = 0|g' ${WRKSRC}/etc/qsheff.conf-default .endif - -post-install: - @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -ruN qsheff_old/distinfo qsheff/distinfo --- qsheff_old/distinfo Wed Aug 3 09:24:30 2005 +++ qsheff/distinfo Tue Aug 2 23:29:36 2005 @@ -1,2 +1,2 @@ -MD5 (qsheff-1.0-r1.tar.gz) = fa9e21cbf2a9014beb05d8a7e55a46d8 -SIZE (qsheff-1.0-r1.tar.gz) = 105460 +MD5 (qsheff-1.0-r2.tar.gz) = 3194b4035423503a550fe67d23c336f9 +SIZE (qsheff-1.0-r2.tar.gz) = 106374 diff -ruN qsheff_old/files/patch-Makefile.in qsheff/files/patch-Makefile.in --- qsheff_old/files/patch-Makefile.in Wed Aug 3 09:24:30 2005 +++ qsheff/files/patch-Makefile.in Thu Jan 1 02:00:00 1970 @@ -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 -ruN qsheff_old/files/pkg-message.in qsheff/files/pkg-message.in --- qsheff_old/files/pkg-message.in Wed Aug 3 09:24:30 2005 +++ qsheff/files/pkg-message.in Thu Jan 1 02:00:00 1970 @@ -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 -ruN qsheff_old/pkg-plist qsheff/pkg-plist --- qsheff_old/pkg-plist Wed Aug 3 09:24:30 2005 +++ qsheff/pkg-plist Tue Aug 2 23:18:55 2005 @@ -1,4 +1,4 @@ -@comment $FreeBSD: ports/mail/qsheff/pkg-plist,v 1.1 2005/07/20 13:39:35 garga Exp $ +@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 @@ -16,9 +16,8 @@ %%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 '/usr/local/etc/qsheff/uninstall-wrapper.sh' to uninstall qSheff completely." +@unexec echo --- qsheff_port.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050803073602.DA2214546C>