- Update to 0.66

PR:             109789
Submitted by:   Martin Matuska <martin@matuska.org> (maintainer)

4 files changed, 47 insertions, 8 deletions

diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index e742bc8742cd..c1d2ca4a2ee9 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	postal
-PORTVERSION=	0.65
+PORTVERSION=	0.66
 CATEGORIES=	benchmarks mail
 MASTER_SITES=	http://www.coker.com.au/postal/
 EXTRACT_SUFX=	.tgz
@@ -24,9 +24,11 @@ PLIST_FILES=	sbin/bhm sbin/postal bin/postal-list sbin/rabid
 MAN1=	postal-list.1
 MAN8=	bhm.8 postal.8 rabid.8
 
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
+.include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+CFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man --disable-gnutls
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/benchmarks/postal/distinfo b/benchmarks/postal/distinfo
index 2aff78865243..65c8c53256eb 100644
--- a/benchmarks/postal/distinfo
+++ b/benchmarks/postal/distinfo
@@ -1,3 +1,3 @@
-MD5 (postal-0.65.tgz) = b1466c62e191aa10fc5ffad49cec9f19
-SHA256 (postal-0.65.tgz) = 87dbc4eac98261b707ebacca25d3ed4e90b545826908585567e7b8c201a8411e
-SIZE (postal-0.65.tgz) = 120745
+MD5 (postal-0.66.tgz) = 01ffeb413ec67c3ee42634bcbb1e1cb0
+SHA256 (postal-0.66.tgz) = 5e1aab4c5e2b05c28732918bdc7e30ab6092854bab161e439eab4ddc33e19db0
+SIZE (postal-0.66.tgz) = 100317
diff --git a/benchmarks/postal/files/patch-Makefile.in b/benchmarks/postal/files/patch-Makefile.in
new file mode 100644
index 000000000000..780bdbac9ef4
--- /dev/null
+++ b/benchmarks/postal/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Mar  2 14:08:50 2007
++++ Makefile.in	Fri Mar  2 14:08:43 2007
+@@ -16,7 +16,7 @@
+ 
+ TESTEXE=ex-test
+ BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
+-LFLAGS=-lstdc++ @extra_ldflags@
++LFLAGS=$(LDFLAGS) -lstdc++ @extra_ldflags@
+ 
+ 
+ ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
diff --git a/benchmarks/postal/files/patch-configure b/benchmarks/postal/files/patch-configure
new file mode 100644
index 000000000000..e39b66bae4a8
--- /dev/null
+++ b/benchmarks/postal/files/patch-configure
@@ -0,0 +1,26 @@
+--- configure.orig	Fri Mar  2 14:15:19 2007
++++ configure	Fri Mar  2 14:15:42 2007
+@@ -4558,7 +4558,6 @@
+    linux_pthread="#define LINUX_PTHREAD"
+ fi
+ 
+-LDFLAGS=-lpthread
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4597,13 +4596,13 @@
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+-  extra_ldflags="$extra_ldflags -lpthread"
++  extra_ldflags="$extra_ldflags"
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	extra_ldflags="$extra_ldflags -pthread"
++	extra_ldflags="$extra_ldflags"
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \