From rebum@mail.vx.sk  Sat Mar  3 10:35:00 2007
Return-Path: <rebum@mail.vx.sk>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D15F216A401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  3 Mar 2007 10:35:00 +0000 (UTC)
	(envelope-from rebum@mail.vx.sk)
Received: from mail.vx.sk (neo.vx.sk [88.198.35.14])
	by mx1.freebsd.org (Postfix) with ESMTP id 620A913C428
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  3 Mar 2007 10:35:00 +0000 (UTC)
	(envelope-from rebum@mail.vx.sk)
Received: from localhost (localhost [127.0.0.1])
	by mail.vx.sk (Postfix) with ESMTP id 758683F40A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  3 Mar 2007 11:34:59 +0100 (CET)
Received: from mail.vx.sk ([127.0.0.1])
	by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id BYmDVbk0NVK5 for <FreeBSD-gnats-submit@freebsd.org>;
	Sat,  3 Mar 2007 11:34:53 +0100 (CET)
Received: by mail.vx.sk (Postfix, from userid 1001)
	id 148E63F434; Sat,  3 Mar 2007 11:34:53 +0100 (CET)
Message-Id: <20070303103453.148E63F434@mail.vx.sk>
Date: Sat,  3 Mar 2007 11:34:53 +0100 (CET)
From: Martin Matuska <martin@matuska.org>
Reply-To:
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] benchmarks/postal 0.65 -> 0.66
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         109789
>Category:       ports
>Synopsis:       [MAINTAINER] benchmarks/postal 0.65 -> 0.66
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 03 10:40:05 GMT 2007
>Closed-Date:    Tue Mar 06 19:07:38 GMT 2007
>Last-Modified:  Tue Mar 06 19:07:38 GMT 2007
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
Update of benchmarks/postal 0.65 -> 0.66
- port now honours CFLAGS, CPPFLAGS and LDFLAGS
- PTHREAD_CFLAGS and PTHREAD_LIBS are implemented correctly

portlint -A:
no fatal errors

Tinderbox log:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/postal-0.66.log

Added files:
files/patch-Makefile.in
files/patch-configure

>How-To-Repeat:
>Fix:
diff -Nbur benchmarks/postal.orig/Makefile benchmarks/postal/Makefile
--- benchmarks/postal.orig/Makefile	Tue Feb  6 18:06:07 2007
+++ benchmarks/postal/Makefile	Fri Mar  2 14:49:27 2007
@@ -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 @@
 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 -Nbur benchmarks/postal.orig/distinfo benchmarks/postal/distinfo
--- benchmarks/postal.orig/distinfo	Tue Feb  6 18:06:07 2007
+++ benchmarks/postal/distinfo	Fri Mar  2 12:54:32 2007
@@ -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 -Nbur benchmarks/postal.orig/files/patch-Makefile.in benchmarks/postal/files/patch-Makefile.in
--- benchmarks/postal.orig/files/patch-Makefile.in	Thu Jan  1 01:00:00 1970
+++ benchmarks/postal/files/patch-Makefile.in	Fri Mar  2 14:10:37 2007
@@ -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 -Nbur benchmarks/postal.orig/files/patch-configure benchmarks/postal/files/patch-configure
--- benchmarks/postal.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
+++ benchmarks/postal/files/patch-configure	Fri Mar  2 14:15:57 2007
@@ -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 \
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Mar 3 10:40:13 UTC 2007 
Responsible-Changed-Why:  
miwi@ wants this PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109789 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Tue Mar 6 19:07:36 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109789 
>Unformatted:
