Update to 1.0.4 [1]

Add OPTIONS to disable OPENSSL and enable DEBUG

PR:		91109 [1]
Submitted by:	Babak Farrokhi <babak@farrokhi.net> [1]

5 files changed, 40 insertions, 51 deletions

diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 39377f293285..1d4e2bf637e3 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -5,22 +5,20 @@
 # $FreeBSD$
 
 PORTNAME=	libesmtp
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.stafford.uklinux.net/libesmtp/ \
 		http://www.tobez.org/download/port-mirrors/mail/libesmtp/ \
 		http://www.borgsdemons.com/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}r1
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A library for posting electronic mail
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15:inc
-USE_PERL5_BUILD=yes
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
@@ -31,15 +29,35 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 # require-all-recipients (implied by enable-all) is required for Balsa
 CONFIGURE_ARGS=	--enable-all --disable-isoc
 
+OPTIONS=	OPENSSL	"Enable TLS support"	on \
+		DEBUG	"Enables debugging support"	off
+
 DOCS=		AUTHORS ChangeLog NEWS Notes README TODO
 EXAMPLES=	examples/*
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_OPENSSL)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
+PLIST_SUB+=		NEED_OPENSSL=""
+.else
+CONFIGURE_ARGS+=	--without-openssl
+PLIST_SUB+=		NEED_OPENSSL="@comment "
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/libesmtp/distinfo b/mail/libesmtp/distinfo
index 9646816db9d8..339a00a12c3f 100644
--- a/mail/libesmtp/distinfo
+++ b/mail/libesmtp/distinfo
@@ -1,3 +1,3 @@
-MD5 (libesmtp-1.0.3r1.tar.bz2) = c07aa79293aa36298626fe5e68d6bfba
-SHA256 (libesmtp-1.0.3r1.tar.bz2) = 6564c7302937f8a17be6a4afccab3fd9e38a4b585913bf03d9524dafd7a1ae34
-SIZE (libesmtp-1.0.3r1.tar.bz2) = 269527
+MD5 (libesmtp-1.0.4.tar.bz2) = 8b4e8a794adc46268f0c6a0b3fb79486
+SHA256 (libesmtp-1.0.4.tar.bz2) = 407ec85a4c3ce2c4045608d28c36a8e19f1cfbad02bf3de784f6b6fa83d15a56
+SIZE (libesmtp-1.0.4.tar.bz2) = 351917
diff --git a/mail/libesmtp/files/patch-errors.c b/mail/libesmtp/files/patch-errors.c
deleted file mode 100644
index adb6255452ea..000000000000
--- a/mail/libesmtp/files/patch-errors.c
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: errors.c
-diff -u errors.c.orig errors.c
---- errors.c.orig	Mon Mar  4 18:06:58 2002
-+++ errors.c	Thu Oct 30 00:52:41 2003
-@@ -77,8 +77,12 @@
-     MAP(EAI_AGAIN)
-     MAP(EAI_FAIL)
-     MAP(EAI_MEMORY)
-+#ifdef EAI_ADDRFAMILY
-     MAP(EAI_ADDRFAMILY)
-+#endif
-+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
-     MAP(EAI_NODATA)
-+#endif
-     MAP(EAI_FAMILY)
-     MAP(EAI_BADFLAGS)
-     MAP(EAI_NONAME)
-@@ -98,8 +102,12 @@
-     MAP(EAI_AGAIN)
-     MAP(EAI_FAIL)
-     MAP(EAI_MEMORY)
-+#ifdef EAI_ADDRFAMILY
-     MAP(EAI_ADDRFAMILY)
-+#endif
-+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
-     MAP(EAI_NODATA)
-+#endif
-     MAP(EAI_FAMILY)
-     MAP(EAI_BADFLAGS)
-     MAP(EAI_NONAME)
diff --git a/mail/libesmtp/files/patch-headers.c b/mail/libesmtp/files/patch-headers.c
new file mode 100644
index 000000000000..2c0984f66e10
--- /dev/null
+++ b/mail/libesmtp/files/patch-headers.c
@@ -0,0 +1,10 @@
+--- headers.c.orig	Thu Dec 15 18:52:01 2005
++++ headers.c	Fri Dec 30 23:51:37 2005
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include <time.h>
+ #include <errno.h>
++#include <sys/time.h>
+ 
+ #include <missing.h>
+ 
diff --git a/mail/libesmtp/pkg-plist b/mail/libesmtp/pkg-plist
index 4abccbe80068..44396daf2daf 100644
--- a/mail/libesmtp/pkg-plist
+++ b/mail/libesmtp/pkg-plist
@@ -2,20 +2,11 @@ bin/libesmtp-config
 include/auth-client.h
 include/auth-plugin.h
 include/libesmtp.h
-lib/esmtp-plugins/sasl-cram-md5.a
-lib/esmtp-plugins/sasl-cram-md5.la
 lib/esmtp-plugins/sasl-cram-md5.so
-lib/esmtp-plugins/sasl-login.a
-lib/esmtp-plugins/sasl-login.la
 lib/esmtp-plugins/sasl-login.so
-lib/esmtp-plugins/sasl-ntlm.a
-lib/esmtp-plugins/sasl-ntlm.la
-lib/esmtp-plugins/sasl-ntlm.so
-lib/esmtp-plugins/sasl-plain.a
-lib/esmtp-plugins/sasl-plain.la
+%%NEED_OPENSSL%%lib/esmtp-plugins/sasl-ntlm.so
 lib/esmtp-plugins/sasl-plain.so
 lib/libesmtp.a
-lib/libesmtp.la
 lib/libesmtp.so
 lib/libesmtp.so.6
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS