Attachment #121906 for bug #164984




#

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

MAINTAINER=	ports@FreeBSD.org


CONFLICTS_INSTALL=	outguess-*

USE_BZIP2=	yes
USE_PYTHON=	2.6+
USE_BISON=	build
USE_GETTEXT=	yes

.endif

.if !defined(NOPORTDOCS)
EXTRACT_DEPENDS+=${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
DISTFILES+=	Csound${PORTVERSION:R}_manual_html.zip:manual
.endif


CMAKE_ARGS+=	Word64=1
.endif

post-extract:
.if !defined(NOPORTDOCS)
	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -qo \
		Csound${PORTVERSION:R}_manual_html.zip -d ${WRKDIR})
.endif

post-patch:
	@${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
		s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|; \

		${WRKSRC}/frontends/CsoundAC/Counterpoint.hpp

post-install:
	@${LN} -sf libcsound64.so.5 ${PREFIX}/lib/libcsound64.so
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@${ECHO_MSG} " Installing the manual."
	@(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${DOCSDIR})
		&& ${COPYTREE_SHARE} . ${DOCSDIR})
	@${ECHO_MSG} " Done."
.endif
	@${CAT} ${PKGMESSAGE}

Lines 1-4 Link Here

(-)audio/csound/distinfo (-4 / +4 lines)
1	SHA256 (csound/Csound5.15.0.tar.gz) = 86d3c2a880f1ab9b923912da60f71265253b68b4c8626ba62555a627908aafeb	1	SHA256 (csound/Csound5.16.1.tar.bz2) = a8e187a1cd6502911bec9102089752685bcd0e389aff635d554442094298c62a
2	SIZE (csound/Csound5.15.0.tar.gz) = 8721762	2	SIZE (csound/Csound5.16.1.tar.bz2) = 8106677
3	SHA256 (csound/Csound5.15_manual_html.zip) = 5c4248941bce1e9876e798d6ca51e52d0de7da1fb0cdba7cf05e16959463a0fe	3	SHA256 (csound/Csound5.16_manual_html.zip) = 572b1b3825fd5203d00e3db6db7a190a17212b28de425cc0373e705d44aa2c8b
4	SIZE (csound/Csound5.15_manual_html.zip) = 9164637	4	SIZE (csound/Csound5.16_manual_html.zip) = 9451986




--- Engine/csound_orc.l.orig	2011-12-22 19:41:53.000000000 +0900
+++ Engine/csound_orc.l	2011-12-27 21:28:55.000000000 +0900
@@ -288,7 +288,7 @@
                   /* printf("Push %p macro stack; new body #%s#\n",
                             PARM->macros, mm->body); */
                   /* printf("Push buffer %p -> ", YY_CURRENT_BUFFER); */
-                  yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
+                  //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
                   yy_scan_string(mm->body, yyscanner);
                   /* printf("%p\n", YY_CURRENT_BUFFER); */
                  }
@@ -313,7 +313,7 @@
                   PARM->alt_stack[PARM->macro_stack_ptr].n = 0;
                   PARM->alt_stack[PARM->macro_stack_ptr++].s = NULL;
                   /* printf("Push buffer %p -> ", YY_CURRENBUFFER_TOKEN); */
-                  yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
+                  //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
                   yy_scan_string(mm->body, yyscanner);
                   /* printf("%p\n", YY_CURRENT_BUFFER); */
                 }
@@ -367,7 +367,7 @@
                   PARM->alt_stack[PARM->macro_stack_ptr].n = mm->acnt;
                   PARM->alt_stack[PARM->macro_stack_ptr++].s = PARM->macros;
                   /* printf("Push %p macro stack\n",PARM->macros); */
-                  yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
+                  //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
                   yy_scan_string(mm->body, yyscanner);
                 }
 {MACRONAMEDA}    {
@@ -419,7 +419,7 @@
                   /* printf("New body: ...#%s#\n", mm->body); */
                   PARM->alt_stack[PARM->macro_stack_ptr].n = mm->acnt;
                   PARM->alt_stack[PARM->macro_stack_ptr++].s = PARM->macros;
-                  yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
+                  //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
                   yy_scan_string(mm->body, yyscanner);
                 }
 {INTGR}         {
@@ -448,7 +448,7 @@
                   MACRO *x, *y;
                   int n;
                   printf("Leaving buffer %p\n", YY_CURRENT_BUFFER);
-                  yypop_buffer_state(yyscanner);
+                  //yypop_buffer_state(yyscanner);
                   if ( !YY_CURRENT_BUFFER ) yyterminate();
                   printf("End of input; popping to %p\n", YY_CURRENT_BUFFER);
                   if (PARM->clearBufferAfterEOF)
@@ -581,7 +581,7 @@
     PARM->alt_stack[PARM->macro_stack_ptr].n = 0;
     PARM->alt_stack[PARM->macro_stack_ptr++].s = NULL;
     PARM->isInclude = PARM->clearBufferAfterEOF = 1;
-    yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
+    //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
     yy_scan_string(cf->body, yyscanner);
 }
 




