4 files changed, 22 insertions, 33 deletions
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index 8f8c700dacba..1540f62240aa 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	esmtp
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Relay-only Mail Transfer Agent with sendmail compatible syntax
@@ -28,34 +26,34 @@ MAN5=		esmtprc.5
 PORTDOCS=	README
 PLIST_FILES=	bin/esmtp etc/esmtprc.sample
 
+SUB_FILES=	pkg-message
+
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g' \
-		${WRKSRC}/sample.esmtprc
-	@${REINPLACE_CMD} -e 's|sendmail(1)|sendmail(8)|g ; \
-		s|/etc|${PREFIX}/etc|g' ${WRKSRC}/${PORTNAME}.1
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' \
-		${WRKSRC}/parser.c ${WRKSRC}/parser.y
+.for file in ${PORTNAME}.1
+	@${REINPLACE_CMD} -e \
+		's|^/etc|${PREFIX}/etc|g' ${WRKSRC}/${file}
+.endfor
+.for file in esmtprc.5 sample.esmtprc
+	@${REINPLACE_CMD} -e \
+		's|/usr/bin/|${LOCALBASE}/bin/|g ; \
+		 s|/usr/lib/|/usr/libexec/|g' ${WRKSRC}/${file}
+.endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${MAN5PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc \
 		${PREFIX}/etc/esmtprc.sample
-	@${ECHO_MSG} "------------------------------------------------------------"
-	@${ECHO_MSG} "Sample of configuration file placed at"
-	@${ECHO_MSG} "${PREFIX}/etc/esmtprc.sample"
-	@${ECHO_MSG} "------------------------------------------------------------"
-
-post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/esmtp/distinfo b/mail/esmtp/distinfo
index 387031eaab88..8bd58b298b55 100644
--- a/mail/esmtp/distinfo
+++ b/mail/esmtp/distinfo
@@ -1,3 +1,3 @@
-MD5 (esmtp-0.5.1.tar.bz2) = 9f0b809e891a548910f099efc4315b02
-SHA256 (esmtp-0.5.1.tar.bz2) = ae023107f8e0c872a2bb6f23a9a5f019b254e9b7eebd20a309af996d9cb7e38e
-SIZE (esmtp-0.5.1.tar.bz2) = 127355
+MD5 (esmtp-1.0.tar.bz2) = e4c4e00eecb70b528a9d772d2e633b29
+SHA256 (esmtp-1.0.tar.bz2) = b880708a52968ca9506ea8d9578ba1cfa8bb5586f51a421279803c8260dbb190
+SIZE (esmtp-1.0.tar.bz2) = 122979
diff --git a/mail/esmtp/files/patch-esmtprc.5 b/mail/esmtp/files/patch-esmtprc.5
deleted file mode 100644
index fd1a13fe83d8..000000000000
--- a/mail/esmtp/files/patch-esmtprc.5
+++ /dev/null
@@ -1,13 +0,0 @@
---- esmtprc.5.orig     Wed Feb 16 04:07:57 2005
-+++ esmtprc.5  Sun Apr 10 10:04:14 2005
-@@ -137,8 +137,8 @@
- place a %T.  The mail message's \fBFrom\fR address will be inserted where you
- place an %F.
- 
--Some common MDAs are "/usr/bin/procmail -d %T", "/usr/bin/deliver" and
--"/usr/lib/mail.local %T".
-+Some common MDAs are "/usr/local/bin/procmail -d %T"
-+and "/usr/libexec/mail.local %T".
- 
- .SH SEE ALSO
- esmtp(1)
diff --git a/mail/esmtp/files/pkg-message.in b/mail/esmtp/files/pkg-message.in
new file mode 100644
index 000000000000..018a0fd4efbe
--- /dev/null
+++ b/mail/esmtp/files/pkg-message.in
@@ -0,0 +1,4 @@
+------------------------------------------------------------
+Sample of configuration file placed at
+%%PREFIX%%/etc/esmtprc.sample
+------------------------------------------------------------