From pieterb@gewis.nl  Thu Apr  1 01:48:44 2004
Return-Path: <pieterb@gewis.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2F10716A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Apr 2004 01:48:44 -0800 (PST)
Received: from gewis.win.tue.nl (gewis.win.tue.nl [131.155.71.116])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9C67A43D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  1 Apr 2004 01:48:43 -0800 (PST)
	(envelope-from pieterb@gewis.nl)
Received: by gewis.win.tue.nl (Postfix, from userid 103)
	id 5E758171EF; Thu,  1 Apr 2004 11:48:42 +0200 (CEST)
Message-Id: <20040401094842.5E758171EF@gewis.win.tue.nl>
Date: Thu,  1 Apr 2004 11:48:42 +0200 (CEST)
From: PieterB <pieterb@gewis.nl>
Reply-To: PieterB <pieterb@gewis.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dean@odyssey.apana.org.au, pieterb@gewis.nl
Subject: upgrade DCC to version 1.2.39
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65029
>Category:       ports
>Synopsis:       upgrade DCC to version 1.2.39
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 01 01:50:19 PST 2004
>Closed-Date:    Sat Apr 03 14:57:04 PST 2004
>Last-Modified:  Sat Apr 03 14:57:04 PST 2004
>Originator:     PieterB
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
GEWIS
>Environment:
System: FreeBSD gewis.win.tue.nl 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Sat Mar 27 17:10:48 GMT 2004 

>Description:
Upgrade of DCC to new version. I tried incorporating 
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/63533
but didn't manage to get it working correctly.

dcc has removed --prefix from configure from version 1.2.33

Please review my patch, because I don't have much FreeBSD ports/dcc
experience

>How-To-Repeat:
>Fix:
--- Makefile.org	Thu Apr  1 11:34:38 2004
+++ Makefile	Thu Apr  1 11:34:38 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dcc-dccd
-PORTVERSION=	1.2.28
+PORTVERSION=	1.2.39
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/ \
@@ -19,7 +19,7 @@
 
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}/dcc
+#CONFIGURE_ARGS=	--prefix=${PREFIX}/dcc
 MANCOMPRESSED=	yes
 MAN8=		cdcc.8		dcc.8		dccd.8 \
 		dccm.8		dccproc.8	dccsight.8 \
@@ -34,14 +34,11 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502102
-FORBIDDEN=	"Links against conflicting thread libraries"
-.endif
-
-post-patch:
-	${FIND} ${WRKSRC} -type f -exec \
-		${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' {} \;
-	${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
-		${WRKSRC}/configure
+#post-patch:
+#	${FIND} ${WRKSRC} -type f -exec \
+#		${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' {} \;
+#	${REINPLACE_CMD} -e 's,PTHREAD_LDFLAGS="$$PTHREAD_LDFLAGS -pthread,PTHREAD_LDFLAGS="$$PTHREAD_LDFLAGS,g' ${WRKSRC}/configure
+#	${REINPLACE_CMD} -e 's,FreeBSD)\n\tPTHREAD_LDFLAGS,FreeBSD)\n\tDCC_CFLAGS="${PTHREAD_CFLAGS} $$DCC_CFLAGS"\n\tPTHREAD_LDFLAGS,g' ${WRKSRC}/configure
+#	${REINPLACE_CMD} -e 's,PTHREAD_LIBS="$$PTHREAD_LIBS -lc_r,PTHREAD_LIBS=" ${PTHREAD_LIBS},g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
--- distinfo.org	Thu Apr  1 11:34:38 2004
+++ distinfo	Thu Apr  1 11:34:38 2004
@@ -1,2 +1,2 @@
-MD5 (dcc-dccd-1.2.28.tar.Z) = 10a8402de107e81a028664cf4b93ec97
-SIZE (dcc-dccd-1.2.28.tar.Z) = 1221437
+MD5 (dcc-dccd-1.2.39.tar.Z) = d875eb9cb1334833eb24fdcdde6f66d7
+SIZE (dcc-dccd-1.2.39.tar.Z) = 1163292

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->yoichi 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Apr 1 07:54:32 PST 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65029 
Responsible-Changed-From-To: yoichi->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Apr 2 07:02:48 PST 2004 
Responsible-Changed-Why:  
Assigned to yoichi by mistake (portsmon misidentified the port; it is 
mail/dcc-dccd, and I just didn't catch that.  My apologies.) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65029 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sat Apr 3 14:56:56 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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