Attachment #128231 for bug #172109




# Created by: Trevor Johnson <trevor@FreeBSD.org>
# Date created:				2000-10-11
# Whom:					trevor
#
# $FreeBSD$
#

PORTNAME=	csound
PORTVERSION=	5.18.02
CATEGORIES=	audio lang
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.18/ \
		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
DISTNAME=	${PORTNAME:S/c/C/}${PORTVERSION}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 \
		${LOCALBASE}/include/gmm/gmm.h:${PORTSDIR}/math/gmm++ \
		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile

OPTIONS_DEFINE=	ALSA DSSI FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO FLTK
OPTIONS_DEFAULT=FLTK

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MALSA}
LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
SCONS_ARGS+=	useALSA=1
PLIST_SUB+=	ALSA=""
ALSA_H=		alsa/asoundlib.h

.endif

.if ${PORT_OPTIONS:MFLUIDSYNTH}
LIB_DEPENDS+=	fluidsynth:${PORTSDIR}/audio/fluidsynth
PLIST_SUB+=	FLUIDSYNTH=""
FLUIDSYNTH_H=	fluidsynth.h
.else

.endif

.if ${PORT_OPTIONS:MJACK}
LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
SCONS_ARGS+=	useJack=1
PLIST_SUB+=	JACK=""
.else

.endif

.if ${PORT_OPTIONS:MOSC}
LIB_DEPENDS+=	lo:${PORTSDIR}/audio/liblo
SCONS_ARGS+=	useOSC=1
PLIST_SUB+=	OSC=""
.else

.endif

.if ${PORT_OPTIONS:MPULSEAUDIO}
LIB_DEPENDS+=	pulse-simple:${PORTSDIR}/audio/pulseaudio
PLIST_SUB+=	PULSEAUDIO=""
PULSEAUDIO_H=	pulse/simple.h
.else

.endif

.if ${PORT_OPTIONS:MFLTK}
LIB_DEPENDS+=	fltk:${PORTSDIR}/x11-toolkits/fltk
PLIST_SUB+=	FLTK=""
SCONS_ARGS+=	buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1
.else

		${WRKSRC}/InOut/rtpa.c
	@${REINPLACE_CMD} -e "s|linux/if.h|sys/types.h|" \
		${WRKSRC}/OOps/remote.c
	@${REINPLACE_CMD} '1658,1659d' \
		${WRKSRC}/SConstruct
post-install:
	@${LN} -sf libcsound64.so.5 ${PREFIX}/lib/libcsound64.so
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	@${ECHO_MSG} " Installing manual ${PORTVERSION}. "
	@(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${DOCSDIR})
	@${ECHO_MSG} " Done."
.endif

Lines 1-4 Link Here

(-)distinfo (-4 / +4 lines)
1	SHA256 (csound/Csound5.17.11.tar.gz) = a86595c4328b63e9b37205b40bf1441182a453451b0ea20558a7777dbc0380b7	1	SHA256 (csound/Csound5.18.02.tar.gz) = 4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8
2	SIZE (csound/Csound5.17.11.tar.gz) = 9152189	2	SIZE (csound/Csound5.18.02.tar.gz) = 9211491
3	SHA256 (csound/Csound5.17_manual_html.zip) = cad3ee307c801c972d9d5f626a79c88dddda6872d8a4af64dd4f3edfe7c0f626	3	SHA256 (csound/Csound5.18_manual_html.zip) = a7347bb1a6b5af3497de95a2df36217a6a42219e2f36a3d6d505cd53b2719cd4
4	SIZE (csound/Csound5.17_manual_html.zip) = 9621312	4	SIZE (csound/Csound5.18_manual_html.zip) = 9773269




--- H/sysdep.h.bak	2012-09-27 02:58:13.000000000 +0000
+++ H/sysdep.h	2012-09-27 03:02:06.000000000 +0000
@@ -100,6 +100,11 @@
   #define EXP exp
   #define LOG log
   #define LOG10 log10
+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
+  #define LOG2(x) (log(x) / log(2))
+#else
+   #define LOG2 log2
+#endif
   /* #define LOG2 log2 */
   #define POWER pow
   #define SQRT sqrt
