From 7626791faa9d127f0f4768d385a23583b599b48d Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sun, 3 Nov 2013 02:01:44 -0800
Subject: [PATCH] Updated sdl_net to add secondaryArchSuffix support

---
 media-libs/sdl_net/sdl_net-1.2.7.recipe  | 29 -----------------------
 media-libs/sdl_net/sdl_net-1.2.8.recipe  | 30 ++++++++++++++----------
 media-libs/sdl_net/sdl_net-1.2_hg.recipe | 29 -----------------------
 3 files changed, 17 insertions(+), 71 deletions(-)
 delete mode 100644 media-libs/sdl_net/sdl_net-1.2.7.recipe
 delete mode 100644 media-libs/sdl_net/sdl_net-1.2_hg.recipe

diff --git a/media-libs/sdl_net/sdl_net-1.2.7.recipe b/media-libs/sdl_net/sdl_net-1.2.7.recipe
deleted file mode 100644
index 3ba48eb2b..000000000
--- a/media-libs/sdl_net/sdl_net-1.2.7.recipe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION="Simple Direct Media Layer Net Library" 
-HOMEPAGE="http://www.libsdl.org/projects/SDL_net" 
-SRC_URI="http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.7.tar.gz"
-CHECKSUM_MD5="6bd4662d1423810f3140d4da21b6d912"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd SDL_net-1.2.7
-	aclocal --force --install -I acinclude
-	libtoolize -fci
-	./autogen.sh
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR
-	make
-}
-
-INSTALL()
-{
-	cd SDL_net-1.2.7
-	make install
-}
-
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1997-2009 Sam Lantinga"
diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe
index 82459fe0d..a359689f9 100644
--- a/media-libs/sdl_net/sdl_net-1.2.8.recipe
+++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe
@@ -7,35 +7,39 @@ LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
-	sdl_net =$portVersion
-	lib:libSDL_net_1.2 = $portVersion compat >= 1.2
-	devel:libSDL_net = $portVersion compat >= 1.2
+	sdl_net$secondaryArchSuffix = $portVersion
+	lib:libSDL_net$secondaryArchSuffix = 1.2_0.8.0 compat >= 1.2_0
+	lib:libSDL_net_1.2$secondaryArchSuffix = 0.8.0 compat >= 1.2	
 	"
 
 REQUIRES="
-	haiku
-	libsdl
+	haiku$secondaryArchSuffix >= $haikuVersion
+	libsdl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libsdl	
+	devel:libsdl$secondaryArchSuffix
 	"
 	
 BUILD_PREREQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtool
 	cmd:make
 	cmd:pkg_config
 	cmd:sdl_config
 	"
+	
+PATCHES="sdl_net-1.2.8.patch"
 
 SOURCE_DIR="SDL_net-$portVersion"
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -49,7 +53,6 @@ INSTALL()
 {
 	make install
 
-
 	prepareInstalledDevelLib libSDL_net
 	fixPkgconfig
 
@@ -58,10 +61,11 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	devel:SDL_net = 0.8.0 compat >= 0
-	devel:libSDL_net = 0.8.0 compat >= 0
+	sdl_net${secondaryArchSuffix} = $portVersion compat >= 1.2
+	devel:libSDL_net$secondaryArchSuffix = 1.2_0.8.0 compat >= 0
+	devel:libSDL_net_1.2$secondaryArchSuffix = 0.8.0 compat >= 0
 	"
 
 REQUIRES_devel="
-	sdl_net == $portVersion base
+	sdl_net$secondaryArchSuffix == $portVersion base
 	"
diff --git a/media-libs/sdl_net/sdl_net-1.2_hg.recipe b/media-libs/sdl_net/sdl_net-1.2_hg.recipe
deleted file mode 100644
index bbea0675b..000000000
--- a/media-libs/sdl_net/sdl_net-1.2_hg.recipe
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION="Simple Direct Media Layer Net Library" 
-HOMEPAGE="http://www.libsdl.org/projects/SDL_net" 
-SRC_URI="hg+http://hg.libsdl.org/SDL_net"
-#CHECKSUM_MD5="6bd4662d1423810f3140d4da21b6d912"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd sdl-net-1.2-hg
-	aclocal --force --install -I acinclude
-	libtoolize -fci
-	./autogen.sh
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR
-	make
-}
-
-INSTALL()
-{
-	cd sdl-net-1.2-hg
-	make install
-}
-
-LICENSE="Zlib"
-COPYRIGHT="1997-2012 Sam Lantinga"