18 files changed, 43 insertions, 53 deletions

diff --git a/audio/bmp-faad/Makefile b/audio/bmp-faad/Makefile
index b4e842aa1e2c..61fe0f6856cb 100644
--- a/audio/bmp-faad/Makefile
+++ b/audio/bmp-faad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	faac
@@ -24,7 +24,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_AUTOTOOLS=	automake:15 autoheader:253 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoheader:261 autoconf:261 libtool:15
 AUTOMAKE_ARGS=		--add-missing
 USE_X_PREFIX=		yes
 USE_GMAKE=		yes
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index 6a96b3117095..95b88a1b3162 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mac
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	CENKES
 PKGNAMEPREFIX=	bmp-
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	lib${PKGNAMEPREFIX}${PORTNAME}.so
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index 5a3186225711..b76c3ec91732 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -6,8 +6,7 @@
 
 PORTNAME=	musepack
 PORTVERSION=	1.2
-PORTREVISION=	1
-PORTREIVIOSN=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://files.musepack.net/linux/plugins/
 PKGNAMEPREFIX=	bmp-
@@ -26,7 +25,7 @@ USE_GMAKE=	yes
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 PLUGDIR=	lib/bmp/Input
 PLUGFILE=	libbmp-mpc.so
 PLIST_FILES=	${PLUGDIR}/${PLUGFILE}
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 9f41acaacad3..8c012e3cac14 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	faac
 PORTVERSION=	1.25
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	faac
@@ -21,7 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:15 autoheader:259 libtool:15
+USE_AUTOTOOLS=	automake:15 autoheader:261 libtool:15
 AUTOMAKE_ARGS=	--add-missing
 USE_GMAKE=	yes
 USE_DOS2UNIX=	yes
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 205a85ea7c80..e9e93c981825 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_CDROM=	Restrictive copyright (do not sell for profit)
 
 USE_DOS2UNIX=	yes
-USE_AUTOTOOLS=	automake:15 autoheader:259 libtool:15
+USE_AUTOTOOLS=	automake:15 autoheader:261 libtool:15
 AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GETOPT_LONG=yes
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index cbde8eb16ae0..13963299f131 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libtremor
 PORTVERSION=	1.0.2.${SNAP_DATE}
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://members.chello.nl/~g.mast/distfiles/
 DISTNAME=	tremor_snapshot_${SNAP_DATE}
@@ -17,7 +18,7 @@ COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library
 
 SNAP_DATE=	02132004
 WRKSRC=		${WRKDIR}/Tremor
-USE_AUTOTOOLS=	automake:15 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoconf:261 libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 7ea13636339b..bae9d9fd6a80 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lmms
 PORTVERSION=	20061204
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
@@ -28,7 +28,7 @@ USE_QT_VER=	3
 USE_SDL=	sdl sound
 USE_GMAKE=	yes
 
-USE_AUTOTOOLS=	autoconf:259 autoheader:259 automake:19 aclocal:19 libtool:15
+USE_AUTOTOOLS=	autoconf:261 autoheader:261 automake:19 aclocal:19 libtool:15
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	-a
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile
index 195d1c8b475c..9482883f9fdd 100644
--- a/audio/mt-daapd/Makefile
+++ b/audio/mt-daapd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mt-daapd
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +26,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-id3tag=${PREFIX} --with-gdbm-includes=${LOCALBASE}/include
 
-USE_AUTOTOOLS=	autoheader:259 autoconf:259:env
+USE_AUTOTOOLS=	autoheader:261 autoconf:261:env
 
 DAAPD_USER?=	daapd
 DAAPD_GROUP?=	daapd
diff --git a/audio/oggsplit/Makefile b/audio/oggsplit/Makefile
index da1c8e1f7d86..da99370881e8 100644
--- a/audio/oggsplit/Makefile
+++ b/audio/oggsplit/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	oggsplit
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://homepage.ntlworld.com/jfe1205/OggVorbis/
 
@@ -16,7 +17,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:15 autoconf:259
+USE_AUTOTOOLS=	automake:15 autoconf:261
 AUTOMAKE_ARGS=	--add-missing
 
 MAN1=		oggsplit.1
diff --git a/audio/orpheus/Makefile b/audio/orpheus/Makefile
index 0d353f26fb0d..c5769bd578b3 100644
--- a/audio/orpheus/Makefile
+++ b/audio/orpheus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	orpheus
 PORTVERSION=	1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://thekonst.net/download/
 
@@ -19,7 +19,7 @@ RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:253
+USE_AUTOTOOLS=	autoconf:261
 
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 6d8c1773a60c..8f43e72c5c3d 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pd
 DISTVERSION=	0.40-2
 DISTVERSIONSUFFIX=	.src
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/
 
@@ -25,7 +25,7 @@ MAN1=		pd.1 pdreceive.1 pdsend.1
 PATCH_WRKSRC=	${WRKSRC}/..
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_TCL=	yes
 USE_TK=		yes
 USE_TCL_BUILD=	yes
diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
index 3e1a784a9e80..b2818970b1bc 100644
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	soundtouch
 DISTVERSION=	1.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.surina.net/soundtouch/
 