@@ -126,6 +131,11 @@
@@ -122,7 +126,11 @@
   #define EXP expf
   #define LOG logf
   #define LOG10 log10f
+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
+  #define LOG2(x) (logf(x) / logf(2))
+#else
+   #define LOG2 log2f
+#endif
   /* #define LOG2 log2f */
   #define POWER powf
   #define SQRT sqrtf
   #define HYPOT hypotf




--- frontends/fltk_gui/CsoundPerformanceSettingsPanel.cpp.orig	2012-08-31 15:40:35.000000000 +0200
+++ frontends/fltk_gui/CsoundPerformanceSettingsPanel.cpp	2012-10-01 23:21:42.734591150 +0200
@@ -4,9 +4,11 @@
 #endif
 
 //CS5GUI_EXPERIMENTAL device query section left out for Windows and Mac while the problem is found
+#ifndef __FreeBSD__
 #ifdef LINUX
 #define CS5GUI_EXPERIMENTAL
 #endif
+#endif
 
 
 #include "csound.hpp"

Lines 48-53 Link Here

(-)pkg-plist (+57 lines)
48	include/csound/sysdep.h	48	include/csound/sysdep.h
49	include/csound/text.h	49	include/csound/text.h
50	include/csound/version.h	50	include/csound/version.h
		51	include/csound/interlocks.h
		52	lib/csound/plugins64/libplaterev.so
