Fusionado haikuports/haikuports con master

app-emulation/qemu/qemu-1.7.0.recipe

@@ -0,0 +1,86 @@
+SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
+DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer."
+HOMEPAGE="http://wiki.qemu.org/"
+SRC_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b135aa8fa7b4c3"
+COPYRIGHT="2003-2008 Fabrice Bellard"
+LICENSE="GNU GPL v2"
+REVISION="1"
+ARCHITECTURES="x86"
+
+PROVIDES="
+	qemu = $portVersion
+	cmd:qemu = $portVersion
+	cmd:qemu_img = $portVersion
+	cmd:qemu_io = $portVersion
+	cmd:qemu_system_alpha = $portVersion
+	cmd:qemu_system_arm = $portVersion
+	cmd:qemu_system_cris = $portVersion
+	cmd:qemu_system_i386 = $portVersion
+	cmd:qemu_system_lm32 = $portVersion
+	cmd:qemu_system_m68k = $portVersion
+	cmd:qemu_system_microblaze = $portVersion
+	cmd:qemu_system_microblazeel = $portVersion
+	cmd:qemu_system_mips = $portVersion
+	cmd:qemu_system_mips64 = $portVersion
+	cmd:qemu_system_mips64el = $portVersion
+	cmd:qemu_system_mipsel = $portVersion
+	cmd:qemu_system_moxie = $portVersion
+	cmd:qemu_system_or32 = $portVersion
+	cmd:qemu_system_ppc = $portVersion
+	cmd:qemu_system_ppc64 = $portVersion
+	cmd:qemu_system_ppcemb = $portVersion
+	cmd:qemu_system_s390x = $portVersion
+	cmd:qemu_system_sh4 = $portVersion
+	cmd:qemu_system_sh4eb = $portVersion
+	cmd:qemu_system_sparc = $portVersion
+	cmd:qemu_system_sparc64 = $portVersion
+	cmd:qemu_system_unicore32 = $portVersion
+	cmd:qemu_system_x86_64 = $portVersion
+	cmd:qemu_system_xtensa = $portVersion
+	cmd:qemu_system_xtensaeb = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	lib:libintl
+	glib >= 2.12
+	pixman
+	"
+
+BUILD_REQUIRES="
+	devel:libz
+	devel:libfdt
+	glib_devel >= 2.12
+	pixman_devel
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:pkg_config
+	cmd:pod2man
+	cmd:python
+	"
+
+BUILD()
+{
+	chmod +x configure
+	./configure --prefix=$prefix --mandir=$manDir --datadir=$dataDir/qemu \
+		--docdir=$docDir --bindir=$binDir --libdir=$libDir \
+		--sysconfdir=$settingsDir/qemu
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# provide convenience symlink to just "qemu"
+	ln -s qemu-system-i386 $binDir/qemu
+
+	# remove empty target config file
+	rm $settingsDir/qemu/target-x86_64.conf
+}

dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe

@@ -202,6 +202,6 @@ INSTALL()
 	# create a profile.d file that sets up JAVA_HOME
 	jdkProfile=$dataDir/profile.d/openjdk.sh
 	mkdir -p $(dirname $jdkProfile)
-	echo JAVA_HOME=`java-config -H` > $jdkProfile
+	echo 'JAVA_HOME=`java-config -H`' > $jdkProfile
 	echo "export JAVA_HOME" >> $jdkProfile
 }

haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe

@@ -0,0 +1,67 @@
+SUMMARY="Search through your files with ease!"
+
+DESCRIPTION="
+	BeIndexed searches all your files and builds a database with 
+	their content. You can then search for files by content,
+	like on Google etc. Index files with Indexer, Find files with
+	Finder.
+	" 
+
+HOMEPAGE="https://github.com/HaikuArchives/BeIndexed" #Or web.archive.org and eiman.tv/BeIndexed
+SRC_URI="git://github.com/HaikuArchives/BeIndexed.git#4bbd3e9709d7288ffefbc215ab41a152a24a2276"
+
+REVISION="1"
+
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2003 Mikael Eiman"
+
+ARCHITECTURES="x86_gcc2 x86"
+
+
+PROVIDES="
+	beindexed = $portVersion
+	app:Finder = $portVersion
+	cmd:Indexer = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libsqlite3
+	lib:liblayout
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:g++
+	cmd:xres
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD_REQUIRES="
+	makefile_engine
+	haiku_devel >= $haikuVersion
+	devel:libsqlite3
+	devel:liblayout
+	"
+
+USER_SETTINGS_FILES="
+	data/BeIndexed directory
+	"
+
+BUILD()
+{
+	mkdir bin || true
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	mkdir -p $appsDir
+	
+	cp bin/Indexer $binDir
+	cp bin/Finder $appsDir
+	
+	addAppDeskbarSymlink $appsDir/Finder
+}