@@ -15,7 +15,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An open-source audio processing library
 
 CONFIGURE_ARGS=	--enable-shared=yes
-USE_AUTOTOOLS=	autoconf:259 automake:19:env libtool:15
+USE_AUTOTOOLS=	autoconf:261 automake:19:env libtool:15
 USE_LDCONFIG=	yes
 
 pre-configure:
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 603beefe5a22..2bfd4e7ac082 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vorbis-tools
 PORTVERSION=	1.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
@@ -25,7 +25,7 @@ LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		speex.1:${PORTSDIR}/audio/speex \
 		vorbis.4:${PORTSDIR}/audio/libvorbis
 
-USE_AUTOTOOLS=	aclocal:19 autoconf:259 automake:19 libtool:15
+USE_AUTOTOOLS=	aclocal:19 autoconf:261 automake:19 libtool:15
 USE_GETTEXT=	yes
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 42360527ded4..dcc046d6cd45 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	faad2
 PORTVERSION=	2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	faac
@@ -25,7 +25,7 @@ PATCH_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_AUTOTOOLS=	automake:15 autoheader:253 autoconf:253 libtool:15
+USE_AUTOTOOLS=	automake:15 autoheader:261 autoconf:261 libtool:15
 AUTOMAKE_ARGS=		--add-missing
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk12
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 1c7c8b9956a8..23f941b62457 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imms
 PORTVERSION=	1.2a
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoheader:259 autoconf:259
+USE_AUTOTOOLS=	autoheader:261 autoconf:261
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -44,6 +44,6 @@ BROKEN=		Does not compile
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/vars.mk.in
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/vars.mk.in
 
 .include <bsd.port.post.mk>
diff --git a/audio/xmms-imms/files/patch-configure.ac b/audio/xmms-imms/files/patch-configure.ac
index 5300a499f6ec..51038664c582 100644
--- a/audio/xmms-imms/files/patch-configure.ac
+++ b/audio/xmms-imms/files/patch-configure.ac
@@ -1,38 +1,24 @@
---- configure.ac.orig	Wed Aug 18 01:56:28 2004
-+++ configure.ac	Tue Aug 31 16:19:40 2004
-@@ -31,8 +31,8 @@
- AC_ARG_ENABLE(debug,
-             AC_HELP_STRING([--enable-debug],
+--- configure.ac.orig	2004-08-17 22:56:28.000000000 -0700
++++ configure.ac	2007-09-22 21:50:52.000000000 -0700
+@@ -33,4 +33,4 @@
                             [Extra debug output]),
 -            [enable_debug='yes' XCPPFLAGS="-ggdb -O0 -DDEBUG"],
 -            [enable_debug='no' XCPPFLAGS="-O3"])
 +            [enable_debug='yes' XCPPFLAGS="-g -DDEBUG"],
 +            [enable_debug='no' XCPPFLAGS=""])
  
- AC_PROG_CXX
- AC_PROG_CC
-@@ -119,6 +119,7 @@
- 
-     saved_libs="$LIBS"
+@@ -121,2 +121,3 @@
      LIBS="$LIBS-ltag"
 +    saved_cppflags="$CPPFLAGS"
      CPPFLAGS=`taglib-config --cflags`
- 
-     AC_TRY_LINK([#include <tag.h>
-@@ -127,6 +128,7 @@
-         [XCPPFLAGS="$XCPPFLAGS `taglib-config --cflags`" 
+@@ -128,3 +129,4 @@
                                              AC_MSG_RESULT(yes)],
-         [LIBS=$saved_libs AC_MSG_RESULT(no)])
+-        [LIBS=$saved_libs AC_MSG_RESULT(no)])
++        [LIBS="$saved_libs"; AC_MSG_RESULT(no)])
 +    CPPFLAGS="$saved_cppflags"
  fi
- 
- if test "$with_taglib" = "yes"; then
-@@ -165,7 +167,7 @@
- 
- 
+@@ -167,3 +169,3 @@
  if test "$with_screensaver" != "no"; then
 -    LDFLAGS="-shared -L/usr/X11R6/lib"
 +    LDFLAGS="-L/usr/X11R6/lib"
      AC_CHECK_LIB(Xext, XextFindDisplay,, [with_screensaver=no])
-     AC_CHECK_LIB(Xss, XScreenSaverQueryInfo,, [with_screensaver=no])
-     AC_CHECK_HEADERS(X11/extensions/scrnsaver.h,,
diff --git a/audio/xmms-mac/Makefile b/audio/xmms-mac/Makefile
index 0327f11992d8..6ec624919dba 100644
--- a/audio/xmms-mac/Makefile
+++ b/audio/xmms-mac/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mac
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	CENKES
 PKGNAMEPREFIX=	xmms-
@@ -22,7 +22,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	CPPFLAGS="${CPPFLAGS}"
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 USE_LDCONFIG=	yes
 
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index e5b24ded6cbe..9c425abbf713 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yammi
 PORTVERSION=	1.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ OPTIONS=	XMMS "XMMS backend support" off
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:259:env automake:19:env libtool:15:env
+USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gstreamer