--- Opcodes/tl/fractalnoise.cpp.orig	2012-02-06 20:21:34.000000000 +0900
+++ Opcodes/tl/fractalnoise.cpp	2012-02-08 00:36:44.000000000 +0900
@@ -34,6 +34,7 @@
     return int(((unsigned int)x) >> n);
 }
 
+#if 0
 /* VECTOR INTRINSICS */
 
 inline void *aligned_calloc(size_t nmemb, size_t size)
@@ -41,6 +42,7 @@
     return (void*)((unsigned long)(calloc((nmemb*size)+15,
                                           (sizeof(char)))+15) & 0xfffffff0);
 }
+#endif
 
 /* ABSTRACT USER INTERFACE */
 

Lines 54-65 Link Here

(-)audio/csound/pkg-plist (-2 / +89 lines)
54	%%DSSI%%lib/csound/plugins64/libdssi4cs.so	54	%%DSSI%%lib/csound/plugins64/libdssi4cs.so
55	lib/csound/plugins64/libfareygen.so	55	lib/csound/plugins64/libfareygen.so
56	%%FLUIDSYNTH%%lib/csound/plugins64/libfluidOpcodes.so	56	%%FLUIDSYNTH%%lib/csound/plugins64/libfluidOpcodes.so
		57	lib/csound/plugins64/libfractalnoise.so
57	lib/csound/plugins64/libimage.so	58	lib/csound/plugins64/libimage.so
58	lib/csound/plugins64/libmixer.so
59	%%JACK%%lib/csound/plugins64/libjackTransport.so	59	%%JACK%%lib/csound/plugins64/libjackTransport.so
60	%%JACK%%lib/csound/plugins64/libjacko.so	60	%%JACK%%lib/csound/plugins64/libjacko.so
61	lib/csound/plugins64/liblinear_algebra.so	61	lib/csound/plugins64/liblinear_algebra.so
62	lib/csound/plugins64/libmutexops.so	62	lib/csound/plugins64/libmixer.so
63	%%OSC%%lib/csound/plugins64/libosc.so	63	%%OSC%%lib/csound/plugins64/libosc.so
64	%%ALSA%%lib/csound/plugins64/librtalsa.so	64	%%ALSA%%lib/csound/plugins64/librtalsa.so
65	%%JACK%%lib/csound/plugins64/librtjack.so	65	%%JACK%%lib/csound/plugins64/librtjack.so
Lines 515-520 Link Here
515	%%PORTDOCS%%%%DOCSDIR%%/control.html	515	%%PORTDOCS%%%%DOCSDIR%%/control.html
516	%%PORTDOCS%%%%DOCSDIR%%/convle.html	516	%%PORTDOCS%%%%DOCSDIR%%/convle.html
517	%%PORTDOCS%%%%DOCSDIR%%/convolve.html	517	%%PORTDOCS%%%%DOCSDIR%%/convolve.html
		518	%%PORTDOCS%%%%DOCSDIR%%/copy2ftab.html
		519	%%PORTDOCS%%%%DOCSDIR%%/copy2ttab.html
518	%%PORTDOCS%%%%DOCSDIR%%/copying.txt	520	%%PORTDOCS%%%%DOCSDIR%%/copying.txt
519	%%PORTDOCS%%%%DOCSDIR%%/cos.html	521	%%PORTDOCS%%%%DOCSDIR%%/cos.html
520	%%PORTDOCS%%%%DOCSDIR%%/cosh.html	522	%%PORTDOCS%%%%DOCSDIR%%/cosh.html
Lines 594-599 Link Here
594	%%PORTDOCS%%%%DOCSDIR%%/dumpk3.html	596	%%PORTDOCS%%%%DOCSDIR%%/dumpk3.html
595	%%PORTDOCS%%%%DOCSDIR%%/dumpk4.html	597	%%PORTDOCS%%%%DOCSDIR%%/dumpk4.html
596	%%PORTDOCS%%%%DOCSDIR%%/duserrnd.html	598	%%PORTDOCS%%%%DOCSDIR%%/duserrnd.html
		599	%%PORTDOCS%%%%DOCSDIR%%/dust.html
		600	%%PORTDOCS%%%%DOCSDIR%%/dust2.html
597	%%PORTDOCS%%%%DOCSDIR%%/e.html	601	%%PORTDOCS%%%%DOCSDIR%%/e.html
598	%%PORTDOCS%%%%DOCSDIR%%/else.html	602	%%PORTDOCS%%%%DOCSDIR%%/else.html
599	%%PORTDOCS%%%%DOCSDIR%%/elseif.html	603	%%PORTDOCS%%%%DOCSDIR%%/elseif.html
Lines 853-858 Link Here
853	%%PORTDOCS%%%%DOCSDIR%%/examples/dumpk3.csd	857	%%PORTDOCS%%%%DOCSDIR%%/examples/dumpk3.csd
854	%%PORTDOCS%%%%DOCSDIR%%/examples/dumpk4.csd	858	%%PORTDOCS%%%%DOCSDIR%%/examples/dumpk4.csd
855	%%PORTDOCS%%%%DOCSDIR%%/examples/duserrnd.csd	859	%%PORTDOCS%%%%DOCSDIR%%/examples/duserrnd.csd
		860	%%PORTDOCS%%%%DOCSDIR%%/examples/dust.csd
		861	%%PORTDOCS%%%%DOCSDIR%%/examples/dust2.csd
