Merge branch 'master' of https://bitbucket.org/munchausen/haikuports

2026-04-23 12:10:06 +02:00 · 2014-01-13 23:20:42 +00:00
parent d21fe69dce b1c9a28825
commit 381587203f
20 changed files with 737 additions and 79 deletions
--- a/app-arch/xz_utils/xz_utils-5.0.4.recipe
+++ b/app-arch/xz_utils/xz_utils-5.0.4.recipe
@@ -8,7 +8,7 @@ LICENSE="
 	GNU GPL v3
 	"
 COPYRIGHT="2005-2012 Lasse Collin"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -88,6 +88,7 @@ INSTALL()
 	cp "$portDir/additional-files/xz_utils-expander-rules" \
 		"$expanderRulesDir/xz_utils"

+	fixPkgconfig liblzma
 	prepareInstalledDevelLibs liblzma
 }

--- a/dev-libs/lzo/lzo-2.06.recipe
+++ b/dev-libs/lzo/lzo-2.06.recipe
@@ -1,28 +1,74 @@
-DESCRIPTION="An extremely fast compression and decompression library"
+SUMMARY="LZO is a portable lossless data compression library written in ANSI C."
+DESCRIPTION="
+LZO is a data compression library which is suitable for data de-/compression in
+real-time. This means it favours speed over compression ratio.
+
+LZO is written in ANSI C. Both the source code and the compressed data format
+are designed to be portable across platforms.
+
+LZO implements a number of algorithms with the following features:
+* Decompression is simple and *very* fast.
+* Requires no memory for decompression.
+* Compression is pretty fast.
+* Requires 64 kB of memory for compression.
+* Allows you to dial up extra compression at a speed cost in the compressor.
+	The speed of the decompressor is not reduced.
+* Includes compression levels for generating pre-compressed data which achieve
+	a quite competitive compression ratio.
+* There is also a compression level which needs only 8 kB for compression.
+* Algorithm is thread safe.
+* Algorithm is lossless.
+* LZO supports overlapping compression and in-place decompression.
+"
 HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
 SRC_URI="http://www.oberhumer.com/opensource/lzo/download/lzo-2.06.tar.gz"
 CHECKSUM_MD5="95380bd4081f85ef08c5209f4107e9f8"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	lzo$secondaryArchSuffix = $portVersion
+	lib:liblzo2$secondaryArchSuffix
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
 BUILD()
 {
-	cd lzo-2.06
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+	runConfigure ./configure
+	make $jobArgs
 }

 INSTALL()
 {
-	cd lzo-2.06
 	make install
+	
+	prepareInstalledDevelLib liblzo2
+	packageEntries devel $developDir
 }

 TEST()
 {
-	cd lzo-2.06
 	make check
 }

+PROVIDES_devel="
+	lzo${secondaryArchSuffix}_devel = $portVersion
+	devel:liblzo2$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	lzo$secondaryArchSuffix == $portVersion base
+	"
+
 LICENSE="GNU GPL v2"
 COPYRIGHT="1996-2011 Markus F.X.J Oberhumer"
