diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-11-26 22:25:13 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-11-26 22:25:13 +0000 |
| commit | 0d8aabec62371ef198d3542084c563c40a1a449e (patch) | |
| tree | 9679f1e394ebe96ec6dfc65f2df7f1f26717bcfc | |
| parent | Update to fine 2.3 to unbreak this port. (diff) | |
Honor CFLAGS/CXXFLAGS and get this to compile on systems with egcs
as the system compiler.
PR: 15077
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=23420
| -rw-r--r-- | audio/maplay/files/patch-ab | 21 | ||||
| -rw-r--r-- | audio/maplay/files/patch-ad | 8 | ||||
| -rw-r--r-- | audio/maplay/files/patch-ae | 20 |
3 files changed, 43 insertions, 6 deletions
diff --git a/audio/maplay/files/patch-ab b/audio/maplay/files/patch-ab index eb0a46814157..a2199cbe6f6e 100644 --- a/audio/maplay/files/patch-ab +++ b/audio/maplay/files/patch-ab @@ -1,5 +1,22 @@ -*** work/Makefile.orig Tue Feb 14 08:18:41 1995 ---- work/Makefile Tue Feb 14 08:19:52 1995 +*** Makefile.orig Thu Jun 23 21:14:46 1994 +--- Makefile Thu Nov 25 02:59:22 1999 +*************** +*** 27,33 **** + # + + +! CFLAGS = $(COMPILERFLAGS) + # debugging: -ggdb -DDEBUG + # profiling: -pg (gprof) or -p (prof) + # strip command has to be removed for debugging or profiling +--- 27,33 ---- + # + + +! CFLAGS += $(COMPILERFLAGS) + # debugging: -ggdb -DDEBUG + # profiling: -pg (gprof) or -p (prof) + # strip command has to be removed for debugging or profiling *************** *** 39,45 **** diff --git a/audio/maplay/files/patch-ad b/audio/maplay/files/patch-ad index 649ef65e8b9d..bb62d8b11cce 100644 --- a/audio/maplay/files/patch-ad +++ b/audio/maplay/files/patch-ad @@ -1,15 +1,15 @@ --- configuration.sh.orig Thu Jun 23 07:14:46 1994 -+++ configuration.sh Sat Sep 18 14:52:25 1999 ++++ configuration.sh Thu Nov 25 02:53:40 1999 @@ -72,6 +72,16 @@ INCLUDEDIRS= LIBRARIES= AUDIO_INCLUDES='#include <sys/audioio.h>' ;; + FreeBSD*) -+ COMPILER=g++ ++ COMPILER='${CXX}' + if [ `uname -m` = "alpha" ]; then -+ COMPILERFLAGS='-O2 -DLINUX' ++ COMPILERFLAGS='-DLINUX' + else -+ COMPILERFLAGS='-O2 -m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER' ++ COMPILERFLAGS='-m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER' + fi + INCLUDEDIRS= + LIBRARIES= diff --git a/audio/maplay/files/patch-ae b/audio/maplay/files/patch-ae new file mode 100644 index 000000000000..3ab25a49b1f1 --- /dev/null +++ b/audio/maplay/files/patch-ae @@ -0,0 +1,20 @@ +--- header.cc.orig Thu Jun 23 07:14:35 1994 ++++ header.cc Fri Nov 26 16:18:21 1999 +@@ -36,7 +36,7 @@ + const uint32 Header::frequencies[3] = { 44100, 48000, 32000 }; + + +-bool Header::read_header (Ibitstream *stream, Crc16 **crcp) ++boolean Header::read_header (Ibitstream *stream, Crc16 **crcp) + { + uint32 headerstring; + +@@ -161,7 +161,7 @@ + static const int32 bitrates_layer_2[15] = { + 0 /*free format*/, 32000, 48000, 56000, 64000, 80000, 96000, + 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000 }; +- static const samplefrequencies[3] = { 44100, 48000, 32000 }; ++ static const int32 samplefrequencies[3] = { 44100, 48000, 32000 }; + uint32 framesize; + + if (h_layer == 1) |