diff options
| author | miwi <miwi@FreeBSD.org> | 2009-11-05 20:30:15 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2009-11-05 20:30:15 +0000 |
| commit | ddbbc2669fc0dba20f0851e60dc86c33e678c557 (patch) | |
| tree | 462ff82d93d60aefaa5f124a1a28dcd937894ad4 /audio/csound | |
| parent | 73628f393cdd229dad4d60adce84c9d486d30627 (diff) | |
| download | FreeBSD-ports-ddbbc2669fc0dba20f0851e60dc86c33e678c557.zip FreeBSD-ports-ddbbc2669fc0dba20f0851e60dc86c33e678c557.tar.gz | |
- Fix fltk thread script
PR: 140301
Submitted by: maintainer
Diffstat (limited to 'audio/csound')
| -rw-r--r-- | audio/csound/Makefile | 7 | ||||
| -rw-r--r-- | audio/csound/scripts/check-fltk-threads.sh | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/audio/csound/Makefile b/audio/csound/Makefile index 3a057f7..c3cb12d 100644 --- a/audio/csound/Makefile +++ b/audio/csound/Makefile @@ -8,6 +8,7 @@ PORTNAME= csound PORTVERSION= 5.11.1 +PORTREVISION= 1 CATEGORIES= audio lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.11/:src \ SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.10/:manual @@ -39,10 +40,6 @@ SUB_FILES= custom.py pkg-message 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 +53,7 @@ BROKEN= Fails to link .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|; \ diff --git a/audio/csound/scripts/check-fltk-threads.sh b/audio/csound/scripts/check-fltk-threads.sh index 0cd015c..d05b18c 100644 --- a/audio/csound/scripts/check-fltk-threads.sh +++ b/audio/csound/scripts/check-fltk-threads.sh @@ -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." |
