Fusionado haikuports/haikuports con master

dev-util/ccache/ccache-3.1.9.recipe

@@ -11,15 +11,21 @@ COPYRIGHT="2002-2007 Andrew Tridgell
 CHECKSUM_MD5="65f48376a91d3651d6527ca568858be8"
 
 ARCHITECTURES="x86 x86_gcc2"
+
 PROVIDES="
+	ccache = $portVersion
 	cmd:ccache
 	"
+
 REQUIRES="
-	lib:libroot >= $haikuVersion
+	haiku >= $haikuVersion
 	lib:libz >= 1
 	"
+
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	"
+
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make

dev-util/fastdep/fastdep-0.16.recipe

@@ -16,10 +16,11 @@ PROVIDES="
 	"
 
 REQUIRES="
-	lib:libstdc++.r4
+	haiku >= $haikuVersion
-	lib:libroot >= $haikuVersion"
+	"
 
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
@@ -40,5 +41,3 @@ INSTALL()
 	mkdir -p $binDir
 	cp -f fastdep $binDir
 }
-
-

haiku-apps/paladin/paladin-1.3.recipe

@@ -25,6 +25,8 @@ PROVIDES="
 REQUIRES="
 	haiku >= $haikuVersion
 	lib:libpcre
+	cmd:fastdep
+	cmd:ccache
 "
 BUILD_REQUIRES="
 	devel:libpcre

media-libs/libsdl/libsdl-1.2.15.recipe

@@ -21,7 +21,7 @@ REQUIRES="
 	lib:libglu$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
+#	lib:libtiff$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="

media-sound/ocp/ocp-0.1.21_git.recipe

@@ -1,28 +1,66 @@
+SUMMARY="ocp - Open Cubic Player" 
 DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS" 
 HOMEPAGE="http://stian.cubic.org/project-ocp.php" 
 SRC_URI="git://git.code.sf.net/p/opencubicplayer/code"
 REVISION="1"
-STATUS_HAIKU="stable"
+LICENSE="GNU GPL v2"
-DEPEND="media-libs/libvorbis >= 1.3.1
+COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"
-		media-libs/libogg >= 1.2.2
+#DEPEND="media-libs/libvorbis >= 1.3.1
-		sys-devel/gettext >= 0.18.1.1
+#		media-libs/libogg >= 1.2.2
-		media-libs/libsdl >= 1.2.14"
+#		sys-devel/gettext >= 0.18.1.1
-#		media-libs/flac >= 1.2.1"
+#		media-libs/libsdl >= 1.2.14"
-# ncurses zlib ... cf. ocp.spec
+##		media-libs/flac >= 1.2.1"
-MESSAGE="This port requires gcc4"
+## ncurses zlib ... cf. ocp.spec
+
+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="
+	ocp$secondaryArchSuffix = $portVersion
+	cmd:ocp = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	libsdl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix >= 0.8.0
+	lib:libvorbis$secondaryArchSuffix >= 0.4.5
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl_1.2$secondaryArchSuffix >= 0.10
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	devel:libogg$secondaryArchSuffix >= 0.8.0
+	devel:libvorbis$secondaryArchSuffix >= 0.4.5
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:sdl_config
+	"
+
+
+SOURCE_DIR="code"
+
 BUILD()
 {
-	cd code
 	autoconf
-	CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	./configure --prefix=$prefix
 	make
 }
 
 INSTALL()
 {
-	cd code
 	make install
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"