haiku-apps/fortuna/fortuna-1.0.0.recipe

@@ -9,7 +9,7 @@ DESCRIPTION="
 	" # Taken from homepage
 
 HOMEPAGE="http://darkwyrm.beemulated.net/apps/fortuna.htm"
-SRC_URI="git://github.com/HaikuArchives/Fortuna.git#eacb3689800064b948d3b943302b2d4bf18c9dbc"
+SRC_URI="git://github.com/HaikuArchives/Fortuna.git#9e0cd6c1e6"
 REVISION="1"
 
 LICENSE="MIT"
@@ -39,6 +39,8 @@ BUILD_REQUIRES="
 
 BUILD()
 {
+
+	rc src/Fortuna.rdef
 	g++ -o Fortuna -lbe src/main.cpp src/FortuneWindow.cpp src/FortuneFunctions.cpp
 	xres -o Fortuna src/Fortuna.rsrc
 	mimeset -f Fortuna

haiku-apps/whisper/whisper-1.2.recipe

@@ -0,0 +1,47 @@
+DESCRIPTION="Whisper BeNet aims to provide a VoIP solution to the Haiku Platform. It was ported from ZETA."
+SUMMARY="VoIP for Haiku"
+COPYRIGHT="
+	1998-2001 the BeNet team
+	2004-2006 Bernd Korz & Oliver Ruiz Dorantes oliver.ruiz.dorantes@gmail.com
+	2008 Oliver Ruiz Dorantes oliver.ruiz.dorantes@gmail.com
+	"
+LICENSE="MIT"
+HOMEPAGE="https://github.com/HaikuArchives/WhisperBeNet"
+SRC_URI="git+https://github.com/HaikuArchives/WhisperBeNet#902635a"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	whisper = $portVersion
+	app:whisper = $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+USER_SETTINGS_FILES="
+	settings/BeNet directory"
+
+BUILD()
+{
+	rc -o BeNet.rsrc BeNet.rdef
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	
+	cd build
+	cp Whisper $appsDir
+	addAppDeskbarSymlink $appsDir/Whisper
+}

sys-apps/dtc/dtc-1.3.0_git.recipe

@@ -1,30 +0,0 @@
-DESCRIPTION="The Device Tree Compiler" 
-HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git;a=summary" 
-SRC_URI="git://git.jdl.com/software/dtc.git"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="sys-devel/bison >= 2.5"
-# TODO: test gcc2 build
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd dtc-1.3.0-git
-	make PREFIX=`finddir B_COMMON_DIRECTORY`
-}
-
-INSTALL()
-{
-	cd dtc-1.3.0-git
-	make install PREFIX=`finddir B_COMMON_DIRECTORY`
-}
-
-TEST()
-{
-	cd dtc-1.3.0-git
-	make tests
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005 David Gibson, IBM Corporation"
-

sys-apps/dtc/dtc-1.4.0.recipe

@@ -0,0 +1,53 @@
+SUMMARY="The Device Tree Compiler"
+DESCRIPTION="The Device Tree Compiler" 
+HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git;a=summary" 
+SRC_URI="git://git.jdl.com/software/dtc.git#v1.4.0"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005 David Gibson, IBM Corporation"
+REVISION="1"
+
+ARCHITECTURES="x86"
+
+PROVIDES="
+	dtc = $portVersion
+	cmd:convert_dtsv0 = $portVersion
+	cmd:dtc = $portVersion
+	cmd:dtdiff = $portVersion
+	cmd:fdtdump = $portVersion
+	cmd:fdtget = $portVersion
+	cmd:fdtput = $portVersion
+	lib:libfdt = $portVersion
+	lib:libfdt_1.4.0 = $portVersion
+	devel:libfdt = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:bison >= 2.5
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCHES="${portVersionedName}.patch"
+
+BUILD()
+{
+	make PREFIX=$prefix $jobArgs
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix INCLUDEDIR=$includeDir
+
+	prepareInstalledDevelLibs libfdt
+}
+
+TEST()
+{
+	make tests
+}

sys-apps/dtc/patches/dtc-1.3.0_git.patch

@@ -1,66 +0,0 @@
-diff --git a/Makefile dtc-1.3.0-git/Makefile
-index 1169e6c..60077a5 100644
---- a/Makefile
-+++ dtc-1.3.0-git/Makefile
-@@ -41,6 +41,15 @@ SHAREDLIB_EXT=so
- SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
- endif
- 
-+ifeq ($(HOSTOS),haiku)
-+INSTALL = /bin/install
-+endif
-+
-+ifneq ($(HOSTOS),haiku)
-+LIBDL = -ldl
-+endif
-+
-+
- #
- # Overall rules
- #
-diff --git a/tests/Makefile.tests dtc-1.3.0-git/tests/Makefile.tests
-index 1795466..97b6131 100644
---- a/tests/Makefile.tests
-+++ dtc-1.3.0-git/tests/Makefile.tests
-@@ -50,7 +50,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
- 
- $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
- 	@$(VECHO) LD [libdl] $@
--	$(LINK.c) -o $@ $^ -ldl
-+	$(LINK.c) -o $@ $^ $(LIBDL)
- 
- $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
- 		util.o $(LIBFDT_archive)
-diff --git a/tests/testutils.c dtc-1.3.0-git/tests/testutils.c
-index f185133..66b34df 100644
---- a/tests/testutils.c
-+++ dtc-1.3.0-git/tests/testutils.c
-@@ -45,16 +45,15 @@ static void sigint_handler(int signum, siginfo_t *si, void *uc)
- {
- 	cleanup();
- 	fprintf(stderr, "%s: %s (pid=%d)\n", test_name,
--		strsignal(signum), getpid());
-+		strsignal(signum), (int)getpid());
- 	exit(RC_BUG);
- }
- 
- void test_init(int argc, char *argv[])
- {
- 	int err;
--	struct sigaction sa_int = {
--		.sa_sigaction = sigint_handler,
--	};
-+	struct sigaction sa_int = { };
-+	sa_int.sa_sigaction = sigint_handler;
- 
- 	test_name = argv[0];
- 
-@@ -66,7 +65,7 @@ void test_init(int argc, char *argv[])
- 		verbose_test = 0;
- 
- 	verbose_printf("Starting testcase \"%s\", pid %d\n",
--		       test_name, getpid());
-+		       test_name, (int)getpid());
- }
- 
- void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size)

