24 files changed, 341 insertions, 193 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 30506c3f99f2..da3f83e8ee83 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -9,18 +9,14 @@ PORTNAME=	libao
 PORTVERSION=	0.6.0
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://home.student.utwente.nl/t.vanklaveren/distfiles/ \
-		http://www.vorbis.com/files/beta4/unix/
+MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/ \
+		http://home.student.utwente.nl/t.vanklaveren/distfiles/
 
-MAINTAINER=	t.vanklaveren@student.utwente.nl
+MAINTAINER=	Christian Weisgerber <naddy@mips.inka.de>
 
 WANT_ESOUND=	yes
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_AUTOMAKE=	yes
-
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/audio/libao/files/patch-ac b/audio/libao/files/patch-ac
deleted file mode 100644
index cdac7830f87a..000000000000
--- a/audio/libao/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sat Feb 24 10:31:45 2001
-+++ configure.in	Fri Mar  2 13:03:53 2001
-@@ -60,7 +60,7 @@
-                 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
-         *)
-                 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/libao/files/patch-configure b/audio/libao/files/patch-configure
new file mode 100644
index 000000000000..2967f72fada6
--- /dev/null
+++ b/audio/libao/files/patch-configure
@@ -0,0 +1,29 @@
+$FreeBSD$
+--- configure.orig	Wed Mar 21 16:27:24 2001
++++ configure	Wed Mar 21 16:28:57 2001
+@@ -1501,9 +1501,9 @@ if test -z "$GCC"; then
+                 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
+ 
+@@ -1517,9 +1517,9 @@ else
+                 CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
+                 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
+         *)
+-                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 -fsigned-char"
++                CFLAGS="$CFLAGS -fsigned-char"
++                PROFILE="$CFLAGS -g -pg -fsigned-char" ;;
+         esac
+ fi
+ 
diff --git a/audio/libao/files/patch-doc_Makefile.in b/audio/libao/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..b0ba162f53f6
--- /dev/null
+++ b/audio/libao/files/patch-doc_Makefile.in
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- doc/Makefile.in.orig	Wed Mar 21 16:29:06 2001
++++ doc/Makefile.in	Wed Mar 21 16:29:15 2001
+@@ -87,7 +87,7 @@ plugindir = @plugindir@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ doc_DATA = API USAGE DRIVERS WANTED
+ 
diff --git a/audio/libao/pkg-descr b/audio/libao/pkg-descr
index 6be152b63306..9b346137f023 100644
--- a/audio/libao/pkg-descr
+++ b/audio/libao/pkg-descr
@@ -4,9 +4,4 @@ supports:
    * Open Sound System (Linux, *BSD)
    * ESounD
    * Advanced Linux Sound Architecture
-   * Solaris (untested)
-   * IRIX (untested)
    * WAV files
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl
diff --git a/audio/libao/pkg-plist b/audio/libao/pkg-plist
index 56f7007a2cc3..26f7a1f28e47 100644
--- a/audio/libao/pkg-plist
+++ b/audio/libao/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 include/ao/ao.h
 include/ao/os_types.h
 lib/libao.so
@@ -6,10 +7,10 @@ lib/libao.so.1
 lib/ao/liboss.so
 %%ESOUND%%lib/ao/libesd.so
 share/aclocal/ao.m4
-share/doc/libao-0.6.0/API
-share/doc/libao-0.6.0/DRIVERS
-share/doc/libao-0.6.0/USAGE
-share/doc/libao-0.6.0/WANTED
+%%NOPORTDOCS%%share/doc/libao/API
+%%NOPORTDOCS%%share/doc/libao/DRIVERS
+%%NOPORTDOCS%%share/doc/libao/USAGE
+%%NOPORTDOCS%%share/doc/libao/WANTED
 @dirrm include/ao
 @dirrm lib/ao
