Change maintainer for libao, libogg, libvorbis, and vorbis. Improve

use of autoconf and automake.  Support NOPORTDOCS.  Respect CFLAGS.
Fix libvorbis encoder on Alpha.  Install documentation in proper
places.

Approved by:	Theo van Klaveren <t.vanklaveren@student.utwente.nl>
		(outgoing maintainer), Christian Weisgerber
		<naddy@mips.inka.de> (new maintainer)

6 files changed, 104 insertions, 11 deletions

diff --git a/audio/libvorbis/files/patch-ac b/audio/libvorbis/files/patch-ac
deleted file mode 100644
index b19fc64a8391..000000000000
--- a/audio/libvorbis/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Feb 26 22:34:27 2001
-+++ configure	Fri Mar  2 12:44:18 2001
-@@ -1710,7 +1710,7 @@
- 		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
- 	*)
- 		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
--		CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
-+		CFLAGS="-D__NO_MATH_INLINES -fsigned-char $CFLAGS"
- 		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-         esac
- fi
diff --git a/audio/libvorbis/files/patch-configure b/audio/libvorbis/files/patch-configure
new file mode 100644
index 000000000000..bc1c134bfd43
--- /dev/null
+++ b/audio/libvorbis/files/patch-configure
@@ -0,0 +1,56 @@
+$FreeBSD$
+--- configure.orig	Mon Feb 26 14:34:27 2001
++++ configure	Wed Mar 21 15:45:36 2001
+@@ -1617,9 +1617,9 @@
+ 		CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+ 		PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
+ 	*)
+-		DEBUG="-g"
+-		CFLAGS="-O"
+-		PROFILE="-g -p" ;;
++		DEBUG="$CFLAGS -g"
++		CFLAGS="$CFLAGS"
++		PROFILE="$CFLAGS -g -p" ;;
+         esac
+ else
+ 
+@@ -1709,9 +1709,9 @@
+ 		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
+ 		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+ 	*)
+-		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+-		CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+-		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
++		DEBUG="$CFLAGS -g -Wall -D__NO_MATH_INLINES -fsigned-char"
++		CFLAGS="$CFLAGS -fsigned-char"
++		PROFILE="$CFLAGS -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+         esac
+ fi
+ 
+@@ -1795,14 +1795,14 @@
+ LIBS=""
+ fi
+ 
+-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:1800: checking for pthread_create in -lpthread" >&5
++echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
++echo "configure:1800: checking for pthread_create in -pthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1808 "configure"
+ #include "confdefs.h"
+@@ -1830,7 +1830,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  pthread_lib="-lpthread"
++  pthread_lib="-pthread"
+ else
+   echo "$ac_t""no" 1>&6
+ :
diff --git a/audio/libvorbis/files/patch-doc_Makefile.in b/audio/libvorbis/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..ad7d72081ed2
--- /dev/null
+++ b/audio/libvorbis/files/patch-doc_Makefile.in
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- doc/Makefile.in.orig	Wed Mar 21 15:53:20 2001
++++ doc/Makefile.in	Wed Mar 21 15:53:49 2001
+@@ -89,7 +89,7 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = vorbisfile vorbisenc
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ doc_DATA = v-comment.html vorbisword2.png white-ogg.png programming.html 	vorbis.html wait.png white-xifish.png vorbis-clip.txt 	vorbis-errors.txt
+ 
diff --git a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
new file mode 100644
index 000000000000..f2c1ac93db01
--- /dev/null
+++ b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- doc/vorbisenc/Makefile.in.orig	Wed Mar 21 15:54:02 2001
++++ doc/vorbisenc/Makefile.in	Wed Mar 21 15:54:16 2001
+@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
++docdir = $(datadir)/doc/$(PACKAGE)/vorbisenc
+ 
+ doc_DATA = index.html overview.html reference.html style.css 	 vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html
+ 
diff --git a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
new file mode 100644
index 000000000000..9e225fc71b4e
--- /dev/null
+++ b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- doc/vorbisfile/Makefile.in.orig	Wed Mar 21 15:54:31 2001
++++ doc/vorbisfile/Makefile.in	Wed Mar 21 15:54:47 2001
+@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
++docdir = $(datadir)/doc/$(PACKAGE)/vorbisfile
+ 
+ doc_DATA = OggVorbis_File.html chaining_example_c.html chainingexample.html 	datastructures.html decoding.html example.html exampleindex.html 	fileinfo.html index.html initialization.html ov_bitrate.html 	ov_bitrate_instant.html ov_callbacks.html ov_clear.html 	ov_comment.html ov_info.html ov_open.html ov_open_callbacks.html 	ov_pcm_seek.html ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html 	ov_raw_tell.html ov_raw_total.html ov_read.html ov_seekable.html 	ov_serialnumber.html ov_streams.html ov_time_seek.html 	ov_time_tell.html ov_time_total.html overview.html reference.html 	seekexample.html seeking.html seeking_test_c.html seekingexample.html 	style.css vorbis_comment.html vorbis_info.html vorbisfile_example_c.html
+ 
diff --git a/audio/libvorbis/files/patch-lib_psy.c b/audio/libvorbis/files/patch-lib_psy.c
new file mode 100644
index 000000000000..c736d2bc7b4d
--- /dev/null
+++ b/audio/libvorbis/files/patch-lib_psy.c
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- lib/psy.c.orig	Mon Feb 26 05:37:59 2001
++++ lib/psy.c	Wed Mar 21 15:50:10 2001
+@@ -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;