From rodrigc@crodrigues.org  Sat Jan 20 16:50:01 2007
Return-Path: <rodrigc@crodrigues.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DCA0916A401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jan 2007 16:50:01 +0000 (UTC)
	(envelope-from rodrigc@crodrigues.org)
Received: from alnrmhc13.comcast.net (alnrmhc13.comcast.net [204.127.225.93])
	by mx1.freebsd.org (Postfix) with ESMTP id A178013C441
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jan 2007 16:50:01 +0000 (UTC)
	(envelope-from rodrigc@crodrigues.org)
Received: from c-66-31-35-94.hsd1.ma.comcast.net ([66.31.35.94])
          by comcast.net (alnrmhc13) with ESMTP
          id <20070120163522b1300kkg8fe>; Sat, 20 Jan 2007 16:35:22 +0000
Received: from c-66-31-35-94.hsd1.ma.comcast.net (localhost.crodrigues.org [127.0.0.1])
	by c-66-31-35-94.hsd1.ma.comcast.net (8.13.8/8.13.8) with ESMTP id l0KGZNvt071715
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jan 2007 11:35:23 -0500 (EST)
	(envelope-from rodrigc@c-66-31-35-94.hsd1.ma.comcast.net)
Received: (from rodrigc@localhost)
	by c-66-31-35-94.hsd1.ma.comcast.net (8.13.8/8.13.8/Submit) id l0KGZNg8071714;
	Sat, 20 Jan 2007 11:35:23 -0500 (EST)
	(envelope-from rodrigc)
Message-Id: <200701201635.l0KGZNg8071714@c-66-31-35-94.hsd1.ma.comcast.net>
Date: Sat, 20 Jan 2007 11:35:23 -0500 (EST)
From: Craig Rodrigues <rodrigc@freebsd.org>
Reply-To: Craig Rodrigues <rodrigc@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: sysutils/hourglass: respect PTHREAD_LIBS, add WITH_LINUXTHREADS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         108154
>Category:       ports
>Synopsis:       sysutils/hourglass: respect PTHREAD_LIBS, add WITH_LINUXTHREADS
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    rodrigc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 20 16:50:18 GMT 2007
>Closed-Date:    Sun Jan 28 01:57:45 GMT 2007
>Last-Modified:  Sun Jan 28 01:57:45 GMT 2007
>Originator:     Craig Rodrigues
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dibbler.crodrigues.org 7.0-CURRENT FreeBSD 7.0-CURRENT #9: Tue Jan 16 22:46:34 EST 2007 root@dibbler.crodrigues.org:/usr/obj/usr/src/sys/MYKERNEL1 i386


	
>Description:
sysutils/hourglass has a hard dependency on linuxthreads.
This dependency is unnecessary.  Change this port to respect
PTHREAD_LIBS and PTHREAD_CFLAGS.  Add a tunable WITH_LINUXTHREADS
if user wishes to use linuxthreads instead of default
pthread library.

>How-To-Repeat:
	
>Fix:


Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/hourglass/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- Makefile	4 Sep 2006 08:35:44 -0000	1.5
+++ Makefile	20 Jan 2007 16:23:33 -0000
@@ -23,15 +23,25 @@
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_LINUXTHREADS)
+
 .if ${OSVERSION} >= 500035
+PTHREAD_LIBS=	-L${LOCALBASE}/lib -llthread -llgcc_r
+PTHREAD_CFLAGS=	-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 LIB_DEPENDS+=	lthread.3:${PORTSDIR}/devel/linuxthreads
 .else
 LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 .endif
 
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%LOCALBASE%,${LOCALBASE},g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,%PTHREAD_LIBS%,${PTHREAD_LIBS},g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,%PTHREAD_CFLAGS%,${PTHREAD_CFLAGS},g' \
+		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
Index: files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/sysutils/hourglass/files/patch-configure,v
retrieving revision 1.1
diff -u -u -r1.1 patch-configure
--- files/patch-configure	12 Apr 2004 15:54:55 -0000	1.1
+++ files/patch-configure	20 Jan 2007 16:23:33 -0000
@@ -24,8 +24,8 @@
 -  CFLAGS='-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads' ;
 +  CFLAGS_sav=$CFLAGS ;
 +  LDFLAGS_sav=$LDFLAGS ;
-+  LDFLAGS="$LDFLAGS_sav -llthread -llgcc_r -L%LOCALBASE%/lib" ;
-+  CFLAGS="$CFLAGS_sav -D_THREAD_SAFE -I%LOCALBASE%/include/pthread/linuxthreads" ;
++  LDFLAGS="$LDFLAGS_sav %PTHREAD_LIBS%" ;
++  CFLAGS="$CFLAGS_sav %PTHREAD_CFLAGS%" ;
    on_unix='yes' ;
    on_windows='no' ;;
  *cygwin*)
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rodrigc 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jan 20 16:50:54 UTC 2007 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108154 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108154: commit references a PR
Date: Sat, 20 Jan 2007 17:30:47 +0000 (UTC)

 rodrigc     2007-01-20 17:30:40 UTC
 
   FreeBSD ports repository (src committer)
 
   Modified files:
     sysutils/hourglass   Makefile 
     sysutils/hourglass/files patch-configure 
   Log:
   PR:     108154
   
   - respect PTHREAD_LIBS and PTHREAD_CFLAGS
   - add WITH_LINUXTHREADS tunable to override PTHREAD_LIBS and PTHREAD_CFLAGS
     with linuxthreads port
   
   Revision  Changes    Path
   1.6       +10 -0     ports/sysutils/hourglass/Makefile
   1.2       +2 -2      ports/sysutils/hourglass/files/patch-configure
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: rodrigc 
State-Changed-When: Sun Jan 28 01:57:22 UTC 2007 
State-Changed-Why:  
Patched. 

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