-@dirrm share/doc/libao-0.6.0
+%%NOPORTDOCS%%@dirrm share/doc/libao
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index aa192df1ca18..1768344b0601 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -13,10 +13,8 @@ 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
+MAINTAINER=	Christian Weisgerber <naddy@mips.inka.de>
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libogg/files/patch-ac b/audio/libogg/files/patch-ac
deleted file mode 100644
index ebf70ad691f2..000000000000
--- a/audio/libogg/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Feb 26 13:30:03 2001
-+++ configure	Fri Mar  2 12:40:51 2001
-@@ -1513,7 +1513,7 @@
- 		;;
-         *)
-                 DEBUG="-g -Wall -fsigned-char"
--                CFLAGS="-O20 -fsigned-char"
-+                CFLAGS="-fsigned-char $CFLAGS"
-                 PROFILE="-O20 -g -pg -fsigned-char" 
- 		;;
-         esac
diff --git a/audio/libogg/files/patch-configure b/audio/libogg/files/patch-configure
new file mode 100644
index 000000000000..df95503486ee
--- /dev/null
+++ b/audio/libogg/files/patch-configure
@@ -0,0 +1,29 @@
+$FreeBSD$
+--- configure.orig	Mon Feb 26 05:30:03 2001
++++ configure	Wed Mar 21 16:32:28 2001
+@@ -1489,9 +1489,9 @@
+                 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
+@@ -1512,9 +1512,9 @@
+ 		PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
+ 		;;
+         *)
+-                DEBUG="-g -Wall -fsigned-char"
+-                CFLAGS="-O20 -fsigned-char"
+-                PROFILE="-O20 -g -pg -fsigned-char" 
++                DEBUG="$CFLAGS -g -Wall -fsigned-char"
++                CFLAGS="$CFLAGS -fsigned-char"
++                PROFILE="$CFLAGS -g -pg -fsigned-char" 
+ 		;;
+         esac
+ fi
diff --git a/audio/libogg/files/patch-doc_Makefile.in b/audio/libogg/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..62af593d50dc
--- /dev/null
+++ b/audio/libogg/files/patch-doc_Makefile.in
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- doc/Makefile.in.orig	Wed Mar 21 16:33:36 2001
++++ doc/Makefile.in	Wed Mar 21 16:33:44 2001
+@@ -87,7 +87,7 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = ogg
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ doc_DATA = index.html framing.html oggstream.html white-xifish.png stream.png white-ogg.png
+ 
diff --git a/audio/libogg/files/patch-doc_ogg_Makefile.in b/audio/libogg/files/patch-doc_ogg_Makefile.in
new file mode 100644
index 000000000000..bd7553a624cb
--- /dev/null
+++ b/audio/libogg/files/patch-doc_ogg_Makefile.in
@@ -0,0 +1,12 @@
+$FreeBSD$
+--- doc/ogg/Makefile.in.orig	Wed Mar 21 16:33:54 2001
++++ doc/ogg/Makefile.in	Wed Mar 21 16:34:03 2001
+@@ -85,7 +85,7 @@ VERSION = @VERSION@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg
++docdir = $(datadir)/doc/$(PACKAGE)/ogg
+ 
+ doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html 	general.html index.html ogg_packet.html ogg_page.html 	ogg_page_bos.html ogg_page_continued.html ogg_page_eos.html 	ogg_page_granulepos.html ogg_page_pageno.html ogg_page_serialno.html 	ogg_page_version.html ogg_stream_clear.html ogg_stream_destroy.html 	ogg_stream_eof.html ogg_stream_eos.html ogg_stream_flush.html 	ogg_stream_init.html ogg_stream_packetin.html ogg_stream_packetout.html 	ogg_stream_pagein.html ogg_stream_pageout.html ogg_stream_reset.html 	ogg_stream_state.html ogg_sync_buffer.html ogg_sync_clear.html 	ogg_sync_destroy.html ogg_sync_init.html ogg_sync_pageout.html 	ogg_sync_pageseek.html ogg_sync_reset.html ogg_sync_state.html 	ogg_sync_wrote.html oggpack_adv.html oggpack_adv1.html 	oggpack_adv_huff.html oggpack_bits.html oggpack_buffer.html 	oggpack_bytes.html oggpack_get_buffer.html oggpack_look.html 	oggpack_look1.html oggpack_look_huff.html oggpack_read.html 	oggpack_read1.html oggpack_readinit.html oggpack_reset.html 	oggpack_write.html oggpack_writeclear.html oggpack_writeinit.html 	overview.html reference.html style.css vorbis_comment.html 	vorbis_info.html
+ 
diff --git a/audio/libogg/pkg-descr b/audio/libogg/pkg-descr
index b13159199a26..f04523a34e3e 100644
--- a/audio/libogg/pkg-descr
+++ b/audio/libogg/pkg-descr
@@ -5,6 +5,3 @@ possible, as well as mixing several separate, concurrent media
 streams into a single physical bitstream.
 
 WWW: http://www.xiph.org/ogg/
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl
diff --git a/audio/libogg/pkg-plist b/audio/libogg/pkg-plist
index d3427157b36b..787ad8c721f9 100644
--- a/audio/libogg/pkg-plist
+++ b/audio/libogg/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 include/ogg/config_types.h
 include/ogg/ogg.h
 include/ogg/os_types.h
