mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

- When fltk is not installed, scripts/check-fltk-threads.sh misbehaves

Browse Source 
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)
This commit is contained in:
Rong-En Fan 2007-09-25 08:53:49 +00:00
parent 547e367f4c
commit fc22f851b1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=200087
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/csound/Makefile
View File

@ -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|; \

4
audio/csound/scripts/check-fltk-threads.sh
View File

@ -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