7 files changed, 43 insertions, 42 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index f252652fb2fb..998df0364b1e 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.0
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
@@ -20,7 +20,7 @@ USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .if defined(NOPORTDOCS)
 MAKE_ENV=	DOC=""
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 5dffde0d7525..6e84d5b5ccef 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,3 +1,3 @@
-MD5 (libvorbis-1.1.2.tar.gz) = 37847626b8e1b53ae79a34714c7b3211
-SHA256 (libvorbis-1.1.2.tar.gz) = 3f7135ccbda589c251017912f5f5ec9da626c976d2376bcfda19ad6b9c4a6050
-SIZE (libvorbis-1.1.2.tar.gz) = 1316434
+MD5 (libvorbis-1.2.0.tar.gz) = 478646358c49f34aedcce58948793619
+SHA256 (libvorbis-1.2.0.tar.gz) = 6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73
+SIZE (libvorbis-1.2.0.tar.gz) = 1494373
diff --git a/audio/libvorbis/files/patch-Makefile.in b/audio/libvorbis/files/patch-Makefile.in
index 0dc426505cee..d6ed5acecb16 100644
--- a/audio/libvorbis/files/patch-Makefile.in
+++ b/audio/libvorbis/files/patch-Makefile.in
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Sun Apr 29 22:42:17 2007
-+++ Makefile.in	Sun Apr 29 22:42:36 2007
-@@ -217,7 +217,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = foreign dist-zip
+--- Makefile.in.orig	2007-07-26 21:46:30.000000000 +0000
++++ Makefile.in	2007-07-26 21:49:02.000000000 +0000
+@@ -221,7 +221,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
 -SUBDIRS = lib include doc examples vq
 +SUBDIRS = lib include $(DOC) examples vq
  m4datadir = $(prefix)/share/aclocal
diff --git a/audio/libvorbis/files/patch-doc_Makefile.in b/audio/libvorbis/files/patch-doc_Makefile.in
index 574bbb02965e..3564cba53739 100644
--- a/audio/libvorbis/files/patch-doc_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- 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
+--- doc/Makefile.in.orig	2007-07-26 21:50:20.000000000 +0000
++++ doc/Makefile.in	2007-07-26 21:50:57.000000000 +0000
+@@ -162,7 +162,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
- 
- ### all of the static docs, commited to SVN and included as is
- static_docs = \
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
index 687548cb12a8..aabc0b79213c 100644
--- a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- 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@
+--- doc/vorbisenc/Makefile.in.orig	2007-07-26 21:52:03.000000000 +0000
++++ doc/vorbisenc/Makefile.in	2007-07-26 21:53:07.000000000 +0000
+@@ -150,7 +150,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -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\
- 	vorbis_encode_init_vbr.html
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
index 1e7550555679..97457f6b054c 100644
--- a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
+++ b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- 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@
+--- doc/vorbisfile/Makefile.in.bak	2007-07-25 16:46:35.000000000 +0000
++++ doc/vorbisfile/Makefile.in	2007-07-26 21:53:26.000000000 +0000
+@@ -150,7 +150,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
 +docdir = $(datadir)/doc/$(PACKAGE)/vorbisfile
- 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\
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index acce25432cf9..ce2131b604f7 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -5,7 +5,7 @@ include/vorbis/vorbisfile.h
 lib/libvorbis.a
 lib/libvorbis.la
 lib/libvorbis.so
-lib/libvorbis.so.3
+lib/libvorbis.so.4
 lib/libvorbisenc.a
 lib/libvorbisenc.la
 lib/libvorbisenc.so
@@ -13,13 +13,14 @@ lib/libvorbisenc.so.2
 lib/libvorbisfile.a
 lib/libvorbisfile.la
 lib/libvorbisfile.so
-lib/libvorbisfile.so.4
+lib/libvorbisfile.so.5
 libdata/pkgconfig/vorbis.pc
 libdata/pkgconfig/vorbisenc.pc
 libdata/pkgconfig/vorbisfile.pc
 share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/components.png
-%%PORTDOCS%%%%DOCSDIR%%/draft-kerr-avt-vorbis-rtp-03.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-avt-rtp-vorbis-06.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-avt-rtp-vorbis-06.xml
 %%PORTDOCS%%%%DOCSDIR%%/eightphase.png
 %%PORTDOCS%%%%DOCSDIR%%/evenlsp.png
 %%PORTDOCS%%%%DOCSDIR%%/floor1-1.png
@@ -121,6 +122,6 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/window1.png
 %%PORTDOCS%%%%DOCSDIR%%/window2.png
 @dirrm include/vorbis
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisenc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisfile
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/vorbisenc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%