Attachment #104973 for bug #145254





PORTNAME=	csound
PORTVERSION=	5.12.1
PORTREVISION=	2
CATEGORIES=	audio lang
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.12/:src \
		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.10/:manual

MAINTAINER=	chris@officialunix.com
COMMENT=	Sound synthesizer

LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile
		fltk.1:${PORTSDIR}/x11-toolkits/fltk
BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13

WRKSRC=		${WRKDIR}/${DISTNAME}/

USE_SCONS=	yes
SCONS_ARGS+=	prefix=${PREFIX} CC=${CC} CXX=${CXX} \
		usePortAudio=0 usePortMIDI=0 useALSA=0 \
		useJack=0 buildCsoundAC=0 buildCsoundVST=0 \
		buildRelease=1 install=1 useCoreAudio=1 \
		buildWinsound=1 buildInterfaces=1 \
		buildVirtual=1 buildCSEditor=1 buildDSSI=0 \
		useGettext=1 dynamicCsoundLibrary=1 useDouble=1

OPTIONS=	FLTKGUI "Build fltk plugin and GUI" on

.include <bsd.port.pre.mk>

USE_GETTEXT=	yes
SUB_FILES=	custom.py pkg-message
SUB_LIST+=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
USE_LDCONFIG=	yes

.if !defined(WITHOUT_FLTKGUI)
LIB_DEPENDS+=  fltk.1:${PORTSDIR}/x11-toolkits/fltk
PLIST_SUB+=	FLTKGUI=""
SCONS_ARGS+=	useFLTK=1 buildCsound5GUI=1
.else
PLIST_SUB+=	FLTKGUI="@comment "
SCONS_ARGS+=	useFLTK=0 buildCsound5GUI=0
.endif

.if !defined(NOPORTDOCS)
BUILD_DEPENDS+=		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip

.endif

post-patch: apply-slist
	@${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|; \

Lines 4-10 Link Here

(-)csound/pkg-plist (-1 / +1 lines)
4	bin/csb64enc	4	bin/csb64enc
5	bin/cseditor	5	bin/cseditor
6	bin/csound	6	bin/csound
7	bin/csound5gui	7	%%FLTKGUI%%bin/csound5gui
8	bin/cvanal	8	bin/cvanal
9	bin/dnoise	9	bin/dnoise
10	bin/envext	10	bin/envext

Removed Link Here

(-)csound/scripts/check-fltk-threads.sh (-10 lines)
1	#!/bin/sh
2
3	if [ -x ${LOCALBASE}/bin/fltk-config ] && [ -z "$(fltk-config --ldflags \| grep pthread)" ]; then
4	echo "FLTK does not have threading support enabled."
5	echo "Please remove the x11-toolkits/fltk port first and recompile csound again"
6	echo "The csound port will automatically install the x11-toolkits/fltk-threads port."
7	exit 1
8	else
9	exit 0
10	fi

Return to bug 145254

Lines 7-13 Link Here

(-)csound/Makefile (-8 / +18 lines)
7		7
8	PORTNAME= csound	8	PORTNAME= csound
9	PORTVERSION= 5.12.1	9	PORTVERSION= 5.12.1
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= audio lang	11	CATEGORIES= audio lang
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.12/:src \	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.12/:src \
13	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.10/:manual	13	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.10/:manual
Lines 20-27 Link Here
20	MAINTAINER= chris@officialunix.com	20	MAINTAINER= chris@officialunix.com
21	COMMENT= Sound synthesizer	21	COMMENT= Sound synthesizer
22		22
23	LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile \	23	LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile
24	fltk.1:${PORTSDIR}/x11-toolkits/fltk
25	BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13	24	BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
26		25
27	WRKSRC= ${WRKDIR}/${DISTNAME}/	26	WRKSRC= ${WRKDIR}/${DISTNAME}/
Lines 29-46 Link Here
29	USE_SCONS= yes	28	USE_SCONS= yes
30	SCONS_ARGS+= prefix=${PREFIX} CC=${CC} CXX=${CXX} \	29	SCONS_ARGS+= prefix=${PREFIX} CC=${CC} CXX=${CXX} \
31	usePortAudio=0 usePortMIDI=0 useALSA=0 \	30	usePortAudio=0 usePortMIDI=0 useALSA=0 \
32	useJack=0 useFLTK=1 buildCsoundAC=0 buildCsoundVST=0 \	31	useJack=0 buildCsoundAC=0 buildCsoundVST=0 \
33	buildCsound5GUI=1 buildRelease=1 install=1 \	32	buildRelease=1 install=1 useCoreAudio=1 \
34	useCoreAudio=1 buildWinsound=1 buildInterfaces=1 \	33	buildWinsound=1 buildInterfaces=1 \
35	buildVirtual=1 buildCSEditor=1 buildDSSI=0 \	34	buildVirtual=1 buildCSEditor=1 buildDSSI=0 \
36	useGettext=1 dynamicCsoundLibrary=1 useDouble=1	35	useGettext=1 dynamicCsoundLibrary=1 useDouble=1
		36
		37	OPTIONS= FLTKGUI "Build fltk plugin and GUI" on
		38
		39	.include <bsd.port.pre.mk>
		40
37	USE_GETTEXT= yes	41	USE_GETTEXT= yes
38	SUB_FILES= custom.py pkg-message	42	SUB_FILES= custom.py pkg-message
39	SUB_LIST+= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \	43	SUB_LIST+= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
40	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}	44	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
41	USE_LDCONFIG= yes	45	USE_LDCONFIG= yes
42		46
43	.include <bsd.port.pre.mk>	47	.if !defined(WITHOUT_FLTKGUI)
		48	LIB_DEPENDS+= fltk.1:${PORTSDIR}/x11-toolkits/fltk
		49	PLIST_SUB+= FLTKGUI=""
		50	SCONS_ARGS+= useFLTK=1 buildCsound5GUI=1
		51	.else
		52	PLIST_SUB+= FLTKGUI="@comment "
		53	SCONS_ARGS+= useFLTK=0 buildCsound5GUI=0
		54	.endif
44		55
45	.if !defined(NOPORTDOCS)	56	.if !defined(NOPORTDOCS)
46	BUILD_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	57	BUILD_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
Lines 48-54 Link Here
48	.endif	59	.endif
49		60
50	post-patch: apply-slist	61	post-patch: apply-slist
51	@${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/check-fltk-threads.sh
52	@${MV} ${WRKDIR}/custom.py ${WRKSRC}	62	@${MV} ${WRKDIR}/custom.py ${WRKSRC}
53	@${REINPLACE_CMD} -e "s\|'unsupported'\|'linux'\|; \	63	@${REINPLACE_CMD} -e "s\|'unsupported'\|'linux'\|; \
54	s\|ENV = {'PATH' : os.environ\['PATH'\]}\|ENV = os.environ\|; \	64	s\|ENV = {'PATH' : os.environ\['PATH'\]}\|ENV = os.environ\|; \