diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/mimedefang/Makefile | 2 | ||||
-rw-r--r-- | mail/mimedefang/distinfo | 2 | ||||
-rw-r--r-- | mail/mimedefang/files/patch-Makefile.in | 32 | ||||
-rw-r--r-- | mail/mimedefang/pkg-plist | 1 |
4 files changed, 19 insertions, 18 deletions
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index 66cb4dde2978..9f36d2455006 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mimedefang -PORTVERSION= 2.17 +PORTVERSION= 2.18 CATEGORIES= mail MASTER_SITES= http://www.roaringpenguin.com/mimedefang/ diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo index 26ed4809b748..232e122129ef 100644 --- a/mail/mimedefang/distinfo +++ b/mail/mimedefang/distinfo @@ -1 +1 @@ -MD5 (mimedefang-2.17.tar.gz) = 0cf138c51ee853d4396b1cc0cb96b4c3 +MD5 (mimedefang-2.18.tar.gz) = 014076fd5bcac6e0a918fc0a88c44384 diff --git a/mail/mimedefang/files/patch-Makefile.in b/mail/mimedefang/files/patch-Makefile.in index 077e9d10fc24..0cb64dc6096d 100644 --- a/mail/mimedefang/files/patch-Makefile.in +++ b/mail/mimedefang/files/patch-Makefile.in @@ -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 --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist index f08d596f0a73..d192b3992ebb 100644 --- a/mail/mimedefang/pkg-plist +++ b/mail/mimedefang/pkg-plist @@ -6,6 +6,7 @@ etc/rc.d/mimedefang.sh-dist 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 |