7 files changed, 44 insertions, 38 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 0dcac5c2b924..162393a437f2 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 PORTEPOCH=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
+MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Audio compression codec library
@@ -18,7 +18,7 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 CONFLICTS=	libvorbis-aotuv-[0-9]*
 
-USE_INC_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	15
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
 INSTALLS_SHLIB=	yes
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index c5bf9e296c43..bb62a1095b13 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,2 +1,2 @@
-MD5 (libvorbis-1.0.1.tar.gz) = 4d6726fd02ce02f6e24824e594b0949a
-SIZE (libvorbis-1.0.1.tar.gz) = 1218076
+MD5 (libvorbis-1.1.0.tar.gz) = bb764aeabde613d1a424a29b1f15e7e6
+SIZE (libvorbis-1.1.0.tar.gz) = 1312404
diff --git a/audio/libvorbis/files/patch-Makefile.in b/audio/libvorbis/files/patch-Makefile.in
index 68c18842b349..4098f7a03fc5 100644
--- a/audio/libvorbis/files/patch-Makefile.in
+++ b/audio/libvorbis/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Sun Dec  7 04:04:51 2003
-+++ Makefile.in	Sun Dec  7 04:08:24 2003
-@@ -106,7 +106,7 @@
- 
+--- Makefile.in.orig	Fri Sep 24 02:10:11 2004
++++ Makefile.in	Fri Sep 24 02:10:25 2004
+@@ -207,7 +207,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = foreign dist-zip
- 
 -SUBDIRS = lib include doc examples win32 debian vq
-+SUBDIRS = lib include $(DOC)
- 
++SUBDIRS = lib include $(DOC) examples win32 debian vq
  m4datadir = $(prefix)/share/aclocal
  m4data_DATA = vorbis.m4
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/audio/libvorbis/files/patch-doc_Makefile.in b/audio/libvorbis/files/patch-doc_Makefile.in
index ad7d72081ed2..574bbb02965e 100644
--- a/audio/libvorbis/files/patch-doc_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_Makefile.in
@@ -1,12 +1,14 @@
+
 $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
- 
+
+--- doc/Makefile.in.orig	Fri Sep 24 02:11:04 2004
++++ doc/Makefile.in	Fri Sep 24 02:11:14 2004
+@@ -184,7 +184,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
  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
- 
+ ### all of the static docs, commited to SVN and included as is
+ static_docs = \
diff --git a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
index f2c1ac93db01..687548cb12a8 100644
--- a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
@@ -1,12 +1,14 @@
+
 $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
- 
+
+--- doc/vorbisenc/Makefile.in.orig	Fri Sep 24 02:11:29 2004
++++ doc/vorbisenc/Makefile.in	Fri Sep 24 02:11:45 2004
+@@ -174,7 +174,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -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
- 
+ doc_DATA = index.html overview.html reference.html style.css\
+ 	 vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html\
+ 	vorbis_encode_init_vbr.html
diff --git a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
index 9e225fc71b4e..1e7550555679 100644
--- a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
@@ -1,12 +1,14 @@
+
 $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
- 
+
+--- doc/vorbisfile/Makefile.in.orig	Fri Sep 24 02:11:56 2004
++++ doc/vorbisfile/Makefile.in	Fri Sep 24 02:12:12 2004
+@@ -174,7 +174,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -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
- 
+ doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\
+ 	chainingexample.html crosslap.html datastructures.html decoding.html\
+ 	example.html exampleindex.html fileinfo.html index.html\
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index 8a5ce5419917..47d585b97240 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -16,7 +16,7 @@ libdata/pkgconfig/vorbisenc.pc
 libdata/pkgconfig/vorbisfile.pc
 share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/components.png
-%%PORTDOCS%%%%DOCSDIR%%/draft-kerr-avt-vorbis-rtp-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-kerr-avt-vorbis-rtp-03.txt
 %%PORTDOCS%%%%DOCSDIR%%/eightphase.png
 %%PORTDOCS%%%%DOCSDIR%%/evenlsp.png
 %%PORTDOCS%%%%DOCSDIR%%/floor1-1.png