@@ -5,70 +6,70 @@ lib/libogg.a
 lib/libogg.so
 lib/libogg.so.1
 share/aclocal/ogg.m4
-share/doc/libogg-1.0beta4/framing.html
-share/doc/libogg-1.0beta4/index.html
-share/doc/libogg-1.0beta4/oggstream.html
-share/doc/libogg-1.0beta4/stream.png
-share/doc/libogg-1.0beta4/white-ogg.png
-share/doc/libogg-1.0beta4/white-xifish.png
-share/doc/libogg-1.0beta4/ogg/bitpacking.html
-share/doc/libogg-1.0beta4/ogg/datastructures.html
-share/doc/libogg-1.0beta4/ogg/decoding.html
-share/doc/libogg-1.0beta4/ogg/encoding.html
-share/doc/libogg-1.0beta4/ogg/general.html
-share/doc/libogg-1.0beta4/ogg/index.html
-share/doc/libogg-1.0beta4/ogg/ogg_packet.html
-share/doc/libogg-1.0beta4/ogg/ogg_page.html
-share/doc/libogg-1.0beta4/ogg/ogg_page_bos.html
-share/doc/libogg-1.0beta4/ogg/ogg_page_continued.html
-share/doc/libogg-1.0beta4/ogg/ogg_page_eos.html
-share/doc/libogg-1.0beta4/ogg/ogg_page_granulepos.html
-share/doc/libogg-1.0beta4/ogg/ogg_page_pageno.html
-share/doc/libogg-1.0beta4/ogg/ogg_page_serialno.html
-share/doc/libogg-1.0beta4/ogg/ogg_page_version.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_clear.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_destroy.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_eof.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_eos.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_flush.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_init.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_packetin.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_packetout.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_pagein.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_pageout.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_reset.html
-share/doc/libogg-1.0beta4/ogg/ogg_stream_state.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_buffer.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_clear.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_destroy.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_init.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_pageout.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_pageseek.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_reset.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_state.html
-share/doc/libogg-1.0beta4/ogg/ogg_sync_wrote.html
-share/doc/libogg-1.0beta4/ogg/oggpack_adv.html
-share/doc/libogg-1.0beta4/ogg/oggpack_adv1.html
-share/doc/libogg-1.0beta4/ogg/oggpack_adv_huff.html
-share/doc/libogg-1.0beta4/ogg/oggpack_bits.html
-share/doc/libogg-1.0beta4/ogg/oggpack_buffer.html
-share/doc/libogg-1.0beta4/ogg/oggpack_bytes.html
-share/doc/libogg-1.0beta4/ogg/oggpack_get_buffer.html
-share/doc/libogg-1.0beta4/ogg/oggpack_look.html
-share/doc/libogg-1.0beta4/ogg/oggpack_look1.html
-share/doc/libogg-1.0beta4/ogg/oggpack_look_huff.html
-share/doc/libogg-1.0beta4/ogg/oggpack_read.html
-share/doc/libogg-1.0beta4/ogg/oggpack_read1.html
-share/doc/libogg-1.0beta4/ogg/oggpack_readinit.html
-share/doc/libogg-1.0beta4/ogg/oggpack_reset.html
-share/doc/libogg-1.0beta4/ogg/oggpack_write.html
-share/doc/libogg-1.0beta4/ogg/oggpack_writeclear.html
-share/doc/libogg-1.0beta4/ogg/oggpack_writeinit.html
-share/doc/libogg-1.0beta4/ogg/overview.html
-share/doc/libogg-1.0beta4/ogg/reference.html
-share/doc/libogg-1.0beta4/ogg/style.css
-share/doc/libogg-1.0beta4/ogg/vorbis_comment.html
-share/doc/libogg-1.0beta4/ogg/vorbis_info.html
+%%NOPORTDOCS%%share/doc/libogg/framing.html
+%%NOPORTDOCS%%share/doc/libogg/index.html
+%%NOPORTDOCS%%share/doc/libogg/oggstream.html
+%%NOPORTDOCS%%share/doc/libogg/stream.png
+%%NOPORTDOCS%%share/doc/libogg/white-ogg.png
+%%NOPORTDOCS%%share/doc/libogg/white-xifish.png
+%%NOPORTDOCS%%share/doc/libogg/ogg/bitpacking.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/datastructures.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/decoding.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/encoding.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/general.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/index.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_packet.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_page.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_page_bos.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_page_continued.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_page_eos.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_page_granulepos.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_page_pageno.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_page_serialno.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_page_version.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_clear.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_destroy.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_eof.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_eos.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_flush.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_init.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_packetin.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_packetout.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_pagein.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_pageout.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_reset.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_stream_state.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_buffer.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_clear.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_destroy.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_init.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_pageout.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_pageseek.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_reset.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_state.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/ogg_sync_wrote.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_adv.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_adv1.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_adv_huff.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_bits.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_buffer.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_bytes.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_get_buffer.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_look.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_look1.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_look_huff.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_read.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_read1.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_readinit.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_reset.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_write.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_writeclear.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/oggpack_writeinit.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/overview.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/reference.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/style.css
+%%NOPORTDOCS%%share/doc/libogg/ogg/vorbis_comment.html
+%%NOPORTDOCS%%share/doc/libogg/ogg/vorbis_info.html
 @dirrm include/ogg
