Make csound-dev build with GCC 2.95.3, remove GCC 3.0 build-time dependency.

4 files changed, 69 insertions, 7 deletions

diff --git a/audio/csound-dev/Makefile b/audio/csound-dev/Makefile
index 85cb83d4a21..9ed4b5d3666 100644
--- a/audio/csound-dev/Makefile
+++ b/audio/csound-dev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/12 02:20:17 snj Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/15 20:52:07 ben Exp $
 #
 
 DISTNAME=		Csound-4.24.1
@@ -18,7 +18,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64	# many LP64 problems
 
 DIST_SUBDIR=		csound
-GCC_REQD=		3.0
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		yes
 USE_X11=		yes
diff --git a/audio/csound-dev/distinfo b/audio/csound-dev/distinfo
index a1c9e531348..f6f6ede45ae 100644
--- a/audio/csound-dev/distinfo
+++ b/audio/csound-dev/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/03/08 23:40:18 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/03/15 20:52:07 ben Exp $
 
 SHA1 (csound/Csound-4.24.1.tar.bz2) = a14903e23b72c78a870b0d38df7bbdb5e1a56c9e
 Size (csound/Csound-4.24.1.tar.bz2) = 1116589 bytes
@@ -17,7 +17,7 @@ SHA1 (patch-al) = 59f0cc70bfa0a69a00c7926264e9ca1ae17d64e7
 SHA1 (patch-am) = 60dcef719e82f063ae87d23ce0410508bab76b93
 SHA1 (patch-an) = 292b472661a67fd79c6fc9f91b9366e267b4d19f
 SHA1 (patch-ao) = 9aad1dcf08550ddd1ecb5be6b6145bca3a8ca84b
-SHA1 (patch-ap) = 9793773fe30bf3b71fe132ad24a4fb90f8472bbb
+SHA1 (patch-ap) = 4860816fc5dbc26b24ff030d451798e75c8e5a26
 SHA1 (patch-aq) = 4f43102124e7b7fc86abb87a4c46eb8eaf2c449c
 SHA1 (patch-ar) = eadee2e5c324b7b899a032bc782d74867c1add72
 SHA1 (patch-as) = 45a18ea81022a722c489aee4013589172490c60f
@@ -25,3 +25,4 @@ SHA1 (patch-at) = fd424477994e026526ed14d9d64a951abcfbb6fb
 SHA1 (patch-au) = 5c002177662b6f9b4eacccba023e88ba8c0699af
 SHA1 (patch-av) = 3f0ab825be6b3e1ce8f5f9a5e019b70b93bcc385
 SHA1 (patch-aw) = a3b52e7a40bba5ca7e2a422d4718b4c11b0f7b95
+SHA1 (patch-ax) = 2dda0346134d115d2299e210e4689fd788104efb
diff --git a/audio/csound-dev/patches/patch-ap b/audio/csound-dev/patches/patch-ap
index bd932b0bbcd..cf340cf6592 100644
--- a/audio/csound-dev/patches/patch-ap
+++ b/audio/csound-dev/patches/patch-ap
@@ -1,8 +1,21 @@
-$NetBSD: patch-ap,v 1.1 2003/12/13 20:26:03 ben Exp $
+$NetBSD: patch-ap,v 1.2 2004/03/15 20:52:07 ben Exp $
 
---- plugins/Makefile.orig	2003-02-25 19:24:01.000000000 -0800
+--- plugins/Makefile.orig	Tue Feb 25 19:24:01 2003
 +++ plugins/Makefile
-@@ -32,7 +32,7 @@ $(PLGNDIR):
+@@ -23,16 +23,18 @@ main.o: main.c
+ 	$(CC) $(CFLAGS) $(C_FLAGS) -c $< -o $@
+ 
+ %-32.o: %.c
+-	$(CC) $(CFLAGS) $(C_FLAGS) -UMYFLT -DMYFLT=float -c $< -o $@
++	$(CC) `echo $(CFLAGS) $(C_FLAGS) | sed s/MYFLT=double/MYFLT=float/g` \
++		-c $< -o $@
+ 
+ %-64.o: %.c
+-	$(CC) $(CFLAGS) $(C_FLAGS) -UMYFLT -DMYFLT=double -c $< -o $@
++	$(CC) `echo $(CFLAGS) $(C_FLAGS) | sed s/MYFLT=float/MYFLT=double/g` \
++		-c $< -o $@
+ 
+ $(PLGNDIR):
  	mkdir -p -m 0755 $@
  
  install: $(PLUGIN) $(PLGNDIR)
diff --git a/audio/csound-dev/patches/patch-ax b/audio/csound-dev/patches/patch-ax
new file mode 100644
index 00000000000..f4bdfa9f761
--- /dev/null
+++ b/audio/csound-dev/patches/patch-ax
@@ -0,0 +1,49 @@
+$NetBSD: patch-ax,v 1.1 2004/03/15 20:52:07 ben Exp $
+
+--- include/Csound/sysdep.h.orig	Mon Mar 15 12:00:29 2004
++++ include/Csound/sysdep.h
+@@ -162,24 +162,44 @@ extern "C" {
+ #  include <stdint.h>
+ #elif !defined(__int8_t_defined)
+     /* these should be fairly portable, */
++#ifndef int8_t
+     typedef     signed char     int8_t;
++#endif
++#ifndef uint8_t
+     typedef     unsigned char   uint8_t;
++#endif
++#ifndef int16_t
+     typedef     short           int16_t;
++#endif
++#ifndef uint16_t
+     typedef     unsigned short  uint16_t;
++#endif
++#ifndef int32_t
+     typedef     int             int32_t;
++#endif
++#ifndef uint32_t
+     typedef     unsigned int    uint32_t;
++#endif
+ #  ifdef __GNUC__
+         /* unlike the following ones */
++#ifndef int64_t
+         typedef     long long           int64_t;
++#endif
++#ifndef uint64_t
+         typedef     unsigned long long  uint64_t;
++#endif
+ #  elif defined(MSVC) || defined(_MSC_VER)
+         typedef     __int64             int64_t;
+         typedef     unsigned __int64    uint64_t;
+ #  endif
+     /* these do not work on Win64, but are OK on 64 bit UNIX */
+     /* systems and all 32 bit platforms */
++#ifndef intptr_t
+     typedef     long            intptr_t;
++#endif
++#ifndef uintptr_t
+     typedef     unsigned long   uintptr_t;
++#endif
+ #endif
+ 
+ #ifndef PI