Update to 1.0.3. Changes in this release:

- 10-15% decoder speedup
- 24-bit input support restored
- more robust plugins
- new metadata block for Vorbis-style tags
- vastly improved metadata editor
- fixed bug with pipes and Windows
- new libFLAC++, a C++ object wrapper around libFLAC
- new metadata editing interface in libFLAC and libFLAC++
- and more...

7 files changed, 76 insertions, 38 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 621a1bc2fac8..9c71ba51a832 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	flac
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	naddy@FreeBSD.org
 
@@ -27,30 +26,21 @@ PLIST_SUB=	XMMS="@comment "
 
 .if ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-CONFIGURE_ARGS+= --enable-sse --enable-3dnow
 .endif
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV=	INCLUDES="-I${WRKSRC}/include"
+CONFIGURE_ARGS= --with-ogg=${LOCALBASE} \
+		--enable-sse --enable-3dnow
+CONFIGURE_ENV=	CONFIG_SHELL=${SH}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+.if defined(NOPORTDOCS)
+MAKE_ENV=	DOC=""
+.else
+MAKE_ENV=	DOC=doc
+.endif
 
 INSTALLS_SHLIB=	yes
 MAN1=		flac.1
 
-pre-build:
-	@${RM} -r ${WRKSRC}/obj
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/flac
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html ${PREFIX}/share/doc/flac
-	${MKDIR} ${PREFIX}/share/doc/flac/images
-	cd ${WRKSRC}/doc/images; \
-	    ${INSTALL_DATA} *.gif *.jpg ${PREFIX}/share/doc/flac/images
-.endif
-
 .include <bsd.port.mk>
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index f84fe07364fc..c678fe0f9dc2 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1 +1 @@
-MD5 (flac-1.0.2-src.tar.gz) = 3b0c646f1e58d5345f3c555c3996885d
+MD5 (flac-1.0.3.tar.gz) = 419e4e4c3403055af1cd6d4a735a9201
diff --git a/audio/flac/files/patch-Makefile.in b/audio/flac/files/patch-Makefile.in
new file mode 100644
index 000000000000..f8684ba0a4c7
--- /dev/null
+++ b/audio/flac/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Sat Jul  6 15:54:56 2002
++++ Makefile.in	Sat Jul  6 15:55:31 2002
+@@ -137,7 +137,7 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+ 
+-SUBDIRS = doc include man src test
++SUBDIRS = $(DOC) include man src test
+ 
+ DISTCLEANFILES = libtool-disable-static
+ 
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
index a75fb9536693..b4f13f6d5d9e 100644
--- a/audio/flac/files/patch-configure
+++ b/audio/flac/files/patch-configure
@@ -1,22 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Jan 17 15:47:34 2002
-+++ configure	Thu Jan 17 15:48:42 2002
-@@ -8240,13 +8240,13 @@
- fi
- 
- SAVE_CFLAGS="$CFLAGS"
--CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I $(top_srcdir)/include -Wall -W'
-+CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I $(top_srcdir)/include'
+--- configure.orig	Sat Jul  6 15:49:41 2002
++++ configure	Sat Jul  6 15:49:54 2002
+@@ -9995,7 +9995,7 @@
  if test x$debug = xtrue; then
- 	CFLAGS="$CFLAGS -g -O0 -DDEBUG"
+ 	OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
  else
--	CFLAGS="$CFLAGS -O3 -DNDEBUG"
-+	CFLAGS="$CFLAGS -DNDEBUG"
+-	OUR_CFLAGS_TAIL="-O3 -DNDEBUG"
++	OUR_CFLAGS_TAIL="-DNDEBUG"
  	if test x$GCC = xyes; then
--		CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -finline-functions -Winline -DFLaC__INLINE=__inline__"
-+		CFLAGS="$CFLAGS -DFLaC__INLINE=__inline__"
+ 		OUR_CFLAGS_TAIL="$OUR_CFLAGS_TAIL -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
  	fi
- fi
- CFLAGS="$CFLAGS $SAVE_CFLAGS"
diff --git a/audio/flac/files/patch-doc_Makefile.in b/audio/flac/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..ba0631a82ac7
--- /dev/null
+++ b/audio/flac/files/patch-doc_Makefile.in
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- doc/Makefile.in.orig	Wed Jul  3 23:01:49 2002
++++ doc/Makefile.in	Sat Jul  6 17:10:19 2002
+@@ -126,9 +126,9 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = . images ru
++SUBDIRS = . images
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ doc_DATA = \
+ 	comparison.html \
diff --git a/audio/flac/files/patch-doc_images_Makefile.in b/audio/flac/files/patch-doc_images_Makefile.in
new file mode 100644
index 000000000000..8da79c0e9a9e
--- /dev/null
+++ b/audio/flac/files/patch-doc_images_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/images/Makefile.in.orig	Sat Jul  6 16:42:17 2002
++++ doc/images/Makefile.in	Sat Jul  6 16:43:26 2002
+@@ -126,7 +126,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/images
++docdir = $(datadir)/doc/$(PACKAGE)/images
+ 
+ doc_DATA = \
+ 	1x1.gif \
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index a7b5aee63793..148e30089220 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -1,20 +1,30 @@
 @comment $FreeBSD$
 bin/flac
 bin/metaflac
+include/FLAC++/all.h
+include/FLAC++/decoder.h
+include/FLAC++/encoder.h
+include/FLAC++/metadata.h
 include/FLAC/all.h
 include/FLAC/assert.h
 include/FLAC/file_decoder.h
 include/FLAC/format.h
+include/FLAC/metadata.h
 include/FLAC/ordinals.h
-include/FLAC/seek_table.h
 include/FLAC/seekable_stream_decoder.h
 include/FLAC/stream_decoder.h
 include/FLAC/stream_encoder.h
-include/FLAC/utility.h
+lib/libFLAC++.a
+lib/libFLAC++.la
+lib/libFLAC++.so
+lib/libFLAC++.so.1
 lib/libFLAC.a
 lib/libFLAC.la
 lib/libFLAC.so
-lib/libFLAC.so.2
+lib/libFLAC.so.3
+share/aclocal/libFLAC++.m4
+share/aclocal/libFLAC.m4
+@unexec /bin/rmdir %D/share/aclocal 2>/dev/null || true
 %%PORTDOCS%%share/doc/flac/comparison.html
 %%PORTDOCS%%share/doc/flac/developers.html
 %%PORTDOCS%%share/doc/flac/documentation.html
@@ -28,6 +38,7 @@ lib/libFLAC.so.2
 %%PORTDOCS%%share/doc/flac/images/logo.jpg
 %%PORTDOCS%%share/doc/flac/index.html
 %%PORTDOCS%%share/doc/flac/news.html
+@dirrm include/FLAC++
 @dirrm include/FLAC
 %%PORTDOCS%%@dirrm share/doc/flac/images
 %%PORTDOCS%%@dirrm share/doc/flac