856	%%PORTDOCS%%%%DOCSDIR%%/examples/eee.aiff	862	%%PORTDOCS%%%%DOCSDIR%%/examples/eee.aiff
857	%%PORTDOCS%%%%DOCSDIR%%/examples/else.csd	863	%%PORTDOCS%%%%DOCSDIR%%/examples/else.csd
858	%%PORTDOCS%%%%DOCSDIR%%/examples/elseif.csd	864	%%PORTDOCS%%%%DOCSDIR%%/examples/elseif.csd
Lines 939-944 Link Here
939	%%PORTDOCS%%%%DOCSDIR%%/examples/fprintks.csd	945	%%PORTDOCS%%%%DOCSDIR%%/examples/fprintks.csd
940	%%PORTDOCS%%%%DOCSDIR%%/examples/fprints.csd	946	%%PORTDOCS%%%%DOCSDIR%%/examples/fprints.csd
941	%%PORTDOCS%%%%DOCSDIR%%/examples/frac.csd	947	%%PORTDOCS%%%%DOCSDIR%%/examples/frac.csd
		948	%%PORTDOCS%%%%DOCSDIR%%/examples/fractalnoise.csd
942	%%PORTDOCS%%%%DOCSDIR%%/examples/freeverb.csd	949	%%PORTDOCS%%%%DOCSDIR%%/examples/freeverb.csd
943	%%PORTDOCS%%%%DOCSDIR%%/examples/ftchnls.csd	950	%%PORTDOCS%%%%DOCSDIR%%/examples/ftchnls.csd
944	%%PORTDOCS%%%%DOCSDIR%%/examples/ftconv.csd	951	%%PORTDOCS%%%%DOCSDIR%%/examples/ftconv.csd
Lines 957-962 Link Here
957	%%PORTDOCS%%%%DOCSDIR%%/examples/gainslider.csd	964	%%PORTDOCS%%%%DOCSDIR%%/examples/gainslider.csd
958	%%PORTDOCS%%%%DOCSDIR%%/examples/gauss.csd	965	%%PORTDOCS%%%%DOCSDIR%%/examples/gauss.csd
959	%%PORTDOCS%%%%DOCSDIR%%/examples/gaussi.csd	966	%%PORTDOCS%%%%DOCSDIR%%/examples/gaussi.csd
		967	%%PORTDOCS%%%%DOCSDIR%%/examples/gausstrig-2.csd
		968	%%PORTDOCS%%%%DOCSDIR%%/examples/gausstrig.csd
960	%%PORTDOCS%%%%DOCSDIR%%/examples/gbuzz.csd	969	%%PORTDOCS%%%%DOCSDIR%%/examples/gbuzz.csd
961	%%PORTDOCS%%%%DOCSDIR%%/examples/gen01.csd	970	%%PORTDOCS%%%%DOCSDIR%%/examples/gen01.csd
962	%%PORTDOCS%%%%DOCSDIR%%/examples/gen01computed.csd	971	%%PORTDOCS%%%%DOCSDIR%%/examples/gen01computed.csd
Lines 973-984 Link Here
973	%%PORTDOCS%%%%DOCSDIR%%/examples/gen12.csd	982	%%PORTDOCS%%%%DOCSDIR%%/examples/gen12.csd
974	%%PORTDOCS%%%%DOCSDIR%%/examples/gen13.csd	983	%%PORTDOCS%%%%DOCSDIR%%/examples/gen13.csd
975	%%PORTDOCS%%%%DOCSDIR%%/examples/gen14.csd	984	%%PORTDOCS%%%%DOCSDIR%%/examples/gen14.csd
		985	%%PORTDOCS%%%%DOCSDIR%%/examples/gen15.csd
976	%%PORTDOCS%%%%DOCSDIR%%/examples/gen16.csd	986	%%PORTDOCS%%%%DOCSDIR%%/examples/gen16.csd
		987	%%PORTDOCS%%%%DOCSDIR%%/examples/gen17.csd
977	%%PORTDOCS%%%%DOCSDIR%%/examples/gen19.csd	988	%%PORTDOCS%%%%DOCSDIR%%/examples/gen19.csd
		989	%%PORTDOCS%%%%DOCSDIR%%/examples/gen20.csd
		990	%%PORTDOCS%%%%DOCSDIR%%/examples/gen21.csd
		991	%%PORTDOCS%%%%DOCSDIR%%/examples/gen24.csd
		992	%%PORTDOCS%%%%DOCSDIR%%/examples/gen25.csd
		993	%%PORTDOCS%%%%DOCSDIR%%/examples/gen27.csd
		994	%%PORTDOCS%%%%DOCSDIR%%/examples/gen28.csd
