Date: Tue, 4 Jun 2002 01:57:46 +0400 (MSD) From: "Andrey V. Pevnev" <andrey@mgul.ac.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/38873: Update port: mail/mimedefang from 2.13 to 2.14 Message-ID: <200206032157.g53LvkqA050226@ns1.mgul.ac.ru>
next in thread | raw e-mail | index | archive | help
>Number: 38873 >Category: ports >Synopsis: Update port: mail/mimedefang from 2.13 to 2.14 >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: Mon Jun 03 15:00:05 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Andrey V. Pevnev >Release: FreeBSD 4.5-RELEASE-p6 i386 >Organization: Moscow State Forestry University >Environment: System: FreeBSD ns1.mgul.ac.ru 4.5-RELEASE-p6 FreeBSD 4.5-RELEASE-p6 #0: Wed May 29 20:54:20 MSD 2002 andrey@ns1.mgul.ac.ru:/usr/obj/usr/src/sys/NS1 i386 >Description: 1. Update from 2.13 to 2.14 2. My patch partially included by author, so porting will be easier now :) 3. Removed files: files/patch-configure files/patch-mimedefang-filter.5.in files/patch-mimedefang-multiplexor.8.in files/patch-mimedefang.8.in files/patch-mimedefang.pl.8.in files/patch-mimedefang.pl.in >How-To-Repeat: >Fix: --- mimedefang.diff begins here --- diff -ruN mimedefang.bak/Makefile mimedefang/Makefile --- mimedefang.bak/Makefile Tue Jun 4 01:12:26 2002 +++ mimedefang/Makefile Tue Jun 4 01:15:52 2002 @@ -6,7 +6,7 @@ # PORTNAME= mimedefang -PORTVERSION= 2.13 +PORTVERSION= 2.14 CATEGORIES= mail MASTER_SITES= http://www.roaringpenguin.com/mimedefang/ @@ -23,7 +23,7 @@ USE_PERL5= yes PERL_SITELIBDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/mimedefang +CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/mimedefang --with-confsubdir= MAN5= mimedefang-filter.5 MAN7= mimedefang-protocol.7 @@ -32,12 +32,6 @@ .if !exists( /usr/include/libmilter/mfapi.h ) BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:${PORTSDIR}/mail/sendmail .endif - -post-extract: - @${MV} ${WRKSRC}/mimedefang-filter.5 ${WRKSRC}/mimedefang-filter.5.in - @${MV} ${WRKSRC}/mimedefang-multiplexor.8 ${WRKSRC}/mimedefang-multiplexor.8.in - @${MV} ${WRKSRC}/mimedefang.8 ${WRKSRC}/mimedefang.8.in - @${MV} ${WRKSRC}/mimedefang.pl.8 ${WRKSRC}/mimedefang.pl.8.in post-install: @${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${PREFIX}/etc/rc.d/mimedefang.sh-dist diff -ruN mimedefang.bak/distinfo mimedefang/distinfo --- mimedefang.bak/distinfo Tue Jun 4 01:12:26 2002 +++ mimedefang/distinfo Tue Jun 4 01:15:03 2002 @@ -1 +1 @@ -MD5 (mimedefang-2.13.tar.gz) = ee9f7a89068d6c8d6395cad6156917a0 +MD5 (mimedefang-2.14.tar.gz) = 0b8dc56aed0a0b3e6044919a89b53431 diff -ruN mimedefang.bak/files/patch-Makefile.in mimedefang/files/patch-Makefile.in --- mimedefang.bak/files/patch-Makefile.in Tue Jun 4 01:12:26 2002 +++ mimedefang/files/patch-Makefile.in Tue Jun 4 01:41:25 2002 @@ -1,50 +1,26 @@ ---- Makefile.in.orig Wed May 29 22:40:47 2002 -+++ Makefile.in Sun Jun 2 22:16:07 2002 -@@ -5,6 +5,7 @@ - # Needed for autoconf to behave properly... - exec_prefix=@exec_prefix@ - prefix=@prefix@ -+sysconfdir=@sysconfdir@ - - MANDIR=@mandir@ - -@@ -93,9 +94,9 @@ - @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)/etc/mail/mimedefang-filter - - install: all -- -mkdir -p $(RPM_INSTALL_ROOT)/etc/mail -+ -mkdir -p $(RPM_INSTALL_ROOT)${sysconfdir} - -if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \ -- mkdir -p $(RPM_INSTALL_ROOT)/etc/mail/spamassassin; \ -+ mkdir -p $(RPM_INSTALL_ROOT)${sysconfdir}/spamassassin; \ - fi - -mkdir -p $(RPM_INSTALL_ROOT)$(prefix)/bin - -mkdir -p $(RPM_INSTALL_ROOT)$(MANDIR)/man5 -@@ -104,10 +105,9 @@ +--- Makefile.in.orig Tue Jun 4 01:37:04 2002 ++++ Makefile.in Tue Jun 4 01:40:57 2002 +@@ -109,9 +109,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)/etc/mail/mimedefang-filter ; then \ -- @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)/etc/mail/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.example || exit 1; \ - else \ -- @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)/etc/mail/mimedefang-filter || exit 1; \ -+ @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${sysconfdir}/mimedefang-filter.example || exit 1; \ -+ if !(test -f $(RPM_INSTALL_ROOT)${sysconfdir}/mimedefang-filter) ; then \ -+ @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${sysconfdir}/mimedefang-filter || exit 1; \ ++ @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; \ fi - @INSTALL@ -m 755 mimedefang-multiplexor $(RPM_INSTALL_ROOT)$(prefix)/bin/mimedefang-multiplexor -@@ -119,10 +119,9 @@ +@@ -124,9 +123,8 @@ @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)/etc/mail/spamassassin/sa-mimedefang.cf ; then \ -- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)/etc/mail/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.example || exit 1; \ - else \ -- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)/etc/mail/spamassassin/sa-mimedefang.cf || exit 1; \ -+ @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${sysconfdir}/spamassassin/sa-mimedefang.cf.example || exit 1; \ -+ if !(test -f $(RPM_INSTALL_ROOT)${sysconfdir}/spamassassin/sa-mimedefang.cf) ; then \ -+ @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${sysconfdir}/spamassassin/sa-mimedefang.cf || exit 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; \ fi \ fi - diff -ruN mimedefang.bak/files/patch-configure mimedefang/files/patch-configure --- mimedefang.bak/files/patch-configure Tue Jun 4 01:12:26 2002 +++ mimedefang/files/patch-configure Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Wed May 29 22:40:42 2002 -+++ configure Sun Jun 2 22:34:17 2002 -@@ -2505,7 +2505,7 @@ - - cat >> $CONFIG_STATUS <<EOF - --CONFIG_FILES=\${CONFIG_FILES-"Makefile mimedefang.pl examples/init-script"} -+CONFIG_FILES=\${CONFIG_FILES-"Makefile mimedefang.pl examples/init-script mimedefang-filter.5 mimedefang-multiplexor.8 mimedefang.8 mimedefang.pl.8"} - EOF - cat >> $CONFIG_STATUS <<\EOF - for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff -ruN mimedefang.bak/files/patch-mimedefang-filter.5.in mimedefang/files/patch-mimedefang-filter.5.in --- mimedefang.bak/files/patch-mimedefang-filter.5.in Tue Jun 4 01:12:26 2002 +++ mimedefang/files/patch-mimedefang-filter.5.in Thu Jan 1 03:00:00 1970 @@ -1,20 +0,0 @@ ---- mimedefang-filter.5.in.orig Fri May 31 20:44:02 2002 -+++ mimedefang-filter.5.in Sun Jun 2 21:50:38 2002 -@@ -19,7 +19,7 @@ - directory and the e-mail message is split into parts in this directory. - - .PP --2) If the file \fB/etc/mail/mimedefang-filter.pl\fR defines a Perl function -+2) If the file \fB@sysconfdir@/mimedefang-filter.pl\fR defines a Perl function - called \fBfilter_begin\fR, it is called with no arguments. Any return - value is ignored. - -@@ -829,7 +829,7 @@ - of the following found will be used: - .TP - .B o --/etc/mail/spamassassin/sa-mimedefang.cf -+@sysconfdir@/spamassassin/sa-mimedefang.cf - .TP - .B o - /etc/mail/spamassassin/local.cf diff -ruN mimedefang.bak/files/patch-mimedefang-multiplexor.8.in mimedefang/files/patch-mimedefang-multiplexor.8.in --- mimedefang.bak/files/patch-mimedefang-multiplexor.8.in Tue Jun 4 01:12:26 2002 +++ mimedefang/files/patch-mimedefang-multiplexor.8.in Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- mimedefang-multiplexor.8.in.orig Wed May 15 17:08:14 2002 -+++ mimedefang-multiplexor.8.in Sun Jun 2 21:52:09 2002 -@@ -118,7 +118,7 @@ - .TP - .B \-F \fIrules_path\fR - Specifies the path to the filter rules. By default, --\fB/etc/mail/mimedefang-filter\fR is used. If you use the \fB\-F\fR -+\fB@sysconfdir@/mimedefang-filter\fR is used. If you use the \fB\-F\fR - option, its value is passed to the underlying Perl filter program - using \fB\-f\fR. - diff -ruN mimedefang.bak/files/patch-mimedefang.8.in mimedefang/files/patch-mimedefang.8.in --- mimedefang.bak/files/patch-mimedefang.8.in Tue Jun 4 01:12:26 2002 +++ mimedefang/files/patch-mimedefang.8.in Thu Jan 1 03:00:00 1970 @@ -1,20 +0,0 @@ ---- mimedefang.8.in.orig Thu May 23 19:12:52 2002 -+++ mimedefang.8.in Sun Jun 2 22:13:54 2002 -@@ -25,7 +25,7 @@ - type. Typically, you should run \fBmimedefang\fR on the same computer - as \fBsendmail\fR. Therefore, you should use a UNIX-domain socket for - the connection type. The suggested value for the \fB\-p\fR switch is --\fB/var/run/mimedefang.sock\fR. -+\fB@SPOOLDIR@/mimedefang.sock\fR. - .TP - .B \-n \fImax_filters\fR - Because each incoming e-mail message forks a new Perl process, you can -@@ -66,7 +66,7 @@ - .TP - .B \-F \fIrules_path\fR - Specifies the path to the filter rules. By default, --\fB/etc/mail/mimedefang-filter\fR is used. If you use the \fB\-F\fR -+\fB@sysconfdir@/mimedefang-filter\fR is used. If you use the \fB\-F\fR - option, its value is passed to the underlying Perl filter program - using \fB\-f\fR. If you are using \fBmimedefang-multiplexor\fR, this - option is ignored; you should use the multiplexor's \fB\-F\fR option diff -ruN mimedefang.bak/files/patch-mimedefang.pl.8.in mimedefang/files/patch-mimedefang.pl.8.in --- mimedefang.bak/files/patch-mimedefang.pl.8.in Tue Jun 4 01:12:26 2002 +++ mimedefang/files/patch-mimedefang.pl.8.in Thu Jan 1 03:00:00 1970 @@ -1,25 +0,0 @@ ---- mimedefang.pl.8.in.orig Thu May 2 18:54:12 2002 -+++ mimedefang.pl.8.in Sun Jun 2 21:54:05 2002 -@@ -18,11 +18,11 @@ - .TP - .B \-f \fIfilter\fR - Specifies the name of the file containing the filter. If this option is --omitted, the default filter \fB/etc/mail/mimedefang-filter\fR is used. -+omitted, the default filter \fB@sysconfdir@/mimedefang-filter\fR is used. - - .SH OPERATION - --\fBmimedefang.pl\fR evaluates the file \fB/etc/mail/mimedefang-filter\fR -+\fBmimedefang.pl\fR evaluates the file \fB@sysconfdir@/mimedefang-filter\fR - as a Perl fragment. This file should define the \fBfilter\fR procedure. - For each part of a MIME message, \fBmimedefang.pl\fR calls \fBfilter\fR and - disposes of the part as instructed by the filter. The various modes -@@ -31,7 +31,7 @@ - .SH TESTING FILTERS - - You are \fIstrongly\fR recommended to test your filter before installing --it in \fB/etc/mail/mimedefang-filter\fR. To test the filter, save it -+it in \fB@sysconfdir@/mimedefang-filter\fR. To test the filter, save it - in a file (e.g. \fBtest-filter\fR) and run this command: - - .nf diff -ruN mimedefang.bak/files/patch-mimedefang.pl.in mimedefang/files/patch-mimedefang.pl.in --- mimedefang.bak/files/patch-mimedefang.pl.in Tue Jun 4 01:12:26 2002 +++ mimedefang/files/patch-mimedefang.pl.in Thu Jan 1 03:00:00 1970 @@ -1,22 +0,0 @@ ---- mimedefang.pl.in.orig Fri May 31 20:38:38 2002 -+++ mimedefang.pl.in Sun Jun 2 21:43:59 2002 -@@ -2348,7 +2348,7 @@ - #*********************************************************************** - sub main { - my($Filter); -- $Filter = '/etc/mail/mimedefang-filter'; -+ $Filter = '@sysconfdir@/mimedefang-filter'; - - my($ip, $name, $sender); - # Check for "-f filter-file" option -@@ -3204,8 +3204,8 @@ - my $config = shift; - unless ($config) - { -- if (-r "/etc/mail/spamassassin/sa-mimedefang.cf") { -- $config = "/etc/mail/spamassassin/sa-mimedefang.cf"; -+ if (-r "@sysconfdir@/spamassassin/sa-mimedefang.cf") { -+ $config = "@sysconfdir@/spamassassin/sa-mimedefang.cf"; - } elsif (-r "/etc/mail/spamassassin/local.cf") { - $config = "/etc/mail/spamassassin/local.cf"; - } else { --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206032157.g53LvkqA050226>