summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2004-03-08 23:40:18 +0000
committerwiz <wiz>2004-03-08 23:40:18 +0000
commit96ab6bc4291ddecd154b2e0f830d8df73e5fa24a (patch)
tree98c50030b0818fbb5da1cbec7e994d3b5814eaf5
parentc676a35a00249225de9e0238c801c4ea16a6ff66 (diff)
downloadpkgsrc-96ab6bc4291ddecd154b2e0f830d8df73e5fa24a.tar.gz
This needs gcc3 to build.
Also, add LDFLAGS to a link call so this builds on non-native-threads systems.
-rw-r--r--audio/csound-dev/Makefile3
-rw-r--r--audio/csound-dev/distinfo4
-rw-r--r--audio/csound-dev/patches/patch-ar13
3 files changed, 15 insertions, 5 deletions
diff --git a/audio/csound-dev/Makefile b/audio/csound-dev/Makefile
index e54a8467adb..4e14d052753 100644
--- a/audio/csound-dev/Makefile
+++ b/audio/csound-dev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/19 04:49:40 ben Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/08 23:40:18 wiz Exp $
#
DISTNAME= Csound-4.24.1
@@ -18,6 +18,7 @@ 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_BUILDLINK2= yes
CONFLICTS= csound-bath*
diff --git a/audio/csound-dev/distinfo b/audio/csound-dev/distinfo
index d5b769bffff..a1c9e531348 100644
--- a/audio/csound-dev/distinfo
+++ b/audio/csound-dev/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/02/19 04:49:40 ben Exp $
+$NetBSD: distinfo,v 1.4 2004/03/08 23:40:18 wiz Exp $
SHA1 (csound/Csound-4.24.1.tar.bz2) = a14903e23b72c78a870b0d38df7bbdb5e1a56c9e
Size (csound/Csound-4.24.1.tar.bz2) = 1116589 bytes
@@ -19,7 +19,7 @@ SHA1 (patch-an) = 292b472661a67fd79c6fc9f91b9366e267b4d19f
SHA1 (patch-ao) = 9aad1dcf08550ddd1ecb5be6b6145bca3a8ca84b
SHA1 (patch-ap) = 9793773fe30bf3b71fe132ad24a4fb90f8472bbb
SHA1 (patch-aq) = 4f43102124e7b7fc86abb87a4c46eb8eaf2c449c
-SHA1 (patch-ar) = 0e3b4037adb3220624dde69dc68015f6de4fc266
+SHA1 (patch-ar) = eadee2e5c324b7b899a032bc782d74867c1add72
SHA1 (patch-as) = 45a18ea81022a722c489aee4013589172490c60f
SHA1 (patch-at) = fd424477994e026526ed14d9d64a951abcfbb6fb
SHA1 (patch-au) = 5c002177662b6f9b4eacccba023e88ba8c0699af
diff --git a/audio/csound-dev/patches/patch-ar b/audio/csound-dev/patches/patch-ar
index 8396b781c92..01fcdda63f5 100644
--- a/audio/csound-dev/patches/patch-ar
+++ b/audio/csound-dev/patches/patch-ar
@@ -1,7 +1,16 @@
-$NetBSD: patch-ar,v 1.1 2003/12/13 20:26:03 ben Exp $
+$NetBSD: patch-ar,v 1.2 2004/03/08 23:40:18 wiz Exp $
---- utils/util1/cs/Makefile.orig 2003-02-25 19:24:01.000000000 -0800
+--- utils/util1/cs/Makefile.orig Wed Feb 26 04:24:01 2003
+++ utils/util1/cs/Makefile
+@@ -10,7 +10,7 @@ OBJ1 = cs.o
+ all: $(PGM1)
+
+ $(PGM1): $(OBJ1)
+- $(LD) $(CFLAGS) -o $@ $(OBJ1) $(LIBS)
++ $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ1) $(LIBS)
+
+ %.o: %.c
+ $(CC) $(CFLAGS) $(C_FLAGS) -c $< -o $@
@@ -19,10 +19,10 @@ $(BINDIR):
mkdir -p -m 0755 $@