--- a/games-action/maelstrom/maelstrom-3.0.6.recipe
+++ b/games-action/maelstrom/maelstrom-3.0.6.recipe
@@ -0,0 +1,75 @@
+SUMMARY="Blast the Asteroids!"
+DESCRIPTION="
+You pilot your ship through the dreaded \"Maelstrom\" asteroid belt -- suddenly
+your best friend thrusts towards you and fires, directly at your cockpit. You
+raise your shields just in time, and the battle is joined.
+
+The deadliest stretch of space known to mankind has just gotten deadlier.
+Everywhere massive asteroids jostle for a chance to crush your ship, and deadly
+shinobi fighter patrols pursue you across the asteroid belt. But the deadliest
+of them all is your sister ship, assigned to you on patrol. The pilot, trained
+by your own Navy, battle hardened by months in the Maelstrom, is equipped with
+a twin of your own ship and intimate knowledge of your tactics.
+
+The lovely Stratocaster R&R facility never sounded so good, but as you fire
+full thrusters to dodge the latest barrage you begin to think you'll never get
+home...
+"
+HOMEPAGE="http://www.libsdl.org/projects/Maelstrom"
+COPYRIGHT="Copyright (C) 1996-2005 Sam Lantinga"
+LICENSE="GNU GPL v2"
+SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-$portVersion.tar.gz"
+CHECKSUM_MD5="96aa6359538a6bd60b4198a792de578b"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	maelstrom$secondaryArchSuffix = $portVersion
+	app:Maelstrom
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	lib:libSDL_net$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libsdl$secondaryArchSuffix
+	devel:libSDL_net$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autom4te
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:nasm
+	cmd:libtoolize
+	"
+SOURCE_DIR="Maelstrom-$portVersion"
+PATCHES="maelstrom-$portVersion.patchset"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	touch NEWS AUTHORS ChangeLog # Yeah, automake needs all this stuff...
+	automake --add-missing
+	autoconf
+
+	export LDFLAGS=-lnetwork
+	export CPPFLAGS=-D__BEOS__
+	runConfigure --omit-dirs "docDir dataRootDir" ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	rm -rf $appsDir
+	mv $prefix/games $appsDir
+
+	cp Maelstrom Maelstrom-netd $appsDir/Maelstrom/
+
+	addAppDeskbarSymlink $appsDir/Maelstrom/Maelstrom Maelstrom
+}
--- a/games-action/maelstrom/patches/maelstrom-3.0.6.patchset
+++ b/games-action/maelstrom/patches/maelstrom-3.0.6.patchset
@@ -0,0 +1,24 @@
+From 0aac53a13823ba5d1025006650115865a75944d4 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 12 Jan 2014 13:27:13 +0100
+Subject: Add haiku support to configure script.
+
+
+diff --git a/configure.in b/configure.in
+index 0170f4b..4f99f3f 100644
+--- a/configure.in
+++ b/configure.in
+@@ -33,6 +33,10 @@ case "$target" in
+         MATHLIB=""
+         INETLIB=""
+         ;;
+    *-*-haiku*)
+        MATHLIB=""
+        INETLIB="-lnetwork"
+        ;;
+     *-*-darwin*)
+         MATHLIB=""
+         INETLIB=""
+-- 
+1.8.3.4
+
--- a/games-arcade/xrick/licenses/xrick
+++ b/games-arcade/xrick/licenses/xrick
@@ -0,0 +1,14 @@
+I have written the xrick code. However, graphics and maps and sounds are by the
+authors of the original Rick Dangerous game, and "Rick Dangerous" remains a
+trademark of its owners (Core Design) who have yet to reply to my emails.
+
+This makes it a bit difficult to formally release the whole code, including
+data for graphics and maps and sounds, under the terms of licences such as the
+GNU General Public License. So the code is released in the spirit of the GNU
+GPL. Whatever that means. Do what you want with it, but please let me know. I
+hate it when I discover xrick has been ported to the FooDoo GameSphereTM and I
+was not even aware of it.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
--- a/games-arcade/xrick/patches/xrick-021212.patchset
+++ b/games-arcade/xrick/patches/xrick-021212.patchset
@@ -0,0 +1,30 @@
+From 1989e5b49aa41dee60c76b0951fea2dd8b1b2251 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 12 Jan 2014 21:32:19 +0100
+Subject: Look for the datafile next to the executable.
+
+XRick can be run from Deskbar or Tracker this way.
+
+diff --git a/src/xrick.c b/src/xrick.c
+index 38d4e26..870adc7 100644
+--- a/src/xrick.c
+++ b/src/xrick.c
+@@ -25,8 +25,13 @@ main(int argc, char *argv[])
+ 	sys_init(argc, argv);
+ 	if (sysarg_args_data)
+ 		data_setpath(sysarg_args_data);
+-	else
+-		data_setpath("data.zip");
+	else {
+		const char* basename = dirname(argv[0]);
+		char* datapath = malloc(strlen(basename) + strlen("/data.zip") + 1);
+		strcpy(datapath, basename);
+		strcat(datapath, "/data.zip");
+		data_setpath(datapath);
+	}
+ 	game_run();
+ 	data_closepath();
+ 	sys_shutdown();
+-- 
+1.8.3.4
+
--- a/games-arcade/xrick/xrick-021212.recipe
+++ b/games-arcade/xrick/xrick-021212.recipe
@@ -0,0 +1,55 @@
+SUMMARY="xrick is a clone of Rick Dangerous."
+HOMEPAGE="http://www.bigorno.net/xrick"
+LICENSE="xrick"
+COPYRIGHT="2000-2006 Bigorno.net"
+SRC_URI="http://www.bigorno.net/xrick/xrick-021212.tgz"
+CHECKSUM_MD5="615190051481266710cb43ecd1fe930c"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	xrick = $portVersion
+	app:xrick = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libsdl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCHES="xrick-$portVersion.patchset"
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/XRick
+	cp xrick $appsDir/XRick
+	cp data.zip $appsDir/XRick
+	addAppDeskbarSymlink $appsDir/XRick/xrick "Rick Dangerous"
+}
+
+# ----- DESCRIPTION -----------------------------------------------------------
+
+DESCRIPTION="
+Remember Rick Dangerous?
+
+Way before Lara Croft, back in the 1980's and early 1990's, Rick Dangerous was
+the Indiana Jones of computer games, running away from rolling rocks, avoiding
+traps, from South America to a futuristic missile base via Egypt and the
+Schwarzendumpf castle.
+"
--- a/games-simulation/openttd/openttd-1.2.3.recipe
+++ b/games-simulation/openttd/openttd-1.2.3.recipe
@@ -1,32 +0,0 @@
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-MESSAGE="This port requires gcc4. You require game graphics/sound files to use this port"
-HOMEPAGE="http://www.openttd.org"
-SRC_URI="http://binaries.openttd.org/releases/1.2.3/openttd-1.2.3-source.tar.xz"
-CHECKSUM_MD5="e1cf40f7c29f8f4b3e96c21626db241d"
-REVISION="1"
-STATUS_HAIKU="unstable"
-DEPEND="media-libs/libsdl,
-		zlib,
-		xz-utils,
-		pkgconfig,
-		lzo"
-
-BUILD()
-{
-	cd openttd-1.2.3
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd openttd-1.2.3
-	make install
-	cp -R bundle /boot/apps
-	mv /boot/apps/bundle /boot/apps/OpenTTD\ 1.2.3
-}
-
-# no TEST script available
-
-COPYRIGHT="2005-2013 OpenTTD Team"
-LICENSE="GNU GPL v2"
--- a/games-simulation/openttd/openttd-1.3.3.recipe
+++ b/games-simulation/openttd/openttd-1.3.3.recipe
@@ -0,0 +1,79 @@
+SUMMARY="OpenTTD is a clone of Transport Tycoon Deluxe"
+DESCRIPTION="
+OpenTTD is an open source simulation game based upon the popular Microprose
+game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic
+the original game as closely as possible while extending it with new features.
+"
+HOMEPAGE="http://www.openttd.org"
+SRC_URI="http://binaries.openttd.org/releases/$portVersion/openttd-$portVersion-source.tar.xz"
+CHECKSUM_MD5="97855877328d61d6c01833c8748a5b96"
+REVISION="1"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	openttd = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:liblzma$secondaryArchSuffix
+	lib:liblzo2$secondaryArchSuffix
+
+	openttd_gfx
+	openttd_sfx
+	openttd_msx
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:liblzma$secondaryArchSuffix
+	devel:liblzo2$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+PATCHES="openttd-$portVersion.patchset"
+BUILD()
+{
+	export includeDir=/system/$relativeIncludeDir
+	# Non-autotools script, can't use runConfigure.
+	./configure --prefix=$prefix --binary-dir=$relativeAppsDir \
+		--data-dir=$relativeDataDir/openttd --doc-dir=$relativeDocDir/openttd \
+		--man-dir=$relativeManDir --icon-dir=trash --menu-dir=trash
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	# The install script leaves some mess all around, let's clean it up...
+	rm -r $prefix/trash
+	rm -r $prefix/16x16
+	rm -r $prefix/32x32
+	rm -r $prefix/48x48
+	rm -r $prefix/64x64
+	rm -r $prefix/128x128
+	rm -r $prefix/256x256
+
+	addAppDeskbarSymlink $appsDir/openttd "Transport Tycoon Deluxe"
+}
+
+# no TEST script available
+
+COPYRIGHT="2005-2013 OpenTTD Team"
+LICENSE="GNU GPL v2"
--- a/games-simulation/openttd/patches/openttd-1.3.3.patchset
+++ b/games-simulation/openttd/patches/openttd-1.3.3.patchset
@@ -0,0 +1,27 @@
+From 0d2515090adbf1ed589046047727ce9a088c0db2 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 12 Jan 2014 18:36:42 +0100
+Subject: Hack to avoid hardcoded library search path.
+
+Makes it possible to find zlib when building as an hybrid package.
+
+diff --git a/config.lib b/config.lib
+index 2dc14a8..215705d 100644
+--- a/config.lib
+++ b/config.lib
+@@ -2597,10 +2597,10 @@ detect_library() {
+ 			fi
+ 		fi
+ 		if [ -z "$res" ] && [ "$os" = "HAIKU" ]; then
+-			eval "$2=`ls -1 /boot/common/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+			eval "$2=`ls -1 $includeDir/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+ 			eval "res=\$$2"
+ 			if [ -z "$res" ]; then
+-				log 2 "  trying /boot/common/include/$4$5... no"
+				log 2 "  trying $includeDir/$4$5... no"
+ 			fi
+ 		fi
+ 
+-- 
+1.8.3.4
+
--- a/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe
+++ b/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe
@@ -0,0 +1,44 @@
+SUMMARY="OpenTTD - free graphics files"
+DESCRIPTION="
+OpenTTD is an open source simulation game based upon the popular Microprose
+game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic
+the original game as closely as possible while extending it with new features.
+
+This package provides free to use graphics file. You can use them if you don't
+have the files from the original Transport Tycoon Deluxe game.
+"
+HOMEPAGE="http://www.openttd.org"
+SRC_URI="http://binaries.openttd.org/extra/opengfx/$portVersion/opengfx-$portVersion-all.zip"
+CHECKSUM_MD5="7709afafb1e6429ee517a5c93a03316c"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+
+SOURCE_DIR="opengfx-$portVersion"
+PROVIDES="
+	openttd_gfx = $portVersion
+	"
+
+#REQUIRES="
+#	"
+
+#BUILD_REQUIRES="
+#	"
+
+#BUILD_PREREQUIRES="
+#	"
+
+BUILD()
+{
+	echo "Nothing to build!"
+}
+
+INSTALL()
+{
+	mkdir -p $dataDir/openttd/baseset/opengfx
+	cp * $dataDir/openttd/baseset/opengfx
+}
+
+# no TEST script available
+
+COPYRIGHT="2005-2013 OpenTTD Team"
+LICENSE="GNU GPL v2"
--- a/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe
+++ b/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe
@@ -0,0 +1,44 @@
+SUMMARY="OpenTTD - free music files"
+DESCRIPTION="
+OpenTTD is an open source simulation game based upon the popular Microprose
+game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic
+the original game as closely as possible while extending it with new features.
+
+This package provides free to use music files. You can use them if you don't
+have the files from the original Transport Tycoon Deluxe game.
+"
+HOMEPAGE="http://www.openttd.org"
+SRC_URI="http://binaries.openttd.org/extra/openmsx/$portVersion/openmsx-$portVersion-all.zip"
+CHECKSUM_MD5="858b79d44aea6de5e15d9d1439e86cc3"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+
+SOURCE_DIR="openmsx-$portVersion"
+PROVIDES="
+	openttd_msx = $portVersion
+	"
+
+#REQUIRES="
+#	"
+
+#BUILD_REQUIRES="
+#	"
+
+#BUILD_PREREQUIRES="
+#	"
+
+BUILD()
+{
+	echo "Nothing to build!"
+}
+
+INSTALL()
+{
+	mkdir -p $dataDir/openttd/baseset/openmsx
+	cp * $dataDir/openttd/baseset/openmsx
+}
+
+# no TEST script available
+
+COPYRIGHT="2005-2013 OpenTTD Team"
+LICENSE="GNU GPL v2"
--- a/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe
+++ b/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe
@@ -0,0 +1,44 @@
+SUMMARY="OpenTTD - free sound files"
+DESCRIPTION="
+OpenTTD is an open source simulation game based upon the popular Microprose
+game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic
+the original game as closely as possible while extending it with new features.
+
+This package provides free to use sound files. You can use them if you don't
+have the files from the original Transport Tycoon Deluxe game.
+"
+HOMEPAGE="http://www.openttd.org"
+SRC_URI="http://binaries.openttd.org/extra/opensfx/$portVersion/opensfx-$portVersion-all.zip"
+CHECKSUM_MD5="3605b82f24153500c8a1804e4420168a"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+
+SOURCE_DIR="opensfx-$portVersion"
+PROVIDES="
+	openttd_sfx = $portVersion
+	"
+
+#REQUIRES="
+#	"
+
+#BUILD_REQUIRES="
+#	"
+
+#BUILD_PREREQUIRES="
+#	"
+
+BUILD()
+{
+	echo "Nothing to build!"
+}
+
+INSTALL()
+{
+	mkdir -p $dataDir/openttd/baseset/opensfx
+	cp * $dataDir/openttd/baseset/opensfx
+}
+
+# no TEST script available
+
+COPYRIGHT="2005-2013 OpenTTD Team"
+LICENSE="GNU GPL v2"
--- a/haiku-apps/W6/W6-1.7.recipe
+++ b/haiku-apps/W6/W6-1.7.recipe
@@ -1,28 +0,0 @@
-DESCRIPTION="What Went Wrong? it's a World Wide War!"
-HOMEPAGE="http://lema.link-u.com/be/"
-SRC_URI="http://lema.link-u.com/be/W6Haiku.zip"
-CHECKSUM_MD5="763e608d79ee6de6efe6dcb77600a331"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-
-BUILD()
-{
-	cd W6Haiku
-	make
-	cd ../
-	wget http://lema.link-u.com/be/W6forR5-with-sources.zip
-	unzip W6forR5-with-sources.zip
-	cp -r W6/w6s W6Haiku
-}
-
-INSTALL()
-{
-	cd W6Haiku
-	mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`/W6
-	install -m 0755 objects.x86-gcc`setgcc | tail -c -2`-release/W6Haiku $DESTDIR`finddir B_APPS_DIRECTORY`/W6/W6
-	cp -r w6s $DESTDIR`finddir B_APPS_DIRECTORY`/W6
-}
-
-LICENSE="Public Domain"
-COPYRIGHT="1998-1999 Santiago Lema"
--- a/haiku-apps/chat/chat-20100903.recipe
+++ b/haiku-apps/chat/chat-20100903.recipe
@@ -46,11 +46,7 @@ BUILD()

 INSTALL()
 {
-	mkdir -p $appsDir/chat
-	cp -r images $appsDir/chat/
-	echo 'dir:'
-	pwd
-	cp src/Chat $appsDir/chat/Chat
-	
-	addAppDeskbarSymlink $appsDir/chat/Chat "Chat"
+	mkdir -p $appsDir
+	cp src/Chat $appsDir/Chat
+	addAppDeskbarSymlink $appsDir/Chat "Chat"
 }
