diff options
| author | rafan <rafan@FreeBSD.org> | 2007-09-25 16:53:49 +0800 |
|---|---|---|
| committer | rafan <rafan@FreeBSD.org> | 2007-09-25 16:53:49 +0800 |
| commit | d3e496de90e04e59a3b00ab08a66f9e79aaf4653 (patch) | |
| tree | 619feda82e2e07f66d2177f81f2545e786dc143d | |
| parent | f5e28043265013d38a4f11702764df5db365bdb7 (diff) | |
| download | freebsd-ports-gnome-d3e496de90e04e59a3b00ab08a66f9e79aaf4653.tar.gz freebsd-ports-gnome-d3e496de90e04e59a3b00ab08a66f9e79aaf4653.tar.zst freebsd-ports-gnome-d3e496de90e04e59a3b00ab08a66f9e79aaf4653.zip | |
- When fltk is not installed, scripts/check-fltk-threads.sh misbehaves
due to not checking existence of fltk-config before using it. Fix that
by checking existence before using.
PR: ports/116623
Submitted by: bgruber <knightbg at yahoo.com>
Approved by: Martin Tournoij <carpetsmoker at xs4all.nl> (maintainer)
| -rw-r--r-- | audio/csound/Makefile | 3 | ||||
| -rw-r--r-- | audio/csound/scripts/check-fltk-threads.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/audio/csound/Makefile b/audio/csound/Makefile index 29d05e157df5..f337563c7e3a 100644 --- a/audio/csound/Makefile +++ b/audio/csound/Makefile @@ -41,8 +41,9 @@ USE_LDCONFIG= yes DISTFILES+= ${DISTNAME}-manual.tar.gz:manual .endif +FLTKBASE?= ${LOCALBASE} post-patch: apply-slist - @/bin/sh ${SCRIPTDIR}/check-fltk-threads.sh + @${SETENV} FLTKBASE=${FLTKBASE} ${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 5168db9e1bea..0cd015cf5a37 100644 --- a/audio/csound/scripts/check-fltk-threads.sh +++ b/audio/csound/scripts/check-fltk-threads.sh @@ -1,7 +1,7 @@ #!/bin/sh -if [ -z "$(fltk-config --ldflags | grep pthread)" ]; then - echo "FLTK does not have threading support enabled.e" +if [ -x ${FLTKBASE}/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." exit 1 |