CVS commit: pkgsrc/audio/csound6

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Wed Oct  7 05:12:23 UTC 2020

Modified Files:
        pkgsrc/audio/csound6: Makefile distinfo
        pkgsrc/audio/csound6/patches: patch-Top_csmodule.c

Log Message:
reduce diffs to upstream and fix the plugin path.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/audio/csound6/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/csound6/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/csound6/patches/patch-Top_csmodule.c

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.55 pkgsrc/audio/csound6/Makefile:1.56
--- pkgsrc/audio/csound6/Makefile:1.55  Tue Oct  6 20:54:55 2020
+++ pkgsrc/audio/csound6/Makefile       Wed Oct  7 05:12:23 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2020/10/06 20:54:55 mrg Exp $
+# $NetBSD: Makefile,v 1.56 2020/10/07 05:12:23 mrg Exp $
 
 DISTNAME=              csound-${CSOUND_VERSION}
 PKGNAME=               csound6-${CSOUND_VERSION}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=csound/}
 GITHUB_PROJECT=                csound
@@ -15,7 +15,8 @@ LICENSE=              gnu-lgpl-v2.1 # or later
 CSOUND_VERSION=                6.15.0
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            bison flex
-CFLAGS+=               -g -D__PKGSRC_PREFIX__=\"${PREFIX}/\" -DBETA
+CFLAGS+=               -g -DBETA
+CFLAGS+=               -DCS_DEFAULT_PLUGINDIR=\"${PREFIX}/lib/csound/plugins64-6.0\"
 USE_CMAKE=             yes
 CMAKE_ARGS+=           -DBUILD_RELEASE=1
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release

Index: pkgsrc/audio/csound6/distinfo
diff -u pkgsrc/audio/csound6/distinfo:1.9 pkgsrc/audio/csound6/distinfo:1.10
--- pkgsrc/audio/csound6/distinfo:1.9   Tue Oct  6 00:26:51 2020
+++ pkgsrc/audio/csound6/distinfo       Wed Oct  7 05:12:23 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2020/10/06 00:26:51 mrg Exp $
+$NetBSD: distinfo,v 1.10 2020/10/07 05:12:23 mrg Exp $
 
 SHA1 (csound-6.15.0.tar.gz) = d8c04b42db03551e801faf7c8a8a969dbdd78fbc
 RMD160 (csound-6.15.0.tar.gz) = ed7c7971ac2a2c06cbe8f71b512d32ddb845c4c3
@@ -13,7 +13,7 @@ SHA1 (patch-InOut_winEPS.c) = 5b3182dc79
 SHA1 (patch-InOut_winFLTK.c) = c8eb6e799095e0a82759fbd9df042fd3dc5c3ae6
 SHA1 (patch-Opcodes_cpumeter.c) = d1b80026b3f0ea203a1055553bb4bd43c7a1dde1
 SHA1 (patch-Opcodes_wavegde.h) = a94da3b1cf6bf5497c6b0ccc15bd9e1e554146d5
-SHA1 (patch-Top_csmodule.c) = 68749a33360c85bb9025d5cb297fcfd757ca6803
+SHA1 (patch-Top_csmodule.c) = 6a15ef7582caeefb7a41a59a499045bf07279bf1
 SHA1 (patch-Top_csound.c) = 6f9e216ff6df71fe937866daa21e205469b732e7
 SHA1 (patch-Top_one_file.c) = b93131eb5b4ea89fb1ab13cff3377510060059dc
 SHA1 (patch-Top_threads.c) = 1c296a92b62561428f5dd010834d6858ff83e481

Index: pkgsrc/audio/csound6/patches/patch-Top_csmodule.c
diff -u pkgsrc/audio/csound6/patches/patch-Top_csmodule.c:1.4 pkgsrc/audio/csound6/patches/patch-Top_csmodule.c:1.5
--- pkgsrc/audio/csound6/patches/patch-Top_csmodule.c:1.4       Sat Nov  2 22:25:46 2019
+++ pkgsrc/audio/csound6/patches/patch-Top_csmodule.c   Wed Oct  7 05:12:23 2020
@@ -1,6 +1,5 @@
-$NetBSD: patch-Top_csmodule.c,v 1.4 2019/11/02 22:25:46 mrg Exp $
+$NetBSD: patch-Top_csmodule.c,v 1.5 2020/10/07 05:12:23 mrg Exp $
 
-Fix the installation path for csound6 plugins.
 Add NetBSD and DragonFlyBSD support.
 
 --- Top/csmodule.c.orig        2019-07-12 14:54:19.000000000 -0700
@@ -23,18 +22,6 @@ Add NetBSD and DragonFlyBSD support.
  #  define ENABLE_OPCODEDIR_WARNINGS 1
  #  ifdef CS_DEFAULT_PLUGINDIR
  #    undef CS_DEFAULT_PLUGINDIR
-@@ -159,9 +159,9 @@
- #  define ENABLE_OPCODEDIR_WARNINGS 0
- #  ifndef CS_DEFAULT_PLUGINDIR
- #    ifndef USE_DOUBLE
--#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins"
-+#      define CS_DEFAULT_PLUGINDIR  __PKGSRC_PREFIX__ "lib/csound6/plugins-6.0"
- #    else
--#      define CS_DEFAULT_PLUGINDIR  "/usr/local/lib/csound/plugins64"
-+#      define CS_DEFAULT_PLUGINDIR  __PKGSRC_PREFIX__ "lib/csound6/plugins-6.0"
- #    endif
- #  endif
- #endif
 @@ -264,7 +264,7 @@
      err = csoundOpenLibrary(&h, libraryPath);
      if (UNLIKELY(err)) {