update libvorbis from 1.0beta4 -> 1.0rc1, including removing a bunch

of patches which are now in the mainline code

8 files changed, 12 insertions, 128 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 52885da61f8..b5f51e45632 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/06/26 13:07:37 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/08 09:55:28 lukem Exp $
 
-DISTNAME=	libvorbis-1.0beta4
-PKGNAME=	libvorbis-1.0.0.4
+DISTNAME=	libvorbis-1.0rc1
+PKGNAME=	libvorbis-1.0.0.5
 CATEGORIES=	devel audio
-MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/
+MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
 
 MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk
index a570fd95299..e45545c362b 100644
--- a/audio/libvorbis/buildlink.mk
+++ b/audio/libvorbis/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/08/08 09:55:28 lukem Exp $
 #
 # This Makefile fragment is included by packages that use libvorbis.
 #
@@ -17,7 +17,7 @@ LIBVORBIS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.4
+BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.5
 DEPENDS+=	${BUILDLINK_DEPENDS.libvorbis}:../../audio/libvorbis
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libvorbis=libvorbis
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 4f2fd0249ab..5171696e674 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/05/02 14:01:44 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/08/08 09:55:28 lukem Exp $
 
-SHA1 (libvorbis-1.0beta4.tar.gz) = c101d89c1064b1e80be65fbef785a22654203e39
-Size (libvorbis-1.0beta4.tar.gz) = 457797 bytes
-SHA1 (patch-aa) = 2293192c1eeadfdb9629d94c86a083c8e348f137
-SHA1 (patch-ab) = 1a84a3757aecef0f4ae0caba996e8740b84ac1e6
-SHA1 (patch-ac) = 39ceba79fffefc2bb165f2245e30158dfa3bc006
-SHA1 (patch-ad) = b3ef346320dfce68e2f1621b902445e9688bf377
+SHA1 (libvorbis-1.0rc1.tar.gz) = f356c2a2fb459bdc6eb291b637087405f56df94a
+Size (libvorbis-1.0rc1.tar.gz) = 477040 bytes
 SHA1 (patch-ae) = de04ccf4a3f22cef52a9d9f5cddb9b045c5ff0f6
 SHA1 (patch-af) = 0cf2573621f6e0e481dbdd1885a7edfdfe5f74a3
 SHA1 (patch-ag) = 772aa8e32352385de6b7f82e557aab66e5199b66
diff --git a/audio/libvorbis/patches/patch-aa b/audio/libvorbis/patches/patch-aa
deleted file mode 100644
index 9e23ba939bd..00000000000
--- a/audio/libvorbis/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/03/21 15:47:28 wiz Exp $
-
---- lib/psy.c.orig	Mon Feb 26 05:37:59 2001
-+++ lib/psy.c
-@@ -191,7 +191,7 @@
-   p->total_octave_lines=maxoc-p->firstoc+1;
- 
-   p->ath=_ogg_malloc(n*sizeof(float));
--  p->octave=_ogg_malloc(n*sizeof(int));
-+  p->octave=_ogg_malloc(n*sizeof(long));
-   p->bark=_ogg_malloc(n*sizeof(float));
-   p->vi=vi;
-   p->n=n;
diff --git a/audio/libvorbis/patches/patch-ab b/audio/libvorbis/patches/patch-ab
deleted file mode 100644
index 0a9181733fe..00000000000
--- a/audio/libvorbis/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/04/04 07:08:29 tron Exp $
-
---- configure.in.orig	Fri Mar 30 02:02:35 2001
-+++ configure.in	Fri Mar 30 02:10:16 2001
-@@ -162,6 +162,7 @@ dnl ------------------------------------
- 
- AC_FUNC_ALLOCA
- AC_FUNC_MEMCMP
-+AC_CHECK_FUNCS(sqrtf)
- 
- dnl --------------------------------------------------
- dnl Do substitutions
diff --git a/audio/libvorbis/patches/patch-ac b/audio/libvorbis/patches/patch-ac
deleted file mode 100644
index 2fcd4663932..00000000000
--- a/audio/libvorbis/patches/patch-ac
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/04/04 07:08:29 tron Exp $
-
---- configure.orig	Mon Feb 26 14:34:27 2001
-+++ configure	Wed Apr  4 09:01:22 2001
-@@ -2235,6 +2235,61 @@
- echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
- test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
- 
-+for ac_func in sqrtf
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:2242: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2247 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
- 
- 
- 
diff --git a/audio/libvorbis/patches/patch-ad b/audio/libvorbis/patches/patch-ad
deleted file mode 100644
index 4d0985e7153..00000000000
--- a/audio/libvorbis/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/04/04 07:08:29 tron Exp $
-
---- lib/os.h.orig	Fri Mar 30 02:10:53 2001
-+++ lib/os.h	Fri Mar 30 02:13:07 2001
-@@ -42,15 +42,7 @@
- #  define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
- #endif
- 
--#ifndef __GNUC__
--#  define NO_FLOAT_MATH_LIB
--#endif
--
--#ifdef DARWIN
--#  define NO_FLOAT_MATH_LIB
--#endif
--
--#ifndef NO_FLOAT_MATH_LIB
-+#ifdef HAVE_SQRTF
- #  define sqrt sqrtf
- #  define log logf
- #  define exp expf
diff --git a/audio/libvorbis/pkg/PLIST b/audio/libvorbis/pkg/PLIST
index c0cb9f9f719..5192d165a59 100644
--- a/audio/libvorbis/pkg/PLIST
+++ b/audio/libvorbis/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/05/02 14:01:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/08/08 09:55:29 lukem Exp $
 include/vorbis/codec.h
 include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
@@ -15,8 +15,8 @@ lib/libvorbisenc.so.0.1
 lib/libvorbisfile.a
 lib/libvorbisfile.la
 lib/libvorbisfile.so
-lib/libvorbisfile.so.0
-lib/libvorbisfile.so.0.1
+lib/libvorbisfile.so.1
+lib/libvorbisfile.so.1.0
 share/aclocal/vorbis.m4
 share/doc/html/${DISTNAME}/programming.html
 share/doc/html/${DISTNAME}/v-comment.html