mail/mailfromd: update the port to version 8.15

Reported by:	maintainer

4 files changed, 52 insertions, 41 deletions

diff --git a/mail/mailfromd/Makefile b/mail/mailfromd/Makefile
index e4a5705f088d..c72617bcbda3 100644
--- a/mail/mailfromd/Makefile
+++ b/mail/mailfromd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mailfromd
-PORTVERSION=	8.14
+PORTVERSION=	8.15
 CATEGORIES=	mail
 MASTER_SITES=	http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
 		http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
@@ -65,6 +65,10 @@ GDBM_CONFIGURE_WITH=	gdbm
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^mfmodnew_LDADD =/s,),& $$(INTLLIBS),' \
+		${WRKSRC}/mfmod/Makefile.in
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATABASEDIR} ${STAGEDIR}${MFD_RUN_DIR}
 
diff --git a/mail/mailfromd/distinfo b/mail/mailfromd/distinfo
index a2181241bb6d..0582ac96092c 100644
--- a/mail/mailfromd/distinfo
+++ b/mail/mailfromd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660381483
-SHA256 (mailfromd-8.14.tar.xz) = 428caf1f7356b7da3a7614f5f5f47f108bf94149ab1db8c0023f1593b837bd31
-SIZE (mailfromd-8.14.tar.xz) = 1180996
+TIMESTAMP = 1670748239
+SHA256 (mailfromd-8.15.tar.xz) = 2a2d01c0c834872fe3b90b2d6e1ed2cbe4a1d2cb9d975703a4c45f67a30079ea
+SIZE (mailfromd-8.15.tar.xz) = 1345180
diff --git a/mail/mailfromd/files/patch-etc_Makefile.in b/mail/mailfromd/files/patch-etc_Makefile.in
index 4ef7d744553f..21a21f199aa5 100644
--- a/mail/mailfromd/files/patch-etc_Makefile.in
+++ b/mail/mailfromd/files/patch-etc_Makefile.in
@@ -1,14 +1,15 @@
---- etc/Makefile.in.orig	2017-04-09 17:50:03 UTC
+--- etc/Makefile.in.orig	2022-12-11 08:36:14 UTC
 +++ etc/Makefile.in
-@@ -681,9 +681,8 @@ check-am: mailfromd.lint
+@@ -716,10 +716,8 @@ check-am: mailfromd.lint
  
  install-data-local:
  	@test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
--	@if [ -r $(DESTDIR)$(sysconfdir)/mailfromd.mf ]; then :; \
--	else ${INSTALL} -m 644 $(top_srcdir)/etc/mailfromd.mf \
--               $(DESTDIR)$(sysconfdir)/mailfromd.mf; fi
-+	${INSTALL} -m 644 $(top_srcdir)/etc/mailfromd.mf \
-+               $(DESTDIR)$(sysconfdir)/mailfromd.mf.sample
+-	@if [ -r $(DESTDIR)$(sysconfdir)/mailfromd.mfl ] || \
+-            [ -r $(DESTDIR)$(sysconfdir)/mailfromd.mf ]; then :; \
+-	else ${INSTALL} -m 644 $(top_srcdir)/etc/mailfromd.mfl \
+-               $(DESTDIR)$(sysconfdir)/mailfromd.mfl; fi
++	${INSTALL} -m 644 $(top_srcdir)/etc/mailfromd.mfl \
++               $(DESTDIR)$(sysconfdir)/mailfromd.mfl.sample
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/mail/mailfromd/pkg-plist b/mail/mailfromd/pkg-plist
index c91b08e8e04b..f8f716415951 100644
--- a/mail/mailfromd/pkg-plist
+++ b/mail/mailfromd/pkg-plist
@@ -1,8 +1,12 @@
 bin/mfdbtool
+bin/mfmodnew
 bin/mtasim
-@sample etc/mailfromd.mf.sample
+@sample etc/mailfromd.mfl.sample
+include/mailfromd/exceptions.h
+include/mailfromd/mfmod.h
 sbin/calloutd
 sbin/mailfromd
+share/aclocal/mfmod.m4
 %%NLS%%share/locale/da/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/id/LC_MESSAGES/mailfromd.mo
@@ -11,36 +15,38 @@ sbin/mailfromd
 %%NLS%%share/locale/sr/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/mailfromd.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/mailfromd.mo