51	lib/csound/plugins64/libampmidid.so	53	lib/csound/plugins64/libampmidid.so
52	lib/csound/plugins64/libcellular.so	54	lib/csound/plugins64/libcellular.so
53	lib/csound/plugins64/libcontrol.so	55	lib/csound/plugins64/libcontrol.so
Lines 2799-2804 Link Here
2799	%%PORTDOCS%%%%DOCSDIR%%/zkr.html	2801	%%PORTDOCS%%%%DOCSDIR%%/zkr.html
2800	%%PORTDOCS%%%%DOCSDIR%%/zkw.html	2802	%%PORTDOCS%%%%DOCSDIR%%/zkw.html
2801	%%PORTDOCS%%%%DOCSDIR%%/zkwm.html	2803	%%PORTDOCS%%%%DOCSDIR%%/zkwm.html
		2804	%%PORTDOCS%%%%DOCSDIR%%/platerev.html
		2805	%%PORTDOCS%%%%DOCSDIR%%/cosseg.html
		2806	%%PORTDOCS%%%%DOCSDIR%%/images/gen18_2.png
		2807	%%PORTDOCS%%%%DOCSDIR%%/images/gentanh_3.png
		2808	%%PORTDOCS%%%%DOCSDIR%%/images/gen14_3.png
		2809	%%PORTDOCS%%%%DOCSDIR%%/images/gentanh_1.png
		2810	%%PORTDOCS%%%%DOCSDIR%%/images/gen14_4.png
		2811	%%PORTDOCS%%%%DOCSDIR%%/images/gen14_2.png
		2812	%%PORTDOCS%%%%DOCSDIR%%/images/genexp_2.png
		2813	%%PORTDOCS%%%%DOCSDIR%%/images/gen18_1.png
		2814	%%PORTDOCS%%%%DOCSDIR%%/images/gen18_3.png
		2815	%%PORTDOCS%%%%DOCSDIR%%/images/gentanh_2.png
		2816	%%PORTDOCS%%%%DOCSDIR%%/images/gen14_1.png
		2817	%%PORTDOCS%%%%DOCSDIR%%/images/gen23.png
		2818	%%PORTDOCS%%%%DOCSDIR%%/images/genexp_1.png
		2819	%%PORTDOCS%%%%DOCSDIR%%/log2.html
		2820	%%PORTDOCS%%%%DOCSDIR%%/vbapg.html
		2821	%%PORTDOCS%%%%DOCSDIR%%/examples/logicOR.csd
		2822	%%PORTDOCS%%%%DOCSDIR%%/examples/Mixer.csd
		2823	%%PORTDOCS%%%%DOCSDIR%%/examples/genwave.csd
		2824	%%PORTDOCS%%%%DOCSDIR%%/examples/cossegb.csd
		2825	%%PORTDOCS%%%%DOCSDIR%%/examples/cossegr.csd
		2826	%%PORTDOCS%%%%DOCSDIR%%/examples/spectrum.txt
		2827	%%PORTDOCS%%%%DOCSDIR%%/examples/plate.csd
		2828	%%PORTDOCS%%%%DOCSDIR%%/examples/log2.csd
		2829	%%PORTDOCS%%%%DOCSDIR%%/examples/readf.csd
		2830	%%PORTDOCS%%%%DOCSDIR%%/examples/readfi.csd
		2831	%%PORTDOCS%%%%DOCSDIR%%/examples/pwd.csd
		2832	%%PORTDOCS%%%%DOCSDIR%%/examples/maxaccum.csd
		2833	%%PORTDOCS%%%%DOCSDIR%%/examples/midipolyaftertouch.csd
		2834	%%PORTDOCS%%%%DOCSDIR%%/examples/sym10.txt
		2835	%%PORTDOCS%%%%DOCSDIR%%/examples/gen18.csd
		2836	%%PORTDOCS%%%%DOCSDIR%%/examples/vbapg.csd
		2837	%%PORTDOCS%%%%DOCSDIR%%/examples/cosseg.csd
		2838	%%PORTDOCS%%%%DOCSDIR%%/examples/joystick.csd
		2839	%%PORTDOCS%%%%DOCSDIR%%/examples/joystick-2.csd
		2840	%%PORTDOCS%%%%DOCSDIR%%/examples/midiprogramchange.csd
		2841	%%PORTDOCS%%%%DOCSDIR%%/examples/vbap.csd
		2842	%%PORTDOCS%%%%DOCSDIR%%/examples/minabsaccum.csd
		2843	%%PORTDOCS%%%%DOCSDIR%%/examples/minaccum.csd
		2844	%%PORTDOCS%%%%DOCSDIR%%/examples/vbapmove.csd
		2845	%%PORTDOCS%%%%DOCSDIR%%/examples/maxabsaccum.csd
		2846	%%PORTDOCS%%%%DOCSDIR%%/examples/gen23.csd
		2847	%%PORTDOCS%%%%DOCSDIR%%/examples/mididefault.csd
		2848	%%PORTDOCS%%%%DOCSDIR%%/examples/centroid.csd
		2849	%%PORTDOCS%%%%DOCSDIR%%/vbapmove.html
		2850	%%PORTDOCS%%%%DOCSDIR%%/pwd.html
		2851	%%PORTDOCS%%%%DOCSDIR%%/vbap.html
		2852	%%PORTDOCS%%%%DOCSDIR%%/GENwave.html
		2853	%%PORTDOCS%%%%DOCSDIR%%/joystick.html
		2854	%%PORTDOCS%%%%DOCSDIR%%/readf.html
		2855	%%PORTDOCS%%%%DOCSDIR%%/cossegr.html
		2856	%%PORTDOCS%%%%DOCSDIR%%/centroid.html
		2857	%%PORTDOCS%%%%DOCSDIR%%/cossegb.html
		2858	%%PORTDOCS%%%%DOCSDIR%%/readfi.html
2802	%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/callouts	2859	%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/callouts
2803	%%PORTDOCS%%@dirrm %%DOCSDIR%%/images	2860	%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
2804	%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples	2861	%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples

Return to bug 172109

Lines 1-14 Link Here

