libvorbis: convert 1.3.2 recipe to an actual recipe

media-libs/libvorbis/libvorbis-1.3.2.recipe

@@ -1,30 +1,78 @@
-DESCRIPTION="libvorbis" 
+SUMMARY="Ogg Vorbis audio compression format library"
-HOMEPAGE="http://www.xiph.org" 
+DESCRIPTION="Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to 128 kbps/channel. This places Vorbis in the same competitive class as audio representations such as MPEG-4 (AAC), and similar to, but higher performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC.
+
+The bitstream format for Vorbis I was frozen Monday, May 8th 2000. All bitstreams encoded since will remain compatible with all future releases of Vorbis." 
+HOMEPAGE="http://www.xiph.org/vorbis/" 
+LICENSE="BSD (3-clause)"
+COPYRIGHT="1994-2010 Xiph.Org Foundation"
 SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz"
 CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554"
 REVISION="1"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
-DEPEND="dev-util/pkgconfig >= 0.23
+
-	media-libs/libogg >= 1.2.0"
+PATCHES="libvorbis-1.3.2.patchset"
+
+PROVIDES="
+	libvorbis = $portVersion
+	lib:libvorbis = 0.4.5 compat >= 0
+	lib:libvorbisenc = 2.0.8 compat >= 2
+	lib:libvorbisfile = 3.3.4 compat >= 3
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libogg
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config
+	devel:libogg
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD()
 {
-	cd libvorbis-1.3.2
 	libtoolize -fci
 	mkdir -p m4
 	aclocal --install -I m4
 	autoconf
 	automake
-	sed -i 's/-lvorbis -lm/-lvorbis/' vorbis.pc.in
+	runConfigure ./configure \
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
+		--docdir $developDocDir
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+	make $jobArgs
-		--datarootdir=$COMMON_DOCS
-	make
 }
 
 INSTALL()
 {
-	cd libvorbis-1.3.2
 	make install
+
+	prepareInstalledDevelLibs libvorbis libvorbisenc libvorbisfile
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$dataDir \
+		$developDir
 }
-LICENSE="BSD (3-clause)"
+
-COPYRIGHT="1994-2010 Xiph.Org Foundation"
+# ----- devel package -------------------------------------------------------
+
+SUMMARY_devel="The libvorbis development files"
+PROVIDES_devel="
+	libvorbis_devel = $portVersion
+	devel:libvorbis = 0.4.5 compat >= 0
+	devel:libvorbisenc = 2.0.8 compat >= 2
+	devel:libvorbisfile = 3.3.4 compat >= 3
+	"
+REQUIRES_devel="
+	libvorbis == $portVersion
+	"

media-libs/libvorbis/patches/libvorbis-1.3.2.patch

@@ -1,14 +0,0 @@
-diff -urN libvorbis-1.3.2-orig/configure.ac libvorbis-1.3.2/configure.ac
---- libvorbis-1.3.2-orig/configure.ac	2010-03-26 06:56:58.061079552 +0000
-+++ libvorbis-1.3.2/configure.ac	2010-05-12 05:56:55.536870912 +0000
-@@ -206,6 +206,10 @@
- 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
- 		CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
- 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
-+ 	*-*-haiku*)
-+		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
-+		CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char"
-+		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-  	*)
- 		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
- 		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"

media-libs/libvorbis/patches/libvorbis-1.3.2.patchset

@@ -0,0 +1,127 @@
+From 70dcb91819b2acac447344c2ad6b0c5c89dfa630 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 17:54:49 +0200
+Subject: applying patch libvorbis-1.3.2.patch
+
+
+diff --git a/configure.ac b/configure.ac
+index 98b78ac..4b881b6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,6 +206,10 @@ else
+ 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+ 		CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
+ 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
++ 	*-*-haiku*)
++		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
++		CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char"
++		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+  	*)
+ 		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
+ 		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
+-- 
+1.7.5
+
+
+From c5e8052a27c7c178afbc25194eeb48b7d1394ad7 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 17:58:19 +0200
+Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS
+
+
+diff --git a/configure.ac b/configure.ac
+index 4b881b6..64858d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@ AC_CANONICAL_TARGET([])
+ 
+ AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+ AM_MAINTAINER_MODE
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl Add parameters for aclocal
+ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+-- 
+1.7.5
+
+
+From 3e8abf19defbbef8ac44abc602112f8b5b2c4273 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 17:58:44 +0200
+Subject: vorbis.pc.in: remove -lm
+
+
+diff --git a/vorbis.pc.in b/vorbis.pc.in
+index 259abe7..54dca60 100644
+--- a/vorbis.pc.in
++++ b/vorbis.pc.in
+@@ -10,5 +10,5 @@ Description: vorbis is the primary Ogg Vorbis library
+ Version: @VERSION@
+ Requires: ogg
+ Conflicts:
+-Libs: -L${libdir} -lvorbis -lm
++Libs: -L${libdir} -lvorbis
+ Cflags: -I${includedir}
+-- 
+1.7.5
+
+
+From ef7dac90d78c39bb3990d66ff932d50bc1ea98d3 Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Tue, 11 Jun 2013 18:06:31 +0200
+Subject: doc/*/Makefile.am: remove hard-coded docdir
+
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 2870528..6d7851b 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,8 +2,6 @@
+ 
+ SUBDIRS = libvorbis vorbisfile vorbisenc
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+-
+ ### all of the static docs, commited to SVN and included as is
+ static_docs = \
+ 	rfc5215.xml \
+diff --git a/doc/libvorbis/Makefile.am b/doc/libvorbis/Makefile.am
+index 0bcc135..aea57e9 100644
+--- a/doc/libvorbis/Makefile.am
++++ b/doc/libvorbis/Makefile.am
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libvorbis
+-
+ doc_DATA = index.html reference.html style.css vorbis_comment.html\
+   vorbis_info.html vorbis_analysis_blockout.html vorbis_analysis_buffer.html\
+   vorbis_analysis_headerout.html vorbis_analysis_init.html \
+diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am
+index bbab3c5..008586e 100644
+--- a/doc/vorbisenc/Makefile.am
++++ b/doc/vorbisenc/Makefile.am
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
+-
+ doc_DATA = changes.html examples.html index.html ovectl_ratemanage2_arg.html \
+ 	ovectl_ratemanage_arg.html overview.html reference.html style.css\
+ 	vorbis_encode_ctl.html vorbis_encode_init.html vorbis_encode_setup_init.html \
+diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am
+index fb27d44..faa6352 100644
+--- a/doc/vorbisfile/Makefile.am
++++ b/doc/vorbisfile/Makefile.am
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
+-
+ doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\
+ 	chainingexample.html crosslap.html datastructures.html decoding.html\
+ 	example.html exampleindex.html fileinfo.html index.html\
+-- 
+1.7.5
+