4 files changed, 36 insertions, 17 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index e5695df9c610..addb99dac1ce 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.0.r1
+PORTVERSION=	1.0.r2
 PORTEPOCH=	2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
+MASTER_SITES=	http://www.vorbis.com/files/rc2/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	naddy@mips.inka.de
@@ -18,8 +18,6 @@ LIB_DEPENDS=	ogg.2:${PORTSDIR}/audio/libogg
 
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-ogg-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(NOPORTDOCS)
 MAKE_ENV=	DOC=""
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 7524d6c28ef3..dc6a89e91382 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1 +1 @@
-MD5 (libvorbis-1.0rc1.tar.gz) = 95b34a6a4f2b037fc6cca78a7ebe9758
+MD5 (libvorbis-1.0rc2.tar.gz) = e5dfe5c71ee451313ec11af1387bd8f7
diff --git a/audio/libvorbis/files/patch-lib_floor1.c b/audio/libvorbis/files/patch-lib_floor1.c
new file mode 100644
index 000000000000..94264d168a5e
--- /dev/null
+++ b/audio/libvorbis/files/patch-lib_floor1.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/floor1.c.orig	Mon Aug 13 13:33:39 2001
++++ lib/floor1.c	Fri Aug 17 01:09:12 2001
+@@ -226,7 +226,7 @@
+ 
+   /* also store a sorted position index */
+   for(i=0;i<n;i++)sortpointer[i]=info->postlist+i;
+-  qsort(sortpointer,n,sizeof(int),icomp);
++  qsort(sortpointer,n,sizeof(int *),icomp);
+ 
+   /* points from sort order back to range number */
+   for(i=0;i<n;i++)look->forward_index[i]=sortpointer[i]-info->postlist;
diff --git a/audio/libvorbis/pkg-descr b/audio/libvorbis/pkg-descr
index 949504b310ad..b19883c60efd 100644
--- a/audio/libvorbis/pkg-descr
+++ b/audio/libvorbis/pkg-descr
@@ -1,14 +1,21 @@
-Vorbis is a general-purpose audio and music encoding format contemporary to
-MPEG-4's AAC and TwinVQ, the next generation beyond MPEG audio layer 3. Unlike
-the MPEG sponsored formats (and other proprietary formats such as RealAudio G2
-and Windows' flavor of the month), the Vorbis CODEC specification belongs to
-the public domain.  All the technical details are published and documented, and
-any software entity may make full use of the format without royalty or patent
-concerns.
-
-This package contains libvorbis, an LGPLed software implementation of the
-Vorbis specification by the Xiphophorus company (http://www.xiph.org/), and
-vorbisfile, an LGPLed convenience library built on Vorbis designed to simplify
-common uses.
+Vorbis is a general purpose audio and music encoding format
+contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
+MPEG audio layer 3.  Unlike the MPEG sponsored formats (and other
+proprietary formats such as RealAudio G2 and Windows' flavor of the
+month), the Vorbis CODEC specification belongs to the public domain.
+All the technical details are published and documented, and any
+software entity may make full use of the format without royalty or
+patent concerns.
+
+This package contains:
+
+- libvorbis, a BSD-license software implementation of the Vorbis
+  specification by the Xiphophorus company.
+
+- libvorbisfile, a BSD-license convenience library built on Vorbis
+  designed to simplify common uses.
+
+- libvorbisenc, a BSD-license library that provides a simple,
+  programmatic encoding setup interface.
 
 WWW: http://www.xiph.org/ogg/