(-)Makefile (-16 / +13 lines)
1	# New ports collection makefile for: csound	1	# Created by: Trevor Johnson <trevor@FreeBSD.org>
2	# Date created: 2000-10-11
3	# Whom: trevor
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= csound	4	PORTNAME= csound
9	PORTVERSION= 5.17.11	5	PORTVERSION= 5.18.02
10	CATEGORIES= audio lang	6	CATEGORIES= audio lang
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION} \	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.18/ \
12	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual	8	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
13	DISTNAME= ${PORTNAME:S/c/C/}${PORTVERSION}	9	DISTNAME= ${PORTNAME:S/c/C/}${PORTVERSION}
14	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
Lines 24-30 Link Here
24	BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 \	20	BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 \
25	${LOCALBASE}/include/gmm/gmm.h:${PORTSDIR}/math/gmm++ \	21	${LOCALBASE}/include/gmm/gmm.h:${PORTSDIR}/math/gmm++ \
26	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex	22	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
27	LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile	23	LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile
28		24
29	OPTIONS_DEFINE= ALSA DSSI FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO FLTK	25	OPTIONS_DEFINE= ALSA DSSI FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO FLTK
30	OPTIONS_DEFAULT=FLTK	26	OPTIONS_DEFAULT=FLTK
Lines 58-64 Link Here
58	.include <bsd.port.options.mk>	54	.include <bsd.port.options.mk>
59		55
60	.if ${PORT_OPTIONS:MALSA}	56	.if ${PORT_OPTIONS:MALSA}
61	LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib	57	LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
62	SCONS_ARGS+= useALSA=1	58	SCONS_ARGS+= useALSA=1
63	PLIST_SUB+= ALSA=""	59	PLIST_SUB+= ALSA=""
64	ALSA_H= alsa/asoundlib.h	60	ALSA_H= alsa/asoundlib.h
Lines 79-85 Link Here
79	.endif	75	.endif
80		76
81	.if ${PORT_OPTIONS:MFLUIDSYNTH}	77	.if ${PORT_OPTIONS:MFLUIDSYNTH}
82	LIB_DEPENDS+= fluidsynth.1:${PORTSDIR}/audio/fluidsynth	78	LIB_DEPENDS+= fluidsynth:${PORTSDIR}/audio/fluidsynth
83	PLIST_SUB+= FLUIDSYNTH=""	79	PLIST_SUB+= FLUIDSYNTH=""
84	FLUIDSYNTH_H= fluidsynth.h	80	FLUIDSYNTH_H= fluidsynth.h
85	.else	81	.else
Lines 88-94 Link Here
88	.endif	84	.endif
89		85
90	.if ${PORT_OPTIONS:MJACK}	86	.if ${PORT_OPTIONS:MJACK}
91	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack	87	LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
92	SCONS_ARGS+= useJack=1	88	SCONS_ARGS+= useJack=1
93	PLIST_SUB+= JACK=""	89	PLIST_SUB+= JACK=""
94	.else	90	.else
Lines 97-103 Link Here
97	.endif	93	.endif
98		94
99	.if ${PORT_OPTIONS:MOSC}	95	.if ${PORT_OPTIONS:MOSC}
100	LIB_DEPENDS+= lo.7:${PORTSDIR}/audio/liblo	96	LIB_DEPENDS+= lo:${PORTSDIR}/audio/liblo
101	SCONS_ARGS+= useOSC=1	97	SCONS_ARGS+= useOSC=1
102	PLIST_SUB+= OSC=""	98	PLIST_SUB+= OSC=""
103	.else	99	.else
Lines 120-126 Link Here
120	.endif	116	.endif
121		117
122	.if ${PORT_OPTIONS:MPULSEAUDIO}	118	.if ${PORT_OPTIONS:MPULSEAUDIO}
123	LIB_DEPENDS+= pulse-simple.0:${PORTSDIR}/audio/pulseaudio	119	LIB_DEPENDS+= pulse-simple:${PORTSDIR}/audio/pulseaudio
124	PLIST_SUB+= PULSEAUDIO=""	120	PLIST_SUB+= PULSEAUDIO=""
125	PULSEAUDIO_H= pulse/simple.h	121	PULSEAUDIO_H= pulse/simple.h
126	.else	122	.else
Lines 129-135 Link Here
129	.endif	125	.endif
130		126
131	.if ${PORT_OPTIONS:MFLTK}	127	.if ${PORT_OPTIONS:MFLTK}
132	LIB_DEPENDS+= fltk.1:${PORTSDIR}/x11-toolkits/fltk	128	LIB_DEPENDS+= fltk:${PORTSDIR}/x11-toolkits/fltk
133	PLIST_SUB+= FLTK=""	129	PLIST_SUB+= FLTK=""
134	SCONS_ARGS+= buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1	130	SCONS_ARGS+= buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1
135	.else	131	.else
Lines 191-202 Link Here
191	${WRKSRC}/InOut/rtpa.c	187	${WRKSRC}/InOut/rtpa.c
192	@${REINPLACE_CMD} -e "s\|linux/if.h\|sys/types.h\|" \	188	@${REINPLACE_CMD} -e "s\|linux/if.h\|sys/types.h\|" \
193	${WRKSRC}/OOps/remote.c	189	${WRKSRC}/OOps/remote.c
194		190	@${REINPLACE_CMD} '1658,1659d' \
		191	${WRKSRC}/SConstruct
