svn commit: r408418 - in head/audio/csound6: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sun Feb  7 15:53:49 2016
New Revision: 408418
URL: https://svnweb.freebsd.org/changeset/ports/408418

Log:
  - Fix build with boost 1.60
  - Fix license
  - Switch to USES=localbase

Added:
  head/audio/csound6/files/patch-Opcodes_chua_ChuaOscillator.cpp   (contents, props changed)
Modified:
  head/audio/csound6/Makefile

Modified: head/audio/csound6/Makefile
==============================================================================
--- head/audio/csound6/Makefile	Sun Feb  7 15:41:35 2016	(r408417)
+++ head/audio/csound6/Makefile	Sun Feb  7 15:53:49 2016	(r408418)
@@ -12,7 +12,8 @@ DIST_SUBDIR=	csound
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Sound synthesizer
 
-LICENSE=	LGPL21
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>0:${PORTSDIR}/devel/boost-libs \
 		swig>2:${PORTSDIR}/devel/swig20 \
@@ -21,7 +22,7 @@ BUILD_DEPENDS=	boost-libs>0:${PORTSDIR}/
 LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
-USES=		bison cmake python:2
+USES=		bison cmake localbase python:2
 CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
 		-DBUILD_JAVA_INTERFACE:BOOL=OFF \
 		-DBUILD_P5GLOVE_OPCODES:BOOL=OFF \
@@ -33,9 +34,6 @@ CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
 USE_LDCONFIG=	yes
 SSP_UNSAFE=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 SUB_FILES=	pkg-message
 
 CONFLICTS=		csound-5.*

Added: head/audio/csound6/files/patch-Opcodes_chua_ChuaOscillator.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/csound6/files/patch-Opcodes_chua_ChuaOscillator.cpp	Sun Feb  7 15:53:49 2016	(r408418)
@@ -0,0 +1,12 @@
+--- Opcodes/chua/ChuaOscillator.cpp.orig	2015-09-29 11:13:27 UTC
++++ Opcodes/chua/ChuaOscillator.cpp
+@@ -117,8 +117,8 @@
+ //     d = sys_variables(12);
+ //     gnor = a*(x.^3) + b*(x.^2) + c*x + d;
+ 
+-#include <OpcodeBase.hpp>
+ #include <boost/numeric/ublas/vector.hpp>
++#include <OpcodeBase.hpp>
+ using namespace boost::numeric;
+ #include <cmath>
+