diff -urN /usr/ports/audio/csound6/Makefile audio/csound6/Makefile --- /usr/ports/audio/csound6/Makefile 2015-08-24 03:54:25.375766000 +0900 +++ audio/csound6/Makefile 2015-10-16 00:00:00.000000000 +0900 @@ -2,7 +2,7 @@ # $FreeBSD: head/audio/csound6/Makefile 394778 2015-08-19 13:29:59Z mat $ PORTNAME= csound -PORTVERSION= 6.05 +PORTVERSION= 6.06 CATEGORIES= audio lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION} PKGNAMESUFFIX= 6 @@ -18,7 +18,8 @@ swig>2:${PORTSDIR}/devel/swig20 \ eigen>0:${PORTSDIR}/math/eigen3 \ gmm++>0:${PORTSDIR}/math/gmm++ -LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile +LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ + libsndfile.so:${PORTSDIR}/audio/libsndfile USES= bison cmake python:2 CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \ @@ -57,6 +58,7 @@ DSSI_RUN_DEPENDS= dssi>0:${PORTSDIR}/audio/dssi DSSI_CMAKE_OFF= -DBUILD_DSSI_OPCODES:BOOL=OFF DSSI_CFLAGS= -isystem ${LOCALBASE}/include/dssi +DSSI_PREVENTS= ALSA FLTK_DESC= Build FLTK plugin and GUI FLTK_LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk FLTK_CMAKE_ON= -DBUILD_WINSOUND:BOOL=ON @@ -131,10 +133,16 @@ @${REINPLACE_CMD} -e \ 's| mixer)| csmixer)|' \ ${WRKSRC}/util/CMakeLists.txt +.for i in Engine/auxfd.c H/prototyp.h OOps/diskin2.c OOps/dumpf.c \ + Opcodes/partials.c Top/csound.c + @${REINPLACE_CMD} -e \ + 's|\([[:blank:]]fd\)\(close\)|\1__\2|' ${WRKSRC}/${i} +.endfor post-install: @${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6 @${LN} -sf libcsound64.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsound64.so.6 + post-install-FLTK-on: @${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6 diff -urN /usr/ports/audio/csound6/distinfo audio/csound6/distinfo --- /usr/ports/audio/csound6/distinfo 2015-08-24 03:54:25.382975000 +0900 +++ audio/csound6/distinfo 2015-10-16 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (csound/Csound6.05.tar.gz) = 0d0ab4c1804265f4947e07c5e41ee72bc1a122b873bd77b9e7179f4c4db43a28 -SIZE (csound/Csound6.05.tar.gz) = 26208635 +SHA256 (csound/Csound6.06.tar.gz) = 03e6542d60eaffc9b4c5e81f36243e8872dedbe94c036adaa8e07c27938feb11 +SIZE (csound/Csound6.06.tar.gz) = 27232172 diff -urN /usr/ports/audio/csound6/files/patch-Opcodes-urandom.c audio/csound6/files/patch-Opcodes-urandom.c --- /usr/ports/audio/csound6/files/patch-Opcodes-urandom.c 2015-08-24 03:54:25.431838000 +0900 +++ audio/csound6/files/patch-Opcodes-urandom.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,10 +0,0 @@ ---- Opcodes/urandom.c.orig 2015-04-25 19:06:23 UTC -+++ Opcodes/urandom.c -@@ -22,7 +22,6 @@ - */ - - #include "csdl.h" --#include - - typedef struct { - OPDS h; diff -urN /usr/ports/audio/csound6/pkg-plist audio/csound6/pkg-plist --- /usr/ports/audio/csound6/pkg-plist 2015-08-24 03:54:25.475217000 +0900 +++ audio/csound6/pkg-plist 2015-10-16 00:00:00.000000000 +0900 @@ -27,6 +27,7 @@ bin/scsort bin/sdif2ad bin/sndinfo +bin/src_conv bin/srconv %%FLTK%%bin/winsound include/csound/CppSound.hpp @@ -70,6 +71,7 @@ lib/csound/plugins-6.0/libfareygen.so %%FLUIDSYNTH%%lib/csound/plugins-6.0/libfluidOpcodes.so lib/csound/plugins-6.0/libfractalnoise.so +lib/csound/plugins-6.0/libframebuffer.so %%HDF5%%lib/csound/plugins-6.0/libhdf5.so %%PNG%%lib/csound/plugins-6.0/libimage.so lib/csound/plugins-6.0/libipmidi.so