Make this build on i386/ELF systems.

4 files changed, 102 insertions, 57 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index e5067142297..4b4a068e649 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.12 1999/04/08 07:34:56 tron Exp $
+# $NetBSD: Makefile,v 1.13 1999/06/28 00:35:33 thorpej Exp $
 #
 
+# for OBJECT_FMT
+.include "../../mk/bsd.prefs.mk"
+
 DISTNAME=       mpg123-0.59q
 CATEGORIES=	audio
 MASTER_SITES=   http://ftp.tu-clausthal.de/pub/unix/audio/mpg123/
@@ -9,7 +12,11 @@ MAINTAINER=	augustss@cs.chalmers.se
 HOMEPAGE=	http://mpg.123.org/
 
 .if (${MACHINE_ARCH} == "i386")
+.if (${OBJECT_FMT} == "ELF")
+ALL_TARGET=	netbsd-i386-elf
+.else
 ALL_TARGET=	netbsd-i386
+.endif
 .elif (${MACHINE_ARCH} == "m68k")
 ALL_TARGET=	netbsd-m68k
 .else
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index b3286959120..ea6f52fd33b 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,33 +1,48 @@
-$NetBSD: patch-aa,v 1.9 1999/02/06 12:24:30 mycroft Exp $
+$NetBSD: patch-aa,v 1.10 1999/06/28 00:35:33 thorpej Exp $
 
---- Makefile.orig	Sun Feb  8 13:23:04 1998
-+++ Makefile	Sat Feb  6 07:19:22 1999
-@@ -32,6 +32,7 @@
+--- Makefile.orig	Tue Jan 26 06:35:18 1999
++++ Makefile	Wed Jun 23 19:45:35 1999
+@@ -34,6 +34,9 @@
  	@echo "make aix            IBM AIX (tested: 4.2)"
  	@echo "make os2            IBM OS/2"
  	@echo "make netbsd         NetBSD"
 +	@echo "make netbsd-i386    NetBSD optimized for i386"
++	@echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format"
++	@echo "make netbsd-m68k    NetBSD optimized for m68k"
  	@echo "make bsdos          BSDI BSD/OS"
- 	@echo "make generic        try this one if your system isn't listed above"
- 	@echo ""
-@@ -213,15 +214,17 @@
- 		OBJECTS='decode.o dct64.o audio_sun.o' \
- 		CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \
- 			-funroll-all-loops -ffast-math \
--			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
-+			-DREAL_IS_FLOAT -DUSE_MMAP -DREAD_MMAP -DNETBSD' \
+ 	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
+ 	@echo "make mint           MiNT on Atari"
+@@ -365,6 +368,33 @@
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
  		mpg123-make
- 
- netbsd-i386:
- 	$(MAKE) CC=cc LDFLAGS= \
--		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_sun.o' \
-+		OBJECTS='decode_i386.o dct64_i386.o getbits_.o decode_i586_.o \
++
++netbsd-i386-elf:
++	$(MAKE) CC=cc LDFLAGS= \
++		OBJECTS='decode_i386.o dct64_i386.o getbits.o decode_i586.o \
 +			audio_sun.o' \
- 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- 			-funroll-all-loops -ffast-math -DROT_I386 \
--			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
++		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
++			-funroll-all-loops -ffast-math -DROT_I386 \
 +			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
 +			-DREAD_MMAP -DNETBSD' \
- 		mpg123-make
++		mpg123-make
++
++netbsd-profile:
++	$(MAKE) CC=cc LDFLAGS='-pg -static'\
++		OBJECTS='decode.o dct64.o audio_sun.o' \
++		CFLAGS='-Wall -ansi -pedantic -O3 -pg \
++			-funroll-all-loops -ffast-math \
++			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD -DM68K_ASSEM' \
++		mpg123-make
++ 
++netbsd-m68k:
++	$(MAKE) CC=cc LDFLAGS= \
++		OBJECTS='decode.o dct64.o audio_sun.o' \
++		CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \
++			-ffast-math -DREAL_IS_FLOAT \
++			-DUSE_MMAP -DNETBSD -DM68K_ASSEM' \
++		mpg123-make
++
  
  bsdos:
