ports/116623: audio/csound: check-fltk-threads.sh misbehaves if fltk is not installed

[bgruber]

>Number:         116623
>Category:       ports
>Synopsis:       audio/csound: check-fltk-threads.sh misbehaves if fltk is not installed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 01:40:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     bgruber
>Release:        6.2
>Organization:
>Environment:
FreeBSD calvin 6.2-RELEASE-p5 FreeBSD 6.2-RELEASE-p5 #1: Wed Jun 13 16:06:49 EDT 2007     root at calvin:/usr/obj/usr/src/sys/CALVIN  i386
>Description:
In the newly updated csound port, the check-fltk-threads.sh doesn't check to see if fltk-config exists before it tries to run it; the result is that it fails to build if fltk is not installed at all.
>How-To-Repeat:

>Fix:
check to see if fltk-config exists. patch attached.

Patch attached with submission follows:

diff -cr /usr/ports/audio/csound/Makefile csound/Makefile
*** /usr/ports/audio/csound/Makefile	Sun Sep 23 01:00:25 2007
--- csound/Makefile	Mon Sep 24 21:16:08 2007
***************
*** 41,48 ****
  DISTFILES+=	${DISTNAME}-manual.tar.gz:manual
  .endif
  
  post-patch: apply-slist
! 	@/bin/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|; \
--- 41,49 ----
  DISTFILES+=	${DISTNAME}-manual.tar.gz:manual
  .endif
  
+ FLTKBASE?=	${LOCALBASE}
  post-patch: apply-slist
! 	@FLTKBASE=${FLTKBASE} /bin/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 -cr /usr/ports/audio/csound/scripts/check-fltk-threads.sh csound/scripts/check-fltk-threads.sh
*** /usr/ports/audio/csound/scripts/check-fltk-threads.sh	Mon Sep 24 04:08:56 2007
--- csound/scripts/check-fltk-threads.sh	Mon Sep 24 21:15:13 2007
***************
*** 1,7 ****
  #!/bin/sh
  
! if [ -z "$(fltk-config --ldflags | grep pthread)" ]; then
! 	echo "FLTK does not have threading support enabled.e"
  	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
--- 1,7 ----
  #!/bin/sh
  
! 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


>Release-Note:
>Audit-Trail:
>Unformatted: