[pkgsrc/trunk]: pkgsrc/audio/csound6 fix build and prepare for the future:

[mrg <mrg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31fe80481a0a
branches:  trunk
changeset: 403622:31fe80481a0a
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Tue Oct 29 20:13:58 2019 +0000

description:
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.)

diffstat:

 audio/csound6/Makefile |  8 ++++----
 audio/csound6/PLIST    |  3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 3549264a6551 -r 31fe80481a0a audio/csound6/Makefile
--- a/audio/csound6/Makefile    Tue Oct 29 19:38:16 2019 +0000
+++ b/audio/csound6/Makefile    Tue Oct 29 20:13:58 2019 +0000
@@ -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 @@
 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 @@
 .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"
diff -r 3549264a6551 -r 31fe80481a0a audio/csound6/PLIST
--- a/audio/csound6/PLIST       Tue Oct 29 19:38:16 2019 +0000
+++ b/audio/csound6/PLIST       Tue Oct 29 20:13:58 2019 +0000
@@ -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/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