diff options
author | Steve Price <steve@FreeBSD.org> | 1999-12-22 21:26:50 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-12-22 21:26:50 +0000 |
commit | e4c68617dc3b27635c0c14167ef5031efb8db311 (patch) | |
tree | 735b8f4fdf0ad10357e533244c853a5c71e126e2 /audio/dap | |
parent | Be sure INSTALLDIR exists before we write into it. (diff) |
Checksum changed on MASTER_SITE, fixup accordingly. Seems they added
support for NetBSD in the Makefiles. Other than that nothing changed.
Notes
Notes:
svn path=/head/; revision=23841
Diffstat (limited to '')
-rw-r--r-- | audio/dap/distinfo | 2 | ||||
-rw-r--r-- | audio/dap/files/patch-aa | 2 | ||||
-rw-r--r-- | audio/dap/files/patch-ab | 20 | ||||
-rw-r--r-- | audio/dap/files/patch-af | 14 |
4 files changed, 18 insertions, 20 deletions
diff --git a/audio/dap/distinfo b/audio/dap/distinfo index b5b0857ce759..f31a2f62a4dd 100644 --- a/audio/dap/distinfo +++ b/audio/dap/distinfo @@ -1 +1 @@ -MD5 (DAPSource.tar.gz) = ab189c9c5190b5b18542ac8d3898099c +MD5 (DAPSource.tar.gz) = 971561d3e26f30db398d51b6b3d8d018 diff --git a/audio/dap/files/patch-aa b/audio/dap/files/patch-aa index bbe0748b9f76..7878b0f41017 100644 --- a/audio/dap/files/patch-aa +++ b/audio/dap/files/patch-aa @@ -6,7 +6,7 @@ Index: Makefile +all: DAP + +DAP: -+ (cd tooltips; make -f Makefile); ++ (cd tooltips; make -f Makefile.linux); + (cd libaudio; make -f Makefile.linux); + (cd libaudiofile; make -f Makefile.linux); + (cd spkit/spkit; make -f Makefile.linux); diff --git a/audio/dap/files/patch-ab b/audio/dap/files/patch-ab index d5a746d0b6f5..1652219de198 100644 --- a/audio/dap/files/patch-ab +++ b/audio/dap/files/patch-ab @@ -1,4 +1,5 @@ -Index: libaudio/audio.h +--- libaudio/audio.h.orig Fri Nov 12 11:35:21 1999 ++++ libaudio/audio.h Sat Dec 11 13:36:15 1999 @@ -17,13 +17,15 @@ | ****************************************************************************/ @@ -10,21 +11,18 @@ Index: libaudio/audio.h #define _audio_h #include <stdio.h> -+#ifndef __FreeBSD__ ++#ifndef __FreeBSD__ #include <malloc.h> +#endif #include <unistd.h> #include <fcntl.h> #include <limits.h> -@@ -31,7 +33,11 @@ - #include <sys/types.h> - #include <sys/stat.h> +@@ -33,6 +35,8 @@ #include <sys/ioctl.h> -+#ifdef __FreeBSD__ + #ifdef __NetBSD__ + #include <soundcard.h> ++#elif defined(__FreeBSD__) +#include <machine/soundcard.h> -+#else + #else #include <sys/soundcard.h> -+#endif - - #ifdef __cplusplus - extern "C" + #endif diff --git a/audio/dap/files/patch-af b/audio/dap/files/patch-af index 21ae8a47d2e6..fcb3ceedab86 100644 --- a/audio/dap/files/patch-af +++ b/audio/dap/files/patch-af @@ -1,5 +1,5 @@ ---- sound/Makefile.linux.orig Sat Oct 2 09:22:30 1999 -+++ sound/Makefile.linux Sat Oct 2 09:22:52 1999 +--- sound/Makefile.linux.orig Mon Nov 15 07:28:21 1999 ++++ sound/Makefile.linux Sat Dec 11 13:45:25 1999 @@ -1,5 +1,5 @@ -CC = gcc -CXX = g++ @@ -12,8 +12,8 @@ HOMEDIR = $(HOME) INCDIR = -I. -I.. -I$(SPKIT) -I$(MAINDIR) LIBDIR = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) --CCFLAGS = -O1 -g3 -DNOFORMS -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -+CCFLAGS = ${CXXFLAGS} -DNOFORMS -DLINUX -DUSINGGCC -Wall - LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -lm - - PROGS = SampleTest +-CCFLAGS = $(DEBUG) $(OPTIM) -DNOFORMS -DLINUX -DBIGENDIAN -DUSINGGCC -Wall ++CCFLAGS = $(CXXFLAGS) -DNOFORMS -DLINUX -DUSINGGCC -Wall + DEBUG = -g3 + OPTIM = -O1 + LDFLAGS = $(LIBDIR) -laudio -laudiofile -lm |