978	%%PORTDOCS%%%%DOCSDIR%%/examples/gen40.csd	995	%%PORTDOCS%%%%DOCSDIR%%/examples/gen40.csd
979	%%PORTDOCS%%%%DOCSDIR%%/examples/gen41.csd	996	%%PORTDOCS%%%%DOCSDIR%%/examples/gen41.csd
980	%%PORTDOCS%%%%DOCSDIR%%/examples/gen42.csd	997	%%PORTDOCS%%%%DOCSDIR%%/examples/gen42.csd
981	%%PORTDOCS%%%%DOCSDIR%%/examples/gen49.csd	998	%%PORTDOCS%%%%DOCSDIR%%/examples/gen49.csd
		999	%%PORTDOCS%%%%DOCSDIR%%/examples/gen51.csd
		1000	%%PORTDOCS%%%%DOCSDIR%%/examples/gen52.csd
		1001	%%PORTDOCS%%%%DOCSDIR%%/examples/gendy-2.csd
		1002	%%PORTDOCS%%%%DOCSDIR%%/examples/gendy.csd
		1003	%%PORTDOCS%%%%DOCSDIR%%/examples/gendyc.csd
		1004	%%PORTDOCS%%%%DOCSDIR%%/examples/gendyx-2.csd
		1005	%%PORTDOCS%%%%DOCSDIR%%/examples/gendyx.csd
982	%%PORTDOCS%%%%DOCSDIR%%/examples/genexp.csd	1006	%%PORTDOCS%%%%DOCSDIR%%/examples/genexp.csd
983	%%PORTDOCS%%%%DOCSDIR%%/examples/genfarey.csd	1007	%%PORTDOCS%%%%DOCSDIR%%/examples/genfarey.csd
984	%%PORTDOCS%%%%DOCSDIR%%/examples/gensone.csd	1008	%%PORTDOCS%%%%DOCSDIR%%/examples/gensone.csd
Lines 1078-1083 Link Here
1078	%%PORTDOCS%%%%DOCSDIR%%/examples/lposcil.csd	1102	%%PORTDOCS%%%%DOCSDIR%%/examples/lposcil.csd
1079	%%PORTDOCS%%%%DOCSDIR%%/examples/lposcil3.csd	1103	%%PORTDOCS%%%%DOCSDIR%%/examples/lposcil3.csd
1080	%%PORTDOCS%%%%DOCSDIR%%/examples/lposcila.csd	1104	%%PORTDOCS%%%%DOCSDIR%%/examples/lposcila.csd
		1105	%%PORTDOCS%%%%DOCSDIR%%/examples/lposcilsa.csd
		1106	%%PORTDOCS%%%%DOCSDIR%%/examples/lposcilsa2.csd
1081	%%PORTDOCS%%%%DOCSDIR%%/examples/lpread.csd	1107	%%PORTDOCS%%%%DOCSDIR%%/examples/lpread.csd
1082	%%PORTDOCS%%%%DOCSDIR%%/examples/lpreson-2.csd	1108	%%PORTDOCS%%%%DOCSDIR%%/examples/lpreson-2.csd
1083	%%PORTDOCS%%%%DOCSDIR%%/examples/lpreson.csd	1109	%%PORTDOCS%%%%DOCSDIR%%/examples/lpreson.csd
Lines 1272-1277 Link Here
1272	%%PORTDOCS%%%%DOCSDIR%%/examples/product.csd	1298	%%PORTDOCS%%%%DOCSDIR%%/examples/product.csd
1273	%%PORTDOCS%%%%DOCSDIR%%/examples/pset-midi.csd	1299	%%PORTDOCS%%%%DOCSDIR%%/examples/pset-midi.csd
1274	%%PORTDOCS%%%%DOCSDIR%%/examples/pset.csd	1300	%%PORTDOCS%%%%DOCSDIR%%/examples/pset.csd
		1301	%%PORTDOCS%%%%DOCSDIR%%/examples/ptable.csd
		1302	%%PORTDOCS%%%%DOCSDIR%%/examples/ptablei.csd
1275	%%PORTDOCS%%%%DOCSDIR%%/examples/ptrack.csd	1303	%%PORTDOCS%%%%DOCSDIR%%/examples/ptrack.csd
1276	%%PORTDOCS%%%%DOCSDIR%%/examples/push.csd	1304	%%PORTDOCS%%%%DOCSDIR%%/examples/push.csd
1277	%%PORTDOCS%%%%DOCSDIR%%/examples/pvadd.csd	1305	%%PORTDOCS%%%%DOCSDIR%%/examples/pvadd.csd
Lines 1341-1346 Link Here
1341	%%PORTDOCS%%%%DOCSDIR%%/examples/resonk.csd	1369	%%PORTDOCS%%%%DOCSDIR%%/examples/resonk.csd
1342	%%PORTDOCS%%%%DOCSDIR%%/examples/resonr.csd	1370	%%PORTDOCS%%%%DOCSDIR%%/examples/resonr.csd
1343	%%PORTDOCS%%%%DOCSDIR%%/examples/resonx.csd	1371	%%PORTDOCS%%%%DOCSDIR%%/examples/resonx.csd
		1372	%%PORTDOCS%%%%DOCSDIR%%/examples/resonxk.csd
