Rescue Makefile entries removed accidentaly.

3 files changed, 46 insertions, 11 deletions

diff --git a/audio/mpg123-esound/distinfo b/audio/mpg123-esound/distinfo
index a80cccc98da..9df513986a7 100644
--- a/audio/mpg123-esound/distinfo
+++ b/audio/mpg123-esound/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2002/06/22 18:47:31 kent Exp $
+$NetBSD: distinfo,v 1.3 2002/06/22 19:03:11 kent Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
 SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
 Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
-SHA1 (patch-aa) = 80bf3acfd104d9f723fb1bc1e7971df57d7333fe
+SHA1 (patch-aa) = 5f5310e52c8a7b17bc675d6d3b21ea629f644b40
 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 097b15f7c07..706b1ee7c75 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2002/06/22 18:47:29 kent Exp $
+$NetBSD: distinfo,v 1.11 2002/06/22 19:03:11 kent Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
 SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
 Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
-SHA1 (patch-aa) = 80bf3acfd104d9f723fb1bc1e7971df57d7333fe
+SHA1 (patch-aa) = 5f5310e52c8a7b17bc675d6d3b21ea629f644b40
 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index 1aa4c64aba3..0b3523482a3 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.19 2002/06/22 18:47:30 kent Exp $
+$NetBSD: patch-aa,v 1.20 2002/06/22 19:03:11 kent Exp $
 
---- Makefile.orig	Sun Jun 23 02:08:27 2002
+--- Makefile.orig	Sun Jun 23 03:50:48 2002
 +++ Makefile
 @@ -54,6 +54,15 @@
  	@echo "make aix-tk3play    IBM AIX"
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.19 2002/06/22 18:47:30 kent Exp $
  	@echo "make bsdos          BSDI BSD/OS"
  	@echo "make bsdos4         BSDI BSD/OS 4.0"
  	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
-@@ -496,18 +505,64 @@
+@@ -496,18 +505,100 @@
  
  netbsd:
  	$(MAKE) CC=cc LDFLAGS= \
@@ -31,11 +31,47 @@ $NetBSD: patch-aa,v 1.19 2002/06/22 18:47:30 kent Exp $
 +			-DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
  		mpg123-make
  
--netbsd-i386:
-+netbsd-esd:
+ netbsd-i386:
  	$(MAKE) CC=cc LDFLAGS= \
 -		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
 -		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
++		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
++			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
++			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
++		mpg123-make
++
++netbsd-i386-elf:
++	$(MAKE) CC=cc LDFLAGS= \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
++			audio_sun.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
++			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
++			-DREAD_MMAP -DNETBSD -DTERM_CONTROL' \
++		mpg123-make
++
++netbsd-m68k:
++	$(MAKE) CC=cc LDFLAGS= \
++		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
++			-ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
++			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \
++		mpg123-make
++
++netbsd-arm:
++	$(MAKE) CC=cc LDFLAGS= \
++		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
++		CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
++			-funroll-all-loops -finline-functions -ffast-math \
++			-march=armv4 -mtune=strongarm -mcpu=strongarm \
++			-DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
++			-DNETBSD' \
++		mpg123-make
++
++netbsd-esd:
++	$(MAKE) CC=cc LDFLAGS= \
 +		AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
 +		OBJECTS='decode.o dct64.o audio_esd.o term.o' \
 +		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
@@ -61,8 +97,7 @@ $NetBSD: patch-aa,v 1.19 2002/06/22 18:47:30 kent Exp $
 +		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
 +			audio_esd.o term.o' \
 +		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
- 			-funroll-all-loops -ffast-math -DROT_I386 \
--			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
++			-funroll-all-loops -ffast-math -DROT_I386 \
 +			-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
 +			-DREAD_MMAP -DNETBSD -DTERM_CONTROL \
 +			`$(ESD_CONFIG) --cflags`' \