From c4f42b1b4f7b70fe75f0c1e76230cae4c0e851dc Mon Sep 17 00:00:00 2001
From: naddy <naddy@FreeBSD.org>
Date: Sat, 3 Dec 2005 22:13:25 +0000
Subject: Maintenance update to libogg 1.1.3 and libvorbis 1.1.2. No
 user-visible changes.

---
 audio/libogg/files/patch-Makefile.in            | 10 +++++-----
 audio/libogg/files/patch-doc_Makefile.in        | 14 +++++++-------
 audio/libogg/files/patch-doc_libogg_Makefile.in | 14 ++++++++++++++
 audio/libogg/files/patch-doc_ogg_Makefile.in    | 14 --------------
 4 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 audio/libogg/files/patch-doc_libogg_Makefile.in
 delete mode 100644 audio/libogg/files/patch-doc_ogg_Makefile.in

(limited to 'audio/libogg/files')

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_libogg_Makefile.in b/audio/libogg/files/patch-doc_libogg_Makefile.in
new file mode 100644
index 000000000000..8b1f86211f40
--- /dev/null
+++ b/audio/libogg/files/patch-doc_libogg_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/libogg/Makefile.in.orig
++++ doc/libogg/Makefile.in
+@@ -168,7 +168,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-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\
diff --git a/audio/libogg/files/patch-doc_ogg_Makefile.in b/audio/libogg/files/patch-doc_ogg_Makefile.in
deleted file mode 100644
index 898850d53516..000000000000
--- a/audio/libogg/files/patch-doc_ogg_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--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\
-- 
cgit