4 files changed, 19 insertions, 89 deletions

diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 37cb3afee50c..6635d569fb1f 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -6,32 +6,39 @@
 #
 
 PORTNAME=	smtpfeed
-PORTVERSION=	1.20
+PORTVERSION=	1.21
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/smtpfeed/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SMTP Fast Exploding External Deliverer for Sendmail
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
 NO_PACKAGE=	complex configuration for sendmail.cf needed
 
+OPTIONS_DEFINE=	DOCS
+
 GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
 
-MAN8=		smtpfeed.8
+SUB_FILES=	pkg-message
 
-MYPORTDOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
-		ML-ADMIN ML-ADMIN.j \
-		OPTIONS OPTIONS.j README README.j RELEASE.NOTE SIGNAL \
-		SIGNAL.j TODO smtpfeed.html
+MAN8=		smtpfeed.8
+PORTDOCS=	FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
+		ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \
+		RELEASE.NOTE SIGNAL SIGNAL.j TODO smtpfeed.html
+PLIST_FILES=	libexec/smtpfeed
 
-SUB_FILES=	pkg-message
+.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/smtpfeed ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${MANPREFIX}/man/man8
-.if !defined(NOPORTDOCS)
+	${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${MAN8PREFIX}/man/man8
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.for file in ${MYPORTDOCS}
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/mail/smtpfeed/distinfo b/mail/smtpfeed/distinfo
index e708d3a5afe0..743a1add2d89 100644
--- a/mail/smtpfeed/distinfo
+++ b/mail/smtpfeed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (smtpfeed-1.20.tar.gz) = 614f24f72918c0ea0868e27cf6170ca5acc73d517998b5d2fded06116dd0c1be
-SIZE (smtpfeed-1.20.tar.gz) = 141144
+SHA256 (smtpfeed-1.21.tar.gz) = d769aa681fde8e9a7a502d2b3cb42d7618a8440f2e61acdc73d19534e19aa7c3
+SIZE (smtpfeed-1.21.tar.gz) = 146056
diff --git a/mail/smtpfeed/files/patch-dns.c b/mail/smtpfeed/files/patch-dns.c
deleted file mode 100644
index c4c358ff8124..000000000000
--- a/mail/smtpfeed/files/patch-dns.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- dns.c.old	2003-08-20 14:13:03.000000000 +0900
-+++ dns.c	2008-07-21 17:42:39.000000000 +0900
-@@ -79,6 +79,13 @@
- # define RES_INSECURE1	0x00000400	/* type 1 security disabled */
- #endif
- 
-+static int query_domain (char *, int);
-+static int make_query (struct dns_stat *, int);
-+static int process_query (int);
-+static void remove_query (struct query_chain *);
-+static void got_answer (struct query_chain *, u_char *, int);
-+static struct mx* newmx (char *, int, int, struct domain *, long);
-+
- int
- pregetmx(dl)
- struct domain *dl;
-@@ -87,7 +94,6 @@
- 	char **map_arg;
- 	long stime, etime;
- 	int n;
--	static int query_domain(), process_query();
- #ifdef INET6
- 	SockAddr dsin;	/* dummy */
- #endif
-@@ -353,7 +359,6 @@
- int type;
- {
- 	struct dns_stat *qrp, **hashp;
--	static int make_query();
- 
- 	qrp = hash_query_lookup(name, &hashp);
- 	if (qrp == NULL) {
-@@ -396,7 +401,6 @@
- 	u_char buf[MAXPACKET];
- 	int n;
- 	struct query_chain *qchain;
--	static int process_query();
- 
- 	switch (type) {
- 	  case T_MX:
-@@ -591,8 +595,6 @@
- 	char nbuf[MAXDNAME+1];
- 	struct dns_stat *qrp;
- 	int pending;
--	static void got_answer();
--	static void remove_query();
- 
- 	if (sync == 0 && cnf.cquery_max != 0
- 	 && query_chain_count >= cnf.cquery_max)
-@@ -1764,7 +1766,6 @@
- #endif
- 					{
- 						struct mx *gwmxp;
--						static struct mx* newmx();
- 
- 						if (cnf.debug & DEBUG_DNS)
- 						log(LOG_DEBUG, "setting protocol gateway as first MX");
diff --git a/mail/smtpfeed/pkg-plist b/mail/smtpfeed/pkg-plist
deleted file mode 100644
index 293dde387335..000000000000
--- a/mail/smtpfeed/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-libexec/smtpfeed
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES.j
-%%PORTDOCS%%%%DOCSDIR%%/FYI
-%%PORTDOCS%%%%DOCSDIR%%/FYI.j
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.j
-%%PORTDOCS%%%%DOCSDIR%%/ML-ADMIN
-%%PORTDOCS%%%%DOCSDIR%%/ML-ADMIN.j
-%%PORTDOCS%%%%DOCSDIR%%/OPTIONS
-%%PORTDOCS%%%%DOCSDIR%%/OPTIONS.j
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.j
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTE
-%%PORTDOCS%%%%DOCSDIR%%/SIGNAL
-%%PORTDOCS%%%%DOCSDIR%%/SIGNAL.j
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/smtpfeed.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%