Update to 1.0.4. Notable improvements:

- vorbis comment and id3v1/v2 support in the plugins
- bug fixes for 24-bit handling
- x86 encoder and decoder speedups
- reduced memory requirements

1 files changed, 11 insertions, 7 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 4d17c8d4c6a2..9373a8fadc67 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	flac
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +17,8 @@ LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
 
 .if defined(WITH_XMMS)
 BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/audio/xmms
-LIB_DEPENDS+=	xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS+=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
+		xmms.3:${PORTSDIR}/audio/xmms
 PLIST_SUB=	XMMS=""
 .else
 CONFIGURE_ENV+=	XMMS_CONFIG=/usr/bin/false	# must be absolute path
@@ -29,11 +29,12 @@ PLIST_SUB=	XMMS="@comment "
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-CONFIGURE_ARGS= --with-ogg=${LOCALBASE} \
-		--enable-sse --enable-3dnow
-CONFIGURE_ENV=	CONFIG_SHELL=${SH}
+CONFIGURE_ARGS=	--enable-sse --enable-3dnow
+CONFIGURE_ENV+=	CONFIG_SHELL=${SH} \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(NOPORTDOCS)
 MAKE_ENV=	DOC=""
@@ -44,4 +45,7 @@ MAKE_ENV=	DOC=doc
 INSTALLS_SHLIB=	yes
 MAN1=		flac.1
 
+post-configure:
+	@${RM} -rf ${WRKSRC}/obj	# "obj" is magic to our make(1)
+
 .include <bsd.port.mk>