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.

4 files changed, 45 insertions, 33 deletions

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;
  }