--- a/haiku-apps/torrentor/torrentor-0.0.5.recipe
+++ b/haiku-apps/torrentor/torrentor-0.0.5.recipe
@@ -0,0 +1,63 @@
+DESCRIPTION="
+Torrentor is a torrent client for the Haiku operating system. \
+BitTorrent protocol is created for relieving servers and speed up \
+downloading files. Users are not downloading data directly from \
+server, but they are sending to and receiving it from themselves.
+"
+SUMMARY="Torrentor is a torrent client for the haiku operating system."
+HOMEPAGE="https://github.com/Prodito/Torrentor" 
+SRC_URI="git+https://github.com/Prodito/Torrentor.git#c1fa0cb62963ec3c4980d99fb12e203789d9ab1a"
+COPYRIGHT="2012 Guido Pola"
+LICENSE="MIT"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	torrentor${secondaryArchSuffix} = $portVersion
+	app:torrentor${secondaryArchSuffix} = $portVersion
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libssl${secondaryArchSuffix}
+	lib:libcurl${secondaryArchSuffix}
+	lib:libevent${secondaryArchSuffix}
+	lib:libz${secondaryArchSuffix}
+	"
+	
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libevent${secondaryArchSuffix}
+	devel:libssl${secondaryArchSuffix}
+	devel:libcurl${secondaryArchSuffix}
+	devel:libz${secondaryArchSuffix}
+	"
+	
+BUILD_PREREQUIRES="
+	makefile_engine
+	curl${secondaryArchSuffix}
+	cmd:jam
+	cmd:gcc${secondaryArchSuffix}
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	jam
+}
+
+INSTALL() # just trying compile, code below doesn't have to work well
+{
+	mkdir -p $appsDir/Torrentor
+	cp Torrentor $appsDir/Torrentor/
+	addAppDeskbarSymlink $appsDir/Torrentor/Torrentor
+}
--- a/haiku-games/w6/patches/w6-1.7.patch
+++ b/haiku-games/w6/patches/w6-1.7.patch
@@ -28,7 +28,26 @@ diff -Naur W6Haiku/W6.cpp W6Haiku-haiku/W6.cpp
 +	//run_me = new Running(_country,_group,_politic,_weapon,_jour);
 	runWin = new BWindow(BRect(0,0,0,0), "W6 time run", B_TITLED_WINDOW,  B_NOT_RESIZABLE); 
 -	runWin->AddChild(run_me); //sinon le pulse fonctionne pas...					  
