6 files changed, 38 insertions, 38 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 9e3fddfdb997..997e12762b15 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	flac
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,13 +28,15 @@ BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
 USE_LIBTOOL=	yes
-USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE=	yes
 
 INSTALLS_SHLIB=	yes
+MAN1=		flac.1
+
+post-extract:
+	@${RM} -r ${WRKSRC}/obj
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 2c90e26d738c..a09c0914f9bc 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1 +1 @@
-MD5 (flac-0.10-src.tar.gz) = d8369dde641b984c96759f6c081171ab
+MD5 (flac-1.0-src.tar.gz) = 137a0f31ef41583e875928f84d9f8d11
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
new file mode 100644
index 000000000000..c619da53aafd
--- /dev/null
+++ b/audio/flac/files/patch-configure
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- configure.orig	Sun Jul 22 20:03:23 2001
++++ configure	Tue Jul 31 01:31:15 2001
+@@ -2136,13 +2136,13 @@
+ 
+ 
+ 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 74ff75797152..000000000000
--- a/audio/flac/files/patch-configure.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$FreeBSD$
---- configure.in.orig	Thu Jun  7 21:27:38 2001
-+++ configure.in	Thu Jun  7 21:28:13 2001
-@@ -51,14 +51,11 @@
- AC_DEFINE(FLAC__HAS_NASM)
- fi
- 
--CFLAGS='-I./include -I $(top_srcdir)/include -Wall -W'
-+CFLAGS="$CFLAGS -I./include -I \$(top_srcdir)/include"
- if test x$debug = xtrue; then
--	CFLAGS="$CFLAGS -g -O0 -DDEBUG"
-+	CFLAGS="$CFLAGS -g -DDEBUG"
- else
--	CFLAGS="$CFLAGS -O3 -DNDEBUG"
--		if test x$GCC = xyes; then
--			CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions"
--		fi
-+	CFLAGS="$CFLAGS -DNDEBUG"
- fi
- 
- AC_OUTPUT(	Makefile	\
diff --git a/audio/flac/files/patch-src::flac::file.c b/audio/flac/files/patch-src::flac::file.c
deleted file mode 100644
index dbf8356f140d..000000000000
--- a/audio/flac/files/patch-src::flac::file.c
+++ /dev/null
@@ -1,11 +0,0 @@
-$FreeBSD$
---- src/flac/file.c.orig	Thu Jun  7 21:50:01 2001
-+++ src/flac/file.c	Thu Jun  7 21:50:20 2001
-@@ -20,6 +20,7 @@
- #include <sys/utime.h> /* for utime() */
- #include <io.h> /* for chmod() */
- #else
-+#include <sys/types.h>
- #include <utime.h> /* for utime() */
- #include <unistd.h> /* for chown() */
- #endif
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index debd14c6a85f..71e6d8db57ff 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -1,9 +1,18 @@
 @comment $FreeBSD$
 bin/flac
 bin/metaflac
+include/FLAC/all.h
+include/FLAC/assert.h
+include/FLAC/file_decoder.h
+include/FLAC/format.h
+include/FLAC/ordinals.h
+include/FLAC/seek_table.h
+include/FLAC/stream_decoder.h
+include/FLAC/stream_encoder.h
+include/FLAC/utility.h
 lib/libFLAC.a
 lib/libFLAC.so
-lib/libFLAC.so.0
+lib/libFLAC.so.1
 %%PORTDOCS%%share/doc/flac/comparison.html
 %%PORTDOCS%%share/doc/flac/developers.html
 %%PORTDOCS%%share/doc/flac/documentation.html