7 files changed, 121 insertions, 83 deletions

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