Make it compile (again?) on -current; perhaps also fixes alpha

bulk build failure.

6 files changed, 155 insertions, 5 deletions

diff --git a/audio/csound/distinfo b/audio/csound/distinfo
index d896a4d9a24..490e06cdd49 100644
--- a/audio/csound/distinfo
+++ b/audio/csound/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/01/11 14:50:31 skrll Exp $
+$NetBSD: distinfo,v 1.5 2002/01/21 11:30:03 wiz Exp $
 
 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-ab) = 35e90d6265b2b7e2b51a0ab1b32ce81202952f5a
 SHA1 (patch-ac) = 935b3b30d5b07263c59d8868466617c94b77d050
 SHA1 (patch-ad) = cd4c34a1ced10383c456cf409f053c366092d7ae
 SHA1 (patch-ae) = 6fec4f4c205a8b458dfc1a0861be9eb9b2005156
@@ -17,3 +17,7 @@ SHA1 (patch-al) = e2a7a30496cfc70118f145590ed1658b459dd44b
 SHA1 (patch-am) = 4bd719ae9d402d6699a8e45782d04e4929e1e030
 SHA1 (patch-an) = 29c786bdfbed4b1ae022b8dfdf4fa17409fbd9c9
 SHA1 (patch-ao) = ea7ed1e6172c3ece8c7f392a3f95504fda4befa3
+SHA1 (patch-ap) = a9bec9f3f85295544c8dca5c6e5fb8407e018764
+SHA1 (patch-aq) = 1cbcf5bf584a1cd2510a6feeba4ab0124334b05b
+SHA1 (patch-ar) = 853370ab5104e116d44fd36f4c7552992603ce12
+SHA1 (patch-as) = 41a3409f389bd146ff9a21d0b983a7ec2e2ff4b6
diff --git a/audio/csound/patches/patch-ab b/audio/csound/patches/patch-ab
index d1249836071..94d093d0a34 100644
--- a/audio/csound/patches/patch-ab
+++ b/audio/csound/patches/patch-ab
@@ -1,8 +1,31 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/21 11:30:03 wiz Exp $
 
 --- Make.Targets.orig	Wed Oct 11 16:33:34 2000
 +++ Make.Targets
-@@ -67,7 +67,7 @@
+@@ -48,26 +48,26 @@
+ anals:			$(ANALS)
+ 
+ $(ANALS):		$(CSLIB)
+-	$(MAKE) -C $@ -$(MAKEFLAGS)
++	$(MAKE) -C $@ $(MAKEFLAGS)
+ 
+ utils1:			$(UTIL1)
+ 
+ $(UTIL1):		$(CSLIB)
+-	$(MAKE) -C $@ -$(MAKEFLAGS)
++	$(MAKE) -C $@ $(MAKEFLAGS)
+ 
+ utils2:			$(UTIL2)
+ 
+ $(UTIL2):		$(CSLIB)
+-	$(MAKE) -C $@ -$(MAKEFLAGS)
++	$(MAKE) -C $@ $(MAKEFLAGS)
+ 
+ $(STRINGSDB):
+-	$(MAKE) -C locale -$(MAKEFLAGS)
++	$(MAKE) -C locale $(MAKEFLAGS)
+ 
+ install:	install-$(CSLIB) install-progs install-headers install-shares
  
  install-progs:	$(PROGS)
  		if [ ! -d $(DEST) ]; then $(INSTALL) -d -m 755 $(DEST); fi
@@ -11,7 +34,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
  			$(CSOUND_PROG) $(DEST)
  		if [ -n "$(OTHER_PROGS)" ]; \
  		then \
-@@ -84,8 +84,8 @@
+@@ -78,14 +78,14 @@
+ 		fi
+ 		for i in $(SUBDIRS);\
+ 		do \
+-			$(MAKE) -C $$i -$(MAKEFLAGS) install; \
++			$(MAKE) -C $$i $(MAKEFLAGS) install; \
+ 		done
+ 
  install-$(CSADYNSO):	$(CSADYNSO)
  		if [ ! -d $(LIB) ]; then $(INSTALL) -d -m 755 $(LIB); fi
  		$(INSTALL) -m 755 $(CSADYNSO) $(LIB)/$(CSADYNSO)
@@ -21,3 +51,57 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
  
  install-$(CSASTAT):	$(CSASTAT)
  		if [ ! -d $(LIB) ]; then $(INSTALL) -d -m 755 $(LIB); fi