195	post-install:	192	post-install:
196	@${LN} -sf libcsound64.so.5 ${PREFIX}/lib/libcsound64.so	193	@${LN} -sf libcsound64.so.5 ${PREFIX}/lib/libcsound64.so
197	.if ${PORT_OPTIONS:MDOCS}	194	.if ${PORT_OPTIONS:MDOCS}
198	@${MKDIR} ${DOCSDIR}	195	@${MKDIR} ${DOCSDIR}
199	@${ECHO_MSG} " Installing the manual."	196	@${ECHO_MSG} " Installing manual ${PORTVERSION}. "
200	@(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${DOCSDIR})	197	@(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${DOCSDIR})
201	@${ECHO_MSG} " Done."	198	@${ECHO_MSG} " Done."
202	.endif	199	.endif

Lines 1-26 Link Here

(-)files/patch-H__sysdep.h (-8 / +8 lines)
1	--- H/sysdep.h.orig 2012-05-29 02:41:30.000000000 +0900	1	--- H/sysdep.h.bak 2012-09-27 02:58:13.000000000 +0000
2	+++ H/sysdep.h 2012-05-31 11:19:28.000000000 +0900	2	+++ H/sysdep.h 2012-09-27 03:02:06.000000000 +0000
3	@@ -96,7 +96,11 @@	3	@@ -100,6 +100,11 @@
4	#define EXP exp	4	#define EXP exp
5	#define LOG log	5	#define LOG log
6	#define LOG10 log10	6	#define LOG10 log10
7	+#if __FreeBSD_version <= 704100 \|\| (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) \|\| (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)	7	+#if __FreeBSD_version <= 704100 \|\| (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) \|\| (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
8	+ #define LOG2(x) (log(x) / log(2))	8	+ #define LOG2(x) (log(x) / log(2))
9	+#else	9	+#else
10	#define LOG2 log2	10	+ #define LOG2 log2
11	+#endif	11	+#endif
		12	/* #define LOG2 log2 */
12	#define POWER pow	13	#define POWER pow
13	#define SQRT sqrt	14	#define SQRT sqrt
14	#define HYPOT hypot	15	@@ -126,6 +131,11 @@
15	@@ -122,7 +126,11 @@
16	#define EXP expf	16	#define EXP expf
17	#define LOG logf	17	#define LOG logf
18	#define LOG10 log10f	18	#define LOG10 log10f
19	+#if __FreeBSD_version <= 704100 \|\| (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) \|\| (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)	19	+#if __FreeBSD_version <= 704100 \|\| (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) \|\| (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
20	+ #define LOG2(x) (logf(x) / logf(2))	20	+ #define LOG2(x) (logf(x) / logf(2))
21	+#else	21	+#else
22	#define LOG2 log2f	22	+ #define LOG2 log2f
23	+#endif	23	+#endif
		24	/* #define LOG2 log2f */
24	#define POWER powf	25	#define POWER powf
25	#define SQRT sqrtf	26	#define SQRT sqrtf
26	#define HYPOT hypotf

Line 0 Link Here

(-)files/patch-frontends_fltk_gui_CsoundPerformanceSettingsPanel.cpp (+14 lines)
	1	--- frontends/fltk_gui/CsoundPerformanceSettingsPanel.cpp.orig 2012-08-31 15:40:35.000000000 +0200
	2	+++ frontends/fltk_gui/CsoundPerformanceSettingsPanel.cpp 2012-10-01 23:21:42.734591150 +0200
	3	@@ -4,9 +4,11 @@
	4	#endif
	5
	6	//CS5GUI_EXPERIMENTAL device query section left out for Windows and Mac while the problem is found
	7	+#ifndef __FreeBSD__
	8	#ifdef LINUX
	9	#define CS5GUI_EXPERIMENTAL
	10	#endif
	11	+#endif
	12
	13
	14	#include "csound.hpp"