update to 1.0 beta4.

PR:		25414
Submitted by:	maintainer

5 files changed, 73 insertions, 629 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 8fe7cb8e491d..ef1c47f37c49 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -6,28 +6,21 @@
 #
 
 PORTNAME=	libvorbis
-PORTVERSION=	20001018
+PORTVERSION=	1.0b4
+PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://home.student.utwente.nl/t.vanklaveren/distfiles/
-DISTNAME=	vorbis-${PORTVERSION}
+MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/ \
+		http://home.student.utwente.nl/t.vanklaveren/distfiles/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	t.vanklaveren@student.utwente.nl
 
-LIB_DEPENDS=	ogg.0:${PORTSDIR}/audio/libogg
-
-WRKSRC=		${WRKDIR}/vorbis
+LIB_DEPENDS=	ogg.1:${PORTSDIR}/audio/libogg
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_AUTOMAKE=	yes
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
-AUTOMAKE_ARGS=	--add-missing
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 AUTOCONF_ARGS=	; ${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
 
-AUTOHEADER?=	${LOCALBASE}/bin/autoheader
-
-pre-configre:
-	cd ${WRKSRC} && ${AUTOHEADER}
-
 .include <bsd.port.mk>
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 93471fa8062d..f2a994281a0c 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1 +1 @@
-MD5 (vorbis-20001018.tar.gz) = e2a134ed638617ffcd702a69590fd868
+MD5 (libvorbis-1.0beta4.tar.gz) = 6954d72386cbf88c613e1ffebb7b4bac
diff --git a/audio/libvorbis/files/patch-aa b/audio/libvorbis/files/patch-aa
deleted file mode 100644
index 8815b462b6e0..000000000000
--- a/audio/libvorbis/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.am.orig	Wed Oct 18 23:23:41 2000
-+++ doc/Makefile.am	Wed Oct 18 23:23:51 2000
-@@ -2,7 +2,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
- 
- doc_DATA = v-comment.html vorbisword2.png white-ogg.png programming.html\
- 	 vorbis.html wait.png white-xifish.png
diff --git a/audio/libvorbis/files/patch-ab b/audio/libvorbis/files/patch-ab
deleted file mode 100644
index effb263bd20f..000000000000
--- a/audio/libvorbis/files/patch-ab
+++ /dev/null
@@ -1,516 +0,0 @@
---- /dev/null	Wed Nov 29 11:56:20 2000
-+++ aclocal.m4	Wed Nov 29 11:57:06 2000
-@@ -0,0 +1,513 @@
-+dnl aclocal.m4 generated automatically by aclocal 1.4
-+
-+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+dnl PARTICULAR PURPOSE.
-+
-+# Do all the work for Automake.  This macro actually does too much --
-+# some checks are only needed if your package does certain things.
-+# But this isn't really a big deal.
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-+
-+AC_DEFUN(AM_INIT_AUTOMAKE,
-+[AC_REQUIRE([AC_PROG_INSTALL])
-+PACKAGE=[$1]
-+AC_SUBST(PACKAGE)
-+VERSION=[$2]
-+AC_SUBST(VERSION)
-+dnl test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+ifelse([$3],,
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-+AC_REQUIRE([AM_SANITY_CHECK])
-+AC_REQUIRE([AC_ARG_PROGRAM])
-+dnl FIXME This is truly gross.
-+missing_dir=`cd $ac_aux_dir && pwd`
-+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-+AC_REQUIRE([AC_PROG_MAKE_SET])])
-+
-+#
-+# Check to make sure that the build environment is sane.
-+#
-+
-+AC_DEFUN(AM_SANITY_CHECK,
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftestfile
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-+   if test "[$]*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftestfile`
-+   fi
-+   if test "[$]*" != "X $srcdir/configure conftestfile" \
-+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "[$]2" = conftestfile
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+rm -f conftest*
-+AC_MSG_RESULT(yes)])
-+
-+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-+dnl The program must properly implement --version.
-+AC_DEFUN(AM_MISSING_PROG,
-+[AC_MSG_CHECKING(for working $2)
-+# Run test in a subshell; some versions of sh will print an error if
-+# an executable is not found, even if stderr is redirected.
-+# Redirect stdin to placate older versions of autoconf.  Sigh.
-+if ($2 --version) < /dev/null > /dev/null 2>&1; then
-+   $1=$2
-+   AC_MSG_RESULT(found)
-+else
-+   $1="$3/missing $2"
-+   AC_MSG_RESULT(missing)
-+fi
-+AC_SUBST($1)])
-+
-+
-+# serial 40 AC_PROG_LIBTOOL
-+AC_DEFUN(AC_PROG_LIBTOOL,
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+
-+# Save cache, so that ltconfig can load it
-+AC_CACHE_SAVE
-+
-+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
-+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+|| AC_MSG_ERROR([libtool configure failed])
-+
-+# Reload cache, that may have been modified by ltconfig
-+AC_CACHE_LOAD
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+# Redirect the config.log output again, so that the ltconfig log is not
-+# clobbered by the next message.
-+exec 5>>./config.log
-+])
-+
-+AC_DEFUN(AC_LIBTOOL_SETUP,
-+[AC_PREREQ(2.13)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_RANLIB])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+dnl
-+
-+case "$target" in
-+NONE) lt_target="$host" ;;
-+*) lt_target="$target" ;;
-+esac
-+
-+# Check for any special flags to pass to ltconfig.
-+libtool_flags="--cache-file=$cache_file"
-+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-+[libtool_flags="$libtool_flags --enable-dlopen"])
-+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-+[libtool_flags="$libtool_flags --enable-win32-dll"])
-+AC_ARG_ENABLE(libtool-lock,
-+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case "$lt_target" in
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case "`/usr/bin/file conftest.o`" in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+
-+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw*)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+])
-+esac
-+])
-+
-+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-+
-+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-+
-+# AC_ENABLE_SHARED - implement the --enable-shared flag
-+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN(AC_ENABLE_SHARED, [dnl
-+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(shared,
-+changequote(<<, >>)dnl
-+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case "$enableval" in
-+yes) enable_shared=yes ;;
-+no) enable_shared=no ;;
-+*)
-+  enable_shared=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_shared=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-+])
-+
-+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)])
-+
-+# AC_ENABLE_STATIC - implement the --enable-static flag
-+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN(AC_ENABLE_STATIC, [dnl
-+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(static,
-+changequote(<<, >>)dnl
-+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case "$enableval" in
-+yes) enable_static=yes ;;
-+no) enable_static=no ;;
-+*)
-+  enable_static=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_static=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-+])
-+
-+# AC_DISABLE_STATIC - set the default static flag to --disable-static
-+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)])
-+
-+
-+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-+#   `yes'.
-+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
-+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE(fast-install,
-+changequote(<<, >>)dnl
-+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-+changequote([, ])dnl
-+[p=${PACKAGE-default}
-+case "$enableval" in
-+yes) enable_fast_install=yes ;;
-+no) enable_fast_install=no ;;
-+*)
-+  enable_fast_install=no
-+  # Look at the argument we got.  We use all the common list separators.
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-+  for pkg in $enableval; do
-+    if test "X$pkg" = "X$p"; then
-+      enable_fast_install=yes
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  ;;
-+esac],
-+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-+])
-+
-+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
-+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)])
-+
-+# AC_PROG_LD - find the path to the GNU or non-GNU linker
-+AC_DEFUN(AC_PROG_LD,
-+[AC_ARG_WITH(gnu-ld,
-+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+ac_prog=ld
-+if test "$ac_cv_prog_gcc" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by GCC])
-+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-+  case "$ac_prog" in
-+    # Accept absolute paths.
-+changequote(,)dnl
-+    [\\/]* | [A-Za-z]:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+changequote([,])dnl
-+      # Canonicalize the path of ld
-+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(ac_cv_path_LD,
-+[if test -z "$LD"; then
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+  for ac_dir in $PATH; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      ac_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some GNU ld's only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-+	test "$with_gnu_ld" != no && break
-+      else
-+	test "$with_gnu_ld" != yes && break
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+else
-+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$ac_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])
-+
-+AC_DEFUN(AC_PROG_LD_GNU,
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  ac_cv_prog_gnu_ld=yes
-+else
-+  ac_cv_prog_gnu_ld=no
-+fi])
-+])
-+
-+# AC_PROG_NM - find the path to a BSD-compatible name lister
-+AC_DEFUN(AC_PROG_NM,
-+[AC_MSG_CHECKING([for BSD-compatible nm])
-+AC_CACHE_VAL(ac_cv_path_NM,
-+[if test -n "$NM"; then
-+  # Let the user override the test.
-+  ac_cv_path_NM="$NM"
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
-+      # Check to see if the nm accepts a BSD-compat flag.
-+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+      #   nm: unknown option "B" ignored
-+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	ac_cv_path_NM="$ac_dir/nm -B"
-+	break
-+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-+	ac_cv_path_NM="$ac_dir/nm -p"
-+	break
-+      else
-+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-+	continue # so that we can try to find one that supports BSD flags
-+      fi
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-+fi])
-+NM="$ac_cv_path_NM"
-+AC_MSG_RESULT([$NM])
-+])
-+
-+# AC_CHECK_LIBM - check for math library
-+AC_DEFUN(AC_CHECK_LIBM,
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case "$lt_target" in
-+*-*-beos* | *-*-cygwin*)
-+  # These system don't have libm
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, main, LIBM="-lm")
-+  ;;
-+esac
-+])
-+
-+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-+# the libltdl convenience library, adds --enable-ltdl-convenience to
-+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-+# '${top_builddir}/' (note the single quotes!) if your package is not
-+# flat, and, if you're not using automake, define top_builddir as
-+# appropriate in the Makefiles.
-+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  case "$enable_ltdl_convenience" in
-+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-+  "") enable_ltdl_convenience=yes
-+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-+  esac
-+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
-+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
-+])
-+
-+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-+# the libltdl installable library, and adds --enable-ltdl-install to
-+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-+# '${top_builddir}/' (note the single quotes!) if your package is not
-+# flat, and, if you're not using automake, define top_builddir as
-+# appropriate in the Makefiles.
-+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  AC_CHECK_LIB(ltdl, main,
-+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-+  [if test x"$enable_ltdl_install" = xno; then
-+     AC_MSG_WARN([libltdl not installed, but installation disabled])
-+   else
-+     enable_ltdl_install=yes
-+   fi
-+  ])
-+  if test x"$enable_ltdl_install" = x"yes"; then
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
-+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
-+  else
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-+    LIBLTDL="-lltdl"
-+    INCLTDL=
-+  fi
-+])
-+
-+dnl old names
-+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
-+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
-+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
-+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
-+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
-+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
-+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-+
-+dnl This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])dnl
-+
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index 2794dd54476f..6fb88f4e7559 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -1,96 +1,74 @@
-include/vorbis/backends.h
-include/vorbis/codebook.h
 include/vorbis/codec.h
