Date: Thu, 5 Nov 2009 07:24:23 GMT From: Chris Petrik <chris@officialunix.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/140301: [PATCH] fix audio/csound fltk thread script Message-ID: <200911050724.nA57ONTv088578@www.freebsd.org> Resent-Message-ID: <200911050730.nA57U11u085410@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140301
>Category: ports
>Synopsis: [PATCH] fix audio/csound fltk thread script
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 05 07:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911050724.nA57ONTv088578>