5 files changed, 27 insertions, 62 deletions

diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index cfe44bef2422..d48e069af6cf 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	esmtp
-PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTVERSION=	0.5.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,18 +17,21 @@ COMMENT=	Relay-only Mail Transfer Agent with sendmail compatible syntax
 LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
 
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GETOPT_LONG=	yes
 USE_OPENSSL=	yes
-USE_REINPLACE=	yes
 USE_BISON=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+USE_GETOPT_LONG=	yes
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-DOC_FILES=	README
 MAN1=		esmtp.1
 MAN5=		esmtprc.5
+PORTDOCS=	README
+PLIST_FILES=	bin/esmtp etc/esmtprc.sample
+
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g' \
@@ -41,20 +43,20 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${MANPREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc \
 		${PREFIX}/etc/esmtprc.sample
-	@${ECHO} "------------------------------------------------------------"
-	@${ECHO} "Sample of configuration file placed at"
-	@${ECHO} "${PREFIX}/etc/esmtprc.sample"
-	@${ECHO} "------------------------------------------------------------"
+	@${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 ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+.for doc in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/mail/esmtp/distinfo b/mail/esmtp/distinfo
index 431d85a80b17..fbb96020df3b 100644
--- a/mail/esmtp/distinfo
+++ b/mail/esmtp/distinfo
@@ -1,2 +1,2 @@
-MD5 (esmtp-0.5.0.tar.bz2) = b22933aa12167080959b42b025047639
-SIZE (esmtp-0.5.0.tar.bz2) = 125494
+MD5 (esmtp-0.5.1.tar.bz2) = 9f0b809e891a548910f099efc4315b02
+SIZE (esmtp-0.5.1.tar.bz2) = 127355
diff --git a/mail/esmtp/files/patch-esmtprc.5 b/mail/esmtp/files/patch-esmtprc.5
index 03e77453bde0..fd1a13fe83d8 100644
--- a/mail/esmtp/files/patch-esmtprc.5
+++ b/mail/esmtp/files/patch-esmtprc.5
@@ -1,11 +1,11 @@
---- esmtprc.5.orig	Tue Jul 15 07:57:07 2003
-+++ esmtprc.5	Tue Jul 15 07:58:05 2003
-@@ -96,8 +96,8 @@
- place a %T. The mail message's \fBFrom\fR address will be inserted where you
+--- 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/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".
  
diff --git a/mail/esmtp/files/patch-smtp.c b/mail/esmtp/files/patch-smtp.c
deleted file mode 100644
index 6c6334512041..000000000000
--- a/mail/esmtp/files/patch-smtp.c
+++ /dev/null
@@ -1,33 +0,0 @@
-
-$FreeBSD$
-
---- smtp.c.orig	Fri Nov  7 12:47:16 2003
-+++ smtp.c	Tue Jun 29 15:27:29 2004
-@@ -426,9 +426,14 @@
- 		goto failure;
- 
- 	/* Do what's needed at application level to use authentication. */
--	authctx = auth_create_context ();
--	auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
--	auth_set_interact_cb (authctx, authinteract, identity);
-+	if(identity->user || identity->pass)
-+	{
-+		authctx = auth_create_context ();
-+		auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
-+		auth_set_interact_cb (authctx, authinteract, identity);
-+	}
-+	else
-+		authctx = NULL;
- 
- 	/* Use our callback for X.509 certificate passwords.  If STARTTLS is not in
- 	 * use or disabled in configure, the following is harmless.
-@@ -560,7 +565,8 @@
- 		fputc('\n', log_fp);
- 
- 	smtp_destroy_session (session);
--	auth_destroy_context (authctx);
-+	if(authctx)
-+		auth_destroy_context (authctx);
- 	auth_client_exit ();
- 
- 	return;
diff --git a/mail/esmtp/pkg-plist b/mail/esmtp/pkg-plist
deleted file mode 100644
index 91f4b9c225eb..000000000000
--- a/mail/esmtp/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/esmtp
-etc/esmtprc.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%