-include/vorbis/mode_A.h
-include/vorbis/mode_B.h
-include/vorbis/mode_C.h
-include/vorbis/mode_D.h
-include/vorbis/mode_E.h
-include/vorbis/modes.h
+include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
-include/vorbis/book/lsp12_0.vqh
-include/vorbis/book/lsp30_0.vqh
-include/vorbis/book/res0_1024a_128_1.vqh
-include/vorbis/book/res0_1024a_128_2.vqh
-include/vorbis/book/res0_1024a_128_3.vqh
-include/vorbis/book/res0_1024a_128_4.vqh
-include/vorbis/book/res0_1024a_128_5.vqh
-include/vorbis/book/res0_1024a_128_6.vqh
-include/vorbis/book/res0_1024a_128_7.vqh
-include/vorbis/book/res0_1024a_128_8.vqh
-include/vorbis/book/res0_1024a_128_9.vqh
-include/vorbis/book/res0_1024a_160_1.vqh
-include/vorbis/book/res0_1024a_160_2.vqh
-include/vorbis/book/res0_1024a_160_3.vqh
-include/vorbis/book/res0_1024a_160_4.vqh
-include/vorbis/book/res0_1024a_160_5.vqh
-include/vorbis/book/res0_1024a_160_6.vqh
-include/vorbis/book/res0_1024a_160_7.vqh
-include/vorbis/book/res0_1024a_160_8.vqh
-include/vorbis/book/res0_1024a_160_9.vqh
-include/vorbis/book/res0_1024a_192_1.vqh
-include/vorbis/book/res0_1024a_192_2.vqh
-include/vorbis/book/res0_1024a_192_3.vqh
-include/vorbis/book/res0_1024a_192_4.vqh
-include/vorbis/book/res0_1024a_192_5.vqh
-include/vorbis/book/res0_1024a_256_1.vqh
-include/vorbis/book/res0_1024a_256_2.vqh
-include/vorbis/book/res0_1024a_256_3.vqh
-include/vorbis/book/res0_1024a_256_4.vqh
-include/vorbis/book/res0_1024a_256_5.vqh
-include/vorbis/book/res0_1024a_350_1.vqh
-include/vorbis/book/res0_1024a_350_2.vqh
-include/vorbis/book/res0_1024a_350_3.vqh
-include/vorbis/book/res0_1024a_350_4.vqh
-include/vorbis/book/res0_1024a_350_5.vqh
-include/vorbis/book/res0_128a_128_1.vqh
-include/vorbis/book/res0_128a_128_2.vqh
-include/vorbis/book/res0_128a_128_3.vqh
-include/vorbis/book/res0_128a_128_4.vqh
-include/vorbis/book/res0_128a_128_5.vqh
-include/vorbis/book/res0_128a_160_1.vqh
-include/vorbis/book/res0_128a_160_2.vqh
-include/vorbis/book/res0_128a_160_3.vqh
-include/vorbis/book/res0_128a_160_4.vqh
-include/vorbis/book/res0_128a_160_5.vqh
-include/vorbis/book/res0_128a_192_1.vqh
-include/vorbis/book/res0_128a_192_2.vqh
-include/vorbis/book/res0_128a_192_3.vqh
-include/vorbis/book/res0_128a_192_4.vqh
-include/vorbis/book/res0_128a_192_5.vqh
-include/vorbis/book/res0_128a_256_1.vqh
-include/vorbis/book/res0_128a_256_2.vqh
-include/vorbis/book/res0_128a_256_3.vqh
-include/vorbis/book/res0_128a_256_4.vqh
-include/vorbis/book/res0_128a_256_5.vqh
-include/vorbis/book/res0_128a_350_1.vqh
-include/vorbis/book/res0_128a_350_2.vqh
-include/vorbis/book/res0_128a_350_3.vqh
-include/vorbis/book/res0_128a_350_4.vqh
-include/vorbis/book/res0_128a_350_5.vqh
-include/vorbis/book/resaux0_1024a_128.vqh
-include/vorbis/book/resaux0_1024a_160.vqh
-include/vorbis/book/resaux0_1024a_192.vqh
-include/vorbis/book/resaux0_1024a_256.vqh
-include/vorbis/book/resaux0_1024a_350.vqh
-include/vorbis/book/resaux0_128a_128.vqh
-include/vorbis/book/resaux0_128a_160.vqh
-include/vorbis/book/resaux0_128a_192.vqh
-include/vorbis/book/resaux0_128a_256.vqh
-include/vorbis/book/resaux0_128a_350.vqh
 lib/libvorbis.a
 lib/libvorbis.so
 lib/libvorbis.so.0