1344	%%PORTDOCS%%%%DOCSDIR%%/examples/resony.csd	1373	%%PORTDOCS%%%%DOCSDIR%%/examples/resony.csd
1345	%%PORTDOCS%%%%DOCSDIR%%/examples/resonz.csd	1374	%%PORTDOCS%%%%DOCSDIR%%/examples/resonz.csd
1346	%%PORTDOCS%%%%DOCSDIR%%/examples/resyn.csd	1375	%%PORTDOCS%%%%DOCSDIR%%/examples/resyn.csd
Lines 1474-1479 Link Here
1474	%%PORTDOCS%%%%DOCSDIR%%/examples/timeinsts.csd	1503	%%PORTDOCS%%%%DOCSDIR%%/examples/timeinsts.csd
1475	%%PORTDOCS%%%%DOCSDIR%%/examples/timek.csd	1504	%%PORTDOCS%%%%DOCSDIR%%/examples/timek.csd
1476	%%PORTDOCS%%%%DOCSDIR%%/examples/times.csd	1505	%%PORTDOCS%%%%DOCSDIR%%/examples/times.csd
		1506	%%PORTDOCS%%%%DOCSDIR%%/examples/times_complex.csd
1477	%%PORTDOCS%%%%DOCSDIR%%/examples/timout.csd	1507	%%PORTDOCS%%%%DOCSDIR%%/examples/timout.csd
1478	%%PORTDOCS%%%%DOCSDIR%%/examples/tival.csd	1508	%%PORTDOCS%%%%DOCSDIR%%/examples/tival.csd
1479	%%PORTDOCS%%%%DOCSDIR%%/examples/tlineto.csd	1509	%%PORTDOCS%%%%DOCSDIR%%/examples/tlineto.csd
Lines 1679-1684 Link Here
1679	%%PORTDOCS%%%%DOCSDIR%%/fprintks.html	1709	%%PORTDOCS%%%%DOCSDIR%%/fprintks.html
1680	%%PORTDOCS%%%%DOCSDIR%%/fprints.html	1710	%%PORTDOCS%%%%DOCSDIR%%/fprints.html
1681	%%PORTDOCS%%%%DOCSDIR%%/frac.html	1711	%%PORTDOCS%%%%DOCSDIR%%/frac.html
		1712	%%PORTDOCS%%%%DOCSDIR%%/fractalnoise.html
1682	%%PORTDOCS%%%%DOCSDIR%%/freeverb.html	1713	%%PORTDOCS%%%%DOCSDIR%%/freeverb.html
1683	%%PORTDOCS%%%%DOCSDIR%%/ftchnls.html	1714	%%PORTDOCS%%%%DOCSDIR%%/ftchnls.html
1684	%%PORTDOCS%%%%DOCSDIR%%/ftconv.html	1715	%%PORTDOCS%%%%DOCSDIR%%/ftconv.html
Lines 1699-1705 Link Here
1699	%%PORTDOCS%%%%DOCSDIR%%/gainslider.html	1730	%%PORTDOCS%%%%DOCSDIR%%/gainslider.html
1700	%%PORTDOCS%%%%DOCSDIR%%/gauss.html	1731	%%PORTDOCS%%%%DOCSDIR%%/gauss.html
1701	%%PORTDOCS%%%%DOCSDIR%%/gaussi.html	1732	%%PORTDOCS%%%%DOCSDIR%%/gaussi.html
		1733	%%PORTDOCS%%%%DOCSDIR%%/gausstrig.html
1702	%%PORTDOCS%%%%DOCSDIR%%/gbuzz.html	1734	%%PORTDOCS%%%%DOCSDIR%%/gbuzz.html
		1735	%%PORTDOCS%%%%DOCSDIR%%/gendy.html
		1736	%%PORTDOCS%%%%DOCSDIR%%/gendyc.html
		1737	%%PORTDOCS%%%%DOCSDIR%%/gendyx.html
1703	%%PORTDOCS%%%%DOCSDIR%%/getcfg.html	1738	%%PORTDOCS%%%%DOCSDIR%%/getcfg.html
1704	%%PORTDOCS%%%%DOCSDIR%%/gogobel.html	1739	%%PORTDOCS%%%%DOCSDIR%%/gogobel.html
1705	%%PORTDOCS%%%%DOCSDIR%%/goto.html	1740	%%PORTDOCS%%%%DOCSDIR%%/goto.html
Lines 1787-1807 Link Here
1787	%%PORTDOCS%%%%DOCSDIR%%/images/fltabs_sliders-tab.png	1822	%%PORTDOCS%%%%DOCSDIR%%/images/fltabs_sliders-tab.png
1788	%%PORTDOCS%%%%DOCSDIR%%/images/fltext.png	1823	%%PORTDOCS%%%%DOCSDIR%%/images/fltext.png
1789	%%PORTDOCS%%%%DOCSDIR%%/images/gen01.png	1824	%%PORTDOCS%%%%DOCSDIR%%/images/gen01.png
		1825	%%PORTDOCS%%%%DOCSDIR%%/images/gen01_1.png
		1826	%%PORTDOCS%%%%DOCSDIR%%/images/gen01_2.png
		1827	%%PORTDOCS%%%%DOCSDIR%%/images/gen01_3.png
1790	%%PORTDOCS%%%%DOCSDIR%%/images/gen02.png	1828	%%PORTDOCS%%%%DOCSDIR%%/images/gen02.png
		1829	%%PORTDOCS%%%%DOCSDIR%%/images/gen02_1.png
		1830	%%PORTDOCS%%%%DOCSDIR%%/images/gen02_2.png
		1831	%%PORTDOCS%%%%DOCSDIR%%/images/gen02_3.png
