CVS commit: pkgsrc/audio/csound5

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Wed Nov  6 11:56:56 UTC 2019

Modified Files:
        pkgsrc/audio/csound5: Makefile PLIST distinfo
        pkgsrc/audio/csound5/patches: patch-install.py

Log Message:
switch to fltk 1.3.  fix build.  bump pkgversion.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/audio/csound5/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/csound5/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/csound5/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/csound5/patches/patch-install.py

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

Modified files:

Index: pkgsrc/audio/csound5/Makefile
diff -u pkgsrc/audio/csound5/Makefile:1.43 pkgsrc/audio/csound5/Makefile:1.44
--- pkgsrc/audio/csound5/Makefile:1.43  Thu Apr 25 07:32:34 2019
+++ pkgsrc/audio/csound5/Makefile       Wed Nov  6 11:56:56 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2019/04/25 07:32:34 maya Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/06 11:56:56 mrg Exp $
 
 DISTNAME=              Csound${CSOUND_VERSION}
 PKGNAME=               csound5-${CSOUND_VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=csound/csound5/csound5.19/}
 WRKSRC=                        ${WRKDIR}/Csound${CSOUND_VERSION}
@@ -44,13 +44,13 @@ do-install:
                install.py --prefix=${PREFIX} --instdir=${DESTDIR}
        cd ${DESTDIR}${PREFIX} && ${LN} -s ../lib/csound5/csound bin/csound5
 
-.include "../../audio/fluidsynth/buildlink3.mk"
+#.include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 PYTHON_FOR_BUILD_ONLY= yes
 .include "../../devel/scons/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../x11/fltk/buildlink3.mk"
+.include "../../x11/fltk13/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/csound5/PLIST
diff -u pkgsrc/audio/csound5/PLIST:1.5 pkgsrc/audio/csound5/PLIST:1.6
--- pkgsrc/audio/csound5/PLIST:1.5      Thu Feb 13 10:10:06 2014
+++ pkgsrc/audio/csound5/PLIST  Wed Nov  6 11:56:56 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/02/13 10:10:06 mrg Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/11/06 11:56:56 mrg Exp $
 bin/csound5
 include/csound5/CppSound.hpp
 include/csound5/CsoundFile.hpp
@@ -47,7 +47,6 @@ lib/csound5/plugins/libcs_date.so
 lib/csound5/plugins/libcsladspa.so
 lib/csound5/plugins/libdoppler.so
 lib/csound5/plugins/libfareygen.so
-lib/csound5/plugins/libfluidOpcodes.so
 lib/csound5/plugins/libfractalnoise.so
 lib/csound5/plugins/libimage.so
 lib/csound5/plugins/libmixer.so

Index: pkgsrc/audio/csound5/distinfo
diff -u pkgsrc/audio/csound5/distinfo:1.14 pkgsrc/audio/csound5/distinfo:1.15
--- pkgsrc/audio/csound5/distinfo:1.14  Wed Jan  2 18:29:14 2019
+++ pkgsrc/audio/csound5/distinfo       Wed Nov  6 11:56:56 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2019/01/02 18:29:14 tnn Exp $
+$NetBSD: distinfo,v 1.15 2019/11/06 11:56:56 mrg Exp $
 
 SHA1 (Csound5.19.01.tar.gz) = eeeb3591745c5b352b9040a2dfa3805f22f5fbda
 RMD160 (Csound5.19.01.tar.gz) = ceb9952d562c57b09143a47a4d51081753f1b694
@@ -23,4 +23,4 @@ SHA1 (patch-an) = edaddf39179bf686e46591
 SHA1 (patch-ao) = 83a028f92ef743072728376cf4ddc79ef3d46381
 SHA1 (patch-custom.py.mkg) = ef45464105e7d7bc8ad2401d1b19f521e12333ca
 SHA1 (patch-frontends_beats_main.c) = 5de77ee83be93120a93b86b755d767c46c58fcdf
-SHA1 (patch-install.py) = 98397ed54f1afb1551a4d82492e020842ee4dee1
+SHA1 (patch-install.py) = 7e17e5a42e7097f232abe530e3f738cc72fc6b0a

Index: pkgsrc/audio/csound5/patches/patch-install.py
diff -u pkgsrc/audio/csound5/patches/patch-install.py:1.3 pkgsrc/audio/csound5/patches/patch-install.py:1.4
--- pkgsrc/audio/csound5/patches/patch-install.py:1.3   Wed Jan  2 18:29:14 2019
+++ pkgsrc/audio/csound5/patches/patch-install.py       Wed Nov  6 11:56:56 2019
@@ -1,9 +1,11 @@
-$NetBSD: patch-install.py,v 1.3 2019/01/02 18:29:14 tnn Exp $
+$NetBSD: patch-install.py,v 1.4 2019/11/06 11:56:56 mrg Exp $
 
 python 3.x support
 
---- install.py.orig    2013-01-07 12:49:35.000000000 +0000
-+++ install.py
+don't fake-conflict with csound6.
+
+--- install.py.orig    2013-01-07 04:49:35.000000000 -0800
++++ install.py 2019-11-06 03:43:25.554498784 -0800
 @@ -3,7 +3,6 @@
  import sys
  import os
@@ -12,7 +14,7 @@ python 3.x support
  import time
  
  # get Python version
-@@ -28,13 +27,14 @@ exeFiles1 = ['csound', 'csound5gui', 'Cs
+@@ -28,13 +27,14 @@
               'scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot']
  
  exeFiles2 = ['brkpt', 'linseg', 'tabdes']