+lib/libvorbisenc.a
+lib/libvorbisenc.so
+lib/libvorbisenc.so.0
 lib/libvorbisfile.a
 lib/libvorbisfile.so
 lib/libvorbisfile.so.0
-share/doc/libvorbis-1.0.0/programming.html
-share/doc/libvorbis-1.0.0/v-comment.html
-share/doc/libvorbis-1.0.0/vorbis.html
-share/doc/libvorbis-1.0.0/vorbisword2.png
-share/doc/libvorbis-1.0.0/wait.png
-share/doc/libvorbis-1.0.0/white-ogg.png
-share/doc/libvorbis-1.0.0/white-xifish.png
-@dirrm include/vorbis/book
+share/aclocal/vorbis.m4
+share/doc/libvorbis-1.0beta4/programming.html
+share/doc/libvorbis-1.0beta4/v-comment.html
+share/doc/libvorbis-1.0beta4/vorbis-clip.txt
+share/doc/libvorbis-1.0beta4/vorbis-errors.txt
+share/doc/libvorbis-1.0beta4/vorbis.html
+share/doc/libvorbis-1.0beta4/vorbisenc/index.html
+share/doc/libvorbis-1.0beta4/vorbisenc/overview.html
+share/doc/libvorbis-1.0beta4/vorbisenc/reference.html
+share/doc/libvorbis-1.0beta4/vorbisenc/style.css
+share/doc/libvorbis-1.0beta4/vorbisenc/vorbis_encode_ctl.html
+share/doc/libvorbis-1.0beta4/vorbisenc/vorbis_encode_init.html
+share/doc/libvorbis-1.0beta4/vorbisenc/vorbis_info.html
+share/doc/libvorbis-1.0beta4/vorbisfile/OggVorbis_File.html
+share/doc/libvorbis-1.0beta4/vorbisfile/chaining_example_c.html
+share/doc/libvorbis-1.0beta4/vorbisfile/chainingexample.html
+share/doc/libvorbis-1.0beta4/vorbisfile/datastructures.html
+share/doc/libvorbis-1.0beta4/vorbisfile/decoding.html
+share/doc/libvorbis-1.0beta4/vorbisfile/example.html
+share/doc/libvorbis-1.0beta4/vorbisfile/exampleindex.html
+share/doc/libvorbis-1.0beta4/vorbisfile/fileinfo.html
+share/doc/libvorbis-1.0beta4/vorbisfile/index.html
+share/doc/libvorbis-1.0beta4/vorbisfile/initialization.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_bitrate.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_bitrate_instant.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_callbacks.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_clear.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_comment.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_info.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_open.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_open_callbacks.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_pcm_seek.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_pcm_tell.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_pcm_total.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_raw_seek.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_raw_tell.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_raw_total.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_read.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_seekable.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_serialnumber.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_streams.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_time_seek.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_time_tell.html
+share/doc/libvorbis-1.0beta4/vorbisfile/ov_time_total.html
+share/doc/libvorbis-1.0beta4/vorbisfile/overview.html
+share/doc/libvorbis-1.0beta4/vorbisfile/reference.html
+share/doc/libvorbis-1.0beta4/vorbisfile/seekexample.html
+share/doc/libvorbis-1.0beta4/vorbisfile/seeking.html
+share/doc/libvorbis-1.0beta4/vorbisfile/seeking_test_c.html
+share/doc/libvorbis-1.0beta4/vorbisfile/style.css
+share/doc/libvorbis-1.0beta4/vorbisfile/seekingexample.html
+share/doc/libvorbis-1.0beta4/vorbisfile/vorbis_comment.html
+share/doc/libvorbis-1.0beta4/vorbisfile/vorbis_info.html
+share/doc/libvorbis-1.0beta4/vorbisfile/vorbisfile_example_c.html
+share/doc/libvorbis-1.0beta4/vorbisword2.png
+share/doc/libvorbis-1.0beta4/wait.png
+share/doc/libvorbis-1.0beta4/white-ogg.png
+share/doc/libvorbis-1.0beta4/white-xifish.png
 @dirrm include/vorbis
-@dirrm share/doc/libvorbis-1.0.0
+@dirrm share/doc/libvorbis-1.0beta4/vorbisenc
+@dirrm share/doc/libvorbis-1.0beta4/vorbisfile
+@dirrm share/doc/libvorbis-1.0beta4