Maintenance update to libogg 1.1.3 and libvorbis 1.1.2.

No user-visible changes.

6 files changed, 20 insertions, 19 deletions

diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 3d3b4e1e8a07..82c0ef174f81 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libogg
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.1.3
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo
index e8f652b0efd9..c5699af3e03b 100644
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@@ -1,2 +1,3 @@
-MD5 (libogg-1.1.2.tar.gz) = 4d82996517bf33bb912c97e9d0b635c4
-SIZE (libogg-1.1.2.tar.gz) = 419959
+MD5 (libogg-1.1.3.tar.gz) = eaf7dc6ebbff30975de7527a80831585
+SHA256 (libogg-1.1.3.tar.gz) = bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65
+SIZE (libogg-1.1.3.tar.gz) = 403467
diff --git a/audio/libogg/files/patch-Makefile.in b/audio/libogg/files/patch-Makefile.in
index e43c22b65015..4617bdaf6048 100644
--- a/audio/libogg/files/patch-Makefile.in
+++ b/audio/libogg/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Fri Sep 24 00:44:30 2004
-+++ Makefile.in	Fri Sep 24 00:44:41 2004
-@@ -187,7 +187,7 @@
+--- Makefile.in.orig
++++ Makefile.in
+@@ -196,7 +196,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
--SUBDIRS = src include doc win32 debian
-+SUBDIRS = src include $(DOC) win32 debian
+-SUBDIRS = src include doc win32
++SUBDIRS = src include $(DOC) win32
  m4datadir = $(prefix)/share/aclocal
  m4data_DATA = ogg.m4
  pkgconfigdir = $(prefix)/libdata/pkgconfig
diff --git a/audio/libogg/files/patch-doc_Makefile.in b/audio/libogg/files/patch-doc_Makefile.in
index 96d0f8ba4a98..5609e8fd3bbb 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	Fri Sep 24 00:35:47 2004
-+++ doc/Makefile.in	Fri Sep 24 00:36:02 2004
-@@ -169,7 +169,7 @@
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
+@@ -178,7 +178,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- SUBDIRS = ogg
+ SUBDIRS = libogg
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = framing.html index.html oggstream.html rfc3533.txt rfc3534.txt stream.png vorbisword2.png white-ogg.png white-xifish.png
- EXTRA_DIST = $(doc_DATA)
- all: all-recursive
+ 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
diff --git a/audio/libogg/files/patch-doc_ogg_Makefile.in b/audio/libogg/files/patch-doc_libogg_Makefile.in
index 898850d53516..8b1f86211f40 100644
--- a/audio/libogg/files/patch-doc_ogg_Makefile.in
+++ b/audio/libogg/files/patch-doc_libogg_Makefile.in
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- doc/ogg/Makefile.in.orig	Fri Sep 24 00:35:51 2004
-+++ doc/ogg/Makefile.in	Fri Sep 24 00:36:19 2004
-@@ -159,7 +159,7 @@
+--- doc/libogg/Makefile.in.orig
++++ doc/libogg/Makefile.in
+@@ -168,7 +168,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
diff --git a/audio/libogg/pkg-plist b/audio/libogg/pkg-plist
index c9940a6246df..2e50da679a24 100644
--- a/audio/libogg/pkg-plist
+++ b/audio/libogg/pkg-plist
@@ -10,6 +10,7 @@ libdata/pkgconfig/ogg.pc
 share/aclocal/ogg.m4
 %%PORTDOCS%%%%DOCSDIR%%/framing.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ogg-multiplex.html
 %%PORTDOCS%%%%DOCSDIR%%/ogg/bitpacking.html
 %%PORTDOCS%%%%DOCSDIR%%/ogg/datastructures.html
 %%PORTDOCS%%%%DOCSDIR%%/ogg/decoding.html