From b3cccf2e4d9a03a6a76592c4f1dab8343768be7a Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Mon, 12 Oct 2009 23:45:21 +0000
Subject: [PATCH] update to 1.9.1: new optimized amd64 and arm decoders ok
 kili@

---
 audio/mpg123/Makefile                | 16 ++++++----------
 audio/mpg123/distinfo                | 10 +++++-----
 audio/mpg123/patches/patch-configure | 28 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 audio/mpg123/patches/patch-configure

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 3df0caf5db5..a388a7ced1c 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2009/04/28 19:07:26 naddy Exp $
+# $OpenBSD: Makefile,v 1.43 2009/10/12 23:45:21 naddy Exp $
 
-COMMENT=	MPEG-1/2 audio layer 1, 2, and 3 player
+COMMENT=	fast console MPEG audio player and decoder library
 
-DISTNAME=	mpg123-1.7.3
-SHARED_LIBS=	mpg123	1.0	# .14.4
+DISTNAME=	mpg123-1.9.1
+SHARED_LIBS=	mpg123	2.0	# .20.2
 CATEGORIES=	audio
 HOMEPAGE=	http://www.mpg123.de/
 
@@ -31,12 +31,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${WRKBUILD}/src/libmpg123/.libs -L${LOCALBASE}/lib"
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build
 
-.if   ${MACHINE_ARCH} == "arm"
-CONFIGURE_ARGS+=--with-cpu=generic_nofpu
-.elif ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--with-cpu=x86
-.else
-CONFIGURE_ARGS+=--with-cpu=generic_fpu
+.if ${MACHINE_ARCH} == "arm"
+CONFIGURE_ARGS+=--with-cpu=arm_nofpu
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index ea5a3bb4ec7..892f00b92ef 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,5 +1,5 @@
-MD5 (mpg123-1.7.3.tar.bz2) = ISPbFsIqH+PFUXwVUaqdiw==
-RMD160 (mpg123-1.7.3.tar.bz2) = WukfV6pmYzbtGywj07dp4Ceo6Rc=
-SHA1 (mpg123-1.7.3.tar.bz2) = nw0oh4PaVTnmfKkawSCX7wiNWvM=
-SHA256 (mpg123-1.7.3.tar.bz2) = uJNaj0gdSbB9Of4NOqLuy/f2MQArZNKeCZ3htb6G6do=
-SIZE (mpg123-1.7.3.tar.bz2) = 1152707
+MD5 (mpg123-1.9.1.tar.bz2) = OapEB7U/qMhvfZY7/gcCyQ==
+RMD160 (mpg123-1.9.1.tar.bz2) = 5ZK1gvjmeEr0eUZDtWuEwDMQp74=
+SHA1 (mpg123-1.9.1.tar.bz2) = IHG2x7Iahce0RW0b2a/4eaLbA30=
+SHA256 (mpg123-1.9.1.tar.bz2) = WLCmCr+eQ3uVXqZX2UjggVtcaxutFcSfEGwzQIbYLjQ=
+SIZE (mpg123-1.9.1.tar.bz2) = 736625
diff --git a/audio/mpg123/patches/patch-configure b/audio/mpg123/patches/patch-configure
new file mode 100644
index 00000000000..d88f32b0139
--- /dev/null
+++ b/audio/mpg123/patches/patch-configure
@@ -0,0 +1,28 @@
+$OpenBSD: patch-configure,v 1.1 2009/10/12 23:45:21 naddy Exp $
+--- configure.orig	Thu Oct  8 23:29:52 2009
++++ configure	Mon Oct 12 19:05:00 2009
+@@ -12651,10 +12651,10 @@ fi
+ # opt-in for IEEE754 floating point action
+ # We want to make sure not to apply hacks relying on IEEE754 storage format on platforms where we did not make sure that this actually is valid.
+ # It _should_ be fine for about all computers still out there, but we play safe.
+-ieee=no
++ieee=yes
+ case $host in
+-  i?86-*|x86_64-*|powerpc*|sparc*)
+-    ieee=yes
++  vax-*)
++    ieee=no
+   ;;
+ esac
+ if test "x$ieee" = xyes; then
+@@ -14481,8 +14481,8 @@ esac
+ for i in $more_sources
+ do
+   # Echo make sure every file is only once in the list.
+-  echo "$DECODER_OBJ" | grep -v -w "$i\.\$(OBJEXT)" && DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)"
+-  echo "$DECODER_LOBJ" | grep -v -w "$i\.lo" && DECODER_LOBJ="$DECODER_LOBJ $i.lo"
++  echo "$DECODER_OBJ" | grep -q -v -w "$i\.\$(OBJEXT)" && DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)"
++  echo "$DECODER_LOBJ" | grep -q -v -w "$i\.lo" && DECODER_LOBJ="$DECODER_LOBJ $i.lo"
+ done
+ 
+