Update to 4.12, provided by Ben Collver in pkg/13103.

Changes: Bugfixes, removed some limitations on some kinds of variables,
e.g. variable name length.
Package change: --sched is working now. Sort PLIST.

7 files changed, 73 insertions, 59 deletions

diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 0814678cf33..27fd14e6a13 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/03/27 03:19:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/29 18:39:03 wiz Exp $
 #
 
-DISTNAME=		unofficial-csound-4.09.0.0b-linux.src
-PKGNAME=		csound-4.09
+DISTNAME=		unofficial-csound-4.12.0.1b-linux.src
+PKGNAME=		csound-4.12
 CATEGORIES=		audio
 MASTER_SITES=		ftp://mustec.bgsu.edu/pub/linux/
 
diff --git a/audio/csound/distinfo b/audio/csound/distinfo
index 2805e96f868..6768ffcf290 100644
--- a/audio/csound/distinfo
+++ b/audio/csound/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 13:04:19 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/29 18:39:03 wiz Exp $
 
-SHA1 (csound/unofficial-csound-4.09.0.0b-linux.src.tar.gz) = 615002ae5d5df7f76ad3aa6a7512458f5e654460
-Size (csound/unofficial-csound-4.09.0.0b-linux.src.tar.gz) = 1008572 bytes
+SHA1 (csound/unofficial-csound-4.12.0.1b-linux.src.tar.gz) = d8fe02c3443fc0a7c4f1edd71e696dedb80af90a
+Size (csound/unofficial-csound-4.12.0.1b-linux.src.tar.gz) = 1053587 bytes
 SHA1 (patch-aa) = 086efe8952d682a929ceff55b5eb6f38594943e6
 SHA1 (patch-ab) = 0003c95c4292309c35aae90fa7cfa76620370510
-SHA1 (patch-ac) = e86fe6149f34c9f8fc8e2532a0143dd5d91f54c6
-SHA1 (patch-ad) = 8f55608870c5194e136f166ff98ab0e1b4768e45
-SHA1 (patch-ae) = 8c56528d6b440a11977dd79b834dcfe1ca74d061
+SHA1 (patch-ac) = 935b3b30d5b07263c59d8868466617c94b77d050
+SHA1 (patch-ad) = cd4c34a1ced10383c456cf409f053c366092d7ae
+SHA1 (patch-ae) = 6fec4f4c205a8b458dfc1a0861be9eb9b2005156
 SHA1 (patch-af) = 4f330a2468fe0a0b97c19076a7f682f6319cc198
 SHA1 (patch-ag) = 6cc2cf7c1ac03a5a44ecdefeb7fb43c87f4f2529
 SHA1 (patch-ah) = 73e89feaa419fe2e8287cab303e04494a726f45c
 SHA1 (patch-ai) = cc5c74c0f32b8726e766b739130be5af442a1440
 SHA1 (patch-aj) = 2d18cf881d09e447969a623c88866c0624b19990
-SHA1 (patch-ak) = 011f2121c47857c3815f20c9040f6029ca61b9e6
+SHA1 (patch-ak) = eef2e5bf815a0359ca9c5474a26c8da038c5da0a
 SHA1 (patch-al) = e2a7a30496cfc70118f145590ed1658b459dd44b
 SHA1 (patch-am) = 4bd719ae9d402d6699a8e45782d04e4929e1e030
 SHA1 (patch-an) = 29c786bdfbed4b1ae022b8dfdf4fa17409fbd9c9
diff --git a/audio/csound/patches/patch-ac b/audio/csound/patches/patch-ac
index ba3787c67ea..d876fd075ef 100644
--- a/audio/csound/patches/patch-ac
+++ b/audio/csound/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2001/06/29 18:39:03 wiz Exp $
 
---- Make.Variables.in.orig	Sun Dec 10 16:37:23 2000
-+++ Make.Variables.in
-@@ -222,7 +222,7 @@
+--- Make.Variables.in.orig	Sun Jun  3 18:13:08 2001
++++ Make.Variables.in	Sun Jun  3 18:13:36 2001
+@@ -229,7 +229,7 @@
  	$(TOP)/configure.in sliders.tk matrix.tk matrix.hlp
  SRCDISTRIB_DIRS=$(SUBDIRS) $(DOC_DIRS)
  STRINGSDB=csound.txt
diff --git a/audio/csound/patches/patch-ad b/audio/csound/patches/patch-ad
index 5cc21f25189..8fd14f2ccac 100644
--- a/audio/csound/patches/patch-ad
+++ b/audio/csound/patches/patch-ad
@@ -1,9 +1,10 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2001/06/29 18:39:03 wiz Exp $
 
---- acconfig.h.orig	Sat Mar 10 01:50:23 2001
-+++ acconfig.h
-@@ -0,0 +1,4 @@
+--- acconfig.h.orig	Sun Jun  3 19:12:50 2001
++++ acconfig.h	Sun Jun  3 19:13:22 2001
+@@ -0,0 +1,5 @@
 +/* these are here to silence autoreconf */
 +#undef FORCE_STDOUT_LBUF
 +#undef NEEDS_MINSHORT
 +#undef NEEDS_SAFE_FCLOSE
++#undef HAVE_INLINE
diff --git a/audio/csound/patches/patch-ae b/audio/csound/patches/patch-ae
index 91f1b19c193..d6d35fd78c2 100644
--- a/audio/csound/patches/patch-ae
+++ b/audio/csound/patches/patch-ae
@@ -1,26 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2001/06/29 18:39:03 wiz Exp $
 
