6 files changed, 36 insertions, 34 deletions

diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index c58cd2921d28..9060625ef436 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libogg
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.4
 PORTEPOCH=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
@@ -26,4 +26,7 @@ MAKE_ENV=	DOC=""
 MAKE_ENV=	DOC=doc
 .endif
 
+regression-test: build
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
+
 .include <bsd.port.mk>
diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo
index c5699af3e03b..f8eb2b3ee872 100644
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@@ -1,3 +1,3 @@
-MD5 (libogg-1.1.3.tar.gz) = eaf7dc6ebbff30975de7527a80831585
-SHA256 (libogg-1.1.3.tar.gz) = bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65
-SIZE (libogg-1.1.3.tar.gz) = 403467
+MD5 (libogg-1.1.4.tar.gz) = 10200ec22543841d9d1c23e0aed4e5e9
+SHA256 (libogg-1.1.4.tar.gz) = 9354c183fd88417c2860778b60b7896c9487d8f6e58b9fec3fdbf971142ce103
+SIZE (libogg-1.1.4.tar.gz) = 439365
diff --git a/audio/libogg/files/patch-Makefile.in b/audio/libogg/files/patch-Makefile.in
index 86af462c091d..ad6628b01c34 100644
--- a/audio/libogg/files/patch-Makefile.in
+++ b/audio/libogg/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Sun Apr 29 22:40:09 2007
-+++ Makefile.in	Sun Apr 29 22:40:33 2007
-@@ -196,7 +196,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- Makefile.in.orig	2009-07-06 19:32:50.000000000 +0200
++++ Makefile.in	2009-07-06 19:33:07.000000000 +0200
+@@ -205,7 +205,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
--SUBDIRS = src include doc win32
-+SUBDIRS = src include $(DOC) win32
+-SUBDIRS = src include doc
++SUBDIRS = src include $(DOC)
  m4datadir = $(datadir)/aclocal
  m4data_DATA = ogg.m4
- pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/audio/libogg/files/patch-doc_Makefile.in b/audio/libogg/files/patch-doc_Makefile.in
index 5609e8fd3bbb..c1c74fb1e5ee 100644
--- a/audio/libogg/files/patch-doc_Makefile.in
+++ b/audio/libogg/files/patch-doc_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- doc/Makefile.in.orig
-+++ doc/Makefile.in
-@@ -178,7 +178,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = libogg
+--- doc/Makefile.in.orig	2009-07-06 19:33:18.000000000 +0200
++++ doc/Makefile.in	2009-07-06 19:33:30.000000000 +0200
+@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = framing.html index.html oggstream.html ogg-multiplex.html \
- 	stream.png vorbisword2.png white-ogg.png white-xifish.png \
- 	rfc3533.txt rfc3534.txt
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/audio/libogg/files/patch-doc_libogg_Makefile.in b/audio/libogg/files/patch-doc_libogg_Makefile.in
index 8b1f86211f40..65dad3656ee9 100644
--- a/audio/libogg/files/patch-doc_libogg_Makefile.in
+++ b/audio/libogg/files/patch-doc_libogg_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- doc/libogg/Makefile.in.orig
-+++ doc/libogg/Makefile.in
-@@ -168,7 +168,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- doc/libogg/Makefile.in.orig	2009-07-06 19:33:41.000000000 +0200
++++ doc/libogg/Makefile.in	2009-07-06 19:33:55.000000000 +0200
+@@ -144,7 +144,7 @@ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
 -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_packet_clear.html\
- 	ogg_page.html ogg_page_bos.html ogg_page_checksum_set.html\
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/audio/libogg/pkg-plist b/audio/libogg/pkg-plist
index 2e50da679a24..fb6ccf71133a 100644
--- a/audio/libogg/pkg-plist
+++ b/audio/libogg/pkg-plist
@@ -5,7 +5,7 @@ include/ogg/os_types.h
 lib/libogg.a
 lib/libogg.la
 lib/libogg.so
-lib/libogg.so.5
+lib/libogg.so.6
 libdata/pkgconfig/ogg.pc
 share/aclocal/ogg.m4
 %%PORTDOCS%%%%DOCSDIR%%/framing.html
@@ -72,11 +72,10 @@ share/aclocal/ogg.m4
 %%PORTDOCS%%%%DOCSDIR%%/ogg/overview.html
 %%PORTDOCS%%%%DOCSDIR%%/ogg/reference.html
 %%PORTDOCS%%%%DOCSDIR%%/ogg/style.css
-%%PORTDOCS%%%%DOCSDIR%%/ogg/vorbis_comment.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/vorbis_info.html
 %%PORTDOCS%%%%DOCSDIR%%/oggstream.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc3533.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc3534.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc5334.txt
+%%PORTDOCS%%%%DOCSDIR%%/skeleton.html
 %%PORTDOCS%%%%DOCSDIR%%/stream.png
 %%PORTDOCS%%%%DOCSDIR%%/vorbisword2.png
 %%PORTDOCS%%%%DOCSDIR%%/white-ogg.png