From ccd489da95225d510555c84f2bbf0cdfd0fd6a12 Mon Sep 17 00:00:00 2001
From: Anton Berezin <tobez@FreeBSD.org>
Date: Sun, 18 Nov 2001 22:48:04 +0000
Subject: Update to 0.8.7.

PR:		31847
Submitted by:	maintainer
---
 mail/libesmtp/Makefile              | 15 ++++++---------
 mail/libesmtp/distinfo              |  2 +-
 mail/libesmtp/files/patch-headers.c | 11 -----------
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 mail/libesmtp/files/patch-headers.c

diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index bc9b34cf0cff..a296651bcdaf 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libesmtp
-PORTVERSION=	0.8.6
-PORTREVISION=	2
+PORTVERSION=	0.8.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.stafford.uklinux.net/libesmtp/ \
 		http://www.tobez.org/download/port-mirrors/mail/libesmtp/ \
@@ -21,17 +20,15 @@ USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	${WRKSRC}/aclocal.m4 ${WRKSRC}/libltdl/aclocal.m4
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-# require-all-recipients is required for Balsa-1.2.x
-CONFIGURE_ARGS=	--enable-require-all-recipients \
-		--enable-etrn \
+# require-all-recipients (implied by enable-all) is required for Balsa-1.2.x
+CONFIGURE_ARGS=	--enable-all \
 		--disable-ltdl-install
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure.in
-
 pre-build:
 	@${CP} ${WRKSRC}/libltdl/libtool ${WRKSRC}/libtool
 
diff --git a/mail/libesmtp/distinfo b/mail/libesmtp/distinfo
index 39f94798d859..c1b24b50b5c7 100644
--- a/mail/libesmtp/distinfo
+++ b/mail/libesmtp/distinfo
@@ -1 +1 @@
-MD5 (libesmtp-0.8.6.tar.bz2) = 2b0faec540e606109535f6ba76f3a45b
+MD5 (libesmtp-0.8.7.tar.bz2) = e42722f24a5f8cfe250e3c9c3b64cd0a
diff --git a/mail/libesmtp/files/patch-headers.c b/mail/libesmtp/files/patch-headers.c
deleted file mode 100644
index 7223def401c8..000000000000
--- a/mail/libesmtp/files/patch-headers.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- headers.c	Wed Oct 17 00:16:54 2001
-+++ headers.c.new	Fri Oct 19 08:58:56 2001
-@@ -688,7 +688,7 @@
- 	      if ((print = action->print) == NULL)
- 		print = print_string;
- 	      cat_reset (&message->hdr_buffer, 0);
--	      (*print) (message, message->current_header);
-+	      (*print) (message, info->hdr);
- 	      header = cat_buffer (&message->hdr_buffer, len);
-             }
-         }
-- 
cgit v1.2.3