CVS commit: pkgsrc/audio/csound6

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Tue Oct 29 20:13:58 UTC 2019

Modified Files:
        pkgsrc/audio/csound6: Makefile PLIST

Log Message:
fix build and prepare for the future:

- switch to fltk 1.3 from 1.1
- turn off fluidsynth for now (API hiding changes needed, likely
  fixed upstream already -- we are out of date.)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/audio/csound6/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/csound6/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/csound6/Makefile
diff -u pkgsrc/audio/csound6/Makefile:1.38 pkgsrc/audio/csound6/Makefile:1.39
--- pkgsrc/audio/csound6/Makefile:1.38  Wed Sep 18 14:17:04 2019
+++ pkgsrc/audio/csound6/Makefile       Tue Oct 29 20:13:58 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2019/09/18 14:17:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.39 2019/10/29 20:13:58 mrg Exp $
 
 DISTNAME=              Csound${CSOUND_VERSION}
 PKGNAME=               csound6-${CSOUND_VERSION}
-PKGREVISION=           26
+PKGREVISION=           27
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=csound/csound6/Csound6.03/}
 WRKSRC=                        ${WRKDIR}/Csound${CSOUND_VERSION}
@@ -39,7 +39,7 @@ CHECK_PORTABILITY_SKIP+=      installer/misc/
 post-install:
        cd ${DESTDIR}${PREFIX} && ${LN} -s ../lib/csound6/csound bin/csound6
 
-.include "../../audio/fluidsynth/buildlink3.mk"
+#.include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
@@ -47,7 +47,7 @@ post-install:
 .include "../../graphics/png/buildlink3.mk"
 PYTHON_FOR_BUILD_ONLY= yes
 .include "../../lang/python/application.mk"
-.include "../../x11/fltk/buildlink3.mk"
+.include "../../x11/fltk13/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/csound6/PLIST
diff -u pkgsrc/audio/csound6/PLIST:1.4 pkgsrc/audio/csound6/PLIST:1.5
--- pkgsrc/audio/csound6/PLIST:1.4      Tue Aug 19 13:47:06 2014
+++ pkgsrc/audio/csound6/PLIST  Tue Oct 29 20:13:58 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/08/19 13:47:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/10/29 20:13:58 mrg Exp $
 bin/csound6
 include/csound6/CppSound.hpp
 include/csound6/CsoundFile.hpp
@@ -59,7 +59,6 @@ lib/csound6/plugins-6.0/libcontrol.so
 lib/csound6/plugins-6.0/libcs_date.so
 lib/csound6/plugins-6.0/libdoppler.so
 lib/csound6/plugins-6.0/libfareygen.so
-lib/csound6/plugins-6.0/libfluidOpcodes.so
 lib/csound6/plugins-6.0/libfractalnoise.so
 lib/csound6/plugins-6.0/libimage.so
 lib/csound6/plugins-6.0/libipmidi.so