-@dirrm share/doc/libogg-1.0beta4/ogg
-@dirrm share/doc/libogg-1.0beta4
+%%NOPORTDOCS%%@dirrm share/doc/libogg/ogg
+%%NOPORTDOCS%%@dirrm share/doc/libogg
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index c8d2280eb63c..2227fd0e881c 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -7,20 +7,20 @@
 
 PORTNAME=	libvorbis
 PORTVERSION=	1.0b4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio
 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
+MAINTAINER=	Christian Weisgerber <naddy@mips.inka.de>
 
 LIB_DEPENDS=	ogg.1:${PORTSDIR}/audio/libogg
 
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-ogg-prefix=${LOCALBASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-AUTOCONF_ARGS=	; ${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
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;
diff --git a/audio/libvorbis/pkg-descr b/audio/libvorbis/pkg-descr
index 262b3656ac22..973053f637bf 100644
--- a/audio/libvorbis/pkg-descr
+++ b/audio/libvorbis/pkg-descr
@@ -12,6 +12,3 @@ vorbisfile, an LGPLed convenience library built on Vorbis designed to simplify
 common uses.
 
 WWW: http://www.vorbis.com
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index 6fb88f4e7559..c97b7db6375e 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 include/vorbis/codec.h
 include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
@@ -11,64 +12,64 @@ lib/libvorbisfile.a
 lib/libvorbisfile.so
 lib/libvorbisfile.so.0
 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
+share/doc/libvorbis/programming.html
+share/doc/libvorbis/v-comment.html
+share/doc/libvorbis/vorbis-clip.txt
+share/doc/libvorbis/vorbis-errors.txt
+share/doc/libvorbis/vorbis.html
+share/doc/libvorbis/vorbisenc/index.html
+share/doc/libvorbis/vorbisenc/overview.html
+share/doc/libvorbis/vorbisenc/reference.html
+share/doc/libvorbis/vorbisenc/style.css
+share/doc/libvorbis/vorbisenc/vorbis_encode_ctl.html
+share/doc/libvorbis/vorbisenc/vorbis_encode_init.html
+share/doc/libvorbis/vorbisenc/vorbis_info.html
+share/doc/libvorbis/vorbisfile/OggVorbis_File.html
+share/doc/libvorbis/vorbisfile/chaining_example_c.html
+share/doc/libvorbis/vorbisfile/chainingexample.html
+share/doc/libvorbis/vorbisfile/datastructures.html
+share/doc/libvorbis/vorbisfile/decoding.html
+share/doc/libvorbis/vorbisfile/example.html
+share/doc/libvorbis/vorbisfile/exampleindex.html
+share/doc/libvorbis/vorbisfile/fileinfo.html
+share/doc/libvorbis/vorbisfile/index.html
+share/doc/libvorbis/vorbisfile/initialization.html
+share/doc/libvorbis/vorbisfile/ov_bitrate.html
+share/doc/libvorbis/vorbisfile/ov_bitrate_instant.html
+share/doc/libvorbis/vorbisfile/ov_callbacks.html
+share/doc/libvorbis/vorbisfile/ov_clear.html
+share/doc/libvorbis/vorbisfile/ov_comment.html
+share/doc/libvorbis/vorbisfile/ov_info.html
+share/doc/libvorbis/vorbisfile/ov_open.html
+share/doc/libvorbis/vorbisfile/ov_open_callbacks.html
+share/doc/libvorbis/vorbisfile/ov_pcm_seek.html
+share/doc/libvorbis/vorbisfile/ov_pcm_tell.html
+share/doc/libvorbis/vorbisfile/ov_pcm_total.html
+share/doc/libvorbis/vorbisfile/ov_raw_seek.html
+share/doc/libvorbis/vorbisfile/ov_raw_tell.html
+share/doc/libvorbis/vorbisfile/ov_raw_total.html
+share/doc/libvorbis/vorbisfile/ov_read.html
+share/doc/libvorbis/vorbisfile/ov_seekable.html
+share/doc/libvorbis/vorbisfile/ov_serialnumber.html
+share/doc/libvorbis/vorbisfile/ov_streams.html
+share/doc/libvorbis/vorbisfile/ov_time_seek.html
+share/doc/libvorbis/vorbisfile/ov_time_tell.html
+share/doc/libvorbis/vorbisfile/ov_time_total.html
+share/doc/libvorbis/vorbisfile/overview.html
+share/doc/libvorbis/vorbisfile/reference.html
+share/doc/libvorbis/vorbisfile/seekexample.html
+share/doc/libvorbis/vorbisfile/seeking.html
+share/doc/libvorbis/vorbisfile/seeking_test_c.html
+share/doc/libvorbis/vorbisfile/style.css
+share/doc/libvorbis/vorbisfile/seekingexample.html
+share/doc/libvorbis/vorbisfile/vorbis_comment.html
+share/doc/libvorbis/vorbisfile/vorbis_info.html
+share/doc/libvorbis/vorbisfile/vorbisfile_example_c.html
+share/doc/libvorbis/vorbisword2.png
+share/doc/libvorbis/wait.png
+share/doc/libvorbis/white-ogg.png
+share/doc/libvorbis/white-xifish.png
 @dirrm include/vorbis
-@dirrm share/doc/libvorbis-1.0beta4/vorbisenc
-@dirrm share/doc/libvorbis-1.0beta4/vorbisfile
-@dirrm share/doc/libvorbis-1.0beta4
+@dirrm share/doc/libvorbis/vorbisenc
+@dirrm share/doc/libvorbis/vorbisfile
+@dirrm share/doc/libvorbis
diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile
index 982e0cbb2a3c..2186bdfc9f39 100644
--- a/audio/vorbis/Makefile
+++ b/audio/vorbis/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	t.vanklaveren@student.utwente.nl
+MAINTAINER=	Christian Weisgerber <naddy@mips.inka.de>
 
 LIB_DEPENDS=	ao.1:${PORTSDIR}/audio/libao \
 		ogg.1:${PORTSDIR}/audio/libogg \
diff --git a/audio/vorbis/pkg-descr b/audio/vorbis/pkg-descr
index 8ecff17e1c0a..013e83ea57c5 100644
--- a/audio/vorbis/pkg-descr
+++ b/audio/vorbis/pkg-descr
@@ -10,6 +10,3 @@ patent concerns.
 This is a meta-port for all the vorbis-related ports.
 
 WWW: http://www.vorbis.com
-
-- Theo van Klaveren
-t.vanklaveren@student.utwente.nl