From 30ad6e6d37f1e73bb9230eee3b652d9bfe374242 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 9 Nov 2017 19:20:14 +0100
Subject: [PATCH] libogg: bump version.

---
 ...ibogg-1.3.2.recipe => libogg-1.3.3.recipe} | 35 ++++++------
 .../libogg/patches/libogg-1.3.0.patchset      | 57 -------------------
 2 files changed, 16 insertions(+), 76 deletions(-)
 rename media-libs/libogg/{libogg-1.3.2.recipe => libogg-1.3.3.recipe} (84%)
 delete mode 100644 media-libs/libogg/patches/libogg-1.3.0.patchset

diff --git a/media-libs/libogg/libogg-1.3.2.recipe b/media-libs/libogg/libogg-1.3.3.recipe
similarity index 84%
rename from media-libs/libogg/libogg-1.3.2.recipe
rename to media-libs/libogg/libogg-1.3.3.recipe
index 201caa65b..a629188dc 100644
--- a/media-libs/libogg/libogg-1.3.2.recipe
+++ b/media-libs/libogg/libogg-1.3.3.recipe
@@ -17,25 +17,35 @@ pipelines. This stream orientation is the major design difference over other \
 file-based container formats.
 "
 HOMEPAGE="http://www.xiph.org"
-LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2011 Xiph.Org Foundation"
+LICENSE="BSD (3-clause)"
+REVISION="1"
 SOURCE_URI="http://downloads.xiph.org/releases/ogg/libogg-$portVersion.tar.gz"
-CHECKSUM_SHA256="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692"
-REVISION="4"
+CHECKSUM_SHA256="c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libogg$secondaryArchSuffix = $portVersion
-	lib:libogg$secondaryArchSuffix = 0.8.2 compat >= 0
+	lib:libogg$secondaryArchSuffix = 0.8.3 compat >= 0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	libogg${secondaryArchSuffix}_devel = $portVersion
+	devel:libogg$secondaryArchSuffix = 0.8.3 compat >= 0
+	"
+REQUIRES_devel="
+	libogg$secondaryArchSuffix == $portVersion
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -47,10 +57,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
+	autoreconf -fi
 	runConfigure ./configure \
 		--docdir $developDocDir
 	make $jobArgs
@@ -70,13 +77,3 @@ INSTALL()
 		$dataDir \
 		$developDir
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	libogg${secondaryArchSuffix}_devel = $portVersion
-	devel:libogg$secondaryArchSuffix = 0.8.2 compat >= 0
-	"
-REQUIRES_devel="
-	libogg$secondaryArchSuffix == $portVersion
-	"
diff --git a/media-libs/libogg/patches/libogg-1.3.0.patchset b/media-libs/libogg/patches/libogg-1.3.0.patchset
deleted file mode 100644
index 12ee3c920..000000000
--- a/media-libs/libogg/patches/libogg-1.3.0.patchset
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2620afc432e102f21a44de0576eb9d901cb7c069 Mon Sep 17 00:00:00 2001
-From: Ingo Weinhold <ingo_weinhold@gmx.de>
-Date: Tue, 11 Jun 2013 14:17:52 +0200
-Subject: configure.in: use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER
-
-
-diff --git a/configure.in b/configure.in
-index 7141645..3a01896 100644
---- a/configure.in
-+++ b/configure.in
-@@ -19,7 +19,7 @@ AM_PROG_LIBTOOL
- AM_PROG_CC_C_O
- 
- dnl config.h
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- dnl Set some options based on environment
- 
--- 
-1.7.5
-
-
-From 79c094d54944f3a970851157f7937811fb73f9d7 Mon Sep 17 00:00:00 2001
-From: Ingo Weinhold <ingo_weinhold@gmx.de>
-Date: Tue, 11 Jun 2013 14:18:38 +0200
-Subject: doc[/libogg]/Makefile.am: don't hard-code docdir
-
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 9c2c316..9c727c4 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -2,8 +2,6 @@
- 
- SUBDIRS = libogg
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
--
- doc_DATA = framing.html index.html oggstream.html ogg-multiplex.html \
- 	stream.png vorbisword2.png white-ogg.png white-xifish.png \
- 	rfc3533.txt rfc5334.txt skeleton.html
-diff --git a/doc/libogg/Makefile.am b/doc/libogg/Makefile.am
-index 9eb7d34..e34c8a8 100644
---- a/doc/libogg/Makefile.am
-+++ b/doc/libogg/Makefile.am
-@@ -1,7 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/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\
--- 
-1.7.5
-