---- configure.in.orig	Sun Oct 29 00:25:07 2000
-+++ configure.in
-@@ -327,6 +327,9 @@
- dnl It provides an interface between Csound realtime record/play calls
- dnl and the device-driver code that controls the actual hardware.
- dnl
-+
-+dnl Some systems require libossaudio.a
-+AC_CHECK_LIB(ossaudio, _oss_ioctl, [LIBOSS="-lossaudio"], [ LIBOSS=""])
- AC_ARG_ENABLE(OSS_RTAUDIO,
-   [  --enable-OSS-RTAUDIO	  enable OSS-RTAUDIO (default: no)],
-   [case "${enable_OSS_RTAUDIO}" in
-@@ -341,6 +344,7 @@
- 	CSOUND_CONF_MESSAGE(enable the OSS-RTAUDIO feature...)
+--- configure.in.orig	Sun Jun  3 18:14:50 2001
++++ configure.in	Sun Jun  3 18:20:52 2001
+@@ -364,6 +364,7 @@
+ 	CSOUND_CONF_MESSAGE(enable the OSS-RTAUDIO driver...)
  	RTAUDIO_DRIVER=["LINUXaudio.c \${LINUX_DISTRIB_DIR}/OSSrtaudio.c"]
  	DEFS=["${DEFS} -DOSSRTAUDIO"]
-+	LIBS=["-lossaudio ${LIBOSS}"]
++	LIBS=["-lossaudio ${LIBS}"]
  fi
  
- dnl
-@@ -575,8 +579,8 @@
+ if test "${enable_rtaudio}" = "alsa"
+@@ -613,8 +614,8 @@
  dnl
  
  case $host in
@@ -31,7 +21,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
  		;;
  	*)
  		;;
-@@ -610,10 +614,10 @@
+@@ -648,10 +649,10 @@
  	changequote(<<, >>)dnl
  	csound_version_full=`(cat ${version_file}; echo VERSIONSTRING) | ${CPP} - | ${AWK} '/^" v"/ { gsub(/[" v]/,""); print $0; }'`
  	changequote([, ])dnl
diff --git a/audio/csound/patches/patch-ak b/audio/csound/patches/patch-ak
index b021c2a1934..8ace9e9b535 100644
--- a/audio/csound/patches/patch-ak
+++ b/audio/csound/patches/patch-ak
@@ -1,19 +1,26 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2001/06/29 18:39:03 wiz Exp $
 
 --- new-src/scheduler.c.orig	Sat Dec 12 12:16:30 1998
 +++ new-src/scheduler.c
-@@ -4,24 +4,6 @@
-  * Written by Fred Floberg <emng@geocities.com>
+@@ -3,25 +3,28 @@
   *
+- * Written by Fred Floberg <emng@geocities.com>
+- *
   */
 -#include <sched.h>
--#include <stdio.h>
++
++#include <sys/time.h>
++#include <sys/resource.h>
+ #include <stdio.h>
 -#include "cs.h"
++
++#define HIGH_PRIORITY -20
++
  void setscheduler(void)
  {
 -        struct sched_param sched_param;
--	extern int scheduler_priority;
--
+ 	extern int scheduler_priority;
+ 
 -	if(!scheduler_priority) return; /* Check commandline option */
 -        if (sched_getparam(0, &sched_param)<0) {
 -                err_printf("Scheduler getparam failed...\n");
@@ -26,4 +33,18 @@ $NetBSD: patch-ak,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
 -                return;
 -        }
 -        err_printf("!!!Scheduler set to Round Robin with priority %i FAILED!!!\n", sched_param.sched_priority);
++	if (scheduler_priority == 0)
++		return;
++
++	if (setpriority(PRIO_PROCESS, 0, HIGH_PRIORITY) == 0) {
++		err_printf("Scheduler set to priority %i...\n",
++			HIGH_PRIORITY);
++		fflush(stderr);
++		return;
++	}
++
++	err_printf("Scheduler set to priority %i FAILED!!!\n",
++		HIGH_PRIORITY);
++	fflush(stderr);
++	return;
  }
diff --git a/audio/csound/pkg/PLIST b/audio/csound/pkg/PLIST
index b6cd1f29f4f..b3e720e11ca 100644
--- a/audio/csound/pkg/PLIST
+++ b/audio/csound/pkg/PLIST
@@ -1,23 +1,25 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/06/29 18:39:03 wiz Exp $
 bin/csound
-bin/hetro
-bin/lpanal
-bin/pvanal
 bin/cvanal
-bin/scot
-bin/scsort
-bin/extract
+bin/dnoise
 bin/envelope
-bin/pv_export
+bin/extract
+bin/extractor
 bin/het_export
-bin/lpc_export
 bin/het_import
-bin/pv_import
+bin/hetro
+bin/lpanal
+bin/lpc_export
 bin/mixer
-bin/extractor
+bin/pv_export
+bin/pv_import
+bin/pvanal
+bin/pvlook
 bin/scale
+bin/scot
+bin/scsort
 bin/sndinfo
-bin/pvlook
+bin/srconv
 include/cscore.h
 include/dsputil.h
 include/fft.h
@@ -25,11 +27,11 @@ include/lpc.h
 include/pvoc.h
 include/sfheader.h
 include/sysdep.h
-lib/libcsound.so
-lib/libcsound.so.4
-lib/libcsound.so.4.09.0.0b
 lib/libcscore.so
 lib/libcscore.so.4
-lib/libcscore.so.4.09.0.0b
+lib/libcscore.so.4.12.0.1b
+lib/libcsound.so
+lib/libcsound.so.4
+lib/libcsound.so.4.12.0.1b
 share/csound/csound.txt
 @dirrm share/csound