Index: head/mail/mailfromd/Makefile
===================================================================
--- head/mail/mailfromd/Makefile	(revision 467303)
+++ head/mail/mailfromd/Makefile	(revision 467304)
@@ -1,75 +1,74 @@
 # Created by: Zeus Panchenko <zeus@gnu.org.ua>
 # $FreeBSD$
 
 PORTNAME=	mailfromd
-PORTVERSION=	8.4
-PORTREVISION=	1
+PORTVERSION=	8.5
 CATEGORIES=	mail
 MASTER_SITES=	http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
 		http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
 
 MAINTAINER=	zeus@gnu.org.ua
 COMMENT=	Mail filtering daemon for Sendmail, Postfix, and MeTA1
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libmailutils.so:mail/mailutils \
 		libadns.so:dns/adns
 
 USES=		gmake localbase readline tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	DEFAULT_STATE_DIR="${DATABASEDIR}" \
 		DEFAULT_SOCKET="unix:${MFD_RUN_DIR}/${PORTNAME}.sock" \
 		DEFAULT_USER=mailnull
 USE_RC_SUBR=	${PORTNAME}
 
 DATABASEDIR?=	/var/db/${PORTNAME}
 MFD_RUN_DIR?=	/var/run/${PORTNAME}
 
 PLIST_SUB+=	DATABASEDIR=${DATABASEDIR} \
 		MFD_RUN_DIR=${MFD_RUN_DIR} \
 		VERSION=${PORTVERSION}
 SUB_LIST+=	MFD_RUN_DIR=${MFD_RUN_DIR}
 
 INFO=		${PORTNAME}
 PORTDOCS=	AUTHORS ChangeLog NEWS README THANKS TODO
 
 OPTIONS_DEFINE=		DEBUG DOCS DSPAM GEOIP NLS
 OPTIONS_DEFAULT=	GDBM
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	BDB GDBM
 OPTIONS_SUB=		yes
 
 BDB_DESC=		Berkeley DB v4.8 support (last working one)
 DB_DESC=		Database configuration
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 DSPAM_DESC=		DSPAM spam filter library support
 DSPAM_LIB_DEPENDS=	libdspam.so:mail/dspam
 DSPAM_USES=		pkgconfig
 DSPAM_CONFIGURE_WITH=	dspam
 
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 GEOIP_CONFIGURE_WITH=	geoip
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 BDB_USES=		bdb:48
 BDB_CONFIGURE_WITH=	berkeley-db
 BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
 BDB_LDFLAGS=		-L${BDB_LIB_DIR}
 INVALID_BDB_VER=	5+
 
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATABASEDIR} ${STAGEDIR}${MFD_RUN_DIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/mailfromd/distinfo
===================================================================
--- head/mail/mailfromd/distinfo	(revision 467303)
+++ head/mail/mailfromd/distinfo	(revision 467304)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509687308
-SHA256 (mailfromd-8.4.tar.xz) = 2bc05fadf3bef1284f1e9b9ffe2335b0e5fc144ace67c7016527d977ea06556c
-SIZE (mailfromd-8.4.tar.xz) = 1056656
+TIMESTAMP = 1523602394
+SHA256 (mailfromd-8.5.tar.xz) = 7796223635ce8a912a649de566f9595432590c6b6d38db7c56d61ab6b86fbbc3
+SIZE (mailfromd-8.5.tar.xz) = 1054908
Index: head/mail/mailfromd/files/patch-lib_dns.c
===================================================================
--- head/mail/mailfromd/files/patch-lib_dns.c	(revision 467303)
+++ head/mail/mailfromd/files/patch-lib_dns.c	(nonexistent)
@@ -1,55 +0,0 @@
-From 2d91db836a95a66c7b9ad1acb9dd0ebf93fb4f44 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Fri, 23 Mar 2018 11:00:37 +0000
-Subject: Fix dns_resolve_ipstr
-
-* lib/dns.c (dns_resolve_ipstr): Select rrtype depending on the
-domain in question. This should produce the same results as it was
-in the previous res_query implementation, which queried for T_ANY
-and selected the first RR type returned.
-
---- lib/dns.c.orig	2017-11-03 05:06:35 UTC
-+++ lib/dns.c
-@@ -438,27 +438,35 @@ dns_resolve_ipstr(const char *ipstr, const char *domai
- 	int rc;
- 	adns_answer *ans;
- 	char *name;
--
--	if (!dns_str_is_ipv4(ipstr))
--		return dns_failure;
--	if (!domain) {
-+	adns_rrtype type;
-+	
-+	if (!domain || strcasecmp(domain, "in-addr.arpa") == 0) {
- 		IPBUF ipbuf;
-+		if (!dns_str_is_ipv4(ipstr))
-+			return dns_failure;
-                 if (dns_reverse_ipstr(ipstr, ipbuf))
-                         return dns_failure;
- 		mu_asprintf(&name, "%s.in-addr.arpa", ipbuf);
-+		type = adns_r_ptr_raw;
-         } else {
- 		mu_asprintf(&name, "%s.%s", ipstr, domain);
-+		type = adns_r_a;
-         }
- 
--	rc = adns_synchronous(get_state(), name, adns_r_ptr_raw,
-+	rc = adns_synchronous(get_state(), name, type,
- 			      DEFAULT_QFLAGS,
- 			      &ans);
- 	free(name);
- 	if (rc)
- 		return errno_to_dns_status(rc);
- 	status = adns_to_dns_status(ans->status);
--	if (status == dns_success)
--		*hbuf = mu_strdup(ans->rrs.str[0]);
-+	if (status == dns_success) {
-+		if (ans->type == adns_r_ptr_raw) {
-+			*hbuf = mu_strdup(ans->rrs.str[0]);
-+		} else {
-+			*hbuf = mu_strdup(inet_ntoa(ans->rrs.inaddr[0]));
-+		}
-+	}
- 	free(ans);
- 	return status;
- }

Property changes on: head/mail/mailfromd/files/patch-lib_dns.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property