Update to 1.18

PR:		36583
Submitted by:	tkato@prontomail.com

6 files changed, 27 insertions, 65 deletions

diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 79c58b8954e1..6a1a1b78693a 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -6,57 +6,33 @@
 #
 
 PORTNAME=	smtpfeed
-PORTVERSION=	1.13
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ \
-		ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/ \
-		ftp://ftp.sendmail.org/ucb/src/sendmail/ \
-		http://freefall.freebsd.org/~itojun/distfiles/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SENDMAIL}${EXTRACT_SUFX} \
-		${SENDMAILPATCH}.patch.gz
-
-MAINTAINER=	ports@freebsd.org
-
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${SENDMAIL}${EXTRACT_SUFX}
-PATCH_SENDMAIL_ARGS=	-d ${WRKSRC_SENDMAIL} -E ${PATCH_DIST_STRIP}
-NO_PACKAGE=	"complex configuration for sendmail.cf needed"
+PORTVERSION=	1.18
+CATEGORIES=	mail ipv6
+MASTER_SITES=	ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/
 
-SENDMAILVER=	8.9.3
-SENDMAIL=	sendmail.${SENDMAILVER}
-SENDMAILDIR=	sendmail-${SENDMAILVER}
-SENDMAILPATCH=	sendmail893+3.2W
-WRKSRC_SMTPFEED=	${WRKSRC}
-WRKSRC_SENDMAIL=	${WRKDIR}/${SENDMAILDIR}/src
+MAINTAINER=	ports@FreeBSD.org
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec
-# use bind8?
-#CONFIGURE_ARGS+=	--with-bind8
+RUN_DEPENDS=	${LOCALBASE}/sbin/sendmail:${PORTSDIR}/mail/sendmail
+
+NO_PACKAGE=	"complex configuration for sendmail.cf needed"
 
-DOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
-	OPTIONS OPTIONS.j README README.j RELEASE.NOTE SIGNAL SIGNAL.j TODO
-DOCDIR=	${PREFIX}/share/doc/smtpfeed
+GNU_CONFIGURE=	yes
 
-post-patch:
-	@${ECHO_MSG} "===>  Applying smtpfeed patch ${SENDMAILPATCH} to ${SENDMAIL}"
-	@(cd ${_DISTDIR}; for i in ${SENDMAILPATCH}.patch.gz; do \
-		${GZCAT} $$i | ${PATCH} ${PATCH_SENDMAIL_ARGS}; \
-	done)
+MAN8=		smtpfeed.8
 
-post-build:
-	@${ECHO_MSG} "===>  Building patched ${SENDMAIL}"
-	@(cd ${WRKSRC_SENDMAIL}; sh makesendmail)
+PORTDOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
+		OPTIONS OPTIONS.j README README.j RELEASE.NOTE SIGNAL \
+		SIGNAL.j TODO smtpfeed.html
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/smtpfeed ${PREFIX}/libexec
+	${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${MANPREFIX}/man/man8
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCDIR}
-	for i in ${DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; \
-	done
+	${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 	@${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE}
 
-install-sendmail:
-	(cd ${WRKSRC_SENDMAIL}; sh makesendmail install)
-
 .include <bsd.port.mk>
diff --git a/mail/smtpfeed/distinfo b/mail/smtpfeed/distinfo
index 8e6ee2d6d221..b875328281ad 100644
--- a/mail/smtpfeed/distinfo
+++ b/mail/smtpfeed/distinfo
@@ -1,3 +1 @@
-MD5 (smtpfeed-1.13.tar.gz) = 5240031fa84f26f8cdd4c6a79ebdeb0b
-MD5 (sendmail.8.9.3.tar.gz) = efedacfbce84a71d1cfb0e617b84596e
-MD5 (sendmail893+3.2W.patch.gz) = 77e2183c40e304a2b1410a5bb041cd46
+MD5 (smtpfeed-1.18.tar.gz) = 0e2fba84682992c1aa6bd6ed3f872141
diff --git a/mail/smtpfeed/files/patch-aa b/mail/smtpfeed/files/patch-aa
deleted file mode 100644
index 007e39e70a65..000000000000
--- a/mail/smtpfeed/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Sun Jan 18 23:02:21 1998
-+++ Makefile.in	Sun Jan 18 23:02:34 1998
-@@ -70,7 +70,6 @@
- 	${RM} -f ${OBJS} ${OBJADDS} ${TARGET} res_send.c
- 
- install:
--	-mv -f ${DEST}/${TARGET} ${DEST}/${TARGET}.old
- 	${INSTALL} ${TARGET} ${DEST}
- 
- gcc2-lint:
diff --git a/mail/smtpfeed/pkg-descr b/mail/smtpfeed/pkg-descr
index d2e0af3c32e9..d3434ebb4630 100644
--- a/mail/smtpfeed/pkg-descr
+++ b/mail/smtpfeed/pkg-descr
@@ -15,3 +15,5 @@ a delivery is not influenced by preceding delivery: DNS query and
 SMTP delivery par destination should be processed in parallel.
 Smtpfeed is the SMTP delivery agent for sendmail implemented with this
 idea.
+
+WWW: http://www.kyoto.wide.ad.jp/smtpfeed/
diff --git a/mail/smtpfeed/pkg-message b/mail/smtpfeed/pkg-message
index c728f8e81b3e..e0cb33e0371c 100644
--- a/mail/smtpfeed/pkg-message
+++ b/mail/smtpfeed/pkg-message
@@ -1,18 +1,13 @@
 **************************************************************
 smtpfeed is installed into /usr/local/libexec/smtpfeed.
-You'll need to perform 3 steps, (a) to (c), to make smtpfeed
+You'll need to perform 2 steps, (a) to (b), to make smtpfeed
 work:
 	(a) replace /etc/sendmail.cf
-	(b) replace sendmail with the patched sendmail
-	(c) setting up /etc/syslog.conf
+	(b) setting up /etc/syslog.conf
 
 (a) depends on what kind of configuration tool you are using
 with sendmail.cf.  Read through documentation in
 /usr/local/share/doc/smtpfeed for details.
-(b) can be done by performing "make install-sendmail" in the
-port directory.
-WARNING: Existing sendmail will be overwritten right away!
-Backup by yourself for safety.
-(c) is the easiest of the three items; see file named INSTALL
-in /usr/local/share/doc/smtpfeed.
+(b) see file named INSTALL in
+/usr/local/share/doc/smtpfeed for details.
 **************************************************************
diff --git a/mail/smtpfeed/pkg-plist b/mail/smtpfeed/pkg-plist
index 4176b7319350..efadc1f01eed 100644
--- a/mail/smtpfeed/pkg-plist
+++ b/mail/smtpfeed/pkg-plist
@@ -14,4 +14,5 @@ libexec/smtpfeed
 %%PORTDOCS%%share/doc/smtpfeed/SIGNAL
 %%PORTDOCS%%share/doc/smtpfeed/SIGNAL.j
 %%PORTDOCS%%share/doc/smtpfeed/TODO
+%%PORTDOCS%%share/doc/smtpfeed/smtpfeed.html
 %%PORTDOCS%%@dirrm share/doc/smtpfeed