+ 	$(MAKE) CC=shlicc2 LDFLAGS= \
diff --git a/audio/mpg123/patches/patch-ae b/audio/mpg123/patches/patch-ae
deleted file mode 100644
index ac4dcaed3e0..00000000000
--- a/audio/mpg123/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1999/05/16 11:00:16 simonb Exp $
-
---- Makefile.mid	Thu Feb 18 18:37:11 1999
-+++ Makefile	Thu Feb 18 18:37:48 1999
-@@ -33,6 +33,7 @@
- 	@echo "make os2            IBM OS/2"
- 	@echo "make netbsd         NetBSD"
- 	@echo "make netbsd-i386    NetBSD optimized for i386"
-+	@echo "make netbsd-m68k    NetBSD optimized for m68k"
- 	@echo "make bsdos          BSDI BSD/OS"
- 	@echo "make generic        try this one if your system isn't listed above"
- 	@echo ""
-@@ -226,6 +227,22 @@
- 			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
- 			-DREAD_MMAP -DNETBSD' \
- 		mpg123-make
-+netbsd-profile:
-+	$(MAKE) CC=cc LDFLAGS='-pg -static'\
-+		OBJECTS='decode.o dct64.o audio_sun.o' \
-+		CFLAGS='-Wall -ansi -pedantic -O3 -pg \
-+			-funroll-all-loops -ffast-math \
-+			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD -DM68K_ASSEM' \
-+		mpg123-make
-+ 
-+netbsd-m68k:
-+	$(MAKE) CC=cc LDFLAGS= \
-+		OBJECTS='decode.o dct64.o audio_sun.o' \
-+		CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-+			-ffast-math -DREAL_IS_FLOAT \
-+			-DUSE_MMAP -DNETBSD -DM68K_ASSEM' \
-+		mpg123-make
-+
- 
- bsdos:
- 	$(MAKE) CC=shlicc2 LDFLAGS= \
diff --git a/audio/mpg123/patches/patch-ah b/audio/mpg123/patches/patch-ah
new file mode 100644
index 00000000000..64d71702bd8
--- /dev/null
+++ b/audio/mpg123/patches/patch-ah
@@ -0,0 +1,58 @@
+$NetBSD: patch-ah,v 1.1 1999/06/28 00:35:33 thorpej Exp $
+
+--- decode_i586.s.orig	Sun Jun 27 17:30:14 1999
++++ decode_i586.s	Sun Jun 27 17:30:46 1999
+@@ -1,28 +1,28 @@
+-/ 
+-/ synth_1to1 works the same way as the c version of this
+-/ file.  only two types of changes have been made:
+-/ - reordered floating point instructions to
+-/   prevent pipline stalls
+-/ - made WRITE_SAMPLE use integer instead of
+-/   (slower) floating point
+-/ all kinds of x86 processors should benefit from these
+-/ modifications.
+-/
+-/ useful sources of information on optimizing x86 code include:
+-/
+-/     Intel Architecture Optimization Manual
+-/     http://www.intel.com/design/pentium/manuals/242816.htm
+-/
+-/     Cyrix 6x86 Instruction Set Summary
+-/     ftp://ftp.cyrix.com/6x86/6x-dbch6.pdf
+-/
+-/     AMD-K5 Processor Software Development
+-/     http://www.amd.com/products/cpg/techdocs/appnotes/20007e.pdf
+-/
+-/ Stefan Bieschewski <stb@acm.org>
+-/
+-/ $Id: patch-ah,v 1.1 1999/06/28 00:35:33 thorpej Exp $
+-/
++# 
++# synth_1to1 works the same way as the c version of this
++# file.  only two types of changes have been made:
++# - reordered floating point instructions to
++#   prevent pipline stalls
++# - made WRITE_SAMPLE use integer instead of
++#   (slower) floating point
++# all kinds of x86 processors should benefit from these
++# modifications.
++#
++# useful sources of information on optimizing x86 code include:
++#
++#     Intel Architecture Optimization Manual
++#     http://www.intel.com/design/pentium/manuals/242816.htm
++#
++#     Cyrix 6x86 Instruction Set Summary
++#     ftp://ftp.cyrix.com/6x86/6x-dbch6.pdf
++#
++#     AMD-K5 Processor Software Development
++#     http://www.amd.com/products/cpg/techdocs/appnotes/20007e.pdf
++#
++# Stefan Bieschewski <stb@acm.org>
++#
++# $Id: patch-ah,v 1.1 1999/06/28 00:35:33 thorpej Exp $
++#
+ .bss
+ 	.comm	buffs,4352,4
+ .data