+@@ -99,7 +99,7 @@
+ 		done
+ 
+ install-shares:
+-		$(MAKE) -C locale -$(MAKEFLAGS) install
++		$(MAKE) -C locale $(MAKEFLAGS) install
+ 
+ bin-distrib: 	$(LINUX_BINDISTRIB).gz
+ 
+@@ -109,7 +109,7 @@
+ 	tar cf $@ $(CSLIB) $(PROGS) $(DOC_FILES)
+ 	for i in $(SUBDIRS); \
+ 	do \
+-		$(MAKE) -C $$i -$(MAKEFLAGS) $@; \
++		$(MAKE) -C $$i $(MAKEFLAGS) $@; \
+ 	done
+ 
+ 
+@@ -125,7 +125,7 @@
+ 	for i in $(SRCDISTRIB_DIRS); \
+ 	do \
+ 		$(INSTALL) -d -m 755 $(LINUX_SRCDISTRIBDIR)/$$i; \
+-		$(MAKE) -C $$i -$(MAKEFLAGS) $@; \
++		$(MAKE) -C $$i $(MAKEFLAGS) $@; \
+ 	done
+ 	for i in $(SRCDISTRIB_FILES); \
+ 	do \
+@@ -141,7 +141,7 @@
+ clean-subdirs:
+ 		for i in $(SUBDIRS); \
+ 		do \
+-			$(MAKE) -$(MAKEFLAGS) -C $$i $(PASSED_FLAGS) clean; \
++			$(MAKE) $(MAKEFLAGS) -C $$i $(PASSED_FLAGS) clean; \
+ 		done
+ 
+ clean:		clean-subdirs
+@@ -154,7 +154,7 @@
+ realclean-subdirs:
+ 		for i in $(SUBDIRS); \
+ 		do \
+-			$(MAKE) -$(MAKEFLAGS) -C $$i $(PASSED_FLAGS) realclean; \
++			$(MAKE) $(MAKEFLAGS) -C $$i $(PASSED_FLAGS) realclean; \
+ 		done
+ 
+ realclean:	clean realclean-subdirs
+@@ -164,7 +164,7 @@
+ 
+ depend:
+ 	$(RM) $(CDEP)
+-	$(MAKE) -$(MAKEFLAGS) $(CDEP)
++	$(MAKE) $(MAKEFLAGS) $(CDEP)
+ 
+ $(CDEP):
+ 	@echo "Building dependencies (this may take some time)..."
diff --git a/audio/csound/patches/patch-ap b/audio/csound/patches/patch-ap
new file mode 100644
index 00000000000..94234b8f560
--- /dev/null
+++ b/audio/csound/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2002/01/21 11:30:04 wiz Exp $
+
+--- sread.c.orig	Thu Apr  5 18:58:53 2001
++++ sread.c
+@@ -1055,7 +1055,7 @@
+ 	 * On Alpha we need to round up to 8 bytes (64 bits).
+ 	 * heh 981101
+ 	 */
+-	bp = (SRTBLK *) ((((LONG) nxp) + 7) & ~0x7);
++	bp = (SRTBLK *) ((((long) nxp) + 7) & ~0x7);
+ #else
+ 	bp = (SRTBLK *) ((((long) nxp) + 3) & -4);
+ #endif
diff --git a/audio/csound/patches/patch-aq b/audio/csound/patches/patch-aq
new file mode 100644
index 00000000000..0bd9e94bf5a
--- /dev/null
+++ b/audio/csound/patches/patch-aq
@@ -0,0 +1,14 @@
+$NetBSD: patch-aq,v 1.1 2002/01/21 11:30:04 wiz Exp $
+
+--- cs.h.orig	Mon Feb 22 18:20:17 1999
++++ cs.h
+@@ -86,9 +86,7 @@
+ 	int	ringbell, termifend, stdoutfd;
+ 	int	rewrt_hdr, heartbeat, gen01defer;
+ 	int     scheduler_priority;     /* emng@geocities.com 12/05/98 */
+-#ifdef LINUX
+ 	int     Volume;		/* Jonathan Mohr  1995 Oct 17 */
+-#endif
+ 	long	sr_override, kr_override;
+ 	long	instxtcount, optxtsize;
+ 	long	poolcount, gblfixed, gblacount;
diff --git a/audio/csound/patches/patch-ar b/audio/csound/patches/patch-ar
new file mode 100644
index 00000000000..52d2de8d3ff
--- /dev/null
+++ b/audio/csound/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2002/01/21 11:30:04 wiz Exp $
+
+--- new-src/maldonado/OpcLoad.c.orig	Thu Sep 21 21:56:03 2000
++++ new-src/maldonado/OpcLoad.c
+@@ -8,7 +8,7 @@
+ #	include <direct.h>
+ #	include <windows.h>
+ #endif /* defined(WIN32) */
+-#if defined(LINUX)
++#if defined(LINUX) || defined(__NetBSD__)
+ #	include <limits.h>
+ #	define	MAX_PATH	PATH_MAX
+ #	define	_MAX_PATH	PATH_MAX
diff --git a/audio/csound/patches/patch-as b/audio/csound/patches/patch-as
new file mode 100644
index 00000000000..5255a9eea60
--- /dev/null
+++ b/audio/csound/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2002/01/21 11:30:04 wiz Exp $
+
+--- main.c.orig	Thu Apr  5 18:58:52 2001
++++ main.c
+@@ -52,7 +52,7 @@
+         int	peakchunks = 1;         /* Ditto */
+ 	long	opcodeCount = 0;	/* needed by dyn linking */
+ 
+-#ifdef LINUX
++#if defined(LINUX) || defined(__NetBSD__)
+ int midi_out;
+ extern void openMIDIout(void);
+ #endif
+@@ -74,7 +74,7 @@
+ 
+ #include <signal.h>
+ 
+-#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__)
++#if !defined(LINUX) && !defined(SGI) && !defined(__BEOS__) && !defined(__NetBSD__)
+ static char *signal_to_string(int sig)
+ {
+     switch(sig) {