head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.46 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.44 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.42 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.40 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.38 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.36 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.34 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.32 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.30 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.28 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.26 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.24 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.22 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.20 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.18 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.16 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.14 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.12 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.10 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.8 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.6 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.4 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.2 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.3.0.6 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.4 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2004.11.28.17.09.13; author ben; state dead; branches; next 1.4; 1.4 date 2004.04.11.21.49.10; author ben; state Exp; branches; next 1.3; 1.3 date 2003.01.19.21.31.10; author hubertf; state Exp; branches; next 1.2; 1.2 date 2002.03.23.02.23.00; author wiz; state Exp; branches; next 1.1; 1.1 date 2001.04.27.17.17.17; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.04.27.17.17.17; author wiz; state Exp; branches; next ; desc @@ 1.5 log @Remove csound-bath to make way for csound4. @ text @$NetBSD: patch-aa,v 1.4 2004/04/11 21:49:10 ben Exp $ --- Makefile.orig 2002-12-16 00:32:21.000000000 -0800 +++ Makefile @@@@ -1,10 +1,10 @@@@ # Csound Makefile # edit the following definitions according to need: -INCLUDE = /usr/local/include -LIB = /usr/local/lib -DEST = /usr/local/bin -MAN = /usr/local/man +INCLUDE = $(PREFIX)/include +LIB = $(PREFIX)/lib +DEST = $(PREFIX)/bin +MAN = $(PREFIX)/man MAN1 = $(MAN)/man1 CAT1 = $(MAN)/cat1 # these directories must exist for stages beyond 'make csound' @@@@ -23,7 +23,7 @@@@ CC = cc # .c.o: # $(CC) $(CFLAGS) -c $*.c -o $@@ -DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -DIV_SCHED -DHAVE_FLTK +DEFINES = -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DPREFIX=\"$(PREFIX)\" # choose any of - # -DSYS5 invoke System 5 headers (e.g. 'string.h' for 'strings.h') # -DWINDOWS include window system calls (X11, SGI, or FG graphics) @@@@ -50,7 +50,7 @@@@ DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM # (e.g., Linux on SPARC [not tested]), you should also define - # -DLINUX_BE Linux audio device handler for big-endian samples -CFLAGS = -Wall -O2 -malign-loops=4 -malign-jumps=4 -ffast-math -fomit-frame-pointer -finline-functions -funroll-loops -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES) +CFLAGS = -Wall $(RPM_OPT_FLAGS) $(DEFINES) # -O Simple optimisation # -O2 to be more specific about the optimization level # -f compile single-precision floats (4.3,VAX,DEC-RISC) @@@@ -90,12 +90,12 @@@@ CFLAGS = -Wall -O2 -malign-loops=4 -mali # CXX = g++ CXXFLAGS = -fno-exceptions -fno-rtti -FLTKSRC = widgets.cpp -FLTKOBJ = widgets.o +FLTKSRC = +FLTKOBJ = # source and object files for FLTK widgets #FLTKLIB = -lfltk -lpthread -lg++ -FLTKLIB = /usr/local/lib/libfltk.a /usr/lib/libpthread.a \ - /usr/lib/libstdc++-libc6.2-2.a.3 +FLTKLIB = + # libraries required by widgets.cpp # -lfltk -lpthread -lg++ use dynamic libraries # @@@@ -105,7 +105,7 @@@@ FLTKLIB = /usr/local/lib/libfltk.a /usr/ # directiories and version # numbers are system-dependent) -LIBS = $(FLTKLIB) -L /usr/X11R6/lib -lX11 -ltcl -ltk -lm -ldl +LIBS = $(LDFLAGS) -lm # -lefence # -lm required # -lX11 for X window calls @@@@ -124,8 +124,8 @@@@ LIBS = $(FLTKLIB) -L /usr/X11R6/lib -lX1 # note: SuSE 7.3 users should use -ltcl8.3 -ltk8.3, but another # (probably better) solution is to create symbolic links -WINSRC = winFLTK.c FL_graph.cpp -WINOBJ = winFLTK.o FL_graph.o +WINSRC = +WINOBJ = # ;if WINDOWS enabled in DEFINES, choose one of - # winX11.o for X11 window graphics # winSGI.o for SGI window graphics @@@@ -133,10 +133,12 @@@@ WINOBJ = winFLTK.o FL_graph.o # winFLTK.o and FL_graph.o for `improved' X graphics # and many others....winbor, wincwin +AUDSRC = +AUDOBJ = #AUDSRC = rtlinux.c LINUXaudio.c #AUDOBJ = rtlinux.o LINUXaudio.o -AUDSRC = rtalsa.c -AUDOBJ = rtalsa.c +#AUDSRC = rtalsa.c +#AUDOBJ = rtalsa.c # ;if RTAUDIO enabled in DEFINES, include one of # rtaudio.o general interface to audio handlers & libraries # rtDEC.c rtSGI.c rtHP.c rtSUN.c @ 1.4 log @Make csound-bath build and run in Linux. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update csound-path to 4.23. No useful list of changes, feel free to look at the ChangeLog. Update submitted by collver1@@attbi.com in PR 19905 @ text @d3 1 a3 1 --- Makefile.orig Mon Dec 16 00:32:21 2002 d20 1 a20 1 @@@@ -23,7 +23,7 @@@@ d25 1 a25 1 +DEFINES = -DNETBSDRTAUDIO -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DPREFIX=\"$(PREFIX)\" d29 1 a29 1 @@@@ -50,7 +50,7 @@@@ d38 1 a38 1 @@@@ -90,12 +90,12 @@@@ d55 1 a55 1 @@@@ -105,7 +105,7 @@@@ d64 1 a64 1 @@@@ -124,8 +124,8 @@@@ d75 3 a77 1 @@@@ -135,8 +135,10 @@@@ d79 2 a86 2 +AUDSRC = rtNetBSD.c +AUDOBJ = rtNetBSD.o @ 1.2 log @Update to 4.18, provided by Ben Collver in pkg/14630. Changes are unknown. Package changes: * the c-preprocessor should now correctly chose whether to build big-endian or little-endian specific code * added support for NetBSD native audio API @ text @d3 1 a3 1 --- Makefile.orig Thu Jan 31 00:58:43 2002 d5 1 a5 1 @@@@ -1,11 +1,11 @@@@ a11 1 -SHARE = /usr/share/csound a15 1 +SHARE = $(PREFIX)/share/csound d20 1 a20 1 @@@@ -24,7 +24,7 @@@@ d24 2 a25 2 -DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK +DEFINES = -DNETBSDRTAUDIO -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DBSD -DPREFIX=\"$(PREFIX)\" d29 3 a31 3 @@@@ -52,7 +52,7 @@@@ # Be sure to include 'LINUXaudio.o' under 'AUDOBJ' below as well. # -- Jonathan Mohr 1995 Oct 17 d33 2 a34 2 -CFLAGS = -O2 -march=i686 -malign-loops=4 -malign-jumps=4 -DWITHx87 $(RPM_OPT_FLAGS) $(DEFINES) +CFLAGS = $(RPM_OPT_FLAGS) $(DEFINES) d38 20 a57 3 @@@@ -76,7 +76,7 @@@@ # -I/usr/openwin/include Solaris openwin interface # -I/usr/demo/SOUND/include Solaris sound interface d59 1 a59 1 -LIBS = -L /usr/X11R6/lib -lX11 -ltcl -ltk -lm d64 3 a66 3 @@@@ -93,16 +93,16 @@@@ # -L/usr/demo/SOUND/lib on Solaris 2.4 # -L/usr/X11R6/li on LINUX d68 2 a69 2 -WINSRC = winX11.c -WINOBJ = winX11.o d75 1 a75 1 # winfg.o for PC Flash Graphics d77 6 a82 3 -AUDSRC = rtlinux.c LINUXaudio.c -AUDOBJ = rtlinux.o LINUXaudio.o a87 21 @@@@ -342,13 +342,13 @@@@ cd midifils; rm -f *.bak *~ cd cscofils; rm -f *.bak *~ -CSLinux.bin.tgz: /usr/local/bin/csound /usr/local/bin/hetro \ - /usr/local/bin/lpanal /usr/local/bin/pvanal /usr/local/bin/scot \ - /usr/local/bin/scsort /usr/local/bin/extract /usr/local/bin/sndinfo \ - /usr/local/bin/scale /usr/local/bin/mixer /usr/local/bin/extractor \ - /usr/local/bin/envext /usr/local/bin/pvlook /usr/local/bin/sdif2ad \ - /usr/local/bin/dnoise /usr/local/bin/srconv - (cd /usr/local/bin; tar cvzf ~/csound/CSLinux.bin.tgz csound \ +CSNetBSD.bin.tgz: $(PREFIX)/bin/csound $(PREFIX)/bin/hetro \ + $(PREFIX)/bin/lpanal $(PREFIX)/bin/pvanal $(PREFIX)/bin/scot \ + $(PREFIX)/bin/scsort $(PREFIX)/bin/extract $(PREFIX)/bin/sndinfo \ + $(PREFIX)/bin/scale $(PREFIX)/bin/mixer $(PREFIX)/bin/extractor \ + $(PREFIX)/bin/envext $(PREFIX)/bin/pvlook $(PREFIX)/bin/sdif2ad \ + $(PREFIX)/bin/dnoise $(PREFIX)/bin/srconv + (cd $(PREFIX)/bin; tar cvzf ~/csound/CSLinux.bin.tgz csound \ hetro lpanal pvanal scot scsort extract sndinfo scale mixer \ extractor envext pvlook sdif2ad dnoise srconv) @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- Makefile.orig Sun Mar 25 18:53:17 2001 d27 1 a27 1 +DEFINES = -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DBSD -DPREFIX=\"$(PREFIX)\" d35 1 a35 1 -CFLAGS = -O2 $(RPM_OPT_FLAGS) $(DEFINES) d40 1 a40 1 @@@@ -73,7 +73,7 @@@@ d44 2 a45 2 -LIBS = -L /usr/X11R6/lib -lX11 -lbsd -ltcl -ltk -lm +LIBS = $(LDFLAGS) -lossaudio -lm d49 1 a49 1 @@@@ -90,8 +90,8 @@@@ d60 11 a70 1 @@@@ -335,15 +335,15 @@@@ d79 1 a79 1 - /usr/local/bin/dnoise /usr/local/bin/srconv /usr/local/lib/csound.txt d86 1 a86 1 + $(PREFIX)/bin/dnoise $(PREFIX)/bin/srconv $(PREFIX)/lib/csound.txt d89 1 a89 2 - extractor envext pvlook sdif2ad dnoise srconv -C /usr/local/lib csound.txt) + extractor envext pvlook sdif2ad dnoise srconv -C $(PREFIX)/lib csound.txt) a90 2 Csound.tar.gz: all_files \ $(CSRCS) $(HDRS) \ @ 1.1.1.1 log @Initial import of csound-bath, supplied by Ben Collver in pkg/11758. Similar to csound, but the 'original' bath version. @ text @@