Upgrade to v0.59r. mpg123 can now be built tuned for your specific x86

architecture at port build time.

PR:		ports/12814
Submitted by:	Maxim Sobolev <sobomax@altavista.net>

4 files changed, 46 insertions, 30 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 72865432bab9..971bfda6115d 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -3,12 +3,13 @@
 # Date created:			25 June 1997
 # Whom:				Carey Jones <mcj@acquiesce.org>
 #
-# $Id: Makefile,v 1.10 1999/01/28 03:41:43 jkoshy Exp $
+# $Id: Makefile,v 1.11 1999/02/01 09:01:09 jkoshy Exp $
 #
 
-DISTNAME=	mpg123-0.59q
+DISTNAME=	mpg123-0.59r
 CATEGORIES=	audio
-MASTER_SITES=	http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
+MASTER_SITES=	http://www.mpg123.de/mpg123/ \
+		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/
 
@@ -20,4 +21,19 @@ MAN1=		mpg123.1
 
 ALL_TARGET=	freebsd
 
+pre-configure:
+.if $(MACHINE_ARCH) == "i386"
+.if !defined(OPT_ARCH) || (($(OPT_ARCH) != "i486") && ($(OPT_ARCH) != "i586"))
+	@echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+	@echo "Please considering setting OPT_ARCH to match your hardware to build mpg123"
+	@echo "optimised for your hardware (e.g: make OPT_ARCH=i486)"
+.if $(PORTOBJFORMAT) == "elf"
+	@echo "Valid values are: i486, i586"
+.else
+	@echo "Valid values are: i486"
+.endif
+	@echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+.endif
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 1dd51b99ea74..e99967eaf0b4 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1 +1 @@
-MD5 (mpg123-0.59q.tar.gz) = 004b50277781704142964a728687224e
+MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index 75426804109d..73a705c27f93 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Jan 26 15:35:18 1999
-+++ Makefile	Mon Jun 14 22:21:57 1999
+--- Makefile.orig	Tue Jun 15 23:39:06 1999
++++ Makefile	Tue Jul 27 14:54:26 1999
 @@ -4,7 +4,7 @@
  
  # Where to install binary and manpage on "make install":
@@ -9,39 +9,49 @@
  BINDIR=$(PREFIX)/bin
  MANDIR=$(PREFIX)/man
  SECTION=1
-@@ -247,24 +247,27 @@
+@@ -285,14 +285,28 @@
  #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
-+
 +CC ?= cc
 +LDFLAGS =
 +CFLAGS ?=-O4 -m486
++
++.if defined(OPT_ARCH)
++.if (${OPT_ARCH} == "i486")
++ARCHOPT = -DI486_OPT
++ARCHFILES = decode_i486.o dct64_i486.o
++.elif (${OPT_ARCH} == "i586")
++ARCHOPT = -DPENTIUM_OPT
++ARCHFILES = decode_i586.o
++.endif
++.endif
++
 +CFLAGS +=-Wall -ansi -pedantic -fomit-frame-pointer \
 +	-funroll-all-loops -ffast-math -DROT_I386 \
 +	-DREAD_MMAP \
-+	-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS
++	-DI386_ASSEM ${ARCHOPT} -DREAL_IS_FLOAT -DUSE_MMAP -DOSS
 +
  freebsd:
 -	$(MAKE) CC=cc LDFLAGS= \
--		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o' \
+-		OBJECTS='decode_i386.o dct64_i386.o 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' \
-+	${MAKE}	OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_oss.o' \
+-		mpg123-make
++	${MAKE}	OBJECTS='decode_i386.o ${ARCHFILES} dct64_i386.o audio_oss.o' \
++ 		mpg123-make
+ 
+ freebsd-esd:
+ 	$(MAKE) CC=cc LDFLAGS= \
+@@ -307,13 +321,8 @@
  		mpg123-make
  
--
  freebsd-frontend:
 -	$(MAKE) CC=cc LDFLAGS= \
--		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_oss.o \
-+	$(MAKE) OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_oss.o \
+-		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
++	$(MAKE) OBJECTS='decode_i386.o ${ARCHFILES} dct64_i386.o 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 \
@@ -50,12 +60,3 @@
  		$(FRONTEND)
   
  
-@@ -414,7 +417,7 @@
- 	@ $(MAKE) BINNAME=mpg123m mpg123
- 
- mpg123-make:
--	@ $(MAKE) BINNAME=mpg123 mpg123
-+	@ $(MAKE) CFLAGS="$(CFLAGS)" BINNAME=mpg123 mpg123
- 
- mpg123: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \
- 		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \
diff --git a/audio/mpg123/pkg-descr b/audio/mpg123/pkg-descr
index 93ce9bbeecea..4d8a64b08e5f 100644
--- a/audio/mpg123/pkg-descr
+++ b/audio/mpg123/pkg-descr
@@ -3,5 +3,4 @@ specified) or URLs and plays them on the audio device (default) or
 outputs them to stdout.  file/URL is assumed to be an MPEG-1/2 audio
 bit stream.
 
-WWW: http://mpg.123.org	 
-http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123.html
+WWW: http://www.mpg123.de/