-%%DATADIR%%/%%VERSION%%/include/_register.mf
-%%DATADIR%%/%%VERSION%%/include/callout.mf
-%%DATADIR%%/%%VERSION%%/include/dkim.mf
-%%DATADIR%%/%%VERSION%%/include/dns.mf
-%%DSPAM%%%%DATADIR%%/%%VERSION%%/include/dspam.mf
-%%DATADIR%%/%%VERSION%%/include/gettext.mf
-%%DATADIR%%/%%VERSION%%/include/header_rename.mf
-%%DATADIR%%/%%VERSION%%/include/heloarg_test.mf
-%%DATADIR%%/%%VERSION%%/include/is_ip.mf
-%%DATADIR%%/%%VERSION%%/include/localdomain.mf
-%%DATADIR%%/%%VERSION%%/include/match_cidr.mf
-%%DATADIR%%/%%VERSION%%/include/match_dnsbl.mf
-%%DATADIR%%/%%VERSION%%/include/match_rhsbl.mf
-%%DATADIR%%/%%VERSION%%/include/mime.mf
-%%DATADIR%%/%%VERSION%%/include/poll.mf
-%%DATADIR%%/%%VERSION%%/include/portprobe.mf
+%%DATADIR%%/%%VERSION%%/_register.mfl
+%%DATADIR%%/%%VERSION%%/callout.mfl
+%%DATADIR%%/%%VERSION%%/dkim.mfl
+%%DATADIR%%/%%VERSION%%/dns.mfl
+%%DATADIR%%/%%VERSION%%/gettext.mfl
+%%DATADIR%%/%%VERSION%%/header_rename.mfl
+%%DATADIR%%/%%VERSION%%/heloarg_test.mfl
 %%DATADIR%%/%%VERSION%%/include/pp-setup
-%%DATADIR%%/%%VERSION%%/include/rateok.mf
-%%DATADIR%%/%%VERSION%%/include/revip.mf
-%%DATADIR%%/%%VERSION%%/include/sa.mf
-%%DATADIR%%/%%VERSION%%/include/safedb.mf
-%%DATADIR%%/%%VERSION%%/include/sieve.mf
-%%DATADIR%%/%%VERSION%%/include/sockmap.mf
-%%DATADIR%%/%%VERSION%%/include/spf.mf
-%%DATADIR%%/%%VERSION%%/include/status.mf
-%%DATADIR%%/%%VERSION%%/include/status.mfh
-%%DATADIR%%/%%VERSION%%/include/strip_domain_part.mf
-%%DATADIR%%/%%VERSION%%/include/syslog.mf
-%%DATADIR%%/%%VERSION%%/include/valid_domain.mf
-%%DATADIR%%/%%VERSION%%/include/verp.mf
+%%DATADIR%%/%%VERSION%%/is_ip.mfl
+%%DATADIR%%/%%VERSION%%/localdomain.mfl
+%%DATADIR%%/%%VERSION%%/match_cidr.mfl
+%%DATADIR%%/%%VERSION%%/match_dnsbl.mfl
+%%DATADIR%%/%%VERSION%%/match_rhsbl.mfl
+%%DATADIR%%/%%VERSION%%/mime.mfl
+%%DATADIR%%/%%VERSION%%/poll.mfl
+%%DATADIR%%/%%VERSION%%/portprobe.mfl
+%%DATADIR%%/%%VERSION%%/rateok.mfl
+%%DATADIR%%/%%VERSION%%/revip.mfl
+%%DATADIR%%/%%VERSION%%/sa.mfl
+%%DATADIR%%/%%VERSION%%/safedb.mfl
+%%DATADIR%%/%%VERSION%%/sieve.mfl
+%%DATADIR%%/%%VERSION%%/sockmap.mfl
+%%DATADIR%%/%%VERSION%%/spf.mfl
+%%DATADIR%%/%%VERSION%%/status.mfl
+%%DATADIR%%/%%VERSION%%/strip_domain_part.mfl
+%%DATADIR%%/%%VERSION%%/syslog.mfl
+%%DATADIR%%/%%VERSION%%/valid_domain.mfl
+%%DATADIR%%/%%VERSION%%/verp.mfl
+%%DATADIR%%/mfmod/template.ac
+%%DATADIR%%/mfmod/template.am
+%%DATADIR%%/mfmod/template.c
+%%DATADIR%%/mfmod/template.mfl
 %%DATADIR%%/postfix-macros.sed
 @dir(mailnull,mail,700) %%DATABASEDIR%%
 @dir(mailnull,mail,700) %%MFD_RUN_DIR%%