From owner-freebsd-ports Thu Aug 22 0:40:15 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6C4837B400 for ; Thu, 22 Aug 2002 00:40:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9564A43E86 for ; Thu, 22 Aug 2002 00:40:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7M7e3JU028163 for ; Thu, 22 Aug 2002 00:40:03 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7M7e3hX028162; Thu, 22 Aug 2002 00:40:03 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CCF5C37B400 for ; Thu, 22 Aug 2002 00:39:07 -0700 (PDT) Received: from ns1.mgul.ac.ru (ns1.mgul.ac.ru [193.233.63.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C5C643E3B for ; Thu, 22 Aug 2002 00:39:06 -0700 (PDT) (envelope-from andrey@ns1.mgul.ac.ru) Received: from ns1.mgul.ac.ru (localhost [IPv6:::1]) by ns1.mgul.ac.ru (8.12.5/8.12.5) with ESMTP id g7M7d4nW018275 for ; Thu, 22 Aug 2002 11:39:04 +0400 (MSD) Received: (from andrey@localhost) by ns1.mgul.ac.ru (8.12.5/8.12.5/Submit) id g7M7d46M018274; Thu, 22 Aug 2002 11:39:04 +0400 (MSD) Message-Id: <200208220739.g7M7d46M018274@ns1.mgul.ac.ru> Date: Thu, 22 Aug 2002 11:39:04 +0400 (MSD) From: "Andrey V. Pevnev" Reply-To: "Andrey V. Pevnev" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41882: Update port: mail/mimedefang from 2.17 to 2.18 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41882 >Category: ports >Synopsis: Update port: mail/mimedefang from 2.17 to 2.18 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Aug 22 00:40:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Andrey V. Pevnev >Release: FreeBSD 4.6.1-RELEASE-p11 i386 >Organization: Moscow State Forestry University >Environment: System: FreeBSD ns1.mgul.ac.ru 4.6.1-RELEASE-p11 FreeBSD 4.6.1-RELEASE-p11 #0: Wed Aug 14 11:23:48 MSD 2002 andrey@ns1.mgul.ac.ru:/usr/obj/.amd_mnt/ns/host/usr/src/sys/NS1 i386 >Description: Update port mail/mimedefang from version 2.17 to 2.18 >How-To-Repeat: >Fix: --- mimedefang.diff begins here --- diff -ruN mimedefang.bak/Makefile mimedefang/Makefile --- mimedefang.bak/Makefile Thu Aug 22 10:38:42 2002 +++ mimedefang/Makefile Thu Aug 22 10:38:52 2002 @@ -6,7 +6,7 @@ # PORTNAME= mimedefang -PORTVERSION= 2.17 +PORTVERSION= 2.18 CATEGORIES= mail MASTER_SITES= http://www.roaringpenguin.com/mimedefang/ diff -ruN mimedefang.bak/distinfo mimedefang/distinfo --- mimedefang.bak/distinfo Thu Aug 22 10:38:42 2002 +++ mimedefang/distinfo Thu Aug 22 10:38:55 2002 @@ -1 +1 @@ -MD5 (mimedefang-2.17.tar.gz) = 0cf138c51ee853d4396b1cc0cb96b4c3 +MD5 (mimedefang-2.18.tar.gz) = 014076fd5bcac6e0a918fc0a88c44384 diff -ruN mimedefang.bak/files/patch-Makefile.in mimedefang/files/patch-Makefile.in --- mimedefang.bak/files/patch-Makefile.in Thu Aug 22 10:38:42 2002 +++ mimedefang/files/patch-Makefile.in Thu Aug 22 11:24:43 2002 @@ -1,28 +1,28 @@ ---- Makefile.in.orig Wed Aug 14 00:57:19 2002 -+++ Makefile.in Wed Aug 14 01:22:31 2002 -@@ -107,9 +107,8 @@ +--- Makefile.in.orig Thu Aug 22 10:50:20 2002 ++++ Makefile.in Thu Aug 22 11:24:27 2002 +@@ -112,9 +112,8 @@ -mkdir -p $(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@SPOOLDIR@ -mkdir -p $(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@QDIR@ -- if test -f $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/mimedefang-filter ; then \ -- @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/mimedefang-filter.example || exit 1; \ +- if test -f $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter ; then \ +- @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \ - else \ -+ @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/mimedefang-filter.example || exit 1; \ -+ if !(test -f $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/mimedefang-filter) ; then \ - @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/mimedefang-filter || exit 1; \ ++ @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \ ++ if !(test -f $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter) ; then \ + @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter || exit 1; \ fi -@@ -122,10 +121,9 @@ +@@ -127,10 +126,9 @@ @INSTALL@ -m 644 mimedefang-filter.5 $(RPM_INSTALL_ROOT)$(MANDIR)/man5/mimedefang-filter.5 @INSTALL@ -m 644 mimedefang-protocol.7 $(RPM_INSTALL_ROOT)$(MANDIR)/man7/mimedefang-protocol.7 if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \ -- if test -f $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/spamassassin/sa-mimedefang.cf ; then \ -- mkdir -p $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/spamassassin > /dev/null 2>&1 ; \ -- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \ +- if test -f $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf ; then \ +- mkdir -p $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin > /dev/null 2>&1 ; \ +- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \ - else \ -+ mkdir -p $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/spamassassin > /dev/null 2>&1 ; \ -+ @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \ -+ if !(test -f $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/spamassassin/sa-mimedefang.cf) ; then \ - @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${sysconfdir}${CONFSUBDIR}/spamassassin/sa-mimedefang.cf || exit 1; \ ++ mkdir -p $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin > /dev/null 2>&1 ; \ ++ @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \ ++ if !(test -f $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf) ; then \ + @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf || exit 1; \ fi \ fi diff -ruN mimedefang.bak/pkg-plist mimedefang/pkg-plist --- mimedefang.bak/pkg-plist Thu Aug 22 10:38:42 2002 +++ mimedefang/pkg-plist Thu Aug 22 11:29:02 2002 @@ -6,6 +6,7 @@ etc/mimedefang/mimedefang-filter.example @unexec if cmp -s %D/etc/mimedefang/spamassassin/sa-mimedefang.cf %D/etc/mimedefang/spamassassin/sa-mimedefang.cf.example; then rm -f %D/etc/mimedefang/spamassassin/sa-mimedefang.cf; fi etc/mimedefang/spamassassin/sa-mimedefang.cf.example +etc/mimedefang/mimedefang-ip-key %%PORTDOCS%%share/doc/mimedefang/README %%PORTDOCS%%share/doc/mimedefang/README.ANOMY %%PORTDOCS%%share/doc/mimedefang/README.SPAMASSASSIN --- mimedefang.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message