o update mad to 0.12.5beta.

o respect CFLAGS.
o add LIB_DEPENDS to gettext and use shared libintl.
o add USE_LIBTOOL to supress installing ltlibs.
o add CONFIGURE_ARGS tweak to get the fast and accurate output(I believe).
o obsolete patch-ab(integrated).

Approved by:	maintainer

6 files changed, 28 insertions, 53 deletions

diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index f2de6995a3de..f02312fe7ca5 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mad
-PORTVERSION=	0.12.1b
+PORTVERSION=	0.12.5b
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.mars.org/pub/mpeg/
@@ -14,16 +14,15 @@ MASTER_SITE_SUBDIR=	mad
 
 MAINTAINER=	jason-freebsd@mastaler.com
 
-GNU_CONFIGURE=	yes
-# This port is not CFLAGS SAFE, something like CFLAGS="-O -Os"
-# breaks configure and configure likes to use -O2 instead of
-# trusting the system. We'll have it use -O instead of -O*
-# since this configure requires a standard and this has
-# been the system standard
-CONFIGURE_ENV=	CFLAGS="-O -pipe"
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libmad/configure
+CONFIGURE_ARGS=	--disable-debugging --enable-sso --enable-accuracy
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=			abxtest.1 madplay.1
+MAN1=		abxtest.1 madplay.1
 
 .include <bsd.port.mk>
diff --git a/audio/mad/distinfo b/audio/mad/distinfo
index e85406fba19c..62fc1099e7da 100644
--- a/audio/mad/distinfo
+++ b/audio/mad/distinfo
@@ -1 +1 @@
-MD5 (mad-0.12.1b.tar.gz) = 7562add886aee7b2dbdc3c22b32e70bd
+MD5 (mad-0.12.5b.tar.gz) = b156bec0dc7d134bf1a5acdb4216a36d
diff --git a/audio/mad/files/patch-aa b/audio/mad/files/patch-aa
index 3a7fab16424f..6649b102efbf 100644
--- a/audio/mad/files/patch-aa
+++ b/audio/mad/files/patch-aa
@@ -1,31 +1,13 @@
-This port is not CFLAGS safe. I will not try to make it on this
-particular version. However, I will make it use -O instead of -O2
-since I am told that -O2 brakes the alpha ARCH. Partially provided
-by lioux@freebsd.org
-
---- configure.orig	Fri Nov 17 04:20:18 2000
-+++ configure	Sun Nov 26 22:56:39 2000
-@@ -3800,7 +3800,8 @@
- then
-     case "$host" in
- 	i386-*)      ARCH="" ;;
--	i?86-*)      ARCH="-m486" ;;
-+	i486-*)      ARCH="-m486" ;;
-+	i586-*)      ARCH="-mpentium" ;;
- 	arm-empeg-*) ARCH="-march=armv4 -mtune=strongarm1100" ;;
- 	armv4*-*)    ARCH="-march=armv4 -mtune=strongarm" ;;
- 	mips*-*)     ARCH="" ;;
-@@ -3813,7 +3814,7 @@
- esac
- 
- case "$CFLAGS" in
--    *-O*) OPTIMIZER="-O2" ;;
-+    *-O*) OPTIMIZER="-O" ;;
- esac
- 
- CFLAGS=`echo ".$CFLAGS" |  \
-@@ -5439,10 +5440,6 @@
-       *) # Relative path.
+--- configure.orig	Fri Feb  9 18:31:26 2001
++++ configure	Thu Feb 15 19:31:10 2001
+@@ -3820,5 +3820,5 @@
+ 	    ;;
+ 	-O*|-f*)
+-	    optimize="$1"
++	    optimize="$optimize $1"
+ 	    shift
+ 	    ;;
+@@ -5653,8 +5653,4 @@
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
 -  case "$ac_given_INSTALL" in
@@ -34,4 +16,3 @@ by lioux@freebsd.org
 -        esac
  
        echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/audio/mad/files/patch-ab b/audio/mad/files/patch-ab
deleted file mode 100644
index 4baa9602788c..000000000000
--- a/audio/mad/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- audio_oss.c.orig	Thu Nov 16 03:51:04 2000
-+++ audio_oss.c	Sat Nov 18 13:45:25 2000
-@@ -57,6 +57,10 @@
- #  undef  AUDIO_TRY32BITS
- # endif
- 
-+# if !defined(SNDCTL_DSP_CHANNELS) && defined(SOUND_PCM_WRITE_CHANNELS)
-+#  define SNDCTL_DSP_CHANNELS   SOUND_PCM_WRITE_CHANNELS
-+# endif
-+
- # define AUDIO_DEVICE	"/dev/dsp"
- 
- static int sfd;
diff --git a/audio/mad/files/patch-ac b/audio/mad/files/patch-ac
new file mode 100644
index 000000000000..a0aea947a9aa
--- /dev/null
+++ b/audio/mad/files/patch-ac
@@ -0,0 +1,9 @@
+--- libmad/configure.orig	Fri Feb  9 18:31:43 2001
++++ libmad/configure	Thu Feb 15 19:17:51 2001
+@@ -1841,5 +1841,5 @@
+ 	    ;;
+ 	-O2)
+-	    optimize="-O"
++	    optimize="-O2"
+ 	    shift
+ 	    ;;
diff --git a/audio/mad/pkg-plist b/audio/mad/pkg-plist
index b476154f0401..1ee0509a8bd2 100644
--- a/audio/mad/pkg-plist
+++ b/audio/mad/pkg-plist
@@ -2,7 +2,6 @@ bin/abxtest
 bin/madplay
 include/mad.h
 lib/libmad.a
-lib/libmad.la
 share/locale/en/LC_MESSAGES/mad.mo
 share/locale/es/LC_MESSAGES/mad.mo
 share/locale/fr/LC_MESSAGES/mad.mo