From 32cb3f1df749afdd38c89c685defd512815c028a Mon Sep 17 00:00:00 2001
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Sat, 19 Jan 2002 16:54:57 +0000
Subject: * Update to 1.0.2. Changes in this release include: - various bug
fixes - support for encapsulating FLAC streams in an Ogg transport layer
* Bump xmms library version number in dependency.
Thanks to sf@ for i386 testing.
---
audio/flac/Makefile | 26 +++++++++++++---------
audio/flac/distinfo | 2 +-
audio/flac/files/patch-configure | 22 ++++++++++++++++++
audio/flac/files/patch-configure.in | 22 ------------------
audio/flac/files/patch-src_flac_Makefile.am | 12 ----------
.../flac/files/patch-src_test__streams_Makefile.am | 13 -----------
audio/flac/files/patch-src_test__unit_Makefile.am | 15 -------------
audio/flac/pkg-comment | 2 +-
audio/flac/pkg-plist | 10 +++++----
9 files changed, 45 insertions(+), 79 deletions(-)
create mode 100644 audio/flac/files/patch-configure
delete mode 100644 audio/flac/files/patch-configure.in
delete mode 100644 audio/flac/files/patch-src_flac_Makefile.am
delete mode 100644 audio/flac/files/patch-src_test__streams_Makefile.am
delete mode 100644 audio/flac/files/patch-src_test__unit_Makefile.am
(limited to 'audio/flac')
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index a2b947f5a39e..621a1bc2fac8 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
# New ports collection makefile for: flac
# Date created: Mar 18, 2001
# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org>
@@ -7,7 +6,7 @@
#
PORTNAME= flac
-PORTVERSION= 1.0
+PORTVERSION= 1.0.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,38 +14,43 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= naddy@FreeBSD.org
+LIB_DEPENDS= ogg.3:${PORTSDIR}/audio/libogg
+
.if defined(WITH_XMMS)
BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms
-LIB_DEPENDS+= xmms.2:${PORTSDIR}/audio/xmms
+LIB_DEPENDS+= xmms.3:${PORTSDIR}/audio/xmms
PLIST_SUB= XMMS=""
.else
+CONFIGURE_ENV+= XMMS_CONFIG=/usr/bin/false # must be absolute path
PLIST_SUB= XMMS="@comment "
.endif
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
+CONFIGURE_ARGS+= --enable-sse --enable-3dnow
.endif
-USE_AUTOMAKE_VER=14
-AUTOMAKE_ARGS= --include-deps
-USE_LIBTOOL= yes
+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"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
INSTALLS_SHLIB= yes
MAN1= flac.1
-post-extract:
+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
- ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/flac
-.for file in 1x1.gif cafebug.gif logo.jpg
- ${INSTALL_DATA} ${WRKSRC}/doc/images/${file} ${PREFIX}/share/doc/flac/images
-.endfor
+ 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 a09c0914f9bc..f84fe07364fc 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1 +1 @@
-MD5 (flac-1.0-src.tar.gz) = 137a0f31ef41583e875928f84d9f8d11
+MD5 (flac-1.0.2-src.tar.gz) = 3b0c646f1e58d5345f3c555c3996885d
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
new file mode 100644
index 000000000000..a75fb9536693
--- /dev/null
+++ b/audio/flac/files/patch-configure
@@ -0,0 +1,22 @@
+
+$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'
+ if test x$debug = xtrue; then
+ CFLAGS="$CFLAGS -g -O0 -DDEBUG"
+ else
+- CFLAGS="$CFLAGS -O3 -DNDEBUG"
++ CFLAGS="$CFLAGS -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__"
+ fi
+ fi
+ CFLAGS="$CFLAGS $SAVE_CFLAGS"
diff --git a/audio/flac/files/patch-configure.in b/audio/flac/files/patch-configure.in
deleted file mode 100644
index b54cb0823ab6..000000000000
--- a/audio/flac/files/patch-configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- configure.in.orig Sun Jul 22 19:43:15 2001
-+++ configure.in Tue Aug 28 17:00:19 2001
-@@ -136,13 +136,13 @@
- AC_SUBST(FLaC__USIZE64)
-
- 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'
- if test x$debug = xtrue; then
- CFLAGS="$CFLAGS -g -O0 -DDEBUG"
- else
-- CFLAGS="$CFLAGS -O3 -DNDEBUG"
-+ CFLAGS="$CFLAGS -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__"
- fi
- fi
- CFLAGS="$CFLAGS $SAVE_CFLAGS"
diff --git a/audio/flac/files/patch-src_flac_Makefile.am b/audio/flac/files/patch-src_flac_Makefile.am
deleted file mode 100644
index aa0421b37ab4..000000000000
--- a/audio/flac/files/patch-src_flac_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- src/flac/Makefile.am.orig Tue Aug 28 15:58:11 2001
-+++ src/flac/Makefile.am Tue Aug 28 15:58:19 2001
-@@ -29,5 +29,4 @@
- encode.h \
- file.h
-
--flac_LDFLAGS = -lm
--flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la
-+flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm
diff --git a/audio/flac/files/patch-src_test__streams_Makefile.am b/audio/flac/files/patch-src_test__streams_Makefile.am
deleted file mode 100644
index 7dafe82dfdb6..000000000000
--- a/audio/flac/files/patch-src_test__streams_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/test_streams/Makefile.am.orig Tue Aug 28 16:00:17 2001
-+++ src/test_streams/Makefile.am Tue Aug 28 16:00:28 2001
-@@ -20,6 +20,6 @@
- noinst_PROGRAMS = test_streams
- test_streams_SOURCES = \
- main.c
--test_streams_LDFLAGS = -lm
-+test_streams_LDADD = -lm
-
- CLEANFILES = $(wildcard *.raw)
diff --git a/audio/flac/files/patch-src_test__unit_Makefile.am b/audio/flac/files/patch-src_test__unit_Makefile.am
deleted file mode 100644
index 766831e6efc7..000000000000
--- a/audio/flac/files/patch-src_test__unit_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/test_unit/Makefile.am.orig Tue Aug 28 16:21:54 2001
-+++ src/test_unit/Makefile.am Tue Aug 28 16:22:05 2001
-@@ -19,8 +19,7 @@
- INCLUDES = -I$(top_srcdir)/src/libFLAC/include
-
- noinst_PROGRAMS = test_unit
--test_unit_LDFLAGS = -lm
--test_unit_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la
-+test_unit_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm
- test_unit_SOURCES = \
- bitbuffer.c \
- main.c \
diff --git a/audio/flac/pkg-comment b/audio/flac/pkg-comment
index 3e9de609fd8c..0cf13f11c0e5 100644
--- a/audio/flac/pkg-comment
+++ b/audio/flac/pkg-comment
@@ -1 +1 @@
-FLAC stands for Free Lossless Audio Codec
+Free lossless audio codec
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index 507af4064651..a7b5aee63793 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -7,13 +7,14 @@ include/FLAC/file_decoder.h
include/FLAC/format.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
-@dirrm include/FLAC
lib/libFLAC.a
+lib/libFLAC.la
lib/libFLAC.so
-lib/libFLAC.so.1
+lib/libFLAC.so.2
%%PORTDOCS%%share/doc/flac/comparison.html
%%PORTDOCS%%share/doc/flac/developers.html
%%PORTDOCS%%share/doc/flac/documentation.html
@@ -22,11 +23,12 @@ lib/libFLAC.so.1
%%PORTDOCS%%share/doc/flac/format.html
%%PORTDOCS%%share/doc/flac/goals.html
%%PORTDOCS%%share/doc/flac/id.html
-%%PORTDOCS%%share/doc/flac/index.html
-%%PORTDOCS%%share/doc/flac/news.html
%%PORTDOCS%%share/doc/flac/images/1x1.gif
%%PORTDOCS%%share/doc/flac/images/cafebug.gif
%%PORTDOCS%%share/doc/flac/images/logo.jpg
+%%PORTDOCS%%share/doc/flac/index.html
+%%PORTDOCS%%share/doc/flac/news.html
+@dirrm include/FLAC
%%PORTDOCS%%@dirrm share/doc/flac/images
%%PORTDOCS%%@dirrm share/doc/flac
%%XMMS%%@cwd %%X11BASE%%
--
cgit v1.2.3