1791	%%PORTDOCS%%%%DOCSDIR%%/images/gen03.png	1832	%%PORTDOCS%%%%DOCSDIR%%/images/gen03.png
1792	%%PORTDOCS%%%%DOCSDIR%%/images/gen05.png	1833	%%PORTDOCS%%%%DOCSDIR%%/images/gen05.png
		1834	%%PORTDOCS%%%%DOCSDIR%%/images/gen05_1.png
		1835	%%PORTDOCS%%%%DOCSDIR%%/images/gen05_2.png
1793	%%PORTDOCS%%%%DOCSDIR%%/images/gen06.png	1836	%%PORTDOCS%%%%DOCSDIR%%/images/gen06.png
		1837	%%PORTDOCS%%%%DOCSDIR%%/images/gen06_1.png
		1838	%%PORTDOCS%%%%DOCSDIR%%/images/gen06_2.png
1794	%%PORTDOCS%%%%DOCSDIR%%/images/gen07.png	1839	%%PORTDOCS%%%%DOCSDIR%%/images/gen07.png
		1840	%%PORTDOCS%%%%DOCSDIR%%/images/gen07_1.png
		1841	%%PORTDOCS%%%%DOCSDIR%%/images/gen07_2.png
		1842	%%PORTDOCS%%%%DOCSDIR%%/images/gen07_3.png
1795	%%PORTDOCS%%%%DOCSDIR%%/images/gen08.png	1843	%%PORTDOCS%%%%DOCSDIR%%/images/gen08.png
		1844	%%PORTDOCS%%%%DOCSDIR%%/images/gen08_1.png
		1845	%%PORTDOCS%%%%DOCSDIR%%/images/gen08_2.png
1796	%%PORTDOCS%%%%DOCSDIR%%/images/gen09.png	1846	%%PORTDOCS%%%%DOCSDIR%%/images/gen09.png
1797	%%PORTDOCS%%%%DOCSDIR%%/images/gen09square.png	1847	%%PORTDOCS%%%%DOCSDIR%%/images/gen09square.png
1798	%%PORTDOCS%%%%DOCSDIR%%/images/gen10.png	1848	%%PORTDOCS%%%%DOCSDIR%%/images/gen10.png
		1849	%%PORTDOCS%%%%DOCSDIR%%/images/gen10_1.png
		1850	%%PORTDOCS%%%%DOCSDIR%%/images/gen10_2.png
		1851	%%PORTDOCS%%%%DOCSDIR%%/images/gen10_3.png
		1852	%%PORTDOCS%%%%DOCSDIR%%/images/gen10_4.png
1799	%%PORTDOCS%%%%DOCSDIR%%/images/gen11.png	1853	%%PORTDOCS%%%%DOCSDIR%%/images/gen11.png
		1854	%%PORTDOCS%%%%DOCSDIR%%/images/gen11_1.png
		1855	%%PORTDOCS%%%%DOCSDIR%%/images/gen11_2.png
		1856	%%PORTDOCS%%%%DOCSDIR%%/images/gen11_3.png
1800	%%PORTDOCS%%%%DOCSDIR%%/images/gen12.png	1857	%%PORTDOCS%%%%DOCSDIR%%/images/gen12.png
1801	%%PORTDOCS%%%%DOCSDIR%%/images/gen13.png	1858	%%PORTDOCS%%%%DOCSDIR%%/images/gen13.png
1802	%%PORTDOCS%%%%DOCSDIR%%/images/gen14.png	1859	%%PORTDOCS%%%%DOCSDIR%%/images/gen14.png
		1860	%%PORTDOCS%%%%DOCSDIR%%/images/gen15-1.png
		1861	%%PORTDOCS%%%%DOCSDIR%%/images/gen15-2.png
		1862	%%PORTDOCS%%%%DOCSDIR%%/images/gen15-3.png
		1863	%%PORTDOCS%%%%DOCSDIR%%/images/gen15-4.png
		1864	%%PORTDOCS%%%%DOCSDIR%%/images/gen15-5.png
1803	%%PORTDOCS%%%%DOCSDIR%%/images/gen16_types.png	1865	%%PORTDOCS%%%%DOCSDIR%%/images/gen16_types.png
		1866	%%PORTDOCS%%%%DOCSDIR%%/images/gen17.png
