- Update to 2.44

PR:		ports/69178
Submitted by:	Andrey V. Pevnev <andrey@msfu.ru> (maintainer)

5 files changed, 18 insertions, 39 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 3e3abf8d375d..c9414f9bcfe9 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mimedefang
-PORTVERSION=	2.43
-PORTREVISION=	2
+PORTVERSION=	2.44
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mimedefang.org/static/
 
@@ -40,7 +39,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/mimedefang \
 			--prefix=${PREFIX}
 
 MAN5=	mimedefang-filter.5
-MAN7=	mimedefang-protocol.7
+MAN7=	mimedefang-notify.7 mimedefang-protocol.7
 MAN8=	mimedefang.8 mimedefang.pl.8 mimedefang-multiplexor.8 \
 	md-mx-ctrl.8 watch-mimedefang.8
 
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index d728f575d301..8dad7609b67e 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,2 +1,2 @@
-MD5 (mimedefang-2.43.tar.gz) = 08573cd3403443d1bd1bed8778cf645e
-SIZE (mimedefang-2.43.tar.gz) = 275595
+MD5 (mimedefang-2.44.tar.gz) = c818e9f92d7aaf5360b5b7464b9e81c4
+SIZE (mimedefang-2.44.tar.gz) = 277642
diff --git a/mail/mimedefang/files/patch-Makefile.in b/mail/mimedefang/files/patch-Makefile.in
index 0b16d958704c..214c11da1621 100644
--- a/mail/mimedefang/files/patch-Makefile.in
+++ b/mail/mimedefang/files/patch-Makefile.in
@@ -1,26 +1,26 @@
---- Makefile.in.orig	Thu Jun 26 22:13:09 2003
-+++ Makefile.in	Thu Jun 26 22:18:40 2003
-@@ -173,9 +173,8 @@
+--- Makefile.in.orig	Sat Jul 17 15:00:15 2004
++++ Makefile.in	Sat Jul 17 15:43:49 2004
+@@ -196,9 +196,8 @@
  	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
  	-test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || true
  
 -	if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter ; then \
 -		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
 -	else \
-+	@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
++	@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1;
 +	if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter) ; then \
  		@INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter || exit 1; \
  	fi
  
-@@ -194,9 +193,8 @@
+@@ -218,9 +217,8 @@
  	if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
- 		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin > /dev/null 2>&1 ; \
- 		chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin ;\
--		if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf ; then \
--			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \
+ 		mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR} > /dev/null 2>&1 ; \
+ 		chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR} ;\
+-		if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}sa-mimedefang.cf ; then \
+-			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
 -		else \
-+		@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \
-+		if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf) ; then \
- 			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf || exit 1; \
++		@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
++		if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}sa-mimedefang.cf) ; then \
+ 			@INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf || exit 1; \
  		fi \
  	fi
diff --git a/mail/mimedefang/files/patch-embperl.c b/mail/mimedefang/files/patch-embperl.c
deleted file mode 100644
index 2812e2658357..000000000000
--- a/mail/mimedefang/files/patch-embperl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- embperl.c.orig	Wed Jun 30 00:57:57 2004
-+++ embperl.c	Wed Jun 30 01:01:55 2004
-@@ -26,6 +26,9 @@
-     char *argv[6];
-     int argc;
- 
-+#ifdef SAFE_EMBED_PERL
-+	PL_perl_destruct_level = 1;
-+#endif
-     if (my_perl != NULL) {
- #ifdef SAFE_EMBED_PERL
- 	perl_destruct(my_perl);
-@@ -46,7 +49,6 @@
- #ifdef PERL_SET_CONTEXT
-     PERL_SET_CONTEXT(my_perl);
- #endif
--    PL_perl_destruct_level = 1;
-     perl_construct(my_perl);
-     if (subFilter) {
- 	argv[0] = "";
diff --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist
index 75b2f723defe..92fe2f2ec6cd 100644
--- a/mail/mimedefang/pkg-plist
+++ b/mail/mimedefang/pkg-plist
@@ -6,8 +6,8 @@ bin/watch-mimedefang
 etc/rc.d/mimedefang.sh-dist
 @unexec if cmp -s %D/etc/mimedefang/mimedefang-filter %D/etc/mimedefang/mimedefang-filter.example; then rm -f %D/etc/mimedefang/mimedefang-filter; fi
 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
+@unexec if cmp -s %D/etc/mimedefang/sa-mimedefang.cf %D/etc/mimedefang/sa-mimedefang.cf.example; then rm -f %D/etc/mimedefang/sa-mimedefang.cf; fi
+etc/mimedefang/sa-mimedefang.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.ANOMY
 %%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN