From edb7840238db4aaa4666e9445e795271ad3acc89 Mon Sep 17 00:00:00 2001 From: pat Date: Tue, 18 Jun 2002 04:56:05 +0000 Subject: Update to 2.15 PR: 39336, 38873 Submitted by: maintainer --- mail/mimedefang/Makefile | 10 +- mail/mimedefang/distinfo | 2 +- mail/mimedefang/files/patch-Makefile.in | 52 +++----- mail/mimedefang/files/patch-configure | 139 +++++++++++++++++++-- mail/mimedefang/files/patch-init-script.in | 18 ++- mail/mimedefang/files/patch-mimedefang-filter.5.in | 20 --- .../files/patch-mimedefang-multiplexor.8.in | 11 -- .../files/patch-mimedefang-multiplexor.c | 44 +++++++ mail/mimedefang/files/patch-mimedefang.8.in | 20 --- mail/mimedefang/files/patch-mimedefang.pl.8.in | 25 ---- mail/mimedefang/files/patch-mimedefang.pl.in | 22 ---- mail/mimedefang/pkg-plist | 3 + 12 files changed, 210 insertions(+), 156 deletions(-) delete mode 100644 mail/mimedefang/files/patch-mimedefang-filter.5.in delete mode 100644 mail/mimedefang/files/patch-mimedefang-multiplexor.8.in create mode 100644 mail/mimedefang/files/patch-mimedefang-multiplexor.c delete mode 100644 mail/mimedefang/files/patch-mimedefang.8.in delete mode 100644 mail/mimedefang/files/patch-mimedefang.pl.8.in delete mode 100644 mail/mimedefang/files/patch-mimedefang.pl.in diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index fb92e3bad9da..01a5edb073fd 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mimedefang -PORTVERSION= 2.13 +PORTVERSION= 2.15 CATEGORIES= mail MASTER_SITES= http://www.roaringpenguin.com/mimedefang/ @@ -23,7 +23,7 @@ BUILD_DEPENDS= \ 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 @@ -33,12 +33,6 @@ MAN8= mimedefang.8 mimedefang.pl.8 mimedefang-multiplexor.8 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 .if !defined(NOPORTDOCS) diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo index 6d03bf8281a6..4035a6b5e3a9 100644 --- a/mail/mimedefang/distinfo +++ b/mail/mimedefang/distinfo @@ -1 +1 @@ -MD5 (mimedefang-2.13.tar.gz) = ee9f7a89068d6c8d6395cad6156917a0 +MD5 (mimedefang-2.15.tar.gz) = 977c25b76b040d66a65757cc88f1746c diff --git a/mail/mimedefang/files/patch-Makefile.in b/mail/mimedefang/files/patch-Makefile.in index 71097af8a795..bbf5fce47eb7 100644 --- a/mail/mimedefang/files/patch-Makefile.in +++ b/mail/mimedefang/files/patch-Makefile.in @@ -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 --git a/mail/mimedefang/files/patch-configure b/mail/mimedefang/files/patch-configure index 2fe42127a4b5..e9cb95950125 100644 --- a/mail/mimedefang/files/patch-configure +++ b/mail/mimedefang/files/patch-configure @@ -1,11 +1,132 @@ ---- configure.orig Wed May 29 22:40:42 2002 -+++ configure Sun Jun 2 22:34:17 2002 -@@ -2505,7 +2505,7 @@ +--- configure Sat Jun 15 18:55:57 2002 ++++ configure Sat Jun 15 19:02:10 2002 +@@ -2172,80 +2172,6 @@ + echo "$ac_t""no" 1>&6 + fi - cat >> $CONFIG_STATUS <&6 +-echo "configure:2180: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_path_LIBSMUTIL'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- case "$LIBSMUTIL" in +- /*) +- ac_cv_path_LIBSMUTIL="$LIBSMUTIL" # Let the user override the test with a path. +- ;; +- ?:/*) +- ac_cv_path_LIBSMUTIL="$LIBSMUTIL" # Let the user override the test with a dos path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$MILTERLIB:$SMPATH:/usr/local/lib:/lib:/usr/lib:/usr/lib/libsmutil:/usr/lib/libmilter" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_path_LIBSMUTIL="$ac_dir/$ac_word" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_LIBSMUTIL" && ac_cv_path_LIBSMUTIL="no" +- ;; +-esac +-fi +-LIBSMUTIL="$ac_cv_path_LIBSMUTIL" +-if test -n "$LIBSMUTIL"; then +- echo "$ac_t""$LIBSMUTIL" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi +- +-SMPATH=`echo ../sendmail-*/obj.*/libsm` +-# Extract the first word of "libsm.a", so it can be a program name with args. +-set dummy libsm.a; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2217: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_path_LIBSM'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- case "$LIBSM" in +- /*) +- ac_cv_path_LIBSM="$LIBSM" # Let the user override the test with a path. +- ;; +- ?:/*) +- ac_cv_path_LIBSM="$LIBSM" # Let the user override the test with a dos path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$MILTERLIB:$SMPATH:/usr/local/lib:/lib:/usr/lib:/usr/lib/libsm:/usr/lib/libmilter" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_path_LIBSM="$ac_dir/$ac_word" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_LIBSM" && ac_cv_path_LIBSM="no" +- ;; +-esac +-fi +-LIBSM="$ac_cv_path_LIBSM" +-if test -n "$LIBSM"; then +- echo "$ac_t""$LIBSM" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi +- + # Extract the first word of "mail", so it can be a program name with args. + set dummy mail; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +@@ -2369,12 +2295,6 @@ --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 + echo "" + +-if test "$LIBSMUTIL" = "no" ; then +- echo "Oops.. I couldn't find libsmutil.a. Please install Sendmail 8.11" +- echo "and its libraries." +- PROBLEM=1 +-fi +- + if test "$LIBMILTER" = "no" ; then + echo "Oops.. I couldn't find libmilter.a. Please install Sendmail 8.11" + echo "and its libraries." +@@ -2389,35 +2309,6 @@ + else + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lsfio" +- fi +- +- +- echo $ac_n "checking whether libmilter requires -lsm""... $ac_c" 1>&6 +-echo "configure:2397: checking whether libmilter requires -lsm" >&5 +- RESULT=`$NM $LIBMILTER | grep sm_strlcpy` +- if test -z "$RESULT" ; then +- echo "$ac_t""no" 1>&6 +- LIBSM="" +- else +- echo "$ac_t""yes" 1>&6 +- LIBS="$LIBS" +- if test "$LIBSM" = "no" ; then +- echo "Oops.. I couldn't find libsm.a. Please install Sendmail 8.12" +- echo "and its libraries." +- PROBLEM=1 +- else +- +- echo $ac_n "checking whether libsm requires -lldap""... $ac_c" 1>&6 +-echo "configure:2412: checking whether libsm requires -lldap" >&5 +- RESULT=`$NM $LIBSM | grep ldap_` +- if test -z "$RESULT" ; then +- echo "$ac_t""no" 1>&6 +- else +- echo "$ac_t""yes" 1>&6 +- LIBS="$LIBS -lldap -llber" +- fi +- +- fi + fi + + fi diff --git a/mail/mimedefang/files/patch-init-script.in b/mail/mimedefang/files/patch-init-script.in index f1f68dc34c49..e650afec44cf 100644 --- a/mail/mimedefang/files/patch-init-script.in +++ b/mail/mimedefang/files/patch-init-script.in @@ -1,5 +1,5 @@ ---- examples/init-script.in.orig Wed May 29 22:34:24 2002 -+++ examples/init-script.in Sun Jun 2 22:50:49 2002 +--- examples/init-script.in.orig Sat Jun 15 19:27:26 2002 ++++ examples/init-script.in Sat Jun 15 19:28:03 2002 @@ -37,7 +37,7 @@ MULTIPLEXOR=yes @@ -9,3 +9,17 @@ # If you want to keep spool directories around if the filter fails, # set the next one to yes +@@ -99,11 +99,11 @@ + + # Limit slave processes' resident-set size to this many kilobytes. Default + # is unlimited. +-# MX_MAX_RSS=10000 ++MX_MAX_RSS=10000 + + # Limit total size of slave processes' memory space to this many kilobytes. + # Default is unlimited. +-# MX_MAX_AS=30000 ++MX_MAX_AS=30000 + + # Number of seconds a process should be idle before checking for + # minimum number and killed diff --git a/mail/mimedefang/files/patch-mimedefang-filter.5.in b/mail/mimedefang/files/patch-mimedefang-filter.5.in deleted file mode 100644 index 116d8251fbd9..000000000000 --- a/mail/mimedefang/files/patch-mimedefang-filter.5.in +++ /dev/null @@ -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 --git a/mail/mimedefang/files/patch-mimedefang-multiplexor.8.in b/mail/mimedefang/files/patch-mimedefang-multiplexor.8.in deleted file mode 100644 index 1e30728cd16a..000000000000 --- a/mail/mimedefang/files/patch-mimedefang-multiplexor.8.in +++ /dev/null @@ -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 --git a/mail/mimedefang/files/patch-mimedefang-multiplexor.c b/mail/mimedefang/files/patch-mimedefang-multiplexor.c new file mode 100644 index 000000000000..76020fc0ed9f --- /dev/null +++ b/mail/mimedefang/files/patch-mimedefang-multiplexor.c @@ -0,0 +1,44 @@ +*** mimedefang-multiplexor.c Sat Jun 15 01:44:53 2002 +--- mimedefang-multiplexor.c Sat Jun 15 18:42:55 2002 +*************** +*** 13,19 **** + ***********************************************************************/ + + static char const RCSID[] = +! "$Id: mimedefang-multiplexor.c,v 1.71 2002/06/14 17:08:24 dfs Exp $"; + + #include "config.h" + #include "event_tcp.h" +--- 13,19 ---- + ***********************************************************************/ + + static char const RCSID[] = +! "$Id: mimedefang-multiplexor.c,v 1.72 2002/06/15 01:12:25 dfs Exp $"; + + #include "config.h" + #include "event_tcp.h" +*************** +*** 1989,1999 **** +--- 1989,2010 ---- + as *= 1024; + lim.rlim_cur = as; + lim.rlim_max = as; ++ #ifdef RLIMIT_AS + n = setrlimit(RLIMIT_AS, &lim); + if (n < 0) { + syslog(LOG_WARNING, "setrlimit(RLIMIT_AS, %lu) failed: %m", + as); + } ++ #endif ++ ++ #ifdef RLIMIT_DATA ++ n = setrlimit(RLIMIT_DATA, &lim); ++ if (n < 0) { ++ syslog(LOG_WARNING, "setrlimit(RLIMIT_DATA, %lu) failed: %m", ++ as); ++ } ++ #endif ++ + } + } + diff --git a/mail/mimedefang/files/patch-mimedefang.8.in b/mail/mimedefang/files/patch-mimedefang.8.in deleted file mode 100644 index a5450c9651c3..000000000000 --- a/mail/mimedefang/files/patch-mimedefang.8.in +++ /dev/null @@ -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 --git a/mail/mimedefang/files/patch-mimedefang.pl.8.in b/mail/mimedefang/files/patch-mimedefang.pl.8.in deleted file mode 100644 index d85b04cecb84..000000000000 --- a/mail/mimedefang/files/patch-mimedefang.pl.8.in +++ /dev/null @@ -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 --git a/mail/mimedefang/files/patch-mimedefang.pl.in b/mail/mimedefang/files/patch-mimedefang.pl.in deleted file mode 100644 index b5b15b05ec3e..000000000000 --- a/mail/mimedefang/files/patch-mimedefang.pl.in +++ /dev/null @@ -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 { diff --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist index 3cdea6d40f95..6ce44883b598 100644 --- a/mail/mimedefang/pkg-plist +++ b/mail/mimedefang/pkg-plist @@ -2,12 +2,15 @@ bin/mimedefang-multiplexor bin/mimedefang bin/mimedefang.pl etc/rc.d/mimedefang.sh-dist +etc/mimedefang/mimedefang-filter etc/mimedefang/mimedefang-filter.example +etc/mimedefang/spamassassin/sa-mimedefang.cf etc/mimedefang/spamassassin/sa-mimedefang.cf.example %%PORTDOCS%%share/doc/mimedefang/README %%PORTDOCS%%share/doc/mimedefang/README.ANOMY %%PORTDOCS%%share/doc/mimedefang/README.SPAMASSASSIN %%PORTDOCS%%share/doc/mimedefang/README.NONROOT +%%PORTDOCS%%share/doc/mimedefang/README.SECURITY %%PORTDOCS%%share/examples/mimedefang/suggested-minimum-filter-for-windows-clients %%PORTDOCS%%share/examples/mimedefang/stream-by-domain-filter %%PORTDOCS%%share/examples/mimedefang/README -- cgit