@@ -29,7 +31,7 @@ python 3.x support
  
  prefix = '/usr/local'
  instDir = '/'
-@@ -47,14 +47,14 @@ md5Name = 'csound5-%s.md5sums' % time.st
+@@ -47,14 +47,14 @@
  word64Suffix = ''
  
  def printUsage():
@@ -52,7 +54,7 @@ python 3.x support
  
  # parse command line options
  
-@@ -73,10 +73,10 @@ if sys.argv.__len__() > 1:
+@@ -73,10 +73,10 @@
              word64Suffix = '64'
          else:
              printUsage()
@@ -65,7 +67,7 @@ python 3.x support
  
  # concatenates a list of directory names,
  # and returns full path without a trailing '/'
-@@ -96,15 +96,15 @@ def concatPath(lst):
+@@ -96,15 +96,15 @@
      return s
  
  # frontends
@@ -86,7 +88,7 @@ python 3.x support
  # XMG files
  xmgDir      = concatPath([prefix, '/share/locale'])
  # documentation
-@@ -128,7 +128,7 @@ def runCmd(args):
+@@ -128,7 +128,7 @@
  
  def makeDir(dirName):
      try:
@@ -95,7 +97,7 @@ python 3.x support
      except:
          pass
  
-@@ -158,9 +158,9 @@ def installFile_(src, dst, perm, stripMo
+@@ -158,9 +158,9 @@
          err = runCmd(['strip', stripMode, fullName])
      if err == 0:
          addMD5(fullName, fileName)
@@ -107,7 +109,7 @@ python 3.x support
      return err
  
  def installFile(src, dst):
-@@ -195,9 +195,9 @@ def installLink(src, dst):
+@@ -195,9 +195,9 @@
              addMD5(concatPath([instDir, src]), linkName)
          else:
              addMD5(concatPath([instDir, linkName]), linkName)
@@ -119,9 +121,12 @@ python 3.x support
      return err
  
  def findFiles(dir, pat):
-@@ -220,28 +220,28 @@ makeDir(concatPath([binDir]))
+@@ -218,30 +218,30 @@
+ 
+ makeDir(concatPath([binDir]))
  installedBinaries = findFiles(concatPath([instDir, binDir]), '.+')
- if ('csound' in installedBinaries) or ('csound64' in installedBinaries):
+-if ('csound' in installedBinaries) or ('csound64' in installedBinaries):
++if ('csound5' in installedBinaries) or ('csound64' in installedBinaries):
      if 'uninstall-csound5' in installedBinaries:
 -        print ' *** WARNING: found an already existing installation of Csound'
 +        print(' *** WARNING: found an already existing installation of Csound')
@@ -157,7 +162,7 @@ python 3.x support
  for i in exeFiles1:
      if findFiles('.', i).__len__() > 0:
          err = installXFile('--strip-unneeded', i, binDir)
-@@ -253,7 +253,7 @@ for i in exeFiles2:
+@@ -253,7 +253,7 @@
  
  # copy libraries
  
@@ -166,7 +171,7 @@ python 3.x support
  libList = findFiles('.', 'libcsound\\.a')
  libList += findFiles('.', 'libcsound64\\.a')
  libList += findFiles('.', 'libcsound\\.so\\..+')
-@@ -280,7 +280,7 @@ for i in libList:
+@@ -280,7 +280,7 @@
  
  # copy plugin libraries
  
@@ -175,7 +180,7 @@ python 3.x support
  if not useDouble:
      pluginDir = pluginDir32
  else:
-@@ -297,13 +297,13 @@ for i in pluginList:
+@@ -297,13 +297,13 @@
  
  # copy header files
  
@@ -191,7 +196,7 @@ python 3.x support
  wrapperList = [['csnd\\.py', '0', pythonDir],
                 ['loris\\.py', '0', pythonDir],
                 ['CsoundVST\\.py', '0', pythonDir],
-@@ -327,7 +327,7 @@ for i in wrapperList:
+@@ -327,7 +327,7 @@
  
  # copy XMG files
  
@@ -200,7 +205,7 @@ python 3.x support
  xmgList = findFiles('.', '.+\\.xmg')
  if xmgList.__len__() > 0:
      err = installFiles(xmgList, xmgDir)
-@@ -341,34 +341,34 @@ else:
+@@ -341,34 +341,34 @@
      err = runCmd(['install', '-p', '-m', '0644', src, fileName])
      if err == 0:
          addMD5(fileName, fileName)
@@ -243,7 +248,7 @@ python 3.x support
      rawWaveFiles = []
      for fName in os.listdir('./Opcodes/stk/rawwaves'):
          if re.match('^.*\.raw$', fName) != None:
-@@ -397,11 +397,11 @@ try:
+@@ -397,11 +397,11 @@
  except:
      pdDir = ''
  if pdDir != '':
@@ -257,7 +262,7 @@ python 3.x support
          except:
              err = -1
      installErrors = installErrors or err
-@@ -409,7 +409,7 @@ if pdDir != '':
+@@ -409,7 +409,7 @@
  # copy VIM files if enabled
  
  if vimDir != '':
@@ -266,7 +271,7 @@ python 3.x support
      err = installXFile('', 'installer/misc/vim/cshelp', binDir)
      installErrors = installErrors or err
      err = installFile('installer/misc/vim/csound.vim',
-@@ -420,71 +420,31 @@ if vimDir != '':
+@@ -420,71 +420,31 @@
                            '%s/%s' % (vimDir, 'syntax'))
          installErrors = installErrors or err