From 15d1ef31fced4e7121f92edd35d472994c229077 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 21 Sep 2013 10:20:33 -0700
Subject: [PATCH] Updated .recipe for vorbis_tools-1.4.0 so that it now builds

---
 .../patches/vorbis_tools-1.2.0.patch          | 29 --------
 .../vorbis_tools/vorbis_tools-1.2.0.recipe    | 26 -------
 .../vorbis_tools/vorbis_tools-1.4.0.recipe    | 71 +++++++++++++++----
 3 files changed, 56 insertions(+), 70 deletions(-)
 delete mode 100644 media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch
 delete mode 100644 media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe

diff --git a/media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch b/media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch
deleted file mode 100644
index 5ce4810d9..000000000
--- a/media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN vorbis-tools-1.2.0/configure.ac vorbis-tools-1.2.0-haiku/configure.ac
---- vorbis-tools-1.2.0/configure.ac	2008-03-03 05:37:31.000000000 +0000
-+++ vorbis-tools-1.2.0-haiku/configure.ac	2009-09-15 06:49:02.000000000 +0000
-@@ -155,6 +155,7 @@
- 
- SOCKET_LIBS=
- AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket")
-+AC_CHECK_LIB(network, socket, SOCKET_LIBS="-lnetwork")
- AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS")
- 
- 
-diff -urN vorbis-tools-1.2.0/oggenc/oggenc.c vorbis-tools-1.2.0-haiku/oggenc/oggenc.c
---- vorbis-tools-1.2.0/oggenc/oggenc.c	2008-03-03 05:37:27.000000000 +0000
-+++ vorbis-tools-1.2.0-haiku/oggenc/oggenc.c	2009-09-15 06:55:48.000000000 +0000
-@@ -262,12 +262,12 @@
-             {
-                 /* Create a filename from existing filename, replacing extension with .ogg or .oga */
-                 char *start, *end;
--
-+                char *extension = (opt.with_skeleton) ? ".oga" : ".ogg";
-                 start = infiles[i];
-+
-                 end = strrchr(infiles[i], '.');
-                 end = end?end:(start + strlen(infiles[i])+1);
- 
--                char *extension = (opt.with_skeleton) ? ".oga" : ".ogg";
-                 out_fn = malloc(end - start + 5);
-                 strncpy(out_fn, start, end-start);
-                 out_fn[end-start] = 0;
diff --git a/media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe
deleted file mode 100644
index ae10bc5fc..000000000
--- a/media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="vorbis-tools - tools for using the Ogg Vorbis sound file format" 
-HOMEPAGE="http://www.vorbis.com/" 
-SRC_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.2.0.tar.gz"
-CHECKSUM_MD5="df976d24e51ef3d87cd462edf747bf9a"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
-BUILD()
-{
-	cd vorbis-tools-1.2.0
-	libtoolize --force --copy --install
-	aclocal -I m4
-	automake
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd vorbis-tools-1.2.0
-	make install
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers"
diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
index d16c1b2f3..f3e3e3430 100644
--- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
+++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe
@@ -1,32 +1,73 @@
+SUMMARY="vorbis-tools - tools for using the Ogg Vorbis sound file format" 
 DESCRIPTION="vorbis-tools - tools for using the Ogg Vorbis sound file format" 
 HOMEPAGE="http://www.vorbis.com/" 
 SRC_URI="http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"
 CHECKSUM_MD5="567e0fb8d321b2cd7124f8208b8b90e6"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libvorbis >= 1.3.1
-		media-libs/flac >= 1.2.1
-		media-libs/libao >= 1.0.0
-		media-libs/speex >1.2"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	vorbis_tools = 1.4.0 compat >= 1
+	cmd:oggenc
+	cmd:oggdec
+	cmd:ogginfo
+	cmd:vcut
+	cmd:vorbiscomment
+	"
+
+REQUIRES="
+	haiku
+	lib:libvorbis
+	lib:libflac
+	lib:speex
+	lib:libao
+	lib:libogg
+	lib:libvorbis
+	lib:libcurl
+	lib:libvorbisfile
+	lib:libvorbisenc
+	lib:libFLAC
+	"
+	
+BUILD_REQUIRES="
+	"
+
+SOURCE_DIR="vorbis-tools-$portVersion"	
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:make
+	cmd:pkg_config
+	devel:libogg
+	devel:libvorbis
+	devel:libflac
+	"
+
+PATCH="vorbis_tools-1.4.0.patch"
+
+PATCH()
+{
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+}
+
 BUILD()
 {
-	cd vorbis-tools-1.4.0
 	libtoolize --force --copy --install
 	aclocal -I m4
 	automake
 	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--mandir=$COMMON_DOCS/man
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd vorbis-tools-1.4.0
 	make install
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2000-2008 Michael Smith, Stan Seibert and other contributers"