-+	//runWin->AddChild(run_me); //sinon le pulse fonctionne pas...					  
+	//runWin->AddChild(run_me); //sinon le pulse fonctionne pas...
 	runWin->Lock();  
 	runWin->Show(); //faut faire show pour lancer le pulse dans les views
 	runWin->Hide(); //quitte à hider la window ensuite
+diff -Naur W6Haiku/makefile W6Haiku/makefil
+e-new
+--- W6Haiku/makefile    2014-01-09 17:29:39.128974848 +0100
+++ W6Haiku/makefile-new        2014-01-09 17:31:10.101974016 +0100
+@@ -3,9 +3,12 @@
+ NAME := W6Haiku
+ TYPE := APP
+ SRCS := BarView.cpp BubbleHelper.cpp BuyWindow.cpp ChooseView.cpp ChooseWindow.cpp ColGrpView.cpp ColorWindow.cpp EditGrpWindow.cpp EditPolWindow.cpp EditWindow.cpp EditorGrpView.cpp EditorPolView.cpp EditorView.cpp FlagView.cpp GroupView.cpp GroupWindow.cpp HistoryView.cpp InfoView.cpp InfoWindow.cpp Init.cpp MapView.cpp OrderWindow.cpp PowerView.cpp Running.cpp SendWindow.cpp SpeedWindow.cpp StatusView.cpp TopView.cpp TxtView.cpp W6.cpp W6Window.cpp WeatherView.cpp attack.cpp classSound.cpp classSoundMaster.cpp country.cpp day.cpp group.cpp politic.cpp weapon.cpp 
+-LIBS := be media png tracker root translation
+LIBS := be media tracker root translation
+ OPTIMIZE := FULL
+ RSRCS := img.rsrc w6.rsrc 
+ CC=g++#Additional makerules go here, use '#' to comment out lines
+ 
+-include /boot/develop/etc/makefile-engine
+## include the makefile-engine
+DEVEL_DIRECTORY := \
+       $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
+include $(DEVEL_DIRECTORY)/etc/makefile-engine
--- a/haiku-games/w6/w6-1.7.recipe
+++ b/haiku-games/w6/w6-1.7.recipe
@@ -0,0 +1,56 @@
+SUMMARY="A strategy game simulating a world wide war"
+DESCRIPTION="\"What Went Wrong? it's a World Wide War!\" features a worldmap \
+with every single country on this planet including Swaziland (great hello to \
+all of you Swaziland BeOS users). It has real data for every country in the \
+world (at least in the 70's), including population, PNB etc.
+Using the editor, you can let the computer play alone and turn it in kind of \
+war simulation software.
+"
+HOMEPAGE="http://lema.link-u.com/be/"
+SRC_URI="http://lema.link-u.com/be/W6Haiku.zip"
+CHECKSUM_MD5="763e608d79ee6de6efe6dcb77600a331"
+SRC_URI_2="http://lema.link-u.com/be/W6forR5-with-sources.zip"
+CHECKSUM_MD5_2="4974a2ee05c68de6c5f7817d6be3bf97"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="1998-1999 Santiago Lema"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	w6 = $portVersion
+	app:w6 = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:make
+	cmd:gcc
+	"
+
+SOURCE_DIR="W6Haiku"
+SOURCE_DIR_2="W6"
+
+PATCHES="w6-1.7.patch"
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	ARCHITECTURE=$(echo $buildArchitecture | sed 's/_/-/g')
+	
+	APPDIR=$appsDir/W6
+	mkdir -p $APPDIR
+	cp -a objects.$ARCHITECTURE-release/W6Haiku $APPDIR/W6
+	cp -r $sourceDir2/w6s $APPDIR
+	cp -r $sourceDir2/help $APPDIR
+	addAppDeskbarSymlink $APPDIR/W6
+}
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe
@@ -0,0 +1,100 @@
+SUMMARY="Open source web browser engine"
+DESCRIPTION="
+WebKit is an open source web browser engine. WebKit is also the name of the \
+Mac OS X system framework version of the engine that's used by Safari, \
+Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
+JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
+"
+HOMEPAGE="http://www.webkit.org/"
+COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al"
+LICENSE="
+	GNU LGPL v2
+	GNU LGPL v2.1
+	MIT
+	"
+SRC_URI="https://github.com/haiku/webkit/archive/1.2.3.tar.gz"
+CHECKSUM_MD5="07068bc8afa6038b6f34a6931d11f4ef"
+REVISION="1"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	haikuwebkit$secondaryArchSuffix = $portVersion
+	lib:libWebKit$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+	
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	devel:libicuuc$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libxslt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:pkg_config
+	cmd:flex
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
+	cmd:ld$secondaryArchSuffix
+	cmd:m4
+	cmd:make
+	cmd:perl
+	cmd:python
+	cmd:cmake
+	cmd:ruby
+	"
+
+SOURCE_DIR="webkit-$portVersion"
+
+BUILD()
+{
+	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
+	Tools/Scripts/build-webkit --haiku --no-webkit2 \
+		--cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix"
+}
+
+INSTALL()
+{
+	cd WebKitBuild/Release
+	make install
+
+	rm $developLibDir/*
+	prepareInstalledDevelLibs libWebKit
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libwebcore$secondaryArchSuffix = $portVersion
+	devel:libWebKit$secondaryArchSuffix = $portVersion
+	devel:libwtf$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	haikuwebkit$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/sdl_net/sdl_net-1.2.8.recipe
+++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe
@@ -7,7 +7,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz"
 CHECKSUM_MD5="20e64e61d65662db66c379034f11f718"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"

@@ -19,7 +19,8 @@ PROVIDES="

 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	libsdl$secondaryArchSuffix
+	lib:libsdl$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
 	"

 BUILD_REQUIRES="