1804	%%PORTDOCS%%%%DOCSDIR%%/images/gen19.png	1867	%%PORTDOCS%%%%DOCSDIR%%/images/gen19.png
		1868	%%PORTDOCS%%%%DOCSDIR%%/images/gen20_1.png
		1869	%%PORTDOCS%%%%DOCSDIR%%/images/gen20_2.png
		1870	%%PORTDOCS%%%%DOCSDIR%%/images/gen21_1.png
		1871	%%PORTDOCS%%%%DOCSDIR%%/images/gen21_2.png
		1872	%%PORTDOCS%%%%DOCSDIR%%/images/gen21_3.png
		1873	%%PORTDOCS%%%%DOCSDIR%%/images/gen21_4.png
		1874	%%PORTDOCS%%%%DOCSDIR%%/images/gen21_5.png
		1875	%%PORTDOCS%%%%DOCSDIR%%/images/gen25.png
		1876	%%PORTDOCS%%%%DOCSDIR%%/images/gen27.png
		1877	%%PORTDOCS%%%%DOCSDIR%%/images/gen40.png
		1878	%%PORTDOCS%%%%DOCSDIR%%/images/gen41.png
		1879	%%PORTDOCS%%%%DOCSDIR%%/images/gen42.png
		1880	%%PORTDOCS%%%%DOCSDIR%%/images/gen49.png
		1881	%%PORTDOCS%%%%DOCSDIR%%/images/gen51_1.png
		1882	%%PORTDOCS%%%%DOCSDIR%%/images/gen51_2.png
		1883	%%PORTDOCS%%%%DOCSDIR%%/images/gen51_3.png
		1884	%%PORTDOCS%%%%DOCSDIR%%/images/gen52.png
		1885	%%PORTDOCS%%%%DOCSDIR%%/images/gendy.png
		1886	%%PORTDOCS%%%%DOCSDIR%%/images/gendyx.png
		1887	%%PORTDOCS%%%%DOCSDIR%%/images/gensone.png
1805	%%PORTDOCS%%%%DOCSDIR%%/images/grain2_rand-448x289.png	1888	%%PORTDOCS%%%%DOCSDIR%%/images/grain2_rand-448x289.png
1806	%%PORTDOCS%%%%DOCSDIR%%/images/grain3_2.png	1889	%%PORTDOCS%%%%DOCSDIR%%/images/grain3_2.png
1807	%%PORTDOCS%%%%DOCSDIR%%/images/image1.png	1890	%%PORTDOCS%%%%DOCSDIR%%/images/image1.png
Lines 2200-2205 Link Here
2200	%%PORTDOCS%%%%DOCSDIR%%/product.html	2283	%%PORTDOCS%%%%DOCSDIR%%/product.html
2201	%%PORTDOCS%%%%DOCSDIR%%/pset.html	2284	%%PORTDOCS%%%%DOCSDIR%%/pset.html
2202	%%PORTDOCS%%%%DOCSDIR%%/pt04.html	2285	%%PORTDOCS%%%%DOCSDIR%%/pt04.html
		2286	%%PORTDOCS%%%%DOCSDIR%%/ptable.html
		2287	%%PORTDOCS%%%%DOCSDIR%%/ptable3.html
		2288	%%PORTDOCS%%%%DOCSDIR%%/ptablei.html
		2289	%%PORTDOCS%%%%DOCSDIR%%/ptablew.html
2203	%%PORTDOCS%%%%DOCSDIR%%/ptrack.html	2290	%%PORTDOCS%%%%DOCSDIR%%/ptrack.html
2204	%%PORTDOCS%%%%DOCSDIR%%/push.html	2291	%%PORTDOCS%%%%DOCSDIR%%/push.html
2205	%%PORTDOCS%%%%DOCSDIR%%/push_f.html	2292	%%PORTDOCS%%%%DOCSDIR%%/push_f.html

Return to bug 164984

Lines 6-17 Link Here

