Merge all changes from trunk

media-libs/sdl-net/patches/sdl-net-1.2.8.patch

@@ -0,0 +1,13 @@
+diff -urN SDL_net-1.2.8/chat.cpp SDL_net-1.2.8-haiku/chat.cpp
+--- SDL_net-1.2.8/chat.cpp	2012-01-15 16:20:10.063963136 +0000
++++ SDL_net-1.2.8-haiku/chat.cpp	2012-02-29 23:58:48.552861696 +0000
+@@ -18,9 +18,6 @@
+      misrepresented as being the original software.
+   3. This notice may not be removed or altered from any source distribution.
+ */
+-    Pleasanton, CA 94588 (USA)
+-    slouken@devolution.com
+-*/
+ 
+ /* Note that this isn't necessarily the way to run a chat system.
+    This is designed to excercise the network code more than be really

media-libs/sdl-net/sdl-net-1.2-hg.bep

@@ -0,0 +1,27 @@
+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"

media-libs/sdl-net/sdl-net-1.2.7.bep

@@ -7,8 +7,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
 	cd SDL_net-1.2.7
-	cp /boot/common/share/aclocal/libtool.m4 acinclude/libtool.m4
-	libtoolize --copy --force --install
+	aclocal --force --install -I acinclude
+	libtoolize -fci
 	./autogen.sh
 	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
@@ -22,5 +22,6 @@ INSTALL {
 	cd SDL_net-1.2.7
 	make install
 }
+
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1997-2009 Sam Lantinga"

media-libs/sdl-net/sdl-net-1.2.8.bep

@@ -0,0 +1,27 @@
+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.8.tar.gz"
+CHECKSUM_MD5="20e64e61d65662db66c379034f11f718"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd SDL_net-1.2.8
+	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.8
+	make install
+}
+
+LICENSE="Zlib"
+COPYRIGHT="1997-2012 Sam Lantinga"