sys-devel/bison/bison-2.5.recipe

@@ -1,33 +1,68 @@
-DESCRIPTION="bison - A yacc-compatible parser generator" 
+SUMMARY="A yacc-compatible parser generator"
+DESCRIPTION="
+	Bison is a general-purpose parser generator that converts an annotated
+	context-free grammar into an LALR(1) or GLR parser for that grammar. Once
+	you are proficient with Bison, you can use it to develop a wide range of
+	language parsers, from those used in simple desk calculators to complex
+	programming languages.
+
+	Bison is upward compatible with Yacc: all properly-written Yacc grammars
+	ought to work with Bison with no change. Anyone familiar with Yacc should
+	be able to use Bison with little trouble. You need to be fluent in C or
+	C++ programming in order to use Bison.
+	"
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html" 
+COPYRIGHT="1992-2011 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz"
 CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4"
 REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND=""
+
+ARCHITECTURES="?x86"
+
+PATCHES="${portVersionedName}.patch"
+
+PROVIDES="
+	bison = $portVersion compat >= 2.5
+	cmd:bison = $portVersion compat >= 2.5
+	cmd:yacc
+	devel:liby = $portVersion compat >= 2.5
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:m4
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:m4
+	cmd:make
+	cmd:sed
+	"
+
 BUILD()
 {
-	cd bison-2.5
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--disable-nls
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd bison-2.5
 	make install
+
+	prepareInstalledDevelLibs liby
+
+	rm $libDir/charset.alias
+	rmdir $libDir
 }
 
 TEST()
 {
-	cd bison-2.5
 	make check
 }
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1992-2011 Free Software Foundation, Inc."

x11-libs/pixman/pixman-0.20.0.recipe

@@ -1,32 +1,8 @@
+SUMMARY="pixman"
 DESCRIPTION="Pixman - The pixel-manipulation library for X and cairo" 
 HOMEPAGE="http://cgit.freedesktop.org/pixman/" 
 SRC_URI="http://cairographics.org/releases/pixman-0.20.0.tar.gz"
 CHECKSUM_MD5="c1a31d5cedfa97c5af7148a2d1fd4356"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd pixman-0.20.0
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make 
-}
-
-INSTALL()
-{
-	cd pixman-0.20.0
-	make install
-}
-
-TEST()
-{
-	cd pixman-0.20.0
-	make check
-}
-
 LICENSE="MIT"
 COPYRIGHT="1987-1998  The Open Group
 	1987-1989 Digital Equipment Corporation
@@ -34,3 +10,73 @@ COPYRIGHT="1987-1998  The Open Group
 	2004-2010 Red Hat, Inc.
 	2009-2010 Sun Microsystems, Inc.
 	and many others"
+
+REVISION="1"
+
+ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	pixman$secondaryArchSuffix = $portVersion
+	lib:libpixman_1$secondaryArchSuffix = $portVersion
+	"
+
+PROVIDES_devel="
+	pixman${secondaryArchSuffix}_devel = $portVersion
+	devel:libpixman_1$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+REQUIRES_devel="
+	pixman$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	"
+
+PATCH()
+{
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
+}
+
+BUILD()
+{
+	aclocal
+	libtoolize --force --copy --install
+	automake --add-missing
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libpixman-1
+
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}