(-)audio/csound/Makefile (-5 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= csound	8	PORTNAME= csound
9	PORTVERSION= 5.15.0	9	PORTVERSION= 5.16.1
10	CATEGORIES= audio lang	10	CATEGORIES= audio lang
11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \
12	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual	12	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
13	DISTNAME= ${PORTNAME:S/c/C/}${PORTVERSION}	13	DISTNAME= ${PORTNAME:S/c/C/}${PORTVERSION}
14	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	14	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
		15	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
15	DIST_SUBDIR= csound	16	DIST_SUBDIR= csound
16		17
17	MAINTAINER= ports@FreeBSD.org	18	MAINTAINER= ports@FreeBSD.org
Lines 36-41 Link Here
36		37
37	CONFLICTS_INSTALL= outguess-*	38	CONFLICTS_INSTALL= outguess-*
38		39
		40	USE_BZIP2= yes
39	USE_PYTHON= 2.6+	41	USE_PYTHON= 2.6+
40	USE_BISON= build	42	USE_BISON= build
41	USE_GETTEXT= yes	43	USE_GETTEXT= yes
Lines 135-141 Link Here
135	.endif	137	.endif
136		138
137	.if !defined(NOPORTDOCS)	139	.if !defined(NOPORTDOCS)
138	BUILD_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip	140	EXTRACT_DEPENDS+=${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
139	DISTFILES+= Csound${PORTVERSION:R}_manual_html.zip:manual	141	DISTFILES+= Csound${PORTVERSION:R}_manual_html.zip:manual
140	.endif	142	.endif
141		143
Lines 145-150 Link Here
145	CMAKE_ARGS+= Word64=1	147	CMAKE_ARGS+= Word64=1
146	.endif	148	.endif
147		149
		150	post-extract:
		151	.if !defined(NOPORTDOCS)
		152	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -qo \
		153	Csound${PORTVERSION:R}_manual_html.zip -d ${WRKDIR})
		154	.endif
		155
148	post-patch:	156	post-patch:
149	@${SED} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g; \	157	@${SED} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g; \
150	s\|%%PYTHON_INCLUDEDIR%%\|${PYTHON_INCLUDEDIR}\|; \	158	s\|%%PYTHON_INCLUDEDIR%%\|${PYTHON_INCLUDEDIR}\|; \
Lines 188-199 Link Here
188	${WRKSRC}/frontends/CsoundAC/Counterpoint.hpp	196	${WRKSRC}/frontends/CsoundAC/Counterpoint.hpp
189		197
190	post-install:	198	post-install:
191	@${LN} -s libcsound64.so.5 ${PREFIX}/lib/libcsound64.so	199	@${LN} -sf libcsound64.so.5 ${PREFIX}/lib/libcsound64.so
192	.if !defined(NOPORTDOCS)	200	.if !defined(NOPORTDOCS)
193	@${MKDIR} ${DOCSDIR}	201	@${MKDIR} ${DOCSDIR}
194	@${ECHO_MSG} " Installing the manual."	202	@${ECHO_MSG} " Installing the manual."
195	@(cd ${WRKDIR}/Csound${PORTVERSION:R}_manual_html \	203	@(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${DOCSDIR})
196	&& ${COPYTREE_SHARE} . ${DOCSDIR})
197	@${ECHO_MSG} " Done."	204	@${ECHO_MSG} " Done."
198	.endif	205	.endif
199	@${CAT} ${PKGMESSAGE}	206	@${CAT} ${PKGMESSAGE}

Lines 1-56 Link Here

(-)audio/csound/files/patch-Engine-csound_orc.l (-56 lines)
1	--- Engine/csound_orc.l.orig 2011-12-22 19:41:53.000000000 +0900
2	+++ Engine/csound_orc.l 2011-12-27 21:28:55.000000000 +0900
3	@@ -288,7 +288,7 @@
4	/* printf("Push %p macro stack; new body #%s#\n",
5	PARM->macros, mm->body); */
6	/* printf("Push buffer %p -> ", YY_CURRENT_BUFFER); */
7	- yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
8	+ //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
9	yy_scan_string(mm->body, yyscanner);
10	/* printf("%p\n", YY_CURRENT_BUFFER); */
11	}
12	@@ -313,7 +313,7 @@
13	PARM->alt_stack[PARM->macro_stack_ptr].n = 0;
14	PARM->alt_stack[PARM->macro_stack_ptr++].s = NULL;
15	/* printf("Push buffer %p -> ", YY_CURRENBUFFER_TOKEN); */
16	- yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
17	+ //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
18	yy_scan_string(mm->body, yyscanner);
19	/* printf("%p\n", YY_CURRENT_BUFFER); */
20	}
21	@@ -367,7 +367,7 @@
22	PARM->alt_stack[PARM->macro_stack_ptr].n = mm->acnt;
23	PARM->alt_stack[PARM->macro_stack_ptr++].s = PARM->macros;
24	/* printf("Push %p macro stack\n",PARM->macros); */
25	- yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
26	+ //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
27	yy_scan_string(mm->body, yyscanner);
28	}
29	{MACRONAMEDA} {
30	@@ -419,7 +419,7 @@
31	/* printf("New body: ...#%s#\n", mm->body); */
32	PARM->alt_stack[PARM->macro_stack_ptr].n = mm->acnt;
33	PARM->alt_stack[PARM->macro_stack_ptr++].s = PARM->macros;
34	- yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
35	+ //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
36	yy_scan_string(mm->body, yyscanner);
37	}
38	{INTGR} {
39	@@ -448,7 +448,7 @@
40	MACRO x, y;
41	int n;
42	printf("Leaving buffer %p\n", YY_CURRENT_BUFFER);
43	- yypop_buffer_state(yyscanner);
44	+ //yypop_buffer_state(yyscanner);
45	if ( !YY_CURRENT_BUFFER ) yyterminate();
46	printf("End of input; popping to %p\n", YY_CURRENT_BUFFER);
47	if (PARM->clearBufferAfterEOF)
48	@@ -581,7 +581,7 @@
49	PARM->alt_stack[PARM->macro_stack_ptr].n = 0;
50	PARM->alt_stack[PARM->macro_stack_ptr++].s = NULL;
51	PARM->isInclude = PARM->clearBufferAfterEOF = 1;
52	- yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
53	+ //yypush_buffer_state(YY_CURRENT_BUFFER, yyscanner);
54	yy_scan_string(cf->body, yyscanner);
55	}
56

Line 0 Link Here

(-)audio/csound/files/patch-Opcodes__tl__fractalnoise.cpp (+18 lines)
	1	--- Opcodes/tl/fractalnoise.cpp.orig 2012-02-06 20:21:34.000000000 +0900
	2	+++ Opcodes/tl/fractalnoise.cpp 2012-02-08 00:36:44.000000000 +0900
	3	@@ -34,6 +34,7 @@
	4	return int(((unsigned int)x) >> n);
	5	}
	6
	7	+#if 0
	8	/* VECTOR INTRINSICS */
	9
	10	inline void *aligned_calloc(size_t nmemb, size_t size)
	11	@@ -41,6 +42,7 @@
	12	return (void)((unsigned long)(calloc((nmembsize)+15,
	13	(sizeof(char)))+15) & 0xfffffff0);
	14	}
	15	+#endif
	16
	17	/* ABSTRACT USER INTERFACE */
	18