From 9295dac9eb505a4b2046dd7ed176aef1bc5f999d Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Wed, 12 May 2010 03:13:58 +0000
Subject: [PATCH] Updated libogg to 1.2.0 (not sure why the source package has
 a 1.1.4 directory in it) inside it

---
 media-libs/libogg/libogg-1.1.3.bep            |  2 --
 media-libs/libogg/libogg-1.2.0.bep            | 17 +++++++++++
 .../libogg/libogg.OptionalPackageDescription  |  6 ++--
 media-libs/libogg/licenses/Xiph               | 28 -------------------
 4 files changed, 20 insertions(+), 33 deletions(-)
 create mode 100644 media-libs/libogg/libogg-1.2.0.bep
 delete mode 100644 media-libs/libogg/licenses/Xiph

diff --git a/media-libs/libogg/libogg-1.1.3.bep b/media-libs/libogg/libogg-1.1.3.bep
index e4df4dc80..83ff0cef6 100644
--- a/media-libs/libogg/libogg-1.1.3.bep
+++ b/media-libs/libogg/libogg-1.1.3.bep
@@ -3,8 +3,6 @@ HOMEPAGE="http://www.xiph.org"
 SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz"
 CHECKSUM_MD5="eaf7dc6ebbff30975de7527a80831585"
 REVISION="1"
-STATUS_R5="untested"
-STATUS_BONE="untested"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
diff --git a/media-libs/libogg/libogg-1.2.0.bep b/media-libs/libogg/libogg-1.2.0.bep
new file mode 100644
index 000000000..305e2003c
--- /dev/null
+++ b/media-libs/libogg/libogg-1.2.0.bep
@@ -0,0 +1,17 @@
+DESCRIPTION="libogg" 
+HOMEPAGE="http://www.xiph.org" 
+SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.2.0.tar.gz"
+CHECKSUM_MD5="c95b73759acfc30712beef6ce4e88efa"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd libogg-1.1.4
+	./configure --prefix=/boot/common
+	make
+}
+
+INSTALL {
+	cd libogg-1.1.4
+	make install
+}
diff --git a/media-libs/libogg/libogg.OptionalPackageDescription b/media-libs/libogg/libogg.OptionalPackageDescription
index ecc9b78cb..12c644888 100644
--- a/media-libs/libogg/libogg.OptionalPackageDescription
+++ b/media-libs/libogg/libogg.OptionalPackageDescription
@@ -1,5 +1,5 @@
 Package:	libogg
-Version:	1.1.4
-Copyright:	1994-2009 Xiph.Org Foundation
-License:	Xiph
+Version:	1.2.0
+Copyright:	1994-2010 Xiph.Org Foundation
+License:	BSD (3-clause)
 URL:	http://www.xiph.org/
diff --git a/media-libs/libogg/licenses/Xiph b/media-libs/libogg/licenses/Xiph
deleted file mode 100644
index 6111c6c5a..000000000
--- a/media-libs/libogg/licenses/Xiph
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2002, Xiph.org Foundation
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.