- Update to 5.07

PR:		ports/120102
Submitted by:	Martin Tournoij <carpetsmoker@xs4all.nl> (maintainer)

audio/csound/Makefile

@@ -2,12 +2,12 @@
 # Date created:				2000-10-11
 # Whom:					trevor
 #
-# $Carpetsmoker: ports/audio/csound/Makefile,v 1.3 2007/07/22 00:52:59 carpetsmoker Exp $
+# $Carpetsmoker: ports/audio/csound/Makefile,v 1.5 2007/11/18 11:10:22 carpetsmoker Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	csound
-PORTVERSION=	5.06
+PORTVERSION=	5.07
 CATEGORIES=	audio lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.carpetsmoker.net/distfiles/:manual \
@@ -22,34 +22,46 @@ MAINTAINER=	carpetsmoker@xs4all.nl
 COMMENT=	Sound synthesizer
 
 LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
-		fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads \
-		portaudio.2:${PORTSDIR}/audio/portaudio2
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_src/.0/}
+WRKSRC=		${WRKDIR}/csound5
 USE_PYTHON=	2.4+
 USE_SCONS=	yes
 SCONS_ARGS+=	prefix=${PREFIX} CC=${CC} CXX=${CXX} \
-		buildRelease=1 install=1 buildCsound5GUI=1 \
-		buildWinsound=1 buildVirtual=1 buildCSEditor=1 Word64=1
-SUB_FILES=	custom.py \
-		pkg-message
-SUB_LIST+=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
+		usePortAudio=0 usePortMIDI=0 useALSA=0 \
+		useJack=0 useFLTK=1 buildCsoundAC=0 buildCsoundVST=0 \
+		buildCsound5GUI=1 buildRelease=1 install=1 \
+		useCoreAudio=1 buildWinsound=1 buildInterfaces=1 \
+		buildVirtual=1 buildCSEditor=1 buildDSSI=0
+SUB_FILES=	custom.py pkg-message
+SUB_LIST+=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
+		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 USE_LDCONFIG=	yes
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+USE_LDCONFIG=	${PREFIX}/lib/csound/plugins
+
+.include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
 DISTFILES+=	${DISTNAME}-manual.tar.gz:manual
 .endif
 
-FLTKBASE?=	${LOCALBASE}
+.if ${ARCH} == "sparc64"
+BROKEN=		Fails to link
+.endif
+
 post-patch: apply-slist
 	@${SETENV} FLTKBASE=${FLTKBASE} ${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|; \
-		s|'dl'|''| ; s|lib64|lib|g" \
+		s|'dl'|''|; \
+		s|'asound'|''|;" \
 		${WRKSRC}/SConstruct
 	@${REINPLACE_CMD} 's|linux/if.h|net/if.h|' ${WRKSRC}/OOps/remote.c
+	@${REINPLACE_CMD} 's|malloc.h|stdlib.h|' \
+		${WRKSRC}/frontends/CsoundAC/Counterpoint.hpp
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -57,13 +69,7 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/csound-manual/tutorial_${PORTVERSION}.pdf ${DOCSDIR}
 	${CP} -r ${WRKDIR}/csound-manual/html ${DOCSDIR}
 .endif
-	${MV} ${PREFIX}/bin/mixer ${PREFIX}/bin/cs_mixer
-	@${CAT} ${WRKDIR}/pkg-message
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Fails to link
-.endif
+	${MV} ${PREFIX}/bin/mixer ${PREFIX}/bin/csmixer
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

audio/csound/distinfo

@@ -1,6 +1,6 @@
-MD5 (csound/Csound5.06.0.tar.gz) = a17b46ffd42b448b374e2dbcdf698e90
-SHA256 (csound/Csound5.06.0.tar.gz) = 2a25c3d442c0abe12d83706650e1c6324866acc658af074daa9d60c0a69dbab1
-SIZE (csound/Csound5.06.0.tar.gz) = 11267389
-MD5 (csound/Csound5.06.0-manual.tar.gz) = 62b4a8edf5d26871092b8412a1f35a3b
-SHA256 (csound/Csound5.06.0-manual.tar.gz) = 01ad6e2d460ff144d687d545d0cc88d0f351d7df4c7d252bc73de5be61e3cdef
-SIZE (csound/Csound5.06.0-manual.tar.gz) = 10538560
+MD5 (csound/Csound5.07.0.tar.gz) = 29b2c8d4fbe866e50a70bc6d7a7c96af
+SHA256 (csound/Csound5.07.0.tar.gz) = d5fa1905163b5f389feba9a01e655ea1f97fbd7c782f05b3e99e653d185f3d6c
+SIZE (csound/Csound5.07.0.tar.gz) = 2972932
+MD5 (csound/Csound5.07.0-manual.tar.gz) = 44085d7e054cf63ee88a6288e5770fce
+SHA256 (csound/Csound5.07.0-manual.tar.gz) = e620e2497dc776742c9da318e3280732251aa520b1a140d1774c97aa39c6d11e
+SIZE (csound/Csound5.07.0-manual.tar.gz) = 10546817

audio/csound/files/custom.py.in

@@ -6,7 +6,7 @@ customCPPPATH = [ '%%LOCALBASE%%/include', '%%PYTHON_INCLUDEDIR%%' ]
 customCCFLAGS = [  ]
 customCXXFLAGS = [  ]
 customLIBS = []
-customLIBPATH = [ '%%LOCALBASE%%/lib' ]
+customLIBPATH = [ '%%LOCALBASE%%/lib/portaudio2', '%%LOCALBASE%%/lib' ]
 customSHLINKFLAGS = []
 customSWIGFLAGS = []
 platform = 'linux'