4 files changed, 45 insertions, 44 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 136640778a91..72865432bab9 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -3,14 +3,14 @@
 # Date created:			25 June 1997
 # Whom:				Carey Jones <mcj@acquiesce.org>
 #
-# $Id: Makefile,v 1.9 1998/11/14 09:43:03 asami Exp $
+# $Id: Makefile,v 1.10 1999/01/28 03:41:43 jkoshy Exp $
 #
 
-DISTNAME=	mpg123-0.59o
+DISTNAME=	mpg123-0.59q
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
-		http://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
-		http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/
+MASTER_SITES=	http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
+		ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
+		http://ftp.tu-clausthal.de/pub/unix/audio/mpg123/
 
 MAINTAINER=	jkoshy@freebsd.org
 
@@ -18,10 +18,6 @@ MAN1=		mpg123.1
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "elf"
-ALL_TARGET=	freebsd-elf
-.else
 ALL_TARGET=	freebsd
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 535ad857c3d0..1dd51b99ea74 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1 +1 @@
-MD5 (mpg123-0.59o.tar.gz) = 5e2788f33e1cb5347a13ae39de6bd8e0
+MD5 (mpg123-0.59q.tar.gz) = 004b50277781704142964a728687224e
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index d8bfa32b010b..08ef372edf5c 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -1,37 +1,43 @@
---- Makefile.orig	Sun Feb  8 23:53:04 1998
-+++ Makefile	Tue Jan 19 09:32:21 1999
-@@ -21,6 +21,7 @@
- 	@echo ""
- 	@echo "make linux-help     Linux, more help"
- 	@echo "make freebsd        FreeBSD"
-+	@echo "make freebsd-elf    FreeBSD ELF"
- 	@echo "make solaris        Solaris 2.x (tested: 2.5 and 2.5.1) using SparcWorks cc"
- 	@echo "make solaris-gcc    Solaris 2.x using GNU cc (somewhat slower)"
- 	@echo "make sunos          SunOS 4.x (tested: 4.1.4)"
-@@ -140,9 +141,19 @@
+--- Makefile.orig	Tue Jan 26 14:35:18 1999
++++ Makefile	Mon Feb  1 14:01:26 1999
+@@ -247,24 +247,32 @@
+ #CFLAGS='-DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
+ #CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
+ 
++.if $(PORTOBJFORMAT) == "elf"
++GETBITS=getbits.o
++.else
++GETBITS=getbits_.o
++.endif
++
  freebsd:
  	$(MAKE) CC=cc LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o' \
--		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
--			-funroll-all-loops -ffast-math -DROT_I386 \
+-		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o' \
++		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_oss.o' \
+ 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-DREAD_MMAP \
 -			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
-+		CFLAGS+='-Wall -O2 -ansi -pedantic -fomit-frame-pointer \
-+			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
 +			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
 +			$(CFLAGS)' \
-+		mpg123-make
-+
-+freebsd-elf:
-+	$(MAKE) CC=cc LDFLAGS= \
-+		OBJECTS='decode_i386.o dct64_i386.o getbits.o audio_oss.o' \
-+		CFLAGS+='-Wall -O2 -ansi -pedantic -fomit-frame-pointer \
-+			-funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+ 		mpg123-make
+ 
+ 
+ freebsd-frontend:
+ 	$(MAKE) CC=cc LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o \
++		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_oss.o \
+ 			control_sajber.o control_tk3play.o' \
+ 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-DFRONTEND \
+-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
 +			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
 +			$(CFLAGS)' \
- 		mpg123-make
+ 		$(FRONTEND)
+  
  
- solaris:
-@@ -251,7 +262,7 @@
+@@ -414,7 +422,7 @@
  	@ $(MAKE) BINNAME=mpg123m mpg123
  
  mpg123-make:
diff --git a/audio/mpg123/files/patch-ab b/audio/mpg123/files/patch-ab
index 638ff0c92c2a..0d441939594c 100644
--- a/audio/mpg123/files/patch-ab
+++ b/audio/mpg123/files/patch-ab
@@ -1,17 +1,17 @@
---- mpg123.c.orig	Tue Nov 24 08:46:40 1998
-+++ mpg123.c	Tue Nov 24 08:47:25 1998
-@@ -14,6 +14,10 @@
- #include <sys/resource.h>
+--- mpg123.c.orig	Tue Jan 26 12:47:05 1999
++++ mpg123.c	Mon Feb  1 14:03:44 1999
+@@ -20,6 +20,10 @@
+ #include <sched.h>
  #endif
  
 +#ifdef __FreeBSD__
 +#include <floatingpoint.h>
 +#endif
 +
- /* #define SET_PRIO */
- 
  #include "mpg123.h"
-@@ -652,6 +656,10 @@
+ #include "getlopt.h"
+ 
+@@ -723,6 +727,10 @@
  
  #ifdef OS2
          _wildcard(&argc,&argv);
@@ -22,4 +22,3 @@
  #endif
  
  	if(sizeof(short) != 2) {
-