From nobody@FreeBSD.org  Thu Nov  5 07:24:24 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 080F11065672
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  5 Nov 2009 07:24:24 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id D235B8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  5 Nov 2009 07:24:23 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nA57ONo5088585
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 5 Nov 2009 07:24:23 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id nA57ONTv088578;
	Thu, 5 Nov 2009 07:24:23 GMT
	(envelope-from nobody)
Message-Id: <200911050724.nA57ONTv088578@www.freebsd.org>
Date: Thu, 5 Nov 2009 07:24:23 GMT
From: Chris Petrik <chris@officialunix.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] fix audio/csound fltk thread script
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         140301
>Category:       ports
>Synopsis:       [PATCH] fix audio/csound fltk thread script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 05 07:30:01 UTC 2009
>Closed-Date:    Thu Nov 05 20:30:25 UTC 2009
>Last-Modified:  Thu Nov  5 20:40:03 UTC 2009
>Originator:     Chris Petrik
>Release:        FreeBSD 8.0 RC2
>Organization:
Officialunix
>Environment:
FreeBSD 8.0 RC2
>Description:
When updating audio/smasher I noticed csound would fail with fltk_lock.

Doing some tests I noticed the script in the scripts folder does not run, I beleive this is due to ${FLTKBASE} not being defined some where.

Thia patch changes it to ${LOCALBASE} 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: csound/Makefile
===================================================================
RCS file: /usr/ncvs/ports/audio/csound/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- csound/Makefile	3 Nov 2009 22:59:36 -0000	1.41
+++ csound/Makefile	5 Nov 2009 07:20:06 -0000
@@ -39,10 +39,6 @@
 SUB_LIST+=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 USE_LDCONFIG=	yes
-# Please note:
-# This option is not needed, if the specific port or new port
-# does not support double float.
-# This was only added to please audio/smasher.
 
 .include <bsd.port.pre.mk>
 
@@ -56,7 +52,7 @@
 .endif
 
 post-patch: apply-slist
-	@${SETENV} FLTKBASE=${FLTKBASE} ${SH} ${SCRIPTDIR}/check-fltk-threads.sh
+	@${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/check-fltk-threads.sh
 	@${MV} ${WRKDIR}/custom.py ${WRKSRC}
 	@${REINPLACE_CMD} -e "s|'unsupported'|'linux'|; \
 		s|ENV = {'PATH' : os.environ\['PATH'\]}|ENV = os.environ|; \
Index: csound/scripts/check-fltk-threads.sh
===================================================================
RCS file: /usr/ncvs/ports/audio/csound/scripts/check-fltk-threads.sh,v
retrieving revision 1.2
diff -u -r1.2 check-fltk-threads.sh
--- csound/scripts/check-fltk-threads.sh	25 Sep 2007 08:53:49 -0000	1.2
+++ csound/scripts/check-fltk-threads.sh	5 Nov 2009 07:20:19 -0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -x ${FLTKBASE}/bin/fltk-config ] && [ -z "$(fltk-config --ldflags | grep pthread)" ]; then
+if [ -x ${LOCALBASE}/bin/fltk-config ] && [ -z "$(fltk-config --ldflags | grep pthread)" ]; then
 	echo "FLTK does not have threading support enabled."
 	echo "Please remove the x11-toolkits/fltk port first and recompile csound again"
 	echo "The csound port will automatically install the x11-toolkits/fltk-threads port."


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Nov 5 16:22:46 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=140301 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Nov 5 20:30:23 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/140301: commit references a PR
Date: Thu,  5 Nov 2009 20:30:24 +0000 (UTC)

 miwi        2009-11-05 20:30:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/csound         Makefile 
     audio/csound/scripts check-fltk-threads.sh 
   Log:
   - Fix fltk thread script
   
   PR:             140301
   Submitted by:   maintainer
   
   Revision  Changes    Path
   1.42      +2 -5      ports/audio/csound/Makefile
   1.3       +1 -1      ports/audio/csound/scripts/check-fltk-threads.sh
 _______________________________________________
 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"
 
>Unformatted:
