head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.46 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.44 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.42 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.40 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.38 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.36 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.34 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.32 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.30 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.28 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.26 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.24 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.22 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.20 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.18 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.16 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.14 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.12 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.10 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.8 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.6 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.4 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.2 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.3.0.4 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2; locks; strict; comment @# @; 1.4 date 2004.11.28.17.12.28; author ben; state dead; branches; next 1.3; 1.3 date 2004.04.17.23.10.19; author ben; state Exp; branches; next 1.2; 1.2 date 2004.02.19.04.49.40; author ben; state Exp; branches; next 1.1; 1.1 date 2003.12.13.20.26.03; author ben; state Exp; branches; next ; desc @@ 1.4 log @Remove csound-dev to make way for csound4. @ text @$NetBSD: patch-aa,v 1.3 2004/04/17 23:10:19 ben Exp $ --- Makefile.defs.orig 2003-02-25 19:24:01.000000000 -0800 +++ Makefile.defs @@@@ -10,7 +10,7 @@@@ TARGET_OS = unix # ----------------------------------------------------------------------------- # installation directories -INSTDIR = /usr/local +INSTDIR = $(PREFIX) BINDIR = $(INSTDIR)/bin LIBDIR = $(INSTDIR)/lib @@@@ -62,7 +62,7 @@@@ CC = gcc CXX = g++ LD = gcc AR = ar rc -MAKEDLL_L = ld -E -s -shared -O1 +MAKEDLL_L = $(CXX) -Wl,-E -Wl,-shared MAKEDLL_P = ld -E -s -shared -O1 RANLIB = ranlib @@@@ -72,7 +72,7 @@@@ RANLIB = ranlib DEFINES = -DWINDOWS -DSFIRCAM -DSYS5 -DLINUX -DHAVE_TERMIOS_H \ -DIV_VERSION -DPIPES -DMACROS -DHAVE_FLTK -D_REENTRANT \ - -DHAVE_SSTREAM -DMYFLT=float + -DHAVE_SSTREAM -DMYFLT=float -DDEVOSSSOUND="\"$(DEVOSSSOUND)\"" # choose any of - # -DSYS5 invoke System V headers, e.g. 'string.h' for 'strings.h' # -DHAVE_SSTREAM include header from C++ sources, instead of @@@@ -112,9 +112,7 @@@@ DEFINES = -DWINDOWS -DSFIRCAM -DSYS5 -DL # of your compiler for the list of available settings. $(DEFINES) must always # be included. -CFLAGS = -pipe -Wall -O2 -ffast-math -fomit-frame-pointer \ - -finline-functions -funroll-loops -fno-strict-aliasing \ - $(PIC_FLAG) \ +CFLAGS+= -Wall -O2 $(PIC_FLAG) \ -I. -I$(TOPDIR) -I$(TOPDIR)/include -I$(TOPDIR)/opcodes $(DEFINES) # -O Simple optimisation # -O2 to be more specific about the optimization level @@@@ -142,15 +140,12 @@@@ CFLAGS = -pipe -Wall -O2 -ffast-math -fo # ----------------------------------------------------------------------------- # Additional flags for the C compiler only -C_FLAGS = -march=pentium3 -falign-functions=16 -falign-loops=16 \ - -falign-jumps=16 -frename-registers -mfpmath=387 -mno-ieee-fp \ - -mno-sse # ----------------------------------------------------------------------------- # C++ compiler flags -CXXFLAGS = $(CFLAGS) $(C_FLAGS) -fno-exceptions -fno-rtti \ - -fno-unroll-loops -I/usr/local/FLTK-1.1.0/Linux/include +CXXFLAGS+= $(CFLAGS) $(C_FLAGS) -fno-exceptions -fno-rtti \ + -fno-unroll-loops # `fltk-config --cxxflags` try adding this if the compilation of # FLTK widgets stops with error messages # related to not finding include files @@@@ -165,8 +160,7 @@@@ FLTKOBJ = buttonsched.o widgets.o # FLTKLIB = -lfltk -lpthread -lstdc++ # FLTKLIB = `fltk-config --libs` -FLTKLIB = /usr/local/FLTK-1.1.0/Linux/lib/libfltk.a \ - /usr/local/gcc-3.2.2/lib/libstdc++.a +FLTKLIB = -lfltk -lstdc++ # libraries required by widgets.cpp # -lfltk -lpthread -lstdc++ use dynamic libraries # @@@@ -188,7 +182,7 @@@@ FLTKLIB = /usr/local/FLTK-1.1.0/Linux/li LIBS = -lpthread -lm # used for linking all executables -MISC_LIB = -ldl +MISC_LIB = # these are used by the main Csound executable only # -lefence for debugging only @@@@ -211,7 +205,7 @@@@ WINOBJ = sysdep/winX11.o # winFLTK.o and FL_graph.o for `improved' X graphics # otherwise leave empty -WINLIBS = -L/usr/X11R6/lib -lX11 +WINLIBS = -lX11 # ;window system libraries # -lX11 for X window calls # -L/usr/lib/X11R4 for HP X11 library, v.4 @@@@ -224,7 +218,7 @@@@ WINLIBS = -L/usr/X11R6/lib -lX11 # ----------------------------------------------------------------------------- # real-time audio support -RTAUDIO_PLUGINS = rtlinux.so rtalsa.so +RTAUDIO_PLUGINS = rtlinux.so # rtlinux.so for Linux (OSS interface) # rtalsa.so for Linux (ALSA interface) # rtwin32.dll Windows 32bit MM library @@@@ -232,7 +226,7 @@@@ RTAUDIO_PLUGINS = rtlinux.so rtalsa.so # ----------------------------------------------------------------------------- # libraries and headers for real-time audio -AUDLIBS = -lasound +AUDLIBS = $(LIBOSSAUDIO) # -laudio on SUN, for SFSUN41 # -laudio on SGI, to include rt devaudio library # -lAlib on HP, to include rt devaudio library @@@@ -248,8 +242,7 @@@@ AUDLIBS = -lasound # Access permissions for main Csound executable. It is recommended to set it # to 4551 under Linux to enable --sched. Other systems should use 0755. -#CSOUND_PERM = 0755 -CSOUND_PERM = 4551 +CSOUND_PERM = 0755 # ----------------------------------------------------------------------------- # The Csound MAKE can be run in separate stages, or as a single command. @ 1.3 log @Make csound-dev build and run in Linux. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Enable FLTK widget support for csound scores. @ text @d28 1 a28 1 + -DHAVE_SSTREAM -DMYFLT=float -DBSD -DDEVOSSSOUND="\"$(DEVOSSSOUND)\"" @ 1.1 log @Add csound-dev-4.24.1 as a replacement for the unmaintained and out-of-date csound package. Csound is a software synthesis package in the tradition of so-called music-N languages, among which the best-known is Music V. It consists of an orchestra- and score-driven executable, written in C for portability. Since Csound is a computational language, it is highly flexible and efficient; complexity is gained only at the expense of computation time. Basically Csound reads some files and creates the result as a file on disk or, on faster machines, through a DAC in real time. This version of csound implements localization and realtime audio as plugins. As a result you need to set the OPCDIR environment variable, and for realtime audio use "-o devaudio" rather than "-o /dev/audio". @ text @d14 8 a21 3 @@@@ -70,9 +70,9 @@@@ RANLIB = ranlib # General defines. These set the type of system for which Csound is compiled, # and select various features to be enabled. d23 4 a26 2 -DEFINES = -DWINDOWS -DSFIRCAM -DSYS5 -DLINUX -DHAVE_TERMIOS_H \ - -DIV_VERSION -DPIPES -DMACROS -DHAVE_FLTK -D_REENTRANT \ d28 1 a28 3 +DEFINES = -DSFIRCAM -DSYS5 -DLINUX -DBSD -DHAVE_TERMIOS_H \ + -DIV_VERSION -DPIPES -DMACROS -D_REENTRANT \ + -DHAVE_SSTREAM -DMYFLT=float -DDEVOSSSOUND="\"$(DEVOSSSOUND)\"" d61 1 a61 9 @@@@ -159,14 +154,13 @@@@ CXXFLAGS = $(CFLAGS) $(C_FLAGS) -fno-exc # ----------------------------------------------------------------------------- # uncomment these if HAVE_FLTK was enabled in DEFINES -FLTKSRC = buttonsched.c widgets.cpp -FLTKOBJ = buttonsched.o widgets.o +FLTKSRC = +FLTKOBJ = # source and object files for FLTK widgets d67 1 a67 1 +FLTKLIB = d71 2 a72 6 @@@@ -185,10 +179,10 @@@@ FLTKLIB = /usr/local/FLTK-1.1.0/Linux/li # ----------------------------------------------------------------------------- # libraries -LIBS = -lpthread -lm +LIBS = -lm d80 1 a80 11 @@@@ -203,15 +197,15 @@@@ MISC_LIB = -ldl # select source and object files for window (X11, FLTK, etc.) displays # all files are in sysdep directory -WINSRC = sysdep/winX11.c -WINOBJ = sysdep/winX11.o +WINSRC = +WINOBJ = # ;if WINDOWS enabled in DEFINES, choose one of - # winX11.o for X11 window graphics # winSGI.o for SGI window graphics d85 1 a85 1 +WINLIBS = @