Merged haikuports/haikuports into master

app-arch/gzip/gzip-1.2.4a.recipe

@@ -1,24 +0,0 @@
-SUMMARY="gzip compression utilities and libraries"
-DESCRIPTION="
-gzip (GNU zip) is a compression utility designed to be a \
-replacement for compress. It provides better compression than compress \
-and although bzip2 produces smaller files is not as fast as bzip2 is.
-"
-HOMEPAGE="http://www.gzip.org/"
-SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.2.4a.tar.gz"
-CHECKSUM_MD5="39053e044b18ecd0627f80fbe7cfeaad"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
-BUILD()
-{
-	cd gzip-1.2.4a
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd gzip-1.2.4a
-	make install
-}

app-arch/gzip/gzip-1.3.12.recipe

@@ -1,24 +0,0 @@
-SUMMARY="gzip compression utilities and libraries"
-DESCRIPTION="
-gzip (GNU zip) is a compression utility designed to be a \
-replacement for compress. It provides better compression than compress \
-and although bzip2 produces smaller files is not as fast as bzip2 is.
-"
-HOMEPAGE="http://www.gzip.org/"
-SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz"
-CHECKSUM_MD5="b5bac2d21840ae077e0217bc5e4845b1"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
-BUILD()
-{
-	cd gzip-1.3.12
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd gzip-1.3.12
-	make install
-}

app-arch/gzip/gzip-1.4.recipe

@@ -1,28 +0,0 @@
-SUMMARY="gzip compression utilities and libraries"
-DESCRIPTION="
-gzip (GNU zip) is a compression utility designed to be a \
-replacement for compress. It provides better compression than compress \
-and although bzip2 produces smaller files is not as fast as bzip2 is.
-"
-HOMEPAGE="http://www.gzip.org/"
-SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.4.tar.gz"
-CHECKSUM_MD5="e381b8506210c794278f5527cba0e765"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
-BUILD()
-{
-	cd gzip-1.4
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd gzip-1.4
-	make install
-}
-LICENSE="GNU GPL v3"
-COPYRIGHT="1999, 2001-2002, 2006-2007, 2009-2010 Free Software Foundation, Inc.
-	1992-1993 Jean-loup Gailly"
-

app-arch/gzip/gzip-1.6.recipe

@@ -0,0 +1,58 @@
+SUMMARY="The gzip compression utilities"
+DESCRIPTION="gzip (GNU zip) is a compression utility designed to be a \
+replacement for compress. Its main advantages over compress are much \
+better compression and freedom from patented algorithms. It has been \
+adopted by the GNU project and is now relatively popular on the Internet."
+HOMEPAGE="http://www.gzip.org/"
+SRC_URI="https://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.xz"
+CHECKSUM_SHA256="37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847"
+SOURCE_DIR="$portVersionedName"
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1992-1993 Jean-loup Gailly
+	1999-2013 Free Software Foundation, Inc."
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	gzip = $portVersion
+	cmd:gzip = $portVersion
+	cmd:gunzip = $portVersion
+	cmd:gzexe = $portVersion
+	cmd:uncompress = $portVersion
+	cmd:zcat = $portVersion
+	cmd:zcmp = $portVersion
+	cmd:zdiff = $portVersion
+	cmd:zegrep = $portVersion
+	cmd:zfgrep = $portVersion
+	cmd:zforce = $portVersion
+	cmd:zgrep = $portVersion
+	cmd:zless = $portVersion
+	cmd:zmore = $portVersion
+	cmd:znew = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	cmd:awk
+	"
+
+BUILD()
+{
+	export CFLAGS="-Wno-error"
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}

app-arch/gzip/patches/gzip-1.2.4a.patch

@@ -1,68 +0,0 @@
-diff -Naur gzip-1.2.4a/Makefile.in gzip-1.2.4a-beos/Makefile.in
---- gzip-1.2.4a/Makefile.in	Tue Aug 17 19:12:40 1993
-+++ gzip-1.2.4a-beos/Makefile.in	Thu Jan  3 00:19:57 2008
-@@ -102,7 +102,7 @@
- # Where to install the manual pages.
- mandir = $(prefix)/man/man$(manext)
- # Use manlinks=so to use the .so method instead of hard links
--manlinks = ln
-+manlinks = ln -s
- 
- alldirs = $(bindir) $(scriptdir) $(datadir) $(libdir) $(infodir) $(mandir)
- 
-@@ -208,7 +208,7 @@
- 	for f in $(SCRIPTS); do \
- 	  $(INSTALL_PROGRAM) $${f} $(scriptdir)/$${f}; done
- 	rm -f $(scriptdir)/$(G)zcmp; \
--	  ln $(scriptdir)/$(G)zdiff $(scriptdir)/$(G)zcmp
-+	  ln -s $(scriptdir)/$(G)zdiff $(scriptdir)/$(G)zcmp
- 	for f in gunzip$X ungzip$X $(ZCAT)$X ; do \
- 	  rm -f $(bindir)/$${f}; done
- 	@if echo $(DEFS) | grep GNU_STANDARD > /dev/null; then \
-@@ -216,8 +216,8 @@
- 	  echo 'exec gzip -dc $${1+"$$@"}' > $(bindir)/$(ZCAT)$X; \
- 	  chmod 755 $(bindir)/gunzip$X  $(bindir)/$(ZCAT)$X; \
- 	else \
--	  ln $(bindir)/gzip$X $(bindir)/gunzip$X; \
--	  ln $(bindir)/gzip$X $(bindir)/$(ZCAT)$X; \
-+	  ln -s $(bindir)/gzip$X $(bindir)/gunzip$X; \
-+	  ln -s $(bindir)/gzip$X $(bindir)/$(ZCAT)$X; \
- 	fi
- 
- installman: gzip.info
-@@ -233,9 +233,9 @@
- 	  echo .so man$(manext)/gzip.$(manext)      > gunzip.$(manext);\
- 	  chmod 644 $(ZCAT).$(manext) $(G)zcmp.$(manext) gunzip.$(manext);\
- 	else \
--	  ln gzip.$(manext)  $(ZCAT).$(manext);\
--	  ln $(G)zdiff.$(manext) $(G)zcmp.$(manext);\
--	  ln gzip.$(manext)  gunzip.$(manext);\
-+	  ln -s gzip.$(manext)  $(ZCAT).$(manext);\
-+	  ln -s $(G)zdiff.$(manext) $(G)zcmp.$(manext);\
-+	  ln -s gzip.$(manext)  gunzip.$(manext);\
- 	fi
- 	-cd $(srcdir); for f in gzip.info* ; do $(INSTALL_DATA) $${f} \
- 	  $(infodir)/$${f}; done
-@@ -251,9 +251,9 @@
- install_compress: install
- 	-test -f $(bindir)/compress.old || \
- 	  mv $(bindir)/compress$X $(bindir)/compress.old
--	ln $(bindir)/gzip$X $(bindir)/compress$X
-+	ln -s $(bindir)/gzip$X $(bindir)/compress$X
- 	rm -f $(bindir)/uncompress$X
--	ln $(bindir)/gzip$X $(bindir)/uncompress$X
-+	ln -s $(bindir)/gzip$X $(bindir)/uncompress$X
- 
- # Make sure all installation directories, e.g. $(bindir) actually exist by
- # making them if necessary. At most one level is created (except for man).
-@@ -329,8 +329,8 @@
- gzip$X:	Makefile $(OBJS)
- 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- 	rm -f gunzip$X $(ZCAT)$X
--	ln gzip$X gunzip$X
--	ln gzip$X $(ZCAT)$X
-+	ln -s gzip$X gunzip$X
-+	ln -s gzip$X $(ZCAT)$X
- 
- gzip$O zip$O deflate$O trees$O bits$O unzip$O inflate$O: gzip.h tailor.h
- util$O lzw$O unlzw$O unpack$O unlzh$O crypt$O: gzip.h tailor.h

app-arch/gzip/patches/gzip-1.3.12-downstream.patch

@@ -1,19 +0,0 @@
-diff -Naur gzip-1.3.12-original/configure.ac gzip-1.3.12/configure.ac
---- gzip-1.3.12-original/configure.ac	2009-04-06 23:31:48.000000000 -0400
-+++ gzip-1.3.12/configure.ac	2009-04-06 23:37:45.000000000 -0400
-@@ -26,13 +26,14 @@
- AC_CONFIG_AUX_DIR(build-aux)
- AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
- AM_INIT_AUTOMAKE([gnits])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_CPP
- AC_CHECK_TOOL([NM], [nm], [nm])
- AC_PROG_LN_S
--AC_PROG_RANLIB
-+LT_INIT
- AC_PROG_SHELL
- 
- gl_EARLY

app-arch/gzip/patches/gzip-1.3.12-stdbool_.h.diff

@@ -1,20 +0,0 @@
---- stdbool_.h	2008-05-14 14:48:48.000000000 +0000
-+++ gzip-1.3.12/lib/stdbool_.h	2007-03-30 23:56:06.000000000 +0000
-@@ -58,7 +58,7 @@
- 
- /* BeOS <sys/socket.h> already #defines false 0, true 1.  We use the same
-    definitions below, but temporarily we have to #undef them.  */
--#if defined __BEOS__ && !defined __HAIKU__
-+#ifdef __BEOS__
- # include <OS.h> /* defines bool but not _Bool */
- # undef false
- # undef true
-@@ -73,7 +73,7 @@
-    (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
-    (see ISO C 99 6.3.1.1.(2)).  So we add a negative value to the
-    enum; this ensures that '_Bool' promotes to 'int'.  */
--#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
-+#if defined __cplusplus || defined __BEOS__
-   /* A compiler known to have 'bool'.  */
-   /* If the compiler already has both 'bool' and '_Bool', we can assume they
-      are the same types.  */

app-arch/gzip/patches/gzip-1.4.patch

@@ -1,18 +0,0 @@
---- gzip-1.4/inflate.c       2010-01-20 14:15:12.017039360 +0100
-+++ gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100
-@@ -588,6 +588,7 @@
-       /* do the copy */
-       do {
-         n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e);
-+        {
- #if !defined(NOMEMCPY) && !defined(DEBUG)
-         unsigned int delta = w > d ? w - d : d - w;
-         if (delta >= e)
-@@ -602,6 +603,7 @@
-             slide[w++] = slide[d++];
-            Tracevv((stderr, "%c", slide[w-1]));
-           } while (--e);
-+        }
-         if (w == WSIZE)
-         {
-           flush_output(w);

app-arch/zip/zip-3.0.recipe

@@ -24,8 +24,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku >= $haikuVersion
+	lib:libz
 	"
 BUILD_REQUIRES="
+	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion

app-cdr/cdrtools/cdrtools-3.01~a25.recipe

@@ -0,0 +1,159 @@
+SUMMARY="A highly portable CD/DVD/BluRay command line recording software"
+DESCRIPTION="
+Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \
+media.
+The suite includes the following programs:
+- cdrecord  A CD/DVD/BD recording program 
+- readcd    A program to read CD/DVD/BD media with CD-clone features 
+- cdda2wav  The most evolved CD-audio extraction program with paranoia support 
+- mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystes with \
+optional Rock Ridge attributes 
+- isodebug  A program to print mkisofs debug information from media 
+- isodump   A program to dump ISO-9660 media 
+- isoinfo   A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems 
+- isovfy    A program to verify the ISO-9660 structures 
+- rscsi     A Remote SCSI enabling daemon
+"
+HOMEPAGE="http://cdrecord.berlios.de" 
+COPYRIGHT="
+	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
+	1995-2013 J. Schilling (cdrecord)
+	"
+LICENSE="
+	GNU GPL v2
+	CDDL v1
+	"
+SRC_URI="http://sourceforge.net/projects/cdrtools/files/alpha/cdrtools-3.01a25.tar.bz2"
+CHECKSUM_SHA256="12c555263c9b56d83ea104918c0c6c7df41c3dd51206ae1986e88aed892b29be"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+
+PATCHES='cdrtools-3.01~a25.patch'
+
+PROVIDES="
+	cdrtools = $portVersion compat >= 3
+	cmd:devdump = $portVersion compat >= 3
+	cmd:rscsi = $portVersion compat >= 3
+	cmd:scgcheck = $portVersion compat >= 3
+	cmd:mkisofs = $portVersion compat >= 3
+	cmd:btcflash = $portVersion compat >= 3
+	cmd:scgskeleton = $portVersion compat >= 3
+	cmd:isovfy = $portVersion compat >= 3
+	cmd:readcd = $portVersion compat >= 3
+	cmd:isodebug = $portVersion compat >= 3
+	cmd:cdda2mp3 = $portVersion compat >= 3
+	cmd:cdda2ogg = $portVersion compat >= 3
+	cmd:cdda2wav = $portVersion compat >= 3
+	cmd:mkhybrid = $portVersion compat >= 3
+	cmd:cdrecord = $portVersion compat >= 3
+	cmd:isodump = $portVersion compat >= 3
+	cmd:isoinfo = $portVersion compat >= 3
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:grep
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+GLOBAL_WRITABLE_FILES="
+	settings/cdrecord keep-old
+	settings/rscsi keep-old
+	"
+
+SOURCE_DIR="cdrtools-3.01"
+
+patchInsdir()
+{
+	# Usage: patchInsdir <oldDir> <newDir> <file> ...
+	oldDir=$1
+	newDir=$2
+	shift 2
+
+	sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@
+}
+
+PATCH()
+{
+	allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)"
+
+	patchInsdir bin $relativeBinDir $allMakefiles
+	patchInsdir sbin $relativeBinDir $allMakefiles
+	patchInsdir share/doc $relativeDocDir $allMakefiles
+	patchInsdir include $relativeIncludeDir $allMakefiles
+	patchInsdir lib $relativeLibDir $allMakefiles
+	patchInsdir etc/default settings $allMakefiles
+
+	sed -i "s,/etc/default,$sysconfDir," \
+		btcflash/btcflash.1 \
+		cdda2wav/cdda2mp3 \
+		cdda2wav/cdda2ogg \
+		cdda2wav/cdda2*.1 \
+		cdrecord/COPYING \
+		cdrecord/README.* \
+		cdrecord/auinfo.c \
+		cdrecord/cdrecord.1 \
+		doc/*.man \
+		doc/*.ps \
+		include/schily/deflts.h \
+		libcdrdeflt/cdrdeflt.c \
+		libcdrdeflt/cdrdeflt.h \
+		mkisofs/diag/isoinfo.8 \
+		readcd/readcd.1 \
+		rscsi/rscsi.1 \
+		rscsi/rscsi.c \
+		scgskeleton/scgskeleton.1
+}
+
+BUILD()
+{
+	make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
+		RUNPATH="" DEFMANBASE=$relativeDocumentationDir
+		# not multi-job safe
+}
+
+INSTALL()
+{
+	make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \
+		RUNPATH="" DEFMANBASE=$relativeDocumentationDir install
+
+	# The whole lib folder only contains static libraries (even in several
+	# subdirectories).
+	mkdir -p $developLibDir
+	mv $libDir/* $developLibDir/
+	rmdir $libDir
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	cdrtools_devel = $portVersion
+	devel:libcdrdeflt = $portVersion compat >= 3
+	devel:libedc_ecc = $portVersion compat >= 3
+	devel:libedc_ecc_dec = $portVersion compat >= 3
+	devel:libdeflt = $portVersion compat >= 3
+	devel:libfile = $portVersion compat >= 3
+	devel:libfind = $portVersion compat >= 3
+	devel:libhfs = $portVersion compat >= 3
+	devel:libmdigest = $portVersion compat >= 3
+	devel:libparanoia = $portVersion compat >= 3
+	devel:librscg = $portVersion compat >= 3
+	devel:libscg = $portVersion compat >= 3
+	devel:libsiconv = $portVersion compat >= 3
+	devel:libscgcmd = $portVersion compat >= 3
+	devel:libschily = $portVersion compat >= 3
+	"
+REQUIRES_devel="
+	cdrtools == $portVersion
+	"

app-cdr/cdrtools/patches/cdrtools-3.01~a25.patch

@@ -0,0 +1,171 @@
+diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
+--- cdrtools-3.01/DEFAULTS/Defaults.haiku	
++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku	
+@@ -29,16 +29,16 @@
+ CWARNOPTS=
+ 
+ DEFINCDIRS=	$(SRCROOT)/include
+ DEFOSINCDIRS=
+-LDPATH=		-L/opt/schily/lib
++LDPATH=		-L$(shell finddir B_SYSTEM_LIB_DIRECTORY)
+ #RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
+-RUNPATH=	-R$(INS_BASE)/lib -R/opt/schily/lib
++RUNPATH=	-R$(INS_BASE)/lib
+
+ ###########################################################################
+ #
+ # Installation config stuff
+ #
+ ###########################################################################
+-INS_BASE=	/boot/opt/schily
++INS_BASE=	$(shell finddir B_SYSTEM_DIRECTORY)
+ INS_KBASE=	/
+ INS_RBASE=	/
+ #
+diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul
+--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul	1970-01-01 00:00:00.000000000 +0000
++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul	2012-12-08 19:24:57.418643968 +0000
+@@ -0,0 +1,54 @@
++#ident "@(#)bepc-haiku-cc.rul	1.3 09/02/05 "
++###########################################################################
++# Written 1996 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for Haiku, a BeOS like OS
++#
++###########################################################################
++# Copyright (c) J. Schilling
++###########################################################################
++# The contents of this file are subject to the terms of the
++# Common Development and Distribution License, Version 1.0 only
++# (the "License").  You may not use this file except in compliance
++# with the License.
++#
++# See the file CDDL.Schily.txt in this distribution for details.
++#
++# When distributing Covered Code, include this CDDL HEADER in each
++# file and include the License file CDDL.Schily.txt from this distribution.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul
++
++#
++# XXX Old BeOS needs libroot.so to get [efg]cvt()
++# XXX New BeOS seems to have this in libc and in addition we include
++# XXX strtod.c for floating point conversion on OS without such code.
++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been
++# XXX removed and printing floating numbers will work with old/new BeOS
++#
++#OSDEFS +=	-DNO_FLOATINGPOINT -DUSE_FLOATINGARGS
++OSDEFS +=
++
++KDEFINES=	-DKERNEL -D_KERNEL
++
++#CONFFLAGS=	i586
++
++LIB_PREFIX=	lib
++LIB_SUFFIX=	.a
++SHL_SUFFIX=	.so
++
++#LIB_SOCKET=	-lsocket -lbind
++LIB_SOCKET=	-lnetwork
++LIB_MATH=
++LIB_KVM=	
++
++#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
++LDOPTS=		$(LIBS_PATH) $(LDPATH)
++
++LORDER=		echo
++TSORT=		cat
++
++LN=             /bin/ln -s
+diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul
+--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul	1970-01-01 00:00:00.000000000 +0000
++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul	2012-12-08 19:24:57.421265408 +0000
+@@ -0,0 +1,54 @@
++#ident "@(#)bepc-haiku-gcc.rul	1.3 09/02/05 "
++###########################################################################
++# Written 1996 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for Haiku, a BeOS like OS
++#
++###########################################################################
++# Copyright (c) J. Schilling
++###########################################################################
++# The contents of this file are subject to the terms of the
++# Common Development and Distribution License, Version 1.0 only
++# (the "License").  You may not use this file except in compliance
++# with the License.
++#
++# See the file CDDL.Schily.txt in this distribution for details.
++#
++# When distributing Covered Code, include this CDDL HEADER in each
++# file and include the License file CDDL.Schily.txt from this distribution.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul
++
++#
++# XXX Old BeOS needs libroot.so to get [efg]cvt()
++# XXX New BeOS seems to have this in libc and in addition we include
++# XXX strtod.c for floating point conversion on OS without such code.
++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been
++# XXX removed and printing floating numbers will work with old/new BeOS
++#
++#OSDEFS +=	-DNO_FLOATINGPOINT -DUSE_FLOATINGARGS
++OSDEFS +=
++
++KDEFINES=	-DKERNEL -D_KERNEL
++
++#CONFFLAGS=	i586
++
++LIB_PREFIX=	lib
++LIB_SUFFIX=	.a
++SHL_SUFFIX=	.so
++
++#LIB_SOCKET=	-lsocket -lbind
++LIB_SOCKET=	-lnetwork
++LIB_MATH=
++LIB_KVM=	
++
++#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
++LDOPTS=		$(LIBS_PATH) $(LDPATH)
++
++LORDER=		echo
++TSORT=		cat
++
++LN=             /bin/ln -s
+diff -up cdrtools-3.01/libscg/scsi-beos.c.orig cdrtools-3.01/libscg/scsi-beos.c
+--- cdrtools-3.01/libscg/scsi-beos.c.orig	2009-06-30 12:34:03.022282240 -0600
++++ cdrtools-3.01/libscg/scsi-beos.c	2012-07-19 18:25:01.146800640 -0600
+@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno)
+ 	char		buf[128];
+ 
+ 	if (busno < 8)
++#ifdef	__HAIKU__
++		js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno);
++#else
+ 		js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno);
++#endif
+ 	else
+ #ifdef	__HAIKU__
+ 		js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8);
+@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun)
+ 			return (f->fd);
+ 	}
+ 	if (busno < 8) {
++#ifdef __HAIKU__
++		js_snprintf(buf, sizeof (buf),
++					"/dev/disk/scsi/%d/%d/%d/raw",
++					busno, tgt, tlun);
++#else
+ 		js_snprintf(buf, sizeof (buf),
+ 					"/dev/bus/scsi/%d/%d/%d/raw",
+ 					busno, tgt, tlun);
++#endif
+ 	} else {
+ 		char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy";
+ 		js_snprintf(buf, sizeof (buf),

app-crypt/gpgme/gpgme-1.5.2.recipe

@@ -22,6 +22,7 @@ COPYRIGHT="
 ARCHITECTURES="x86_gcc2 x86 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+#TODO: fix gpgme-config hardcoded package paths
 PROVIDES="
 	gpgme${secondaryArchSuffix} = $portVersion compat >= 1.5
 	cmd:gpgme_tool${secondaryArchSuffix} = $portVersion compat >= 1.5
@@ -76,6 +77,21 @@ INSTALL()
 
 	prepareInstalledDevelLibs libgpgme libgpgme-pthread
 
+	# The libtool files reference other libraries using the wrong paths, which
+	# creates a lot of confusion. Fix them so correct paths are used.
+	local develPackageName="${portName}_devel-$portFullVersion"
+	local packageLinksDir=$(dirname $portPackageLinksDir)
+	for l in libgpgme libgpgme-pthread; do
+		local linksDir="$packageLinksDir/${develPackageName}/devel~libassuan$secondaryArchSuffix/$relativeDevelopLibDir"
+		sed -i -e "s,\(-L/packages/libassuan[^ ]*\),-L$linksDir," \
+			-e "s,[^ ]*/libassuan\.la,$linksDir/libassuan.la,g" \
+			$developLibDir/$l.la
+		local linksDir="$packageLinksDir/${develPackageName}/devel~libgpg_error$secondaryArchSuffix/$relativeDevelopLibDir"
+		sed -i -e "s,\(-L/packages/libgpg_error[^ ]*\),-L$linksDir," \
+			-e "s,[^ ]*/libgpg-error\.la,$linksDir/libgpg-error.la,g" \
+			$developLibDir/$l.la
+	done
+
 	packageEntries devel \
 		$developDir $binDir/gpgme-config
 }

app-crypt/gpgme/patches/gpgme-1.5.2.patchset

@@ -1,40 +1,54 @@
-From 9d2d28bfa7cbbdfef179c5fb4a29e777c092bf8a Mon Sep 17 00:00:00 2001
+From ce6d32b33fa2385e4627239a10c12ac7d18a66c5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Sun, 16 Nov 2014 14:50:17 +0100
-Subject: [PATCH 1/2] configure.ac: Haiku does have a thread-safe getenv
+Subject: [PATCH 1/3] configure.ac: Haiku does have a thread-safe getenv
 
 Also force HAVE_PTHREAD.
 ---
- configure.ac | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
+ configure.ac | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0ffe847..890b682 100644
+index 0ffe847..0f33189 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -186,11 +186,12 @@ case "${host}" in
+@@ -141,6 +141,7 @@ GPG_DEFAULT=no
+ GPGSM_DEFAULT=no
+ GPGCONF_DEFAULT=no
+ G13_DEFAULT=no
++PTHREAD_LIBS=""
+ component_system=None
+ have_dosish_system=no
+ have_android_system=no
+@@ -186,11 +187,16 @@ case "${host}" in
  	    AC_HELP_STRING([--enable-w32-qt], [build GPGME Qt for W32]),
  	    		   build_w32_qt=$enableval)
          ;;
 +    *-haiku*)
 +	have_thread_safe_getenv=yes
++	# Haiku has it in libroot
 +	AC_CHECK_FUNC(pthread_create,have_pthread=yes)
 +        ;;
      *)
- 	AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
+-	AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
 -	if test "$have_pthread" = yes; then
 -	  AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
 -	fi
++	save_LIBS="$LIBS"
++	AC_SEARCH_LIBS(pthread_create,pthread,have_pthread=yes)
++	PTHREAD_LIBS="$LIBS"
++	LIBS="$save_LIBS"
  
  	# XXX: Probably use exec-prefix here?
  #	GPG_DEFAULT='/usr/bin/gpg'
-@@ -200,6 +201,10 @@ case "${host}" in
+@@ -200,6 +206,11 @@ case "${host}" in
  	;;
  esac
  
 +if test "$have_pthread" = yes; then
 +  AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
 +fi
++AC_SUBST(PTHREAD_LIBS)
 +
  if test "$have_dosish_system" = yes; then
     AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
@@ -43,10 +57,10 @@ index 0ffe847..890b682 100644
 1.8.3.4
 
 
-From 3914cec87c354b9726af7612ed23f945bdab5092 Mon Sep 17 00:00:00 2001
+From 24a23b475810c5a5fba58f3d6615b2811cf07392 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Wed, 19 Nov 2014 21:52:09 +0100
-Subject: [PATCH 2/2] Makefile.am: remove hardcoded -lpthread
+Subject: [PATCH 2/3] Makefile.am: replace hardcoded -lpthread by an AC_SUBST
 
 ---
  src/Makefile.am       | 2 +-
@@ -54,7 +68,7 @@ Subject: [PATCH 2/2] Makefile.am: remove hardcoded -lpthread
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index b7ddbc1..258aab8 100644
+index b7ddbc1..5ac20de 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -185,7 +185,7 @@ libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
@@ -62,12 +76,12 @@ index b7ddbc1..258aab8 100644
  libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
  libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 -	-lpthread @GPG_ERROR_LIBS@
-+	@LIBS@ @GPG_ERROR_LIBS@
++	@PTHREAD_LIBS@ @GPG_ERROR_LIBS@
  
  if BUILD_W32_GLIB
  libgpgme_glib_la_LDFLAGS = $(no_undefined) \
 diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
-index 5c1266e..484226f 100644
+index 5c1266e..5261da2 100644
 --- a/tests/gpg/Makefile.am
 +++ b/tests/gpg/Makefile.am
 @@ -61,7 +61,7 @@ INCLUDES = -I$(top_builddir)/src
@@ -75,10 +89,37 @@ index 5c1266e..484226f 100644
  AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
  LDADD = ../../src/libgpgme.la
 -t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
-+t_thread1_LDADD = ../../src/libgpgme-pthread.la @LIBS@
++t_thread1_LDADD = ../../src/libgpgme-pthread.la @PTHREAD_LIBS@
  
  # We don't run t-genkey in the test suite, because it takes too long
  noinst_PROGRAMS = $(c_tests) t-genkey
 -- 
 1.8.3.4
 
+
+From 82e7a0cfbfea15ffee496882e5fd3cf93325a948 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Wed, 26 Nov 2014 02:24:03 +0100
+Subject: [PATCH 3/3] gpgme-config.in: replace hardcoded -lpthread by an
+ AC_SUBST
+
+---
+ src/gpgme-config.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gpgme-config.in b/src/gpgme-config.in
+index 4be1e08..bf83deb 100644
+--- a/src/gpgme-config.in
++++ b/src/gpgme-config.in
+@@ -33,7 +33,7 @@ gpg_error_libs="@GPG_ERROR_LIBS@"
+ thread_modules=""
+ 
+ @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
+-libs_pthread="-lpthread"
++libs_pthread="@PTHREAD_LIBS@"
+ cflags_pthread=""
+ 
+ # Configure glib.
+-- 
+1.8.3.4
+

app-editors/vim/vim-7.4.recipe

@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2"
 CHECKSUM_SHA256="d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade"
 COPYRIGHT="Bram Moleenar et al."
 LICENSE="Vim"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
@@ -50,11 +50,13 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc
 	cmd:find
+	cmd:grep
+	cmd:sed
 "
 
 SOURCE_DIR="vim74"
 PATCHES="
-	vim-7.4.patch
+	vim-7.4.patchset
 "
 
 BUILD()

app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe

@@ -8,8 +8,7 @@ This package contains the VirtualBox kernel modules and user-space \
 tools for Haiku guests.
 "
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="svn+http://www.virtualbox.org/svn/vbox/trunk#51740"
-#CHECKSUM_SHA256=""
+SRC_URI="svn+http://www.virtualbox.org/svn/vbox/trunk#53373"
 #TODO:check user manual for full list
 COPYRIGHT="2003-2014 Oracle Corporation."
 #TODO:check user manual for full list
@@ -17,7 +16,7 @@ LICENSE="
 	GNU GPL v2
 	CDDL v1
 	"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
@@ -27,7 +26,7 @@ PROVIDES="
 	cmd:VBoxTray$secondaryArchSuffix = $portVersion
 	"
 
-PATCHES="vbox-$portVersion.patch"
+# TODO: POST_INSTALL_SCRIPTS=""
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
@@ -35,7 +34,6 @@ REQUIRES="
 	lib:libiconv$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
-#	lib:libstdc++$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
 	"
 
@@ -52,6 +50,7 @@ BUILD_PREREQUIRES="
 	haiku_x86 >= $haikuVersion
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:mkisofs
+	cmd:grep
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:sed
@@ -59,6 +58,8 @@ BUILD_PREREQUIRES="
 	cmd:yasm
 	"
 
+PATCHES="virtualbox_guest_additions-$portVersion.patchset"
+
 BUILD()
 {
 	# use the checked-out kBuild for now
@@ -71,23 +72,28 @@ BUILD()
 
 INSTALL()
 {
-	op="out/haiku.x86/strict"
-	ap=$op/bin/additions
+	cd out/haiku.x86/strict/bin/additions
+	mkdir -p $addOnsDir/kernel/{generic,drivers/bin,drivers/dev/misc}
 
-	tad="$addOnsDir"
-	tbd="$binDir"
+	cp vboxguest $addOnsDir/kernel/generic
+	cp vboxdev $addOnsDir/kernel/drivers/bin
+	ln -fs ../../bin/vboxdev $addOnsDir/kernel/drivers/dev/misc
 
-	mkdir -p "$tad/kernel/generic"
-	mkdir -p "$tad/kernel/drivers/bin"
-	cp $ap/vboxguest "$tad/kernel/generic/"
-	cp $ap/vboxdev "$tad/kernel/drivers/bin/"
-	mkdir -p "$tad/kernel/drivers/dev/misc"
-	ln -fs ../../bin/vboxdev "$tad/kernel/drivers/dev/misc/"
-	mkdir -p "$tad/kernel/file_systems"
-	#cp $ap/vboxsf "$tad/kernel/file_systems/"
+#	mkdir -p $addOnsDir/kernel/file_systems
+#	cp vboxsf $addOnsDir/kernel/file_systems
 
-	mkdir -p "$tbd"
-	cp $ap/VBoxControl "$tbd/"
-	cp $ap/VBoxService "$tbd/"
-	cp $ap/VBoxTray "$tbd/"
+#	mkdir -p $addOnsDir/{input_server/filters,input_server/devices}
+#	cp VBoxMouseFilter $addOnsDir/input_server/filters
+#	cp VBoxMouse $addOnsDir/input_server/devices
+
+#	mkdir -p $addOnsDir/{accelerants,kernel/drivers/dev/graphics}
+#	cp vboxvideo $addOnsDir/kernel/drivers/bin
+#	ln -fs ../../bin/vboxvideo $addOnsDir/kernel/drivers/dev/graphics
+#	cp vboxvideo.accelerant $addOnsDir/accelerants
+#
+	mkdir -p $binDir
+	cp VBoxControl $binDir
+	cp VBoxService $binDir
+	cp VBoxTray $binDir
 }
+

app-misc/gcal/gcal-3.6.3.recipe

@@ -0,0 +1,56 @@
+SUMMARY="Program for calculating and printing calendars"
+DESCRIPTION="
+Gcal is a program for calculating and printing calendars. Gcal displays hybrid \
+and proleptic Julian and Gregorian calendar sheets, respectively for one month, \
+three months, or a whole year. It also displays eternal holiday lists for many \
+countries around the globe, and features a very powerful creation of fixed date \
+lists that can be used for reminding purposes.
+"
+HOMEPAGE="http://www.gnu.org/software/gcal/"
+SRC_URI="http://ftp.gnu.org/gnu/gcal/gcal-3.6.3.tar.gz"
+CHECKSUM_SHA256="9d9be60841150a5c60e27fc5e0f2c06c06635ac44c18698d6a48ef7bb47ba86d"
+LICENSE="GNU GPL v3"
+REVISION="1"
+COPYRIGHT="1994-2013 Free Software Foundation Inc."
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	gcal = $portVersion
+	cmd:gcal
+	cmd:gcal2txt
+	cmd:tcal
+	cmd:txt2gcal
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:grep
+	cmd:make
+	cmd:sed
+	cmd:gcc
+	cmd:awk
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}

app-misc/weather/weather-0.0.1_git.recipe

@@ -0,0 +1,33 @@
+SUMMARY="A simple weather application."
+DESCRIPTION="A small weather application built for GCI, currently only a GUI demonstration. Network capability should arrive by 0.1.1"
+HOMEPAGE="https://github.com/georgewhite5/HaikuWeather"
+SRC_URI="git+https://github.com/georgewhite5/HaikuWeather.git#7731be69bbcd1a150a72a631ef84784c842c75ec"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2014 George White"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	makefile_engine
+	haiku_devel
+	"
+
+PROVIDES="
+	weather
+	app:Weather = $portVersion
+	"
+
+BUILD()
+{
+	make OBJDIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cd objects*
+	cp Weather $appsDir/Weather
+	addAppDeskbarSymlink $appsDir/Weather
+}

app-text/antiword/patches/antiword-0.37.patch

@@ -6,7 +6,7 @@ diff -Naur antiword-0.37/antiword.h antiword-0.37-haiku/antiword.h
  #define ANTIWORD_DIR		"antiword"
  #define FONTNAMES_FILE		"fontnames"
 +#elif defined(__haiku)
-+#define GLOBAL_ANTIWORD_DIR	"/boot/common/data/antiword"
++#define GLOBAL_ANTIWORD_DIR	"/boot/system/data/antiword"
 +#define ANTIWORD_DIR		"antiword"
 +#define FONTNAMES_FILE		"fontnames"
  #elif defined(__CYGMING__)
@@ -28,7 +28,7 @@ diff -Naur antiword-0.37/Makefile.haiku antiword-0.37-haiku/Makefile.haiku
 +INSTALL_DATA	= $(INSTALL)
 +
 +# must be equal to DEBUG or NDEBUG
-+DB	= DEBUG
++DB	= NDEBUG
 +# Optimization: -O<n> or debugging: -g
 +OPT	= -O2
 +

app-text/sword/sword-1.7.3.recipe

@@ -1,24 +1,28 @@
-SUMMARY="the biblical text research engine"
-
+SUMMARY="The biblical text research engine"
 DESCRIPTION="The SWORD Project is the CrossWire Bible Society's free Bible \
 software project. Its purpose is to create cross-platform open-source tools-- \
 covered by the GNU General Public License-- that allow programmers and Bible \
 societies to write new Bible software more quickly and easily. We also create \
 Bible study software for all readers, students, scholars, and translators of \
-the Bible, and have a growing collection of over 200 texts in over 50 languages
-"
-
+the Bible, and have a growing collection of over 200 texts in over 50 languages."
 HOMEPAGE="http://www.crosswire.org/sword"
 LICENSE="GNU GPL v2"
-COPYRIGHT="Copyright 1998-2014 CrossWire Bible Society"
+COPYRIGHT="1998-2014 CrossWire Bible Society"
 SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.3.tar.gz"
 CHECKSUM_SHA256="5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86"
+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
+    # for a different secondary architecture.
+    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	libsword$secondaryArchSuffix = $portVersion
+	sword$secondaryArchSuffix = $portVersion
 	cmd:diatheke$secondaryArchSuffix = $portVersion
 	cmd:imp2gbs$secondaryArchSuffix = $portVersion
 	cmd:imp2ld$secondaryArchSuffix = $portVersion
@@ -36,7 +40,11 @@ PROVIDES="
 	cmd:vs2osisreftxt$secondaryArchSuffix = $portVersion
 	cmd:xml2gbs$secondaryArchSuffix = $portVersion
 	lib:libsword$secondaryArchSuffix = $portVersion
-	lib:libsword$secondaryArchSuffix = $portVersion
+	"
+	
+PROVIDES_devel="
+	sword${secondaryArchSuffix}_devel = $portVersion
+	devel:libsword$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
@@ -44,7 +52,12 @@ REQUIRES="
 	lib:libcurl$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
-	lib:libz$libcrypto$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	sword$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -66,7 +79,6 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	echo true
 	runConfigure ./configure --without-conf --without-clucene
 	make $jobArgs
 }
@@ -74,4 +86,10 @@ BUILD()
 INSTALL()
 {
 	make $jobArgs install
+	
+	prepareInstalledDevelLibs \
+		libsword
+	
+	packageEntries devel \
+		$developDir
 }

dev-cpp/hugen/hugen-1.recipe

@@ -23,8 +23,10 @@ REQUIRES="
 	cmd:python$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
+	cmd:python
 	"
 BUILD_PREREQUIRES="
+	cmd:python
 	"
 
 BUILD()
@@ -35,8 +37,13 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $binDir/hugen_app
-	cp -R hugen.py configs/ templates/ $binDir/hugen_app
-	echo python $binDir/hugen_app/hugen.py > $binDir/hugen
-	chmod +x $binDir/hugen 
+	mkdir -p $binDir
+	python=$portPackageLinksDir/cmd~python/bin/python
+	version=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	
+	installLocation=$prefix/lib/python$version/vendor-packages
+	mkdir -p $installLocation/hugen_app
+	cp -R hugen.py configs/ templates/ $installLocation/hugen_app
+	echo python $installLocation/hugen_app/hugen.py > $binDir/hugen
+	chmod +x $binDir/hugen
 }

dev-games/ode/ode-0.12.recipe

@@ -36,6 +36,7 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	"
 
 PATCHES="ode-0.12.patch"

dev-lang/perl/perl-5.18.2.recipe

@@ -89,6 +89,7 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	cmd:make
 	cmd:sed
+	cmd:grep
 	"
 
 perlArchName="$(uname -m)-haiku"

dev-lang/yab/yab-1.7.02.recipe

@@ -4,10 +4,14 @@ yab is an extended version of yabasic, a BASIC programming language, with \
 special commands designed for Haiku.
 "
 HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
-SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4"
+SRC_URI="https://github.com/HaikuArchives/Yab/archive/v1.7.3.tar.gz"
+CHECKSUM_SIZE="1176449"
+CHECKSUM_RMD160="f62fa02a585d9f6c5ee3eb9b781a06083352bd6f"
+CHECKSUM_SHA512="a74edcf9718ee9a13a16ab0a99fbbed3cceebf1ea4bfac714b098d51531de7fdd0738e126b9a2e5d2f8d84fd0c153d9b7702e806cc91c6a97537dda11411e915"
+SOURCE_DIR="Yab-1.7.3"
 
 
-REVISION="2"
+REVISION="3"
 
 LICENSE="Artistic"
 

dev-libs/glib/glib-1.2.10.recipe

@@ -22,8 +22,8 @@ COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 
 REVISION="1"
 
-ARCHITECTURES="?x86_gcc2 x86"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	glib$secondaryArchSuffix = $portVersion compat >= 1

dev-libs/libffi/libffi-3.2.1.recipe

@@ -6,8 +6,8 @@ HOMEPAGE="http://sourceware.org/libffi"
 LICENSE="MIT"
 REVISION="2"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 SRC_URI="ftp://sourceware.org/pub/libffi/libffi-$portVersion.tar.gz"
 CHECKSUM_SHA256="d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"

dev-libs/libidl/libidl-0.6.8.recipe

@@ -12,8 +12,8 @@ CHECKSUM_SHA256="50e8f7674815e42a6e8be32610838d9b7da91b3043784d2b69d17b79c7203e7
 COPYRIGHT="1998-1999 Andrew T. Veliath"
 LICENSE="GNU LGPL v2"
 REVISION="1"
-ARCHITECTURES="x86 ?x86_gcc2"
-SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libidl$secondaryArchSuffix = $portVersion
@@ -23,7 +23,7 @@ PROVIDES="
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libglib
+	lib:libglib$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="

dev-libs/libtommath/libtommath-0.42.0.recipe

@@ -0,0 +1,54 @@
+SUMMARY="LibTomMath is a theoretic integer library written entirely in C."
+DESCRIPTION="LibTomMath is a free open source portable number theoretic \
+multiple-precision integer library written entirely in C."
+HOMEPAGE="http://libtommath.org"
+SRC_URI="https://github.com/libtom/libtommath/archive/v0.42.0.tar.gz"
+CHECKSUM_SHA256="5246356ba18c1b6edf4a7bc836a3d223842b86914cdba6dd8c112bfc59e227c8"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="2010 Tom St. Denis"
+PATCHES="libtommath-0.42.0.patchset"
+
+ARCHITECTURES="x86_gcc2 ?x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+        libtommath$secondaryArchSuffix = $portVersion
+        "
+
+PROVIDES_devel="
+              libtommath${secondaryArchSuffix}_devel = $portVersion
+              devel:libtommath$secondaryArchSuffix = $portVersion
+              "
+
+REQUIRES="
+        haiku$secondaryArchSuffix >= $haikuVersion
+        "
+        
+REQUIRES_devel="
+              haiku${secondaryArchSuffix}_devel >= $haikuVersion
+              libtommath$secondaryArchSuffix == $portVersion base
+              "
+
+BUILD_REQUIRES="
+              haiku${secondaryArchSuffix}_devel >= $haikuVersion
+              cmd:make
+              cmd:cc
+              cmd:ar
+              cmd:ranlib
+              cmd:install
+              "
+              
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	export LIBPATH=$libDir
+	export INCPATH=$includeDir
+	make install $jobArgs
+	prepareInstalledDevelLibs libtommath
+	packageEntries devel $developDir
+}

dev-libs/libtommath/patches/libtommath-0.42.0.patchset

@@ -0,0 +1,50 @@
+From f2b4b4b4aa83b658ae9a23d5195e04487a102d88 Mon Sep 17 00:00:00 2001
+From: Nolan Clark <tweakdeveloper@gmail.com>
+Date: Sat, 6 Dec 2014 16:01:50 -0600
+Subject: applying patch makefile.patch
+
+
+diff --git a/makefile b/makefile
+index 70de306..e3a0a04 100644
+--- a/makefile
++++ b/makefile
+@@ -27,18 +27,9 @@ CFLAGS  += -fomit-frame-pointer
+ 
+ endif
+ 
+-#install as this user
+-ifndef INSTALL_GROUP
+-   GROUP=wheel
+-else
+-   GROUP=$(INSTALL_GROUP)
+-endif
+-
+-ifndef INSTALL_USER
+-   USER=root
+-else
+-   USER=$(INSTALL_USER)
+-endif
++#install as this user and group
++USER=user
++GROUP=root
+ 
+ #default files to install
+ ifndef LIBNAME
+@@ -49,14 +40,6 @@ default: ${LIBNAME}
+ 
+ HEADERS=tommath.h tommath_class.h tommath_superclass.h
+ 
+-#LIBPATH-The directory for libtommath to be installed to.
+-#INCPATH-The directory to install the header files for libtommath.
+-#DATAPATH-The directory to install the pdf docs.
+-DESTDIR=
+-LIBPATH=/usr/lib
+-INCPATH=/usr/include
+-DATAPATH=/usr/share/doc/libtommath/pdf
+-
+ OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
+ bn_mp_clamp.o bn_mp_zero.o  bn_mp_set.o bn_mp_set_int.o bn_mp_init_size.o bn_mp_copy.o \
+ bn_mp_init_copy.o bn_mp_abs.o bn_mp_neg.o bn_mp_cmp_mag.o bn_mp_cmp.o bn_mp_cmp_d.o \
+-- 
+1.8.3.4
+

dev-python/argh/argh-0.26.1.recipe

@@ -0,0 +1,55 @@
+SUMMARY="An unobtrusive argparse wrapper with natural syntax"
+DESCRIPTION="Building a command-line interface? \
+Found yourself uttering "argh!" while struggling with the API of argparse? \
+Don't like the complexity but need the power?
+Argh is a smart wrapper for argparse. Argparse is a very powerful tool; \
+Argh just makes it easy to use."
+HOMEPAGE="https://pypi.python.org/pypi/argh"
+
+SRC_URI="https://pypi.python.org/packages/source/a/argh/argh-0.26.1.tar.gz"
+CHECKSUM_SHA256="06a7442cb9130fb8806fe336000fcf20edf1f2f8ad205e7b62cec118505510db"
+LICENSE="GNU LGPL v3"
+COPYRIGHT="2010—2014 Andrey Mikhaylenko and contributors"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+SOURCE_DIR="argh-$portVersion"
+
+PROVIDES="
+	argh = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:python
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	python_setuptools
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python/bin/python
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--single-version-externally-managed \
+		--root=/ --prefix=$prefix
+}

dev-python/pathtools/pathtools-0.1.2.recipe

@@ -0,0 +1,56 @@
+SUMMARY="HTTP library for human beings"
+DESCRIPTION="
+	Requests is an Apache2 Licensed HTTP library, written in Python, \
+	for human beings.
+"
+HOMEPAGE="
+	http://python-requests.org/
+	http://pypi.python.org/pypi/requests
+	"
+SRC_URI="https://pypi.python.org/packages/source/p/pathtools/pathtools-0.1.2.tar.gz"
+CHECKSUM_SHA256="7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0"
+LICENSE="MIT"
+COPYRIGHT="2010 Yesudeep Mangalapilly"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+SOURCE_DIR="pathtools-$portVersion"
+
+PROVIDES="
+	pathtools = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:python
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	python_setuptools
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python/bin/python
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--single-version-externally-managed \
+		--root=/ --prefix=$prefix
+}

dev-python/python_setuptools/python_setuptools-5.3.recipe

@@ -27,6 +27,7 @@ BUILD_REQUIRES=""
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:python
+	cmd:sed
 	"
 
 BUILD()

dev-python/pyyaml/pyyaml-3.11.recipe

@@ -0,0 +1,66 @@
+SUMMARY="YAML parser and emitter for Python"
+DESCRIPTION="
+YAML is a data serialization format designed for human readability \
+and interaction with scripting languages. \
+PyYAML is a YAML parser and emitter for Python.
+
+PyYAML features a complete YAML 1.1 parser, Unicode support, \
+pickle support, capable extension API, and sensible error messages. \
+PyYAML supports standard YAML tags and \
+provides Python-specific tags that allow to represent an arbitrary Python object.
+
+PyYAML is applicable for a broad range of tasks from \
+complex configuration files to object serialization and persistance.
+"
+HOMEPAGE="
+	http://pyyaml.org/
+	http://pypi.python.org/pypi/PyYAML
+	"
+SRC_URI="https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.11.tar.gz"
+CHECKSUM_SHA256="c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8"
+LICENSE="MIT"
+COPYRIGHT="2006 Kirill Simonov"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+SOURCE_DIR="PyYAML-$portVersion"
+
+PROVIDES="
+	pyyaml = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:python
+	"
+
+#TODO: eventually depend on http://pyyaml.org/wiki/LibYAML
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:sed
+	python_setuptools
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python/bin/python
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--prefix=$prefix
+}

dev-python/urllib3/urllib3-1.9.1.recipe

@@ -0,0 +1,64 @@
+SUMMARY="HTTP library with thread-safe connection pooling, file post, and more."
+DESCRIPTION="
+- Re-use the same socket connection for multiple requests
+  (HTTPConnectionPool and HTTPSConnectionPool)
+  (with optional client-side certificate verification).
+- File posting (encode_multipart_formdata).
+- Built-in redirection and retries (optional).
+- Supports gzip and deflate decoding.
+- Thread-safe and sanity-safe.
+- Works with AppEngine, gevent, and eventlib.
+- Tested on Python 2.6+, Python 3.2+, and PyPy, with 100% unit test coverage.
+- Small and easy to understand codebase perfect for extending and building upon.
+  For a more comprehensive solution, have a look at \
+  Requests <http://python-requests.org/> which is also powered by urllib3
+"
+HOMEPAGE="
+	http://urllib3.readthedocs.org/
+	https://pypi.python.org/pypi/urllib3
+	"
+SRC_URI="https://github.com/shazow/urllib3/archive/1.9.1.tar.gz"
+CHECKSUM_SHA256="baf4dbc6d78f4a7bb28a44d3772cd8f3b24df5282f5cb72f3d85106aa06cf2a3"
+LICENSE="MIT"
+COPYRIGHT="2008-2014 Andrey Petrov and contributors"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+SOURCE_DIR="urllib3-$portVersion"
+
+PROVIDES="
+	urllib3 = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:python
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python/bin/python
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--prefix=$prefix
+}

dev-python/watchdog/watchdog-0.8.2.recipe

@@ -0,0 +1,58 @@
+SUMMARY="Filesystem events monitoring"
+DESCRIPTION="Python API and shell utilities to monitor file system events."
+HOMEPAGE="https://pypi.python.org/pypi/watchdog"
+
+SRC_URI="https://pypi.python.org/packages/source/w/watchdog/watchdog-0.8.2.tar.gz"
+CHECKSUM_SHA256="33a9ab3ce2e6b1aca4d2a50752231668d69bdba4ab096d9742195ccfbef1e023"
+LICENSE="Apache v2"
+COPYRIGHT="
+	2011 Yesudeep Mangalapilly
+	2012 Google, Inc.
+	"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+SOURCE_DIR="watchdog-$portVersion"
+
+PROVIDES="
+	watchdog = $portVersion
+	cmd:watchmedo
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:python
+	argh
+	pathtools
+	pyyaml
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	python_setuptools
+	"
+
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python/bin/python setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python/bin/python
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--single-version-externally-managed \
+		--root=/ --prefix=$prefix
+}

dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe

@@ -0,0 +1,61 @@
+SUMMARY="A cross platform IDE written in C++/Qt 4"
+DESCRIPTION="MonkeyStudio's primary goal was to be a Qt 4 only IDE, but it \
+evolved to be a way to support any kind of project. It supports Qt 4 \
+project management and embeds Designer and Assistant to form a complete, \
+fast and powerful Qt-based IDE. It's based upon a flexible plugin system \
+that allows extending it in a near-infinite manner."
+HOMEPAGE="http://www.monkeystudio.org"
+SRC_URI="http://monkeystudio.googlecode.com/files/mks_1.9.0.4-src.tar.gz"
+CHECKSUM_SHA256="cfd3517ac6d4a5d8ffdf7ec9995a624b6cef13aa00163e46a9b54b1f52164ffd"
+SOURCE_DIR="mks_$portVersion-src"
+PATCHES="monkeystudio-$portVersion.patch"
+REVISION="1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2012 Azevedo Filipe & The Monkey Studio Team"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	monkeystudio${secondaryArchSuffix} = $portVersion
+	app:MonkeyStudio${secondaryArchSuffix} = $portVersion
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	libqt4${secondaryArchSuffix} >= 4.8.0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:qmake${secondaryArchSuffix}
+	cmd:make
+	cmd:g++${secondaryArchSuffix}
+	"
+        
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel == $haikuVersion
+	libqt4${secondaryArchSuffix}_devel >= 4.8.0
+	"
+
+BUILD()
+{
+	qmake -set SYSTEM_QSCINTILLA 0
+	qmake -r prefix=$appsDir/MonkeyStudio
+	make $jobArgs
+}
+
+INSTALL()
+{
+	monkeyDir=$appsDir/MonkeyStudio
+	mkdir -p $monkeyDir
+	make install
+
+	mv $monkeyDir/bin/monkeystudio $monkeyDir/bin/MonkeyStudio
+	rm -rf $monkeyDir/share/applications
+	rm -rf $monkeyDir/share/doc
+	
+	addAppDeskbarSymlink $monkeyDir/bin/MonkeyStudio "MonkeyStudio"
+}

dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patch

@@ -0,0 +1,25 @@
+From cc357095af73c88c2cc267bc355ad59476afde50 Mon Sep 17 00:00:00 2001
+From: Augustin Cavalier <waddlesplash@gmail.com>
+Date: Wed, 3 Dec 2014 20:58:56 -0500
+Subject: [PATCH] Don't pass -rdynamic on Haiku.
+
+Our GCC4 doesn't support this and throws an error.
+---
+ monkey/monkey.pro | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/monkey/monkey.pro b/monkey/monkey.pro
+index e006f70..a11d135 100644
+--- a/monkey/monkey.pro
++++ b/monkey/monkey.pro
+@@ -20,7 +20,6 @@ LIBS    *= -L$${PACKAGE_BUILD_PATH}/$${Q_TARGET_ARCH}/$$buildMode()
+ mac:*-g++*:LIBS *= -Wl,-all_load # import all symbols as the not used ones too
+ else:*-g++*:LIBS    *= -Wl,--whole-archive # import all symbols as the not used ones too
+ mac:*-g++*:LIBS *= -dynamic
+-else:unix:*-g++*:LIBS   *= -rdynamic
+ 
+ # include qscintilla framework
+ include( ../qscintilla/qscintilla.pri )
+-- 
+1.8.3.4
+

dev-util/astyle/astyle-2.05.recipe

@@ -5,13 +5,18 @@ re-formats C / C++ / C# / Java source files. It can be used from a command \
 line, or it can be incorporated as classes in another C++ program.
 "
 HOMEPAGE="http://astyle.sourceforge.net" 
-SRC_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%202.03/astyle_2.03_linux.tar.gz"
-CHECKSUM_SHA256="22b5249a0b8c9fab3b3bcd467abcb3c6b4a78458b528028634a83dca4c6ca389"
+SRC_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%20${portVersion}/astyle_${portVersion}_linux.tar.gz"
+CHECKSUM_SHA256="da34eb1f8f12e6f50f1cf674944c0db70c91b203008e11be0f57aa8267823a39"
 LICENSE="GNU LGPL v3"
-COPYRIGHT="1998-2002 by Tal Davidson
-		2006-2013 Jim Pattee"
+
+COPYRIGHT="
+1998-2002 by Tal Davidson \
+2006-2013 Jim Pattee
+"
+
 REVISION="1"
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 x86_64 arm ppc"
+
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
 	# for a different secondary architecture.

dev-util/indent/indent-2.2.10.recipe

@@ -0,0 +1,78 @@
+SUMMARY="Indent program source files"
+DESCRIPTION="The indent program can be used to make code easier to read.
+	It can also convert from one style of writing C to another. indent
+	understands a substantial amount about the syntax of C, but it also
+	attempts to cope with incomplete and misformed syntax.
+	"
+HOMEPAGE="https://www.gnu.org/software/indent/" 
+REVISION="2"
+ARCHITECTURES="x86 x86_gcc2"
+LICENSE="GNU GPL v3"
+COPYRIGHT="Copyright (c) 1999, 2000 Carlo Wood.  All rights reserved. 
+	Copyright (c) 1994, 1996, 1997 Joseph Arceneaux.  All rights reserved.
+	Copyright (c) 1992, 2002, 2008 Free Software Foundation, Inc.  All rights reserved.
+	Copyright (c) 1980 The Regents of the University of California.
+	Copyright (c) 1976 Board of Trustees of the University of Illinois. All rights reserved.
+	Copyright (c) 1985 Sun Microsystems, Inc.1998-2000 The Santa Cruz Operation
+	"
+
+SRC_URI="http://mirror.keystealth.org/gnu/indent/indent-2.2.10.tar.gz"
+CHECKSUM_SHA256="8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639"
+
+ARCHITECTURES="x86 x86_64 arm ppc"
+
+PROVIDES="
+	indent = $portVersion
+	cmd:indent = $portVersion
+	cmd:texinfo2man = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+    lib:libiconv$secondaryArchSuffix
+    lib:libintl$secondaryArchSuffix
+    "
+
+BUILD_REQUIRES="
+    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	gettext$secondaryArchSuffix
+    "
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:autopoint
+	cmd:autoreconf
+	cmd:awk
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:find
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	./bootstrap
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# Clean up improperly placed documentation
+	mkdir -p $docDir/html
+	mv $prefix/doc/indent/* $docDir/html/
+	rm -rf $prefix/doc
+}
+
+TEST()
+{
+	make test
+	make check
+}

dev-util/indent/indent-2.2.11.recipe

@@ -1,39 +0,0 @@
-DESCRIPTION="Indent program source files" 
-HOMEPAGE="http://indent.isidore-it.eu/beautify.html" 
-SRC_URI="http://indent.isidore-it.eu/indent-2.2.11.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="sys-devel/gettext >= 0.17
-	net-misc/rsync >= 3.0.7
-	app-text/texi2html >= 1.82"
-CHECKSUM_MD5="98beafca62472805a3739d3867d5d70f"
-BUILD()
-{
-	cd indent-2.2.11
-	libtoolize --force --copy --install
-	./bootstrap
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd indent-2.2.11
-	make install DESTDIR=${DESTDIR}
-}
-
-TEST()
-{
-	cd indent-2.2.11
-#	make test
-#	make check
-}
-
-LICENSE="BSD (3-clause)"
-COPYRIGHT="1999-2000 Carlo Wood.  All rights reserved
-	1994, 1996-1997 Joseph Arceneaux All rights reserved.
-	1992, 2002, 2008 Free Software Foundation, Inc.  All rights reserved.
-	1985 Sun Microsystems, Inc.
-	1980 The Regents of the University of California.
-	1976 Board of Trustees of the University of Illinois. All rights reserved.
-	"

dev-util/uncrustify/uncrustify-0.60.recipe

@@ -0,0 +1,58 @@
+SUMMARY="A highly configurable, easily modifiable source code beautifier"
+DESCRIPTION="\
+ * Ident code, aligning on parens, assignments, etc
+ * Align on '=' and variable definitions
+ * Align structure initializers
+ * Align #define stuff
+ * Align backslash-newline stuff
+ * Reformat comments (a little bit)
+ * Fix inter-character spacing
+ * Add or remove parens on return statements
+ * Add or remove braces on single-statement if/do/while/for statements
+ * Supports embedded SQL 'EXEC SQL' stuff
+ * Highly configurable - 454 configurable options!"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+COPYRIGHT="2005-2014 Ben Gardner"
+LICENSE="GNU GPL v2"
+SRC_URI="https://github.com/bengardner/uncrustify/archive/uncrustify-$portVersion.tar.gz"
+CHECKSUM_SHA256="42c9f84340c5d6a0087037c96b4fe4b46955691e7038700dec98a2e4782b57a3"
+SOURCE_DIR="uncrustify-uncrustify-$portVersion"
+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="
+	uncrustify$secondaryArchSuffix = $portVersion compat >= 0.60
+	cmd:uncrustify = $portVersion compat >= 0.60
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:awk
+	"
+
+BUILD()
+{
+	runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}

games-emulation/visualboyadvance/visualboyadvance-1.8.recipe

@@ -34,7 +34,7 @@ BUILD_REQUIRES="
 	devel:libpng$secondaryArchSuffix
 "
 BUILD_PREREQUIRES="
-	cmd:nasm$secondaryArchSuffix
+	cmd:nasm
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix

games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe

@@ -7,7 +7,7 @@ HOMEPAGE="http://scummvm.org"
 SRC_URI="http://sourceforge.net/projects/scummvm/files/scummvm-tools/1.7.0/scummvm-tools-1.7.0.tar.gz"
 SOURCE_DIR="scummvm-tools-1.7.0"
 CHECKSUM_SHA256="6437cc87d5a0c81fe971c96059670e662e72141b53ee61923d374b5660997cbc"
-REVISION="1"
+REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"
 
@@ -33,7 +33,7 @@ REQUIRES="
 	haiku >= $haikuVersion
 	lib:libvorbis
 	lib:libogg
-	lib:libflac
+	lib:libFLAC
 	lib:libmad
 	lib:libpng
 	lib:libz
@@ -46,7 +46,7 @@ BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
 	devel:libvorbis
 	devel:libogg
-	devel:libflac
+	devel:libFLAC
 	devel:libmad
 	devel:libpng
 	devel:libz

games-engines/scummvm/scummvm-1.6.0.recipe

@@ -7,7 +7,7 @@ were never designed!"
 HOMEPAGE="http://scummvm.org"
 SRC_URI="http://prdownloads.sourceforge.net/scummvm/scummvm-1.6.0.tar.bz2?download"
 CHECKSUM_SHA256="396060da6a8f391438055c292a280048d29dc408c5b615db43256a86f0e57ec4"
-REVISION="3"
+REVISION="4"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2013 ScummVM Team"
 
@@ -29,7 +29,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libfaad$secondaryArchSuffix
-	lib:libflac++$secondaryArchSuffix
+	lib:libFLAC++$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libfluidsynth$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
@@ -46,7 +46,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libbz2$secondaryArchSuffix
 	devel:libfaad$secondaryArchSuffix
-	devel:libflac++$secondaryArchSuffix
+	devel:libFLAC++$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libfluidsynth$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix

games-engines/scummvm/scummvm-1.7.0.recipe

@@ -7,7 +7,7 @@ were never designed!"
 HOMEPAGE="http://scummvm.org"
 SRC_URI="http://sourceforge.net/projects/scummvm/files/scummvm/1.7.0/scummvm-1.7.0.tar.gz"
 CHECKSUM_SHA256="aaee99d06b9c55e1359556908b5faeccfa017f2fdf5d1f3cf978dfb02b5bc301"
-REVISION="1"
+REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2014 ScummVM Team"
 
@@ -29,7 +29,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libfaad$secondaryArchSuffix
-	lib:libflac$secondaryArchSuffix
+	lib:libFLAC$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libfluidsynth$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -47,7 +47,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libbz2$secondaryArchSuffix
 	devel:libfaad$secondaryArchSuffix
-	devel:libflac$secondaryArchSuffix
+	devel:libFLAC$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libfluidsynth$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix

games-kids/pipepanic/patches/pipepanic-0.1.3.patch

@@ -1,17 +1,34 @@
---- ../main.c	2006-05-16 22:11:29.042991616 +0200
-+++ main-new.c	2013-12-09 16:52:30.000000000 +0100
-@@ -16,6 +16,10 @@
+diff --git a/main.c b/main.c
+index 6cf114c..960f57a 100644
+--- a/main.c
++++ b/main.c
+@@ -16,6 +16,14 @@ along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
  
  /* Includes */
 +// chdir()
 +#include <unistd.h>
 +#include <libgen.h>
++
++#ifdef __HAIKU__
++#include <FindDirectory.h>
++#endif
 +
  #include <SDL/SDL_main.h>
  #include <SDL/SDL.h>
  #include <string.h>
-@@ -102,6 +106,9 @@
+@@ -44,6 +52,10 @@ SDL_Surface *temp;
+ SDL_Event event;
+ char *current_dir;
+ char *user_home_dir;
++#ifdef __HAIKU__
++char user_settings_dir[256];
++#endif
++char save_file[256];
+ int quit = 0;
+ int game_mode = GAMEON;
+ int previous_game_mode = 0;
+@@ -102,6 +114,9 @@ extern "C"
  int main(int argc, char *argv[]) {
  	int count, count2;
  	
@@ -21,9 +38,89 @@
  	/* Initialise the highscoreboard array because there may not yet
  	   be a saved highscore[board]/rc file */
  	for (count = 0; count < 5; count++) {
-
---- ../pipepanic.rdef
-+++ pipepanic.rdef
+@@ -114,7 +129,16 @@ int main(int argc, char *argv[]) {
+ 	
+ 	current_dir = getenv("PWD");
+ 	user_home_dir = getenv("HOME");
+-	
++
++	#ifdef __HAIKU__
++	find_directory(B_USER_SETTINGS_DIRECTORY, NULL, true,
++			user_settings_dir, sizeof(user_settings_dir));
++	snprintf(save_file, sizeof(save_file),
++			"%s/" RESOURCEFILE, user_settings_dir);
++	#else
++	snprintf(save_file, sizeof(save_file),
++			"%s/" RESOURCEFILE, user_home_dir);
++	#endif
+ 	#ifdef DEBUG
+ 	printf("PWD=%s\n", current_dir);
+ 	printf("HOME=%s\n", user_home_dir);
+@@ -1567,16 +1591,12 @@ void read_rc_file(void) {
+ 	FILE* file;
+ 	int result, value, count;
+ 		
+-	strcpy(buffer, user_home_dir);
+-	strcat(buffer, "/");
+-	strcat(buffer, RESOURCEFILE);
+-	
+ 	#ifdef DEBUG
+-	printf("%s\n", buffer);
++	printf("%s\n", save_file);
+ 	#endif
+ 	
+-	if ((file = fopen(buffer,"r")) == NULL) {
+-		printf("%s: Cannot read from file %s\n", __func__, buffer);
++	if ((file = fopen(save_file,"r")) == NULL) {
++		printf("%s: Cannot read from file %s\n", __func__, save_file);
+ 		return;
+ 	}
+ 
+@@ -1638,20 +1658,15 @@ void read_rc_file(void) {
+  ***************************************************************************/
+ 
+ void save_rc_file(void) {
+-	char buffer[256];
+ 	FILE* file;
+ 	int count;
+ 		
+-	strcpy(buffer, user_home_dir);
+-	strcat(buffer, "/");
+-	strcat(buffer, RESOURCEFILE);
+-	
+ 	#ifdef DEBUG
+-	printf("%s\n", buffer);
++	printf("%s\n", save_file);
+ 	#endif
+ 	
+-	if ((file = fopen(buffer,"w")) == NULL) {
+-		printf("%s: Cannot write to file %s\n", __func__, buffer);
++	if ((file = fopen(save_file,"w")) == NULL) {
++		printf("%s: Cannot write to file %s\n", __func__, save_file);
+ 		return;
+ 	}
+ 
+diff --git a/main.h b/main.h
+index 664b75b..178f665 100644
+--- a/main.h
++++ b/main.h
+@@ -27,7 +27,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #define TILES48BMP "tiles48.bmp"
+ #define ASCII15BMP "ascii15.bmp"
+ #define ASCII30BMP "ascii30.bmp"
++#ifdef __HAIKU__
++#define RESOURCEFILE "pipepanic"
++#else
+ #define RESOURCEFILE ".pipepanicrc"
++#endif
+ 
+ #define MAGENTA 0xff, 0x00, 0xff
+ #define YELLOW  0xff, 0xcc, 0x66
+diff --git a/pipepanic.rdef b/pipepanic.rdef
+new file mode 100644
+index 0000000..096d98d
+--- /dev/null
++++ b/pipepanic.rdef
 @@ -0,0 +1,30 @@
 +resource app_signature "application/x-vnd.Thnor-Pipepanic";
 +

games-kids/pipepanic/pipepanic-0.1.3.recipe

@@ -28,6 +28,9 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
+USER_SETTINGS_FILES="
+	settings/pipepanic
+	"
 PATCHES="
 	pipepanic-0.1.3.patch
 	"

games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe

@@ -0,0 +1,74 @@
+SUMMARY="Homeworld is a space real-time strategy computer game."
+DESCRIPTION="
+Homeworld is a real-time strategy computer \
+game, set and played in a 3D space environment. \
+Developed by Relic Entertainment, it was released \
+for the PC in 1998 to worldwide acclaim, winning \
+multiple awards for its novel gameplay and strong \
+single-player story. Relic Entertainment later released \
+the source code to the public under licence. 
+"
+HOMEPAGE="http://www.homeworldsdl.org/"
+COPYRIGHT="1999-2000 Sierra On-Line, Inc."
+LICENSE="RE-INC-EULA"
+SRC_URI="git+https://bitbucket.org/extrowerk/homeworld-sdl-haiku.git"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	homeworld_sdl$secondaryArchSuffix = $portVersion
+	app:homeworld_sdl$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libsdl$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libglu$secondaryArchSuffix
+	#lib:mesa_swrast
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:autoconf
+	cmd:aclocal
+	cmd:libtool
+	cmd:yacc$secondaryArchSuffix
+	cmd:flex
+	"
+	
+SOURCE_DIR="homeworld-sdl-haiku"
+
+BUILD()
+{
+	cd Haiku
+	echo "Bootstrapping Homewold_SDL"
+	bash ./bootstrap
+	echo "Configuring Homeworld_SDL"
+	runConfigure ../configure -C --bindir=$appsDir/Homeworld_SDL
+	echo "Building Homeworld_SDL"
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd Haiku/src
+	echo "Striping debug symbols"
+	strip homeworld
+	echo "Creating bin directory for packaging Homeworld_SDL"
+	mkdir -p $appsDir/Homeworld_SDL
+	echo "Moving binary into the bin directory"
+	cp homeworld $appsDir/Homeworld_SDL/homeworld_sdl
+	cd ..
+	unzip ./Haiku_Extra/Homeworld_Haiku_Start.sh.zip
+	cp Homeworld_Haiku_Start.sh $appsDir/Homeworld_SDL/Start_Homeworld_SDL.sh
+	echo "Adding Homeworld_SDL to the Deskbar"
+	addAppDeskbarSymlink $appsDir/Start_Homeworld_SDL.sh Homeworld_SDL
+}

games-strategy/homeworld_sdl/licenses/RE-INC-EULA

@@ -0,0 +1,261 @@
+Homeworld © 1999-2000 Sierra On-Line, Inc.  All Rights Reserved.
+Homeworld is a registered trademark, and Sierra and Sierra Studios are
+registered trademarks of Sierra On-Line, Inc.  Relic is a trademark of Relic
+Entertainment, Inc.
+
+------------------------------------------------------------------------------
+
+This port of Homeworld is based on the original Homeworld source code released
+by Relic Entertainment through the Relic Developers Network.  It has been
+edited for content and formatted to fit your OS.
+
+The original Homeworld source code in its entirety is available from the Relic
+Developers Network website at http://www.relic.com/rdn/
+
+This file contains a copy of the end-user license agreement presented with the
+Homeworld source code from the Relic Developers Network.  If you are using a
+pre-built version of Homeworld, other pre-built libraries have been included
+with the distribution which utilize their own licenses (particularly the GPL
+and LGPL).  Copies of these licenses have been included in additional
+"COPYING_*" files with the pre-built package.
+
+Simple DirectMedia Layer (SDL) is licensed under the LGPL.  The source code to
+SDL is available at http://www.libsdl.org/
+
+Headers for Glide 2 have also been thrown into the source package.  They are
+taken from the open-source Glide 2 library, which is licensed under the 3dfx
+Glide General Public License.  A copy of the license is included in the
+"include/glide2" directory in the source package.
+
+------------------------------------------------------------------------------
+
+                         Relic Entertainment Inc. TM
+
+                        END-USER LICENSE AGREEMENT FOR
+                 RELIC ENTERTAINMENT INC. ("RELIC") SOFTWARE
+
+                          IMPORTANT-READ CAREFULLY:
+
+
+This RELIC End-User License Agreement (the "Agreement") is a legal agreement
+between you (either an individual or a single entity) and RELIC, for the use
+of one or more elements of RELIC proprietary software, which may at RELIC's
+discretion include computer code related to Homeworld 1 TM, tools or other
+material related to creating content related to Homeworld 2 TM and/or
+Impossible Creatures TM including without limitation associated media, printed
+materials, and "online" or electronic documentation (individually or
+collectively referred to as the "SOFTWARE PRODUCT").  The SOFTWARE PRODUCT may
+also include any updates and supplements to the original SOFTWARE PRODUCT
+provided to you by RELIC.  Any software provided along with the SOFTWARE
+PRODUCT that is associated with a separate end-user license agreement is
+licensed to you under the terms of that license agreement.
+
+BY CLICKING "AGREE" BELOW, AND/OR BY INSTALLING, COPYING, DOWNLOADING,
+ACCESSING OR OTHERWISE USING THE SOFTWARE PRODUCT, YOU AGREE TO BE BOUND BY
+THE TERMS OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO THE TERMS OF THIS
+AGREEMENT, DO NOT INSTALL OR USE THE SOFTWARE PRODUCT.
+
+This Agreement is made by and between you (the "LICENSEE") and RELIC.
+
+WHEREAS, RELIC is a game development company that owns certain tools, game
+engines and other technology used to develop interactive entertainment
+software games; and
+
+WHEREAS, LICENSEE wishes to utilize the SOFTWARE PRODUCT for non-commercial
+purposes in accordance with the terms set forth herein; and
+
+WHEREAS, LICENSEE wishes to license from RELIC and RELIC wishes to license to
+LICENSEE, the SOFTWARE PRODUCT and other information as deemed from time to
+time appropriate by RELIC, all on the terms set forth herein;
+
+NOW, THEREFORE, in consideration of the mutual promises made herein, the
+receipt and sufficiency of which is hereby acknowledged, the parties agree as
+follows:
+
+
+1. License
+
+1.1 License Grant. Provided that the LICENSEE complies with the terms set
+forth herein, RELIC hereby grants LICENSEE a limited purpose, nonexclusive,
+royalty-free, terminable, worldwide, non-transferable license to:
+
+  (a) use, reproduce and modify the SOFTWARE PRODUCT and the MODIFIED SOFTWARE
+(as defined in section 2.1) solely for non-commercial purposes; and
+
+  (b) distribute the SOFTWARE PRODUCT and the MODIFIED SOFTWARE, solely for
+non-commercial purposes, and only to registered members of RDN-RELIC
+Developer's Network who have agreed to abide by the terms of this Agreement.
+
+For greater certainty, the term "for non-commercial purposes" as used in this
+Agreement means that the use, reproduction, modification and/or distribution
+of the SOFTWARE PRODUCT and/or MODIFIED SOFTWARE must be made free of any and
+all charges or payments and, without limitation, must not entitle, directly or
+indirectly, the LICENSEE, any related parties or third parties to receive any
+financial consideration or compensation related to such use, reproduction,
+modification and/or distribution.
+
+1.2 Updates. RELIC may from time to time, in its sole discretion, and without
+any obligation on the part of RELIC, provide updates, error corrections, and
+future versions of SOFTWARE PRODUCT to LICENSEE.  Upon delivery, such updates,
+error corrections and future versions shall be deemed part of the SOFTWARE
+PRODUCT, as applicable, and governed by the terms and conditions of this
+Agreement.
+
+1.3 Reservation of Rights. RELIC reserves all rights not explicitly granted
+herein.
+
+1.4 Indemnity. LICENSEE hereby agrees that it is solely responsible for any
+and all liability, claims, damages or losses arising, directly or indirectly,
+from any and all LICENSEE use, reproduction, modification and distribution of
+the SOFTWARE PRODUCT.  LICENSEE shall defend, indemnify, and hold harmless
+RELIC, its officers, directors, employees and agents against any and all
+claims, damages, losses, or liabilities whatsoever arising out of LICENSEE's
+use, reproduction, modification and/or distribution of the SOFTWARE PRODUCT.
+
+1.5 Trademarks. LICENSEE acknowledges and agrees that this Agreement does not
+grant LICENSEE any right to use any trademarks or trade names of RELIC or
+their licensors.  All such marks shall remain the property of the respective
+owner.
+
+
+2. Intellectual Property
+
+2.1 Ownership. The LICENSEE acknowledges and agrees that if the SOFTWARE
+PROGRAM is improved, modified, developed or otherwise amended by the LICENSEE
+("MODIFIED SOFTWARE") the LICENSEE shall have, save and except for the limited
+license granted to the LICENSEE pursuant to the terms and conditions of this
+Agreement, no right, title or interest in and to the MODIFIED SOFTWARE as
+modified or altered, whether modified by the LICENSEE or RELIC and whether or
+not such modifications are authorized pursuant to this Agreement.
+Specifically, the LICENSEE hereby assigns all right, title and interest
+arising out of any such MODIFIED SOFTWARE to RELIC or any other entity as
+RELIC shall require and the LICENSEE will execute such further and other
+documents and do such further and other acts as may be necessary, in the sole
+opinion of RELIC, to transfer all such right, title and interest in and to the
+MODIFIED SOFTWARE from the LICENSEE to RELIC.  If, to the extent that it may
+be deemed that an assignment or grant of right under this section cannot be
+made until after relevant works are in existence, the LICENSEE's acceptance of
+the terms and conditions of this Agreement shall constitute an irrevocable
+assignment of all right, title and interest in and to all complete or
+incomplete works that make up the MODIFIED SOFTWARE.  The LICENSEE hereby
+irrevocably waives in whole any and all moral rights arising under the
+Copyright Act (Canada), as amended from time to time, or other similar
+legislation in any jurisdiction or at common law, which the LICENSEE may have
+in the MODIFIED SOFTWARE.
+
+
+3. Term
+
+3.1 Term. This Agreement shall become effective as of the date LICENSEE
+downloads or installs the SOFTWARE PRODUCT and shall expire five (5) years
+after such date.
+
+3.2 Termination. RELIC may, at its sole discretion and authority, terminate
+this Agreement immediately upon notice including without limitation notice via
+email to LICENSEE.  The Agreement will terminate automatically upon LICENSEE's
+breach of any term of this Agreement.  Any notice sent or transmitted by RELIC
+to the LICENSEE's last known or registered address will be deemed to have been
+sent by RELIC and received by LICENSEE one (1) day after such sending or
+transmission by RELIC.  In the event that this Agreement is terminated for any
+reason, the LICENSEE shall immediately and permanently cease use,
+reproduction, modification or distribution of the SOFTWARE PRODUCT and
+MODIFIED SOFTWARE and will destroy any and all software, code, associated
+media and printed materials related to, directly or indirectly, the SOFTWARE
+PRODUCT and/or the MODIFIED SOFTWARE.
+
+3.3 Survival. Sections 1.4, 1.5, 2.1, 3.2, 3.3, 4.1, 4.2, 5.1 and 7 shall
+survive any expiration or termination of this Agreement.
+
+
+4. Disclaimers, Warranties and Limitation of Liability
+
+4.1 NO WARRANTIES. RELIC AND ITS SUPPLIERS DISCLAIM ANY AND ALL WARRANTIES
+WITH RESPECT TO THE SOFTWARE PRODUCT, EITHER EXPRESS OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.  THE LICENSEE ACKNOWLEDGES THAT IT HAS NOT RELIED ON ANY
+WARRANTY MADE BY RELIC OR ITS SUPPLIERS.  THE SOFTWARE PRODUCT IS PROVIDED ON
+AN "AS IS" BASIS WITH NO WARRANTY, EXPRESS OR IMPLIED AND RELIC HAS NO
+OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
+MODIFICATIONS WITH RESPECT TO THE SOFTWARE PRODUCT TO THE LICENSEE.
+
+4.2 LIMITATION OF LIABILITY. IN NO EVENT SHALL RELIC OR ITS SUPPLIERS BE
+LIABLE FOR ANY DAMAGES SUFFERED OR INCURRED BY THE LICENSEE OR ANY OTHER
+PERSON OR ENTITY INCLUDING, WITHOUT LIMITATION, ANY SPECIAL, INCIDENTAL,
+INDIRECT, PUNITIVE OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, LOSS OF REVENUE, BUSINESS
+INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS)
+ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE PRODUCT, EVEN IF
+RELIC HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+5.
+
+5.1 COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT
+(including but not limited to any images, photographs, animations, video,
+audio, music, text, and "applets" incorporated into the SOFTWARE PRODUCT), the
+accompanying printed materials, and any copies of the SOFTWARE PRODUCT are
+owned by RELIC or its suppliers.  All title and intellectual property rights
+in and to the content which may be accessed through use of the SOFTWARE
+PRODUCT is the property of the respective content owner and may be protected
+by applicable copyright or other intellectual property laws and treaties.
+This Agreement grants LICENSEE no rights to use such content.  If this
+SOFTWARE PRODUCT contains documentation, which is provided only in electronic
+form, LICENSEE may print one copy of such electronic documentation.  LICENSEE
+may not copy the printed materials accompanying the SOFTWARE PRODUCT.
+
+5.2 COPY PROTECTION. Use of the SOFTWARE PRODUCT may require additional RELIC
+software for use of the SOFTWARE PRODUCT which may employ copy protection
+technology to prevent the unauthorized copying of the SOFTWARE PRODUCT and/or
+additional RELIC software.  It is illegal to make unauthorized copies of the
+SOFTWARE PRODUCT and/or additional RELIC software or circumvent any copy protection technology employed by RELIC.
+
+
+6. No Exclusivity
+
+Nothing in this Agreement nor the license of the SOFTWARE PRODUCT shall
+constitute or imply any promise to or intention to make any purchase of
+products or services by either party or its affiliated companies or any
+commitment by either party or its affiliated companies with respect to the
+present or future marketing of any product or service or any commitment to
+enter into any other business relationship.
+
+
+7. General
+
+7.1 Modification. No amendment or modification of this Agreement shall be
+valid or binding on RELIC unless made in writing and signed on behalf of RELIC
+by its respective duly authorized officers or representatives.  RELIC may,
+without notice to the LICENSEE, modify, alter or vary the terms of this
+Agreement without the consent of the LICENSEE, however, such modification,
+alteration or variance shall be displayed on the RELIC website located at
+www.relic.com .
+
+7.2 Assignment. LICENSEE may not assign this Agreement without the prior
+written consent of RELIC.  Subject to the limitations set forth in this
+Agreement, this Agreement will inure to the benefit of and be binding upon the
+parties, their successors and permitted assigns.
+
+7.3 Separation of Components. The SOFTWARE PRODUCT is licensed as a single
+product.  Its component parts may not be separated for use license,
+distribution or replacement by the LICENSEE.
+
+7.4 Severability. If any provision of this Agreement shall be held by a court
+of competent jurisdiction to be illegal, invalid or unenforceable, the
+remaining provisions will not be affected and will be deemed to be in full
+force and effect.
+
+7.5 Governing Law, Jurisdiction and Venue. This Agreement shall be governed by
+the laws of the Province of British Columbia.  Each of the parties hereto
+submits and attorns to the exclusive jurisdiction and venue in the provincial
+and federal courts sitting in Vancouver, BC.
+
+7.6 Entire Agreement. This Agreement constitutes the entire understanding
+between the parties hereto and supersedes all previous communications,
+representations and understandings, oral or written, between the parties, with
+respect to the subject matter of this Agreement.
+
+7.7 The LICENSEE agrees that RELIC would be irreparably injured by breach of
+this Agreement by LICENSEE and that RELIC shall be entitled to equitable
+relief, including injunctive relief and specific performance, in addition to
+any and all monetary damages, in the event of any breach of the provisions of
+this Agreement by the LICENSEE.

haiku-apps/armyknife/armyknife-4.3.0.recipe

@@ -29,6 +29,8 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:unzip
+	cmd:find
+	cmd:xargs
 	"
 
 BUILD()

haiku-apps/artpaint/artpaint-2.1.0git.recipe

@@ -0,0 +1,47 @@
+SUMMARY="An award winning painting and image-processing program"
+DESCRIPTION="The main features of ArtPaint include a comprehensive set of \
+painting-tools and real-time preview for many image-manipulating operations. \
+The key design principle has been to let the user see what they are doing \
+instead of just forcing them to type in some numbers and then hoping that \
+the result will not be too far from the expected."
+HOMEPAGE="https://github.com/HaikuArchives/ArtPaint"
+SRC_URI="https://github.com/HaikuArchives/ArtPaint/archive/3e4be5a29e2966b390d668b7e96ef3f7901fa001.tar.gz"
+CHECKSUM_SHA256="2990682bb932f4fbd8f156511171ae09d61038eddfa88fc7646af715f6fc83d8"
+SOURCE_DIR="ArtPaint-3e4be5a29e2966b390d668b7e96ef3f7901fa001"
+COPYRIGHT="2003 Heikki Suhonen
+	2009 Karsten Heimrich"
+LICENSE="MIT"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	artpaint = $portVersion
+	app:ArtPaint = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:mkdepend
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+
+BUILD()
+{
+	cd artpaint
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	cd artpaint
+	mkdir -p $appsDir
+	cp objects/ArtPaint $appsDir
+	addAppDeskbarSymlink $appsDir/ArtPaint
+}

haiku-apps/backup/backup-0.0.1.recipe

@@ -5,8 +5,8 @@ A backup application for Haiku.
 COPYRIGHT="2013 Alexander von Gluck IV"
 LICENSE="MIT"
 HOMEPAGE="https://github.com/kallisti5/backup" 
-SRC_URI="git+https://github.com/kallisti5/backup#34e156f64d"
-REVISION="2"
+SRC_URI="git+https://github.com/kallisti5/backup#4c01c5b6f0"
+REVISION="3"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
@@ -25,8 +25,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:mkdepend
 	"
-		
-PATCHES="backup-0.0.1.patch"
 
 BUILD()
 {

haiku-apps/backup/patches/backup-0.0.1.patch

@@ -1,12 +0,0 @@
-diff -Naur backup/BackupView.cpp backup-fix/BackupView.cpp
---- backup/BackupView.cpp	2013-11-18 21:15:38.949223424 +0000
-+++ backup-fix/BackupView.cpp	2013-11-18 21:15:33.142344192 +0000
-@@ -120,7 +120,7 @@
- 
- 	// Refresh System Directory
- 	BPath sysSettingsDirectory;
--	find_directory(B_COMMON_SETTINGS_DIRECTORY, &sysSettingsDirectory);
-+	find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &sysSettingsDirectory);
- 	fSysSettingBytes = DirectorySize(&sysSettingsDirectory);
- 	size_to_string(fSysSettingBytes, sizeText, 512);
- 	fSysSettingSizeText->SetText(sizeText);

haiku-apps/beezer/beezer-0.99.hg.recipe

@@ -12,7 +12,7 @@ COPYRIGHT="
 	2009 Ramshankar (aka Teknomancer)
 	2011-2012 Chris Roberts
 	"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
@@ -29,15 +29,11 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	cmd:cmake >= 2.8
+	cmd:cmake
 	cmd:gcc
 	cmd:make
 	"
 
-PATCHES="
-	beezer-0.99.hg.patch
-	"
-
 BUILD()
 {
 	cd Source

haiku-apps/beezer/patches/beezer-0.99.hg.patch

@@ -1,57 +0,0 @@
-From 3728835e4083c862c9b03dd5ffdb5941f34f9da5 Mon Sep 17 00:00:00 2001
-From: Luke <noryb009@gmail.com>
-Date: Sun, 1 Dec 2013 12:22:29 +0000
-Subject: [PATCH] Remove references to B_COMMON_
-
----
- Source/Archiver/Archiver.cpp      | 13 +------------
- Source/Beezer/FSUtils/FSUtils.cpp |  2 +-
- 2 files changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/Source/Archiver/Archiver.cpp b/Source/Archiver/Archiver.cpp
-index c272333..7b57313 100644
---- a/Source/Archiver/Archiver.cpp
-+++ b/Source/Archiver/Archiver.cpp
-@@ -625,7 +625,7 @@ status_t Archiver::SetComment(char* commentStr, const char* tempDirPath)
- bool Archiver::IsBinaryFound(char* filePath, const char* fileName) const
- {
-     // Check if the given fileName exists in the given dir, if so copy the full path of fileName to filePath
--    // Path priority  <appdir>/workers -> B_SYSTEM_BIN_DIRECTORY -> B_COMMON_BIN_DIRECTORY
-+    // Path priority  <appdir>/workers -> B_SYSTEM_BIN_DIRECTORY
-     BPath binPath;
-     app_info appInfo;
-     be_app->GetAppInfo(&appInfo);
-@@ -652,17 +652,6 @@ bool Archiver::IsBinaryFound(char* filePath, const char* fileName) const
-         }
-     }
- 
--    if (find_directory(B_COMMON_BIN_DIRECTORY, &binPath) == B_OK)
--    {
--        binPath.Append(fileName);
--        BEntry entry(binPath.Path(), true);
--        if (entry.Exists())
--        {
--            strcpy(filePath, binPath.Path());
--            return true;
--        }
--    }
--
-     // TODO full search of $PATH
- 
-     filePath = '\0';
-diff --git a/Source/Beezer/FSUtils/FSUtils.cpp b/Source/Beezer/FSUtils/FSUtils.cpp
-index a651c58..8fbb01d 100644
---- a/Source/Beezer/FSUtils/FSUtils.cpp
-+++ b/Source/Beezer/FSUtils/FSUtils.cpp
-@@ -177,7 +177,7 @@ BString CreateTempDirectory(const char* prefix, BDirectory** createdDir, bool cr
-         prefixStr << prefix << "_";
- 
-     BPath tmpPath;
--    find_directory(B_COMMON_TEMP_DIRECTORY, &tmpPath, true);
-+    find_directory(B_SYSTEM_TEMP_DIRECTORY, &tmpPath, true);
-     BString tempDirName = tempnam(const_cast<char*>(tmpPath.Path()), const_cast<char*>(prefixStr.String()));
- 
-     // Further random the dir name (the below number is a prime)
--- 
-1.8.3.4
-

haiku-apps/burnitnow/burnitnow-0.1.0.recipe

@@ -0,0 +1,58 @@
+SUMMARY="A GUI frontend for burning CDs"
+DESCRIPTION="BurnItNow is a GUI frontend for CDRecord and mkisofs. \
+It supports Audio CD, MixCD (on the fly), Data CD (on the fly, multisession), \
+BootableCD and burning an BFS image."
+HOMEPAGE="https://github.com/HaikuArchives/BurnItNow"
+SRC_URI="https://github.com/HaikuArchives/BurnItNow/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="7db12d261ddebcbfe82e2ab5e7aed4227caef476f01488a1ccec4f58287833d2"
+SOURCE_DIR="BurnItNow-$portVersion"
+REVISION="1"
+COPYRIGHT="2010-2014 BurnItNow Team"
+LICENSE="MIT"
+
+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="
+	burnitnow$secondaryArchSuffix = $portVersion
+	app:BurnItNow = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:cdrecord
+	cmd:mkisofs
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:make
+	cmd:mkdepend
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	cd Source
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	cd Source
+	mkdir -p $appsDir
+	cp objects/BurnItNow $appsDir
+	addAppDeskbarSymlink $appsDir/BurnItNow
+}

haiku-apps/burnitnow/burnitnow-trunk.recipe

@@ -1,49 +0,0 @@
-SUMMARY="A utility for burning CD"
-DESCRIPTION="
-BurnItNow is a CD burning utility application for Haiku.
-"
-HOMEPAGE="https://github.com/HaikuArchives/BurnItNow"
-SRC_URI="git+https://github.com/HaikuArchives/BurnItNow.git#a790db9a87"
-REVISION="1"
-COPYRIGHT="
-	2010-2013 BurnItNow Team
-	"
-LICENSE="MIT"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	burnitnow = $portVersion
-	app:BurnItNow = $portVersion
-	"
-
-REQUIRES="
-	haiku >= $haikuVersion
-	cmd:cdrecord
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	"
-
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	"
-
-#SOURCE_DIR="$portName/burnitnow2"
-
-BUILD()
-{
-	cmake .
-	make
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/BurnItNow
-	cp BurnItNow $appsDir/BurnItNow
-	addAppDeskbarSymlink $appsDir/BurnItNow/BurnItNow
-}

haiku-apps/capitalbe/capitalbe-1.0.recipe

@@ -1,46 +0,0 @@
-SUMMARY="A finance manager for Haiku."
-DESCRIPTION="Capital Be is a finance manager for Haiku. Easily track where your money is \
-going. View reports, reconcile accounts and more! Like other programs \
-published by the same author, Capital Be focuses on keeping easy jobs easy and \
-making tough ones easier."
-HOMEPAGE="http://github.com/HaikuArchives/CapitalBe"
-SRC_URI="git://github.com/HaikuArchives/CapitalBe.git#eb8d7f92bbaa1594dddeb07c64f90442de106a3e"
-REVISION="2"
-LICENSE="MIT"
-COPYRIGHT="2009 DarkWyrm (Jon Yoder)"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-
-PROVIDES="
-	capitalbe = $portVersion
-	app:capitalbe = $portVersion
-	"
-
-REQUIRES="
-	haiku >= $haikuVersion
-	"
-
-BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	devel:libsqlite3
-	"
-
-BUILD_PREREQUIRES="
-	cmd:gcc
-	"
-
-BUILD()
-{
-	g++ -lbe -ltracker -ltranslation -lsqlite3 src/*.cpp -o capitalbe
-	rc -o capitalbe.rsrc src/capitalbe.rdef
-	xres -o capitalbe capitalbe.rsrc
-	mimeset -f capitalbe
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/capitalbe
-	mkdir -p $appsDir/capitalbe/helpfiles
-	cp -r src/helpfiles/* $appsDir/capitalbe/helpfiles/
-	mv capitalbe $appsDir/capitalbe/capitalbe
-	addAppDeskbarSymlink $appsDir/capitalbe/capitalbe "Capital Be"
-}

haiku-apps/capitalbe/capitalbe-1.1.recipe

@@ -0,0 +1,51 @@
+SUMMARY="A finance manager for Haiku"
+DESCRIPTION="CapitalBe is a finance manager for Haiku. Easily track \
+where your money is going. View reports, reconcile accounts and more! \
+Like other programs published by the same author, Capital Be focuses \
+on keeping easy jobs easy and making tough ones easier."
+HOMEPAGE="http://github.com/HaikuArchives/CapitalBe"
+SRC_URI="https://github.com/HaikuArchives/CapitalBe/archive/v1.1.tar.gz"
+CHECKSUM_SHA256="e6e5ab26a372e79bbc1ac2eb6d7018296b983409f65c0da634bb420de08adde9"
+SOURCE_DIR="CapitalBe-$portVersion"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2009 DarkWyrm (Jon Yoder)"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	capitalbe = $portVersion
+	app:CapitalBe = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libsqlite3
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsqlite3
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	makefile_engine
+	"
+
+BUILD()
+{
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	capitalBeDir=$appsDir/CapitalBe
+	mkdir -p $capitalBeDir
+	mkdir -p $capitalBeDir/helpfiles
+	cp -r src/helpfiles/* $capitalBeDir/helpfiles/
+	
+	mv objects/CapitalBe $capitalBeDir/CapitalBe
+	addAppDeskbarSymlink $capitalBeDir/CapitalBe "CapitalBe"
+}

haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe

@@ -0,0 +1,45 @@
+SUMMARY="The desktop calculator which features a skin interface system."
+DESCRIPTION="CoveredCalc is a desktop calculator whose look and feel is \
+flexibly customizable. It works on Windows, BeOS, and Haiku. In this \
+application the word \"cover\" means a set of files for its design, \
+instead of the commonly used word \"skin\"."
+HOMEPAGE="https://code.google.com/p/coveredcalc"
+SRC_URI_1="svn+http://coveredcalc.googlecode.com/svn/trunk@72"
+SRC_URI_2="https://coveredcalc.googlecode.com/files/CoveredCalcBe1.10.0.zip"
+CHECKSUM_SHA256_2="f5256c9cdb581c0246292005e9d3275586552bd4630b91e7372bd1903a94b669"
+REVISION="1"
+LICENSE="MIT"
+ARCHITECTURES="x86_gcc2 ?x86"
+COPYRIGHT="2008 hiron@with.memail.jp"
+
+PROVIDES="
+        coveredcalc = $portVersion
+        app:CoveredCalc = $portVersion
+        "
+
+REQUIRES="
+        haiku >= $haikuVersion
+        "
+
+BUILD_REQUIRES="
+              haiku_devel >= $haikuVersion
+              cmd:make
+              cmd:gcc
+              cmd:xres
+              "
+
+BUILD()
+{
+	cd Sources/CoveredCalc/CoveredCalcBe
+	make release $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/CoveredCalc/{NLS,Keymaps}
+	cp Sources/CoveredCalc/CoveredCalcBe/obj.release/CoveredCalc $appsDir/CoveredCalc
+	cp LangFiles/BeOS/* $appsDir/CoveredCalc/NLS
+	cp KeyMappings/BeOS/* $appsDir/CoveredCalc/Keymaps
+	cp -R ../../sources-2/CoveredCalc/Covers $appsDir/CoveredCalc
+	addAppDeskbarSymlink $appsDir/CoveredCalc/CoveredCalc
+}

haiku-apps/digiclock/digiclock-1.0.recipe

@@ -1,30 +1,34 @@
 SUMMARY="DigiClock Screensaver"
-DESCRIPTION="Based on BinaryClock by David Enderson. DigiClock uses filled rectangles and random colors."
-
-HOMEPAGE="https://github.com/bbjimmy/DigiClock"
-SRC_URI="git+https://github.com/bbjimmy/DigiClock.git#7c49eb1ec29b1eb1046f9d7911646e2d5f5e6def"
+DESCRIPTION="Based on BinaryClock by David Enderson. DigiClock uses filled rectangles and\
+ random colors."
+HOMEPAGE="http://www.fatelk.com"
+SRC_URI="https://github.com/bbjimmy/DigiClock/archive/1.0.tar.gz"
+CHECKSUM_SHA512="24ab1ed06a4b13d63fbca87708a9e98b53b5737d12fee22663549132e6434b61e789326231e0168447f46f609eb4a296497f98418db41874cc712756f118daa8"
+SOURCE_DIR="DigiClock-1.0"
 
 LICENSE="GNU GPL v2"
 COPYRIGHT="2012 Jim Saxton, Fat Elk Software"
 
+REVISION="2"
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
-	digiclock = $portVersion"
-	app:digiclock = $portVersion"
-
-REVISION="1"
+	digiclock = $portVersion
+	app:digiclock = $portVersion
+	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion"
+	haiku >= $haikuVersion"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion"
+	haiku_devel >= $haikuVersion"
 
 BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
+	cmd:gcc
 	cmd:make
-	makefile_engine"
+	makefile_engine
+	"
 
 BUILD()
 {

haiku-apps/einsteinium/einsteinium-20141023.recipe

@@ -0,0 +1,77 @@
+SUMMARY="Monitor applications and system services"
+DESCRIPTION="
+Einsteinium provides smarter monitoring of applications and system services \
+for Haiku. It will restart applications and system services that quit or crash, \
+gather statistics on application usage and provide customizable ranked lists of \
+applications.
+"
+HOMEPAGE="https://sourceforge.net/projects/esforhaiku/"
+SRC_URI="svn://svn.code.sf.net/p/esforhaiku/code/trunk#r79"
+REVISION="1"
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2010-2013 Brian Hill"
+
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	einsteinium = $portVersion
+	app:Einsteinium = $portVersion
+	cmd:einsteinium_engine = $portVersion
+	cmd:einsteinium_daemon = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libsqlite3
+	lib:libxml2
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	devel:libsqlite3
+	devel:libxml2
+	cmd:mkdepend
+	cmd:g++
+	cmd:gcc
+	cmd:make
+	"
+
+PATCH()
+{
+	cd src
+	for f in Engine Daemon Preferences Launcher; do
+		sed -e "s|/boot/develop|$(finddir B_SYSTEM_DEVELOP_DIRECTORY)|" \
+			-e "s|/boot/common/include|$(finddir B_SYSTEM_HEADERS_DIRECTORY)|" -i $f/makefile
+	done
+}
+
+BUILD()
+{
+	cd src
+	for f in Engine Daemon; do
+		pushd $f
+		make $jobArgs OBJ_DIR=.
+		popd
+	done
+	for f in Preferences Launcher; do
+		pushd $f
+		make $jobArgs
+		popd
+	done
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	mkdir -p $appsDir
+	mkdir -p $preferencesDir
+	cd src
+
+	cp Engine/einsteinium_engine Daemon/einsteinium_daemon $binDir
+	cp Preferences/Einsteinium_Preferences $preferencesDir/Einsteinium
+	cp Launcher/Einsteinium_Launcher $appsDir/Einsteinium
+
+	addPreferencesDeskbarSymlink $preferencesDir/Einsteinium
+	addAppDeskbarSymlink $appsDir/Einsteinium
+}

haiku-apps/finance/finance-1.0.0.recipe

@@ -28,6 +28,7 @@ BUILD_PREREQUIRES="
 	cmd:xres
 	cmd:gcc
 	cmd:jam
+	cmd:awk
 	"
 BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion

haiku-apps/globe/globe-0.4.recipe

@@ -1,27 +1,45 @@
-DESCRIPTION="Globe Web Editor" 
-HOMEPAGE="http://globe.beos.hu/index_en.html" 
+SUMMARY="Globe Web Editor"
+DESCRIPTION="
+Globe is an editor with support for HTML and PHP. It offers syntax \
+highlighting and basic project management.
+"
+HOMEPAGE="http://globe.beos.hu/index_en.html"
 SRC_URI="http://ports-space.haiku-files.org/source/globe-0.4.zip"
-CHECKSUM_MD5="61601576e59b0dc5ab6364f684a47236"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+CHECKSUM_SHA256="1ed42fa741a7b7923cd9accb759395b6ddaa5287695f7dfceeaa5112ebe3c765"
+SOURCE_DIR="globe0.4"
+REVISION="2"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	"
+
+PROVIDES="
+	globe = $portVersion
+	app:Globe = $portVersion
+	"
+
+PATCHES="globe-0.4.patch"
+
 BUILD()
 {
-	cd globe0.4
-	make
+	make $jobArgs OBJ_DIR=objects
 }
 
 INSTALL()
 {
-	cd globe0.4
-	TARGET_DIR=${DESTDIR}`finddir B_APPS_DIRECTORY`/Globe
-	mkdir -p $TARGET_DIR
-	cp Globe $TARGET_DIR
-	cp GlobeBUGList.txt $TARGET_DIR
-	cp globe* $TARGET_DIR
-	cp LICENSE.txt $TARGET_DIR
-	cp NewFeatures.txt $TARGET_DIR
-	cp objects.*/Globe* $TARGET_DIR
+	mkdir -p $appsDir
+	cp objects/Globe $appsDir/Globe
+	addAppDeskbarSymlink $appsDir/Globe
 }
+
 LICENSE="GNU GPL v2"
 COPYRIGHT="2001-2004 Gergely Rózsahegyi"

haiku-apps/globe/patches/globe-0.4.patch

@@ -1,14 +1,14 @@
-diff -Naur globe0.4/Makefile globe0.4-haiku/Makefile
---- globe0.4/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ globe0.4-haiku/Makefile	2012-12-30 19:40:59.058720256 +0000
+diff -x .git -Naur ../globe0.4/Makefile ./Makefile
+--- ../globe0.4/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ ./Makefile	2014-12-02 19:15:53.759918816 +0100
 @@ -0,0 +1,27 @@
 +NAME= Globe
 +TYPE= APP
 +SRCS= RHTML_app.cpp RHTML_win.cpp RHTML_numview.cpp RHTML_savewin.cpp RHTML_aboutwin.cpp RHTML_prefwin.cpp RHTML_fmenu.cpp RHTML_buttonmenu.cpp RHTML_bmenu.cpp RHTML_parammenu.cpp RHTML_colorwin.cpp RHTML_amenu.cpp RHTML_textview.cpp RHTML_tabbutton.cpp RHTML_tagmenu.cpp RHTML_filetypes.cpp RHTML_options.cpp ToolTip/TToolTip.cpp Timer/RTimer.cpp URLView/URLView.cpp Tool/RadioBar.cpp Tool/ToolBar.cpp Tool/ToolItem.cpp Tool/ToolView.cpp
 +RSRCS= Globe.rsrc
-+LIBS= /boot/system/lib/libbe.so /boot/system/lib/libtextencoding.so /boot/system/lib/libtracker.so /boot/system/lib/libroot.so /boot/system/lib/libtranslation.so /boot/system/lib/libgame.so /boot/system/lib/libstdc++.r4.so
++LIBS= /boot/system/lib/libbe.so /boot/system/lib/libtextencoding.so /boot/system/lib/libtracker.so /boot/system/lib/libroot.so /boot/system/lib/libtranslation.so /boot/system/lib/libgame.so /boot/system/lib/libstdc++.so
 +LIBPATHS=
-+SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/develop/lib /boot/beos/system/lib
++SYSTEM_INCLUDE_PATHS= /boot/system/develop/headers/be /boot/system/develop/headers/cpp /boot/system/develop/headers/posix /boot/system/develop/headers/os/storage /boot/system/develop/lib /boot/system/beos/system/lib
 +LOCAL_INCLUDE_PATHS= ./../../../config/lib ./Genesis ToolTip Timer URLView Tool
 +OPTIMIZE=FULL
 +#	specify any preprocessor symbols to be defined.  The symbols will not
@@ -28,10 +28,97 @@ diff -Naur globe0.4/Makefile globe0.4-haiku/Makefile
 +LINKER_FLAGS=
 +
 +## include the makefile-engine
-+include $(BUILDHOME)/etc/makefile-engine
-diff -Naur globe0.4/RHTML_win.cpp globe0.4-haiku/RHTML_win.cpp
---- globe0.4/RHTML_win.cpp	2004-10-21 14:16:28.000000000 +0000
-+++ globe0.4-haiku/RHTML_win.cpp	2012-12-30 18:28:09.000000000 +0000
++include /boot/system/develop/etc/makefile-engine
+diff -x .git -Naur ../globe0.4/RHTML_filetypes.cpp ./RHTML_filetypes.cpp
+--- ../globe0.4/RHTML_filetypes.cpp	2004-10-21 16:18:44.000000000 +0200
++++ ./RHTML_filetypes.cpp	2014-12-02 18:56:43.069920922 +0100
+@@ -39,7 +39,7 @@
+ // - End - RHTML_File_Types - RHTMLFileTypes -----------------------------------------------------------------
+ 
+ // ---------------------------------------------------------------------- RHTML_File_Types - SetFontAndColor -
+-void RHTMLFileTypes::SetFontAndColor(BString *oldtext,BString *currenttext,int mode=0,int offset1=-1,int offset2=-1)
++void RHTMLFileTypes::SetFontAndColor(BString *oldtext,BString *currenttext,int mode,int offset1,int offset2)
+ {
+  if (fOptions->FileTypes[FileType]->Name->ICompare("HTML")==0)
+  {
+diff -x .git -Naur ../globe0.4/RHTML_options.cpp ./RHTML_options.cpp
+--- ../globe0.4/RHTML_options.cpp	2004-10-21 16:18:57.000000000 +0200
++++ ./RHTML_options.cpp	2014-12-02 19:07:34.499919730 +0100
+@@ -34,6 +34,8 @@
+ #include <Directory.h>
+ #include <fstream>
+ 
++using std::ifstream;
++
+ RHTMLOptions *fOptions;
+ 
+ // ---------------------------------------------------------------------------- RHTML_Options - RHTMLOptions -
+@@ -554,7 +556,7 @@
+      tmp.CopyInto(val1,tmp.FindFirst('=')+1,tmp.Length()-tmp.FindFirst('=')-1);
+      val1=rgetstring(val1);
+      font_style fstyle;
+-     get_font_style((font_family) val1.String(), 0, &fstyle);
++     get_font_style((char *) val1.String(), 0, &fstyle);
+      DefaultFont->SetFamilyAndStyle(val1.String(),fstyle);
+     } else
+     if (name.ICompare("Default_Font_Style")==0)	// - Default_Font_Style
+diff -x .git -Naur ../globe0.4/RHTML_options.h ./RHTML_options.h
+--- ../globe0.4/RHTML_options.h	2004-10-21 16:19:01.000000000 +0200
++++ ./RHTML_options.h	2014-12-02 18:31:28.159923695 +0100
+@@ -33,7 +33,7 @@
+ #include <String.h>
+ #include <View.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ class RHTMLOptions;
+ 
+diff -x .git -Naur ../globe0.4/RHTML_parammenu.cpp ./RHTML_parammenu.cpp
+--- ../globe0.4/RHTML_parammenu.cpp	2004-10-21 16:17:48.000000000 +0200
++++ ./RHTML_parammenu.cpp	2014-12-02 18:53:29.809921276 +0100
+@@ -35,7 +35,7 @@
+ #include <Clipboard.h>
+ #include <StringView.h>
+ #include <stdio.h>
+-#include <ostream.h>
++#include <ostream>
+ #include <math.h>
+ 
+ // ------------------------------------------------------------------------ RHTML_parammenu - RHTMLparammenu -
+@@ -602,7 +602,7 @@
+ void RHTMLptextview::Paste(BClipboard *clipboard)
+ {
+ 	const char *text;
+-	int32 textlen;
++	ssize_t textlen;
+ 	BMessage *clip = (BMessage *) NULL;
+ 
+ 	if (clipboard->Lock())
+diff -x .git -Naur ../globe0.4/RHTML_prefwin.cpp ./RHTML_prefwin.cpp
+--- ../globe0.4/RHTML_prefwin.cpp	2004-10-21 16:17:14.000000000 +0200
++++ ./RHTML_prefwin.cpp	2014-12-02 18:49:57.739921664 +0100
+@@ -386,7 +386,7 @@
+ // - End - RHTML_Preferences_Win - FTCreateKitList -----------------------------------------------------------
+ 
+ // ----------------------------------------------------------------------- RHTML_Preferences_Win - FTSetFont -
+-void RHTMLPreferencesWin::FTSetFont(const char *font,const char *style ="")
++void RHTMLPreferencesWin::FTSetFont(const char *font,const char *style)
+ {
+  fFTFontsBox->RemoveChild(fFTDFStyle);
+ 
+@@ -649,7 +649,7 @@
+     msg->FindString("font_family",&family);
+     FTSetFont(family);
+     font_style fStyle;
+-    get_font_style((font_family) family, 0, &fStyle);
++    get_font_style((char *) family, 0, &fStyle);
+     fOptions->DefaultFont->SetFamilyAndStyle(family,fStyle);
+     fOptions->Save();
+    }
+diff -x .git -Naur ../globe0.4/RHTML_win.cpp ./RHTML_win.cpp
+--- ../globe0.4/RHTML_win.cpp	2004-10-21 16:16:28.000000000 +0200
++++ ./RHTML_win.cpp	2014-12-02 18:30:50.089923764 +0100
 @@ -288,7 +288,9 @@
   if (textdb>0)
   {
@@ -72,9 +159,39 @@ diff -Naur globe0.4/RHTML_win.cpp globe0.4-haiku/RHTML_win.cpp
    }
    break;
    case 'ABWQ':
-diff -Naur globe0.4/URLView/URLView.cpp globe0.4-haiku/URLView/URLView.cpp
---- globe0.4/URLView/URLView.cpp	2002-03-10 00:38:20.000000000 +0000
-+++ globe0.4-haiku/URLView/URLView.cpp	2012-12-29 14:17:53.000000000 +0000
+diff -x .git -Naur ../globe0.4/Timer/RTimer.cpp ./Timer/RTimer.cpp
+--- ../globe0.4/Timer/RTimer.cpp	2004-10-21 16:22:13.000000000 +0200
++++ ./Timer/RTimer.cpp	2014-12-02 19:09:02.649919568 +0100
+@@ -28,7 +28,7 @@
+ // - Includes
+ #include "RTimer.h"
+ #include <Autolock.h>
+-#include <ostream.h>
++#include <ostream>
+ 
+ #define SLEEP_TIME 1000
+ // ---------------------------------------------------------------------------------------- R_Timer - RTimer -
+diff -x .git -Naur ../globe0.4/Tool/ToolItem.cpp ./Tool/ToolItem.cpp
+--- ../globe0.4/Tool/ToolItem.cpp	2004-10-21 16:23:12.000000000 +0200
++++ ./Tool/ToolItem.cpp	2014-12-02 19:13:26.509919086 +0100
+@@ -31,10 +31,13 @@
+ #include <TranslationUtils.h>
+ #include <Window.h>
+ #include <stdio.h>
+-#include <ostream.h>
++#include <iostream>
++#include <ostream>
+ 
+ #include "ToolItem.h"
+ 
++using namespace std;
++
+ const uint32 B_UPDATE_SIZE_MSG = 'BUSM';
+ const uint32 B_MOUSE_DOWN_MSG = 'BMDM';
+ const uint32 B_MOUSE_UP_MSG = 'BMUM';
+diff -x .git -Naur ../globe0.4/URLView/URLView.cpp ./URLView/URLView.cpp
+--- ../globe0.4/URLView/URLView.cpp	2002-03-10 01:38:20.000000000 +0100
++++ ./URLView/URLView.cpp	2014-12-02 18:30:50.089923764 +0100
 @@ -30,9 +30,13 @@
  
  #include <unistd.h>

haiku-apps/haikutwitter/haikutwitter-1.0.recipe

@@ -1,20 +0,0 @@
-DESCRIPTION="Twitter client for Haiku OS"
-HOMEPAGE="http://code.google.com/p/haikutwitter/"
-SRC_URI="svn+http://haikutwitter.googlecode.com/svn/tags/1.0/HaikuTwitter"
-REVISION="1"
-STATUS_HAIKUE="broken"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND="net-misc/curl >= 7.26.0"
-BUILD()
-{
-	cd haikutwitter-1.0
-	make
-}
-
-INSTALL()
-{
-	cd haikutwitter-1.0
-	make install
-}
-LICENSE="MIT"
-COPYRIGHT="2010-2012 Martin Hebnes Pedersen"

haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe

@@ -0,0 +1,55 @@
+SUMMARY="Native Twitter client for Haiku"
+DESCRIPTION="HaikuTwitter is an open-source Twitter client for Haiku. It's \
+based off the open-source TwitCurl library."
+COPYRIGHT="2012 Martin Pedersen"
+LICENSE="MIT"
+HOMEPAGE="https://github.com/HaikuArchives/HaikuTwitter" 
+SRC_URI="https://github.com/HaikuArchives/HaikuTwitter/archive/918dd954b6db3c5ed476b3a4826910992f3b4566.tar.gz"
+CHECKSUM_SHA256="bc330cb15c8e10362306eef7d85228f5dee08db667d16a15c0a5245f6013b1e1"
+SOURCE_DIR="HaikuTwitter-918dd954b6db3c5ed476b3a4826910992f3b4566"
+REVISION="2"
+
+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="
+	haikutwitter$secondaryArchSuffix = $portVersion
+	app:HaikuTwitter = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libcurl$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libcurl$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp objects/HaikuTwitter $appsDir
+	
+	addAppDeskbarSymlink $appsDir/HaikuTwitter
+}

haiku-apps/jammin/jammin-0.1.0.recipe

@@ -6,8 +6,8 @@ Jamfiles are also used for organizing targets— each Jamfile is a separate \
 project that can be built independently from the other projects.
 "
 HOMEPAGE="https://github.com/HaikuArchives/JamMin"
-SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#681e87d6d4"
-REVISION="2"
+SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#85ce20ccc0"
+REVISION="3"
 COPYRIGHT="2003 Guido Casiraghi"
 LICENSE="MIT"
 
@@ -33,11 +33,10 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-PATCHES="jampatch-1.patch"
-
 
 BUILD()
 {
+	cd source
 	make OBJ_DIR=objects \
 		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
@@ -45,6 +44,6 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $appsDir
-	cp objects/JamApp $appsDir
+	cp source/objects/JamApp $appsDir
 	addAppDeskbarSymlink $appsDir/JamApp
 }

haiku-apps/jammin/patches/jampatch-1.patch

@@ -1,51 +0,0 @@
-diff --git a/JamMin.rdef b/JamMin.rdef
-index 1707392..a46587d 100644
---- a/JamMin.rdef
-+++ b/JamMin.rdef
-@@ -13,10 +13,7 @@ resource app_version {
- 	variety = B_APPV_ALPHA,
- 	internal = 0,
- 
--	short_info = "The Jamfile Administrator",
--	long_info = #'CSTR' array {
--
--	}
-+	short_info = "The Jamfile Administrator"
- };
- 
- resource app_flags B_SINGLE_LAUNCH;
-diff --git a/JamMinWindow.cpp b/JamMinWindow.cpp
-index 2b0077f..2b3c9af 100644
---- a/JamMinWindow.cpp
-+++ b/JamMinWindow.cpp
-@@ -1001,10 +1001,6 @@ JamMinWindow::IsSystemLibraryPath(BPath* libPath)
- 	//if (ret == B_OK) {
- 		if ( strcmp(libPath->Path(), path.Path()) == 0 ) return true;
- 	//}
--	ret = find_directory(B_COMMON_LIB_DIRECTORY, &path);
--	if (ret == B_OK) {
--		if ( strcmp(libPath->Path(), path.Path()) == 0 ) return true;
--	}
- 	
- 	ret = find_directory(B_USER_LIB_DIRECTORY, &path); //the same as B_COMMON_LIB_DIRECTORY
- 	if (ret == B_OK) {
-diff --git a/makefile b/makefile
-new file mode 100644
-index 0000000..8514e9d
---- /dev/null
-+++ b/makefile
-@@ -0,0 +1,14 @@
-+## JamMin makefile for Haiku OS ##
-+
-+NAME= JamApp
-+
-+TYPE= APP
-+
-+SRCS= TargetSettingsWin.cpp TargetConfig.cpp main.cpp LinkerSettingsView.cpp JMOpenFilePanel.cpp JamMinWindow.cpp JamMinApp.cpp JamFile.cpp IncludeSettingsView.cpp GeneralSettingsView.cpp CompilerSettingsView.cpp
-+RDEFS= JamMin.rdef
-+LIBS= be stdc++.r4 root tracker
-+OPTIMIZE= FULL
-+WARNINGS = ALL
-+
-+## include makefile engine
-+include $(BUILDHOME)/etc/makefile-engine

haiku-apps/masterpiece/masterpiece-r742.recipe

@@ -27,12 +27,12 @@ REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libsqlite3$secondaryArchSuffix
 	lib:liblayout
-	lib:libpython2.6
+	lib:libpython2.7
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libsqlite3$secondaryArchSuffix
-	devel:libpython2.6
+	devel:libpython2.7
 	"
 BUILD_PREREQUIRES="
 	makefile_engine

haiku-apps/masterpiece/patches/masterpiece-r742.patch

@@ -1,6 +1,20 @@
+diff -Pur masterpiece/CommonFunctions.cpp masterpiece-haiku/CommonFunctions.cpp
+--- masterpiece/CommonFunctions.cpp	2014-12-05 16:06:41.210736548 +0100
++++ masterpiece-haiku/CommonFunctions.cpp	2014-12-05 16:10:44.720736102 +0100
+@@ -287,8 +287,8 @@
+ 	int	sqlValue;
+ 	BString tmpString;
+ 	sqlErrMsg = 0;
+-	BString tmpPath = GetAppDirPath(); // for testing purposes, use local one.
+-	//BString tmpPath = GetUserDirPath(); // for publish purposes, use real location
++	//BString tmpPath = GetAppDirPath(); // for testing purposes, use local one.
++	BString tmpPath = GetUserDirPath(); // for publish purposes, use real location
+ 	if(tmpPath != "-15")
+ 	{
+ 		tmpPath += "/MasterPiece.db";
 diff -Pur masterpiece/Makefile masterpiece-haiku/Makefile
---- masterpiece/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ masterpiece-haiku/Makefile	2013-12-31 20:32:00.608960512 +0000
+--- masterpiece/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ masterpiece-haiku/Makefile	2014-12-05 16:09:36.420736227 +0100
 @@ -0,0 +1,146 @@
 +## BeOS Generic Makefile v2.5 ##
 +
@@ -73,7 +87,7 @@ diff -Pur masterpiece/Makefile masterpiece-haiku/Makefile
 +#                naming scheme you need to specify the path to the library
 +#                and it's name
 +#                library: my_lib.a entry: my_lib.a or path/my_lib.a
-+LIBS=root be sqlite3 $(STDCPPLIBS) python2.6 tracker
++LIBS=root be sqlite3 $(STDCPPLIBS) python2.7 tracker
 +
 +#        specify additional paths to directories following the standard
 +#        libXXX.so or libXXX.a naming scheme.  You can specify full paths

haiku-apps/microbe/microbe-20130728.recipe

@@ -0,0 +1,42 @@
+SUMMARY="Source code editor"
+DESCRIPTION="
+Microbe is a minimalistic programmers text and source code editor.
+"
+HOMEPAGE="https://github.com/aldeck/microbe"
+SRC_URI="git://github.com/aldeck/microbe#41f6ce8a5d96c96af9fb17eda1b466a5e9e0bfb1"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2011 Alexandre Deckner"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	microbe = $portVersion
+	app:Microbe = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	cmd:mkdepend
+	cmd:make
+	cmd:g++
+	"
+
+PATCHES="microbe-20130728.patch"
+
+BUILD()
+{
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp objects/Microbe $appsDir/Microbe
+	addAppDeskbarSymlink $appsDir/Microbe
+}

haiku-apps/microbe/patches/microbe-20130728.patch

@@ -0,0 +1,75 @@
+diff --git a/MainView.cpp b/MainView.cpp
+index 098027d..dc122bf 100644
+--- a/MainView.cpp
++++ b/MainView.cpp
+@@ -18,8 +18,7 @@ MainView::MainView(BRect frame)
+ 	:
+ 	//BTextView("MainView")
+ 	BTextView(frame, "textview", frame,
+-		B_FOLLOW_ALL, B_FRAME_EVENTS | B_WILL_DRAW),
+-	fPythonPlugin(this, "klong")
++		B_FOLLOW_ALL, B_FRAME_EVENTS | B_WILL_DRAW)
+ {
+ 	fHighlighter = new Highlighter(this);
+ 	SetStylable(true);
+@@ -100,7 +99,6 @@ void
+ MainView::DeleteText(int32 start, int32 finish)
+ {
+ 	BTextView::DeleteText(start, finish);
+-	fPythonPlugin.Func1(Text()/*text*/);
+ }
+ 
+ 
+@@ -113,6 +111,5 @@ MainView::InsertText(const char *text, int32 length, int32 offset,
+ 
+ 	BTextView::InsertText(text, length, offset, runs);
+ 	bigtime_t start = system_time();
+-	fPythonPlugin.Func1(Text()/*text*/);
+ 	printf("script time: %lims\n", (system_time() - start) / 1000);
+ }
+diff --git a/MainView.h b/MainView.h
+index f1c456f..e705a27 100644
+--- a/MainView.h
++++ b/MainView.h
+@@ -9,8 +9,6 @@
+ 
+ #include <TextView.h>
+ 
+-#include "PythonPlugin.h"
+-
+ #include <vector>
+ 
+ 
+@@ -40,7 +38,6 @@ public:
+ 
+ private:
+ 			Highlighter* 		fHighlighter;
+-			PythonPlugin 		fPythonPlugin;
+ };
+ 
+ 
+diff --git a/makefile b/makefile
+index e2f41a7..1ac7063 100644
+--- a/makefile
++++ b/makefile
+@@ -2,17 +2,16 @@ TYPE = APP
+ 
+ NAME = Microbe
+ 
+-SYSTEM_INCLUDE_PATHS = /boot/common/include/python2.6
++SYSTEM_INCLUDE_PATHS = /boot/system/develop/headers/python2.7
+ 
+ SRCS = App.cpp
+ SRCS += Highlighter.cpp
+ SRCS += MainWindow.cpp
+ SRCS += MainView.cpp
+-SRCS += PythonPlugin.cpp
+ SRCS += TextRange.cpp
+-LIBS = be python2.6 tracker #stdc++
++LIBS = be tracker stdc++
+ 
+ RDEFS = Microbe.rdef
+ 
+ # include the makefile-engine
+-include $(BUILDHOME)/etc/makefile-engine
++include /boot/system/develop/etc/makefile-engine

haiku-apps/minimizeall/minimizeall-1.0.0.recipe

@@ -6,9 +6,9 @@ standalone app that minimizes the whole app, and a replicant for your Deskbar. \
 Both do the same: Minimize all your apps!
 "
 HOMEPAGE="https://github.com/HaikuArchives/MinimizeAll/"
-SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#12fefdf26131375f695693a680bf01edb35d57a9"
+SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#5f61ffe08a0e832d6f5308c9fecccbbb573972f8"
 
-REVISION="1"
+REVISION="2"
 
 COPYRIGHT="
 	2001-2008 Werner Freytag
@@ -17,7 +17,7 @@ COPYRIGHT="
 
 LICENSE="MIT"
 
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	minimizeall = $portVersion
@@ -36,14 +36,22 @@ BUILD_PREREQUIRES="
 BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
 	"
+
+PATCHES="minimizeall-1.0.0.patch"
+
 BUILD()
 {
-	cd trunk
 	mkdir -p bin
 
+	if [ "$effectiveTargetArchitecture" = "x86_gcc2" ]; then
+		STDLIB="stdc++.r4"
+	else
+		STDLIB="stdc++"
+	fi
+
 	# Step 1 - Building the app
 	cd app
-	gcc -o ../bin/MinimizeAll -lbe main.cpp ../minimize.cpp
+	gcc -o ../bin/MinimizeAll -lbe -l$STDLIB main.cpp ../minimize.cpp
 	rc -o ../bin/MinimizeAll.rsrc Application.rdef
 	xres -o ../bin/MinimizeAll ../bin/MinimizeAll.rsrc
 	mimeset -f ../bin/MinimizeAll
@@ -51,19 +59,18 @@ BUILD()
 
 	# Step 2 - The DeskBar AddOn!
 	cd "deskbar add-on"
-	gcc -o ../bin/DeskbarAddOn -lbe DeskbarView.cpp ../minimize.cpp
+	gcc -o ../bin/DeskbarAddOn -lbe -l$STDLIB DeskbarView.cpp ../minimize.cpp
 	rc -o ../bin/DeskbarAddOn.rsrc DeskbarAddOn.rdef
 	xres -o ../bin/DeskbarAddOn ../bin/DeskbarAddOn.rsrc
 	mimeset -f ../bin/DeskbarAddOn
 	cd ..
-
 }
 
 INSTALL()
 {
 	mkdir -p $appsDir/MinimizeAll
-	cp trunk/bin/MinimizeAll $appsDir/MinimizeAll/MinimizeAll
-	cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn
+	cp bin/MinimizeAll $appsDir/MinimizeAll/MinimizeAll
+	cp bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn
 	addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll
 	mkdir -p "$dataDir/deskbar/menu/Desktop applets"
 	symlinkRelative -s "$appsDir/MinimizeAll/DeskbarAddOn"  \

haiku-apps/minimizeall/patches/minimizeall-1.0.0.patch

@@ -0,0 +1,13 @@
+diff --git a/minimize.cpp b/minimize.cpp
+index cf3d1e1..c263d01 100644
+--- a/minimize.cpp
++++ b/minimize.cpp
+@@ -20,6 +20,8 @@
+ #include <string.h>
+ #include <vector>
+ 
++using std::vector;
++
+ // wird irgendwo vom BeOS definiert (stammt aus Tracker source)
+ void do_minimize_team(BRect zoomRect, team_id team, bool zoom);
+ void do_bring_to_front_team(BRect zoomRect, team_id app, bool zoom);

haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe

@@ -0,0 +1,76 @@
+DESCRIPTION="Orphilia is an open-source Dropbox client written in Python. \
+Project's main goal is to provide an open-source desktop Dropbox client for \
+platforms, that  aren't supported (for example, Haiku). Orphilia is \
+script-based which makes it platform-independent. It's written using \
+Dropbox SDK from here, which has been integrated \ 
+into Orphilia's source code and is not required for installation."
+SUMMARY="Open-source Dropbox client."
+HOMEPAGE="https://github.com/ksiazkowicz/orphilia-dropbox"
+SRC_URI="git+https://github.com/ksiazkowicz/orphilia-dropbox.git#f692f26793a48e2742f12c20767f0f22a9ff39af"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+# Should be called after activating package
+#POST_INSTALL_SCRIPTS="
+#	\"orphilia.py --configuration\"
+#	"
+
+PROVIDES="
+	orphilia_dropbox = $portVersion
+	cmd:orphilia_haiku_notify = $portVersion
+	cmd:orphilia.py = $portVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:python
+	cmd:sed
+	"
+
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	python_setuptools
+	"
+
+REQUIRES="
+	pathtools
+	python_setuptools
+	urllib3
+	watchdog
+	cmd:python
+	"
+
+COPYRIGHT="2011-2014 Maciej Janiszewski"
+LICENSE="MIT"
+
+BUILD()
+{
+	python build.py
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	export PATH="$portPackageLinksDir/cmd~python/bin:$PATH"
+	pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	cd built/dependencies
+        python setup.py install \
+                --single-version-externally-managed \
+                --root=/ --prefix=$prefix
+	cd ../..
+
+	mkdir -p $installLocation/orphilia_dropbox
+	cp -R built/* $installLocation/orphilia_dropbox
+
+	mkdir -p $binDir
+
+	# create symlink which could be directly accessed
+	ln -s $installLocation/orphilia_dropbox/notify/haiku-notify $binDir/orphilia_haiku-notify
+	ln -s $installLocation/orphilia_dropbox/orphilia.py $binDir/orphilia.py
+}

haiku-apps/peek/peek-20140206.recipe

@@ -0,0 +1,47 @@
+SUMMARY="Image browser"
+DESCRIPTION="
+Peek is a free image browser and viewer with the aim of of being small, fast, \
+efficient, very functional and intuitive.
+"
+HOMEPAGE="https://github.com/HaikuArchives/Peek"
+SRC_URI="git+https://github.com/HaikuArchives/Peek.git#ce06fe5"
+REVISION="1"
+COPYRIGHT="2001 Durand John Miller"
+LICENSE="BSD (3-clause)"
+
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	peek = $portVersion
+	app:Peek = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:mkdepend
+	cmd:make
+	cmd:gcc
+	cmd:g++
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/Peek
+	cp source/objects/Peek $appsDir/Peek/Peek
+	cp -r languages $appsDir/Peek/
+	addAppDeskbarSymlink $appsDir/Peek/Peek
+}

haiku-apps/rename/rename-3.9.0.recipe

@@ -0,0 +1,50 @@
+SUMMARY="A Tracker add-on that provides you with a way to rename multiple files at once."
+DESCRIPTION="
+ReName! is a Tracker Add-On for HAIKU users. It provides you with a way to\
+rename multiple files at once. ReName! allows you to add, remove or change file\
+extensions. It also allows you to change the capitialization of your files, and\
+do a search and replace on your file names. ReName! also allows you to prepend\
+or append text to multiple file names!
+"
+HOMEPAGE="https://github.com/bbjimmy/ReName_for_HAIKU"
+SRC_URI="https://github.com/bbjimmy/ReName_for_HAIKU/archive/1.0.tar.gz"
+CHECKSUM_SHA512="f13f3a022dab3305c35af0a149711e9e304b00082835115aea3ca8eafa7026cf15613e8f932466e16050dc8282fdcdc16ea3b0d4dc257db09442e16a69c939ae"
+SOURCE_DIR="ReName_for_HAIKU-1.0"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="
+	 2000 FlipSide Software
+	"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	rename= $portVersion
+	app:rename = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	makefile_engine
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	mkdir -p $addOnsDir/Tracker
+	cp source/ReName $addOnsDir/Tracker/ReName!
+	mkdir -p $documentationDir/ReName
+	cd documentation
+	cp -r * $documentationDir/ReName
+	
+}

haiku-apps/resourceedit/resourceedit-1.0_git.recipe

@@ -0,0 +1,46 @@
+SUMMARY="Graphical RSRC resource editor"
+DESCRIPTION="An editor for binary resource files (.rsrc) that get compiled \
+into an application and can then be used within the application."
+HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit"
+LICENSE="MIT"
+COPYRIGHT="2012-2013 Tri-Edge AI"
+SRC_URI="https://github.com/HaikuArchives/ResourceEdit/archive/8c3f779d08525ed1e607627213278436a0502125.tar.gz"
+CHECKSUM_SHA256="848b4e6d8a30737793d858d95360d33219efa615635b0b79c845bc4b78f6a64b"
+SOURCE_DIR="ResourceEdit-8c3f779d08525ed1e607627213278436a0502125"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	resourceedit = $portVersion
+	app:ResourceEdit = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	cd source
+	mkdir -p $appsDir
+	cp objects/ResourceEdit $appsDir
+	addAppDeskbarSymlink $appsDir/ResourceEdit
+}

haiku-apps/resourceedit/resourceedit-1.recipe

@@ -1,52 +0,0 @@
-DESCRIPTION="
-This is an editor for resource files (.rsrc), binary files that get compiled \
-into an application and can then be accessed by that application.
-"
-SUMMARY="Resource editor"
-HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit"
-LICENSE="MIT"
-COPYRIGHT="2012-2013 Tri-Edge AI"
-SRC_URI="git+https://github.com/HaikuArchives/ResourceEdit.git#1873c33591e2d2ccb3dccb692c175e9f10a0e450"
-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="
-	resourceedit$secondaryArchSuffix = $portVersion
-	app:ResourceEdit = $portVersion
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:mkdepend
-	"
-	
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	# supports "x86" architecture only
-	mkdir $appsDir
-	cp objects.x86-gcc4-release/ResourceEdit $appsDir
-	addAppDeskbarSymlink $appsDir/ResourceEdit
-}

haiku-apps/rez/rez-108.recipe

@@ -1,24 +1,47 @@
-DESCRIPTION="rez" 
-HOMEPAGE="http://dev.osdrawer.net/projects/sum-it" 
-SRC_URI="svn+http://svn.osdrawer.net/sum-it/rez#108"
+DESCRIPTION="Rez is a resource compiler similar to rc. Its main use is compiling\
+the Sum-it spreadsheet. New applications should consider using rc instead, but\
+Rez may still be useful to compile some old apps from the BeOS days"
+SUMMARY="The Rez resource compiler"
+
+LICENSE="BSD (4-clause)"
+COPYRIGHT="1996-1998, 2000	Hekkelman Programmatuur B.V.  All rights reserved.
+	1999-2000 Tim Vernum. All rights reserved."
+
+HOMEPAGE="https://github.com/HaikuArchives/Rez/archive/v1.0" 
+SRC_URI="https://github.com/HaikuArchives/Rez/archive/v1.0.tar.gz"
+SOURCE_DIR="Rez-1.0"
+
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-#CHECKSUM_MD5=""
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku >= $haikuVersion
+	cmd:make
+	cmd:flex
+	cmd:bison
+	cmd:cc
+	"
+
+CHECKSUM_SHA256="a2e41044ad34302abef5ccaf2f86b16e7bf658c96ab337935cee5b6228597afa"
+
+ARCHITECTURES="!x86 x86_gcc2"
+
+PROVIDES="
+	rez = $portVersion
+	cmd:rez = $portVersion
+	"
 
 BUILD()
 {
-	cd rez-108
-	make
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd rez-108
-	BIN_DIR=`finddir B_COMMON_BIN_DIRECTORY`
-	mkdir -p ${DESTDIR}${BIN_DIR}
-	cp rez ${DESTDIR}${BIN_DIR}/rez
-}
-
-#LICENSE=""
-#COPYRIGHT=""
+	mkdir -p $binDir
+	cp rez $binDir
+}

haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe

@@ -0,0 +1,69 @@
+SUMMARY="Bible study tool that supports a wide variety of Bibles"
+DESCRIPTION="ScriptureGuide is a Bible study tool. It supports all of the \
+features you'd expect: search, setting the font, taking notes, etc. Through \
+the accompanying ScriptureGuideManager app, you can download hundereds of free \
+copies of various Bibles, commentaries, and related books."
+COPYRIGHT="2014 ScriptureGuide Team"
+LICENSE="GNU GPL v2"
+HOMEPAGE="https://github.com/HaikuArchives/ScriptureGuide" 
+SRC_URI="https://github.com/HaikuArchives/ScriptureGuide/archive/v0.9.0.tar.gz"
+CHECKSUM_SHA256="63b36186eaf4be130f333e62fa0fb283dbff90149a14763e96c157d9950777b5"
+SOURCE_DIR="ScriptureGuide-$portVersion"
+REVISION="2"
+
+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="
+	scriptureguide$secondaryArchSuffix = $portVersion
+	app:ScriptureGuide = $portVersion
+	app:ScriptureGuideManager = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:awk
+	cmd:wget
+	cmd:unzip
+	lib:libsword$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	icu$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsword$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	icu${secondaryArchSuffix}_devel
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	cd ScriptureGuide
+	make $jobArgs
+	cd ../ScriptureGuideManager
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp -R App $appsDir
+	mv $appsDir/App $appsDir/ScriptureGuide
+	
+	addAppDeskbarSymlink $appsDir/ScriptureGuide/ScriptureGuide
+	addAppDeskbarSymlink $appsDir/ScriptureGuide/ScriptureGuideManager
+}

haiku-apps/scrittore/licenses/Scintilla

@@ -0,0 +1,20 @@
+License for Scintilla and SciTE
+
+Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved 
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that 
+both that copyright notice and this permission notice appear in 
+supporting documentation. 
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
+OR PERFORMANCE OF THIS SOFTWARE. 

haiku-apps/scrittore/scrittore-git.recipe

@@ -0,0 +1,36 @@
+SUMMARY="A Scintilla-based text editor."
+DESCRIPTION="Based on the popular framework for code highlighting, Scrittore provides a simplistic programmer's text editor."
+REVISION="1"
+LICENSE="Scintilla"
+SRC_URI="git+https://github.com/HaikuArchives/Scrittore.git"
+COPYRIGHT="
+       1998-2003 Scintilla authors.
+       2011-2013 Haiku authors.
+       "
+
+HOMEPAGE="https://github.com/HaikuArchives/Scrittore"
+PROVIDES="
+       Scrittore
+       app:Scrittore
+       "
+
+ARCHITECTURES="x86 !x86_64 ?arm ?ppc"
+
+BUILD_PREREQUIRES="
+       cmd:make
+       cmd:g++
+       haiku_devel
+       "
+
+BUILD()
+{
+       cd scintilla/haiku
+       make
+}
+
+INSTALL()
+{
+       mkdir -p $appsDir
+       cp bin/scintilla-haiku $appsDir/Scrittore
+       addAppDeskbarSymlink $appsDir/Scrittore
+}

haiku-apps/shredder/shredder-1.0.0.recipe

@@ -0,0 +1,50 @@
+SUMMARY="Safely delete files."
+DESCRIPTION="
+Shredder is a plugin for tracker, which allows to safely delete files by \
+overwriting them multiple times.
+"
+HOMEPAGE="https://github.com/HaikuArchives/Shredder"
+SRC_URI="git+https://github.com/HaikuArchives/Shredder.git#c6311845fee6e51b347a9eff2c79fbf9548316a6"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2009 Jason Grenier"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	shredder = $portVersion
+	app:Shredder = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	cmd:make
+	cmd:gcc
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	cd src/Shredder
+	make $jobArgs OBJ_DIR=objects
+
+	cd ../Shredder-S
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cd src/Shredder
+	cp objects/Shredder $appsDir/Shredder
+	addPreferencesDeskbarSymlink $appsDir/Shredder
+
+	mkdir -p $addOnsDir/Tracker
+	cd ../Shredder-S
+	cp objects/Shredder-S $addOnsDir/Tracker
+}

haiku-apps/sortsave/licenses/SortSave

@@ -0,0 +1,16 @@
+sort-save is copyright © 2013 Jim Saxton ...  Fat Elk Software ᵗᵐ
+
+
+sort-save license:
+
+Freeware:
+
+FAT ELK Software reserves the right to modify the program. Users are free to use,
+copy or share this program without limitation. 
+
+
+Use at your own risk:
+
+THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE 

haiku-apps/sortsave/sortsave-1.0.recipe

@@ -0,0 +1,52 @@
+SUMMARY="sort-save screensaver"
+DESCRIPTION="Just like the Borg, bringing order to chaos. SortSave is a re-creation of an \
+old program that I used for a screensaver on my old Tandy 1000 computer. \
+The original was programmed in BASIC and compiled to run on MS Dos."
+HOMEPAGE="https://github.com/bbjimmy/Sort-Save"
+SRC_URI="https://github.com/bbjimmy/Sort-Save/archive/1.0.tar.gz"
+CHECKSUM_SHA512="794b3d582667b627ea00654e28ede1a0fde59164cbda87bb05ca8ba8327b98bd4bd726dec013098101ce6ac69fc8b3a86311198829b4ba18f6a55528f6f83d8e"
+SOURCE_DIR="Sort-Save-1.0"
+
+LICENSE="SortSave"
+COPYRIGHT="2013 Jim Saxton, Fat Elk Software"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	sortsave = $portVersion
+	app:sortsave = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	makefile_engine
+	"
+
+BUILD()
+{
+		make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{	
+	
+	mkdir -p $addOnsDir/Screen\ Savers
+	cd objects*
+	cp sort-save $addOnsDir/Screen\ Savers/sort-save
+	mkdir -p $dataDir/FatElk
+	cd ..
+	cd FatElk
+	unzip -o fatelk.zip
+	cp "FAT ELK" $dataDir/FatElk/
+	cp "Fat Elk " $dataDir/FatElk/
+		
+}

haiku-apps/substrate/substrate-1.0.recipe

@@ -0,0 +1,42 @@
+SUMMARY="Screensaver drawing interesting city-like structures."
+DESCRIPTION="
+Substrate is a screensaver which creates interesting images from lines and circles. \
+Inspired by xscreensaver's Substrate.
+"
+HOMEPAGE="https://github.com/atalax/haiku-substrate"
+SRC_URI="git+https://github.com/atalax/haiku-substrate.git#1bd0a5"
+REVISION="1"
+COPYRIGHT="2014 Josef Gajdusek"
+LICENSE="MIT"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	substrate = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:mkdepend
+	cmd:make
+	cmd:gcc
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $addOnsDir/Screen\ Savers/
+	cp objects/Substrate $addOnsDir/Screen\ Savers/
+}

haiku-apps/sum_it/sum_it-0.2beta.recipe

@@ -27,6 +27,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:flex
 	cmd:bison
+	cmd:rez
 	"
 
 BUILD()
@@ -35,12 +36,7 @@ BUILD()
 	BE_C_COMPILER=gcc make DEBUG=0
 	PATH=`pwd`:$PATH
 	popd
-
-
-	pushd rez
-	BE_C_COMPILER=gcc make DEBUG=0
-	PATH=`pwd`:$PATH
-	popd
+	
 
 	cd sum-it
 	BE_C_COMPILER=gcc make DEBUG=0

haiku-apps/systeminfo/patches/systeminfo-2-2.patchset

@@ -0,0 +1,41 @@
+From d0ea409005cecef76c6fcb7a0cefd0a662d340e0 Mon Sep 17 00:00:00 2001
+From: Chirayu Desai <chirayudesai1@gmail.com>
+Date: Wed, 3 Dec 2014 19:50:33 +0000
+Subject: [PATCH] CPUPercent: Update for new API
+
+---
+ CPUPercent.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/CPUPercent.cpp b/CPUPercent.cpp
+index 3e4c8e8931..4225f73642 100644
+--- a/CPUPercent.cpp
++++ b/CPUPercent.cpp
+@@ -19,17 +19,22 @@ void CPU_Percent::Update()
+ {
+ 	system_info info;
+ 	get_system_info(&info);
++
++	cpu_info* cpuInfos = new cpu_info[info.cpu_count];
++	get_cpu_info(0, info.cpu_count, cpuInfos);
+ 	
+ 	delta_system = (double)system_time() - last_system_time;
+-	delta_cpu = double(info.cpu_infos[theCPU].active_time) - last_active_cpu_time;
++	delta_cpu = double(cpuInfos[theCPU].active_time) - last_active_cpu_time;
+ 	
+ 	percent = (delta_cpu/delta_system);
+ 	if(percent < 0) percent = 0.00;
+ 	if(percent > 1) percent = 1.00;
+ 	
+ 	lastpercent = percent;
+-	last_active_cpu_time = (double)info.cpu_infos[theCPU].active_time;
++	last_active_cpu_time = (double)cpuInfos[theCPU].active_time;
+ 	last_system_time = (double)system_time();
++
++	delete[] cpuInfos;
+ }
+ 
+ double CPU_Percent::Percentage()
+-- 
+1.8.3.4
+

haiku-apps/systeminfo/systeminfo-2.recipe

@@ -37,6 +37,10 @@ BUILD_PREREQUIRES="
 	cmd:xres
 	"
 
+PATCHES="
+	systeminfo-2-2.patchset
+"
+
 BUILD()
 {
 	echo "const uint32 CP_CHANGE_BG = 'CPBG'; const uint32 CP_CHANGE_FG = 'CPFG';"  > ./DigitalView.h

haiku-apps/textsaver/textsaver-1.0.recipe

@@ -0,0 +1,52 @@
+SUMMARY="TextSaver screensaver"
+DESCRIPTION="Displays your text at random locations in random colors."
+HOMEPAGE="https://github.com/bbjimmy/TextSaver"
+SRC_URI="https://github.com/bbjimmy/TextSaver/archive/1.0.tar.gz"
+CHECKSUM_SHA256="00ecaba878786fce07620946124bdb42ec52e9d1c597cc2a876355229a786747"
+SOURCE_DIR="TextSaver-1.0"
+
+LICENSE="MIT"
+COPYRIGHT="2002 Marcus Overhagen
+ 2004-2013 Jim Saxton, FAT ELK SOFTWARE
+"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	testsaver = $portVersion
+	app:textsaver = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	makefile_engine
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{	
+	
+	mkdir -p $addOnsDir/Screen\ Savers
+	cd source
+	cp TextSaver $addOnsDir/Screen\ Savers/TextSaver
+	mkdir -p $dataDir/FatElk
+	cd ..
+	unzip -o fatelk
+	cp "FAT ELK" $dataDir/FatElk/
+	cp "Fat Elk" $dataDir/FatElk/
+		
+}

haiku-apps/timecop/timecop-0.61.recipe

@@ -0,0 +1,47 @@
+SUMMARY="TimeCop helps you collect statistics about your computer working"
+DESCRIPTION="
+You want to know, how much time you spend in front of your computer?
+You want to know, how often your computer crashes?
+
+So you can use TimeCop to write a protocol of your computer sessions.
+"
+HOMEPAGE="http://www.augusta.de/michael/BeOS/TimeCop/index.us.html"
+SRC_URI="git://github.com/HaikuArchives/TimeCop.git#ee79c42895"
+REVISION="2"
+LICENSE="GNU GPL v2"
+COPYRIGHT="Copyright Michael Pieper"
+ARCHITECTURES="x86_gcc2 x86 !ppc"
+CHECKSUM_SHA256="d384c22c8768298fb1d9ea60fbdb8e7f7e440c00bae44c37e7507f20c4fe6a94"
+
+REQUIRES="
+	haiku >= $haikuVersion 
+"
+	
+PROVIDES="
+	cmd:TimeCop_daemon = $portVersion
+	app:TimeCop = $portVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+"
+	
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	mkdir -p $appsDir
+	cp -a $sourceDir/bin/TimeCop_daemon $binDir/TimeCop_daemon
+	cp -a $sourceDir/bin/TimeCop $appsDir/TimeCop
+	
+	addAppDeskbarSymlink $appsDir/TimeCop
+}

haiku-apps/virtualbelive/virtualbelive-20140718.recipe

@@ -0,0 +1,46 @@
+SUMMARY="Video editing software."
+DESCRIPTION="
+VirtualBeLive is a software for video editing. It supports basic transitions, \
+cutting and a few effects.
+"
+HOMEPAGE="https://github.com/HaikuArchives/VirtualBeLive"
+SRC_URI="git+https://github.com/HaikuArchives/VirtualBeLive#23bea51"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="Public Domain"
+
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	virtualbelive = $portVersion
+	app:VirtualBeLive = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:mkdepend
+	cmd:make
+	cmd:g++
+	cmd:xres
+	cmd:grep
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp objects/VirtualBeLive $appsDir/VirtualBeLive
+	addAppDeskbarSymlink $appsDir/VirtualBeLive
+}

haiku-apps/yab_ide/yab_ide-2.2.3.recipe

@@ -0,0 +1,85 @@
+SUMMARY="integrated development environment for yab."
+DESCRIPTION="
+Yab allows fast prototyping with simple and clean code. yab contains a large \
+number of BeAPI specific commands for GUI creation and much, much more.
+
+yab wouldn't be complete without the yab-IDE, a powerful development \
+environment, which of course is programmed in yab itself.
+"
+HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
+SRC_URI="https://github.com/HaikuArchives/Yab/archive/v1.7.3.tar.gz"
+CHECKSUM_SIZE="1176449"
+CHECKSUM_RMD160="f62fa02a585d9f6c5ee3eb9b781a06083352bd6f"
+CHECKSUM_SHA512="a74edcf9718ee9a13a16ab0a99fbbed3cceebf1ea4bfac714b098d51531de7fdd0738e126b9a2e5d2f8d84fd0c153d9b7702e806cc91c6a97537dda11411e915"
+SOURCE_DIR="Yab-1.7.3"
+
+REVISION="1"
+
+LICENSE="Artistic"
+COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
+	2006-2009 Jan Bungeroth (yab improvements)
+	2013 Jim Saxton (yab improvements)"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	yab_ide$secondaryArchSuffix = $portVersion
+	app:yab_IDE = $portVersion
+		"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
+	yab$secondaryArchSuffix >= 1.7.02
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+"
+
+BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:perl
+	makefile_engine
+	"
+
+BUILD()
+{
+	cd src
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	unzip -o App_YAB.zip
+	copyattr App_YAB yab
+	cd ../yab-IDE/BuildFactory
+	gcc -o yab-compress yab-compress.c -lz
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	mkdir -p tmp
+	mkdir -p tmp/buildfactory
+
+	cp -r src/* tmp/buildfactory
+	cp -r yab-IDE/BuildFactory/* tmp/buildfactory/
+	unzip -o tmp/buildfactory/parts/yabstuff.zip -d tmp/buildfactory/parts
+	cp yab-IDE/src/yab-IDE.yab  tmp/buildfactory/
+
+	pushd tmp/buildfactory
+	BuildFactory.yab yab-IDE yab-IDE.yab application/x-vnd.yab-IDE
+	popd
+
+	mkdir -p $appsDir
+	cp -r yab-IDE/ $appsDir/
+	cp  tmp/buildfactory/yab-IDE $appsDir/yab-IDE/
+	cp yab-IDE/src/yab-IDE.yab $appsDir/yab-IDE/src/
+
+	addAppDeskbarSymlink $appsDir/yab-IDE/yab-IDE "Yab IDE"
+}

haiku-games/becheckers/becheckers-1.0.1.recipe

@@ -4,10 +4,10 @@ BeCheckers is a simple checkers game for two players. It follows almost all \
 American Checker Federation (ACF) rules.
 "
 HOMEPAGE="https://github.com/HaikuArchives/BeCheckers"
-SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#930d3e37339c4570d58e59c3300dba7d69dd4439"
+SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#d4fbfc69656ba5861184d37f7932b9a53ff28373"
 LICENSE="MIT"
 COPYRIGHT="2000 Jeremy J. Gibbons"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
@@ -28,7 +28,6 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cd trunk
 	g++ -o BeCheckers -lbe \
 		BeCheckers.cpp BeCheckersWindow.cpp \
 		Checker.cpp CheckerBoard.cpp
@@ -37,6 +36,6 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $appsDir
-	cp trunk/BeCheckers $appsDir
+	cp BeCheckers $appsDir
 	addAppDeskbarSymlink $appsDir/BeCheckers
 }

haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe

@@ -13,9 +13,9 @@ LICENSE="
 	MIT
 	"
 SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="93e692e42ab056e6827f24f8abfe7e2ba72c375393cbf0af10ebd7465305008a"
+CHECKSUM_SHA256="a8ecce6a38af093113e03b437da1a3ea7bf075172fbc0e580da2a0b4a4da37e6"
 SRC_FILENAME="haikuwebkit-$portVersion.tar.gz"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -95,7 +95,7 @@ INSTALL()
 	ninja install
 
 	rm $developLibDir/*
-	prepareInstalledDevelLibs libWebKit
+	prepareInstalledDevelLibs libWebKit libJavaScriptCore
 
 	# devel package
 	packageEntries devel \
@@ -106,7 +106,7 @@ INSTALL()
 
 PROVIDES_devel="
 	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
-	devel:libjavascriptcore$secondaryArchSuffix = $portVersion
+	devel:libJavaScriptCore$secondaryArchSuffix = $portVersion
 	devel:libwebcore$secondaryArchSuffix = $portVersion
 	devel:libWebKit$secondaryArchSuffix = $portVersion
 	devel:libwtf$secondaryArchSuffix = $portVersion

haiku-libs/libburndevice/libburndevice-1.0.recipe

@@ -1,71 +1,24 @@
 SUMMARY="A disc burning library for Haiku"
-DESCRIPTION="
-LibBurnDevice is a disc burning library for Haiku
-"
-
+DESCRIPTION="LibBurnDevice is a disc burning library for Haiku."
 HOMEPAGE="https://github.com/HaikuArchives/Lava"
-SRC_URI="git+https://github.com/HaikuArchives/Lava.git"
-
-REVISION="1"
-
+SRC_URI="https://github.com/HaikuArchives/Lava/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="0c1899141eac1fca086a554d56527f38baa70ae7bff0a6db37cd180084c01c71"
+SOURCE_DIR="Lava-$portVersion"
 LICENSE="Public Domain"
-COPYRIGHT="
-	2007, 2010 Team MAUI
-	2003-2006 Haiku Inc.
-	"
-
+COPYRIGHT="2007, 2010 Team MAUI
+	2003-2006 Haiku Inc."
+REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTRUES="x86_gcc2 x86"
 
 PROVIDES="
-	libburndevice = $portVersion
+	libburndevice$secondaryArchSuffix = $portVersion
 	lib:libburndevice$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	cmd:cdrtools
 	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:mkdepend
-	makefile_engine"
-	
-BUILD()
-{
-	exit 0
-	cd LibBurnDevice
-	make TYPE=SHARED OBJ_DIR=objects-shared \
-		BUILDHOME=$(finddir B_SYSTEM_DEVELOP_DIRECTORY)
-		
-	make TYPE=STATIC OBJ_DIR=objects-static \
-		BUILDHOME=$(finddir B_SYSTEM_DEVELOP_DIRECTORY)	
-}
-
-INSTALL()
-{
-	mkdir -p $libDir $developLibDir $includeDir/burndevice
-	
-	cd LibBurnDevice
-	
-	cp objects-static/libburndevice.a $developLibDir
-	cp objects-shared/libburndevice $libDir/libburndevice.so
-	
-	cp BurnDevice.h $includeDir/burndevice
-	
-	symlinkRelative -s $libDir/libburndevice.so $developLibDir
-	
-	packageEntries devel \
-		$developLibDir \
-		$includeDir	
-	
-}
-
-# -------- devel package --------------------------------------------------
 
 PROVIDES_devel="
 	libburndevice${secondaryArchSuffix}_devel = $portVersion
@@ -74,3 +27,36 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libburndevice$secondaryArchSuffix == $portVersion base
 	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	"
+	
+BUILD()
+{
+	cd LibBurnDevice
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	cd LibBurnDevice
+	mkdir -p $libDir $developLibDir $includeDir/burndevice
+	
+	cp objects/libburndevice.so $libDir/libburndevice.so
+	cp BurnDevice.h $includeDir/burndevice
+	
+	prepareInstalledDevelLibs \
+		libburndevice
+	
+	packageEntries devel \
+		$developLibDir \
+		$includeDir	
+}

haiku-misc/rssavers/patches/rssavers-0.2.patchset

@@ -0,0 +1,619 @@
+From ee9e2d290aed2d9206b911140662ec2aa2babd4f Mon Sep 17 00:00:00 2001
+From: Puck Meerburg <puck@puckipedia.nl>
+Date: Tue, 2 Dec 2014 15:06:43 +0000
+Subject: Fix Haiku compilation, add screen_blanker wrapper for screen savers
+
+
+diff --git a/include/rsHaikuScreenSaver/rsHaikuScreenSaver.h b/include/rsHaikuScreenSaver/rsHaikuScreenSaver.h
+new file mode 100644
+index 0000000..098b748
+--- /dev/null
++++ b/include/rsHaikuScreenSaver/rsHaikuScreenSaver.h
+@@ -0,0 +1,71 @@
++/*
++ * Copyright (C) 2006  Terence M. Welsh (rsXScreenSaver)
++ * Modified by Puck Meerburg, (c) 2014
++ * 
++ * This file is part of rsHaikuScreenSaver.
++ *
++ * rsHaikuScreenSaver is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * rsHaikuScreenSaver 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.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++
++/*
++ * rsHaikuScreenSaver library, based on rsXScreenSaver
++ *
++ * Library for handling standard OpenGL screensaver functionality, such
++ * as opening windows, choosing pixel formats, setting video modes,
++ * handling user input, etc...
++ */
++
++
++
++#ifndef RSHAIKUSCREENSAVER_H
++#define RSHAIKUSCREENSAVER_H
++
++
++#include <GL/gl.h>
++#include <stdlib.h>
++#include <util/rsTimer.h>
++#include <pthread.h>
++#include <util/arguments.h>
++
++
++
++extern int checkingPassword;  // A saver should check this and stop drawing if true
++extern int isSuspended;  // power save mode
++extern int doingPreview;  // Previews take extra long to initialize because Windows
++// has lots of screwy resource hogging problems.  It's good to check this so that you
++// can simplify your preview.
++
++// These variables can be useful information for saver programmer
++extern int pfd_swap_exchange;  // Is this bit set in the PIXELFORMATDESCRIPTOR?
++extern int pfd_swap_copy;  // Is this bit set in the PIXELFORMATDESCRIPTOR?
++// used to limit frame rate of saver (0 = no limit)
++extern unsigned int dFrameRateLimit;
++// Keyboard toggle for displaying statistics, such as frames per second.
++// User must implement the displaying of statistics if kStatistics is true.
++extern int kStatistics;
++
++
++
++//----------------------------------------------------------------------------
++
++
++// All idle processing is done here.  Typically, you would just draw 
++// frames during this routine.
++//void idleProc();
++
++
++
++#endif
+diff --git a/include/rsMath/rsMatrix.h b/include/rsMath/rsMatrix.h
+index 75d8cfc..08794b8 100644
+--- a/include/rsMath/rsMatrix.h
++++ b/include/rsMath/rsMatrix.h
+@@ -24,7 +24,7 @@
+ 
+ 
+ 
+-#include <ostream>
++#include <iostream>
+ 
+ 
+ 
+diff --git a/include/util/arguments.h b/include/util/arguments.h
+index 7295a0c..899bebe 100644
+--- a/include/util/arguments.h
++++ b/include/util/arguments.h
+@@ -33,7 +33,10 @@
+ 
+ // Handy template for converting std::string to numeric types.
+ template <class T>
+-bool from_string(T& t, const std::string& str, std::ios_base& (*f)(std::ios_base&)){
++bool from_string(
++	T& t,
++	const std::string& str,
++	std::ios& (*f)(std::ios&)){
+ 	std::istringstream iss(str);
+ 	return !(iss >> f >> t).fail();
+ }
+diff --git a/include/util/rsTimer.h b/include/util/rsTimer.h
+index 0eeed2d..0a9855d 100644
+--- a/include/util/rsTimer.h
++++ b/include/util/rsTimer.h
+@@ -28,6 +28,7 @@
+ #include <windows.h>
+ #else
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <sys/time.h>
+ #include <iostream>
+ #endif
+diff --git a/src/Flocks/Flocks.cpp b/src/Flocks/Flocks.cpp
+index 12515fc..3eb5189 100644
+--- a/src/Flocks/Flocks.cpp
++++ b/src/Flocks/Flocks.cpp
+@@ -32,6 +32,9 @@
+ #ifdef RS_XSCREENSAVER
+ #include <rsXScreenSaver/rsXScreenSaver.h>
+ #endif
++#ifdef RS_HAIKUSCREENSAVER
++#include <rsHaikuScreenSaver/rsHaikuScreenSaver.h>
++#endif
+ 
+ #include <stdio.h>
+ #include <math.h>
+@@ -417,7 +420,7 @@ void setDefaults(){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void handleCommandLine(int argc, char* argv[]){
+ 	setDefaults();
+ 	getArgumentsValue(argc, argv, std::string("-leaders"), dLeaders, 1, 100);
+@@ -468,7 +471,7 @@ void initSaver(HWND hwnd){
+ 	
+ 	reshape(rect.right, rect.bottom);
+ #endif
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void initSaver(){
+ #endif
+ 	int i;
+@@ -529,7 +532,7 @@ void initSaver(){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) | defined(RS_HAIKUSCREENSAVER)
+ void cleanUp(){
+ 	// Free memory
+ 	delete[] lBugs;
+diff --git a/src/Flocks/Makefile b/src/Flocks/Makefile
+index c8e926e..b816e29 100644
+--- a/src/Flocks/Makefile
++++ b/src/Flocks/Makefile
+@@ -1,6 +1,6 @@
+ INCLUDE = -I../../include
+-LIBRARY = -lm -lGL -lGLU ../../lib/rsXScreenSaver.a ../../lib/Rgbhsl.a ../../lib/rsText.a
+-CFLAGS = -O3 -DRS_XSCREENSAVER $(INCLUDE)
++LIBRARY = -shared -g -lGL -lGLU ../../lib/rsHaikuScreenSaver.a ../../lib/Rgbhsl.a ../../lib/rsText.a # -lm 
++CFLAGS = -O3 -g -DRS_HAIKUSCREENSAVER $(INCLUDE)
+ 
+ OBJECTS = Flocks.o
+ 
+diff --git a/src/Flux/Flux.cpp b/src/Flux/Flux.cpp
+index 0bff6c1..f297801 100644
+--- a/src/Flux/Flux.cpp
++++ b/src/Flux/Flux.cpp
+@@ -32,6 +32,9 @@
+ #ifdef RS_XSCREENSAVER
+ #include <rsXScreenSaver/rsXScreenSaver.h>
+ #endif
++#ifdef RS_HAIKUSCREENSAVER
++#include <rsHaikuScreenSaver/rsHaikuScreenSaver.h>
++#endif
+ 
+ #include <stdio.h>
+ #include <rsText/rsText.h>
+@@ -82,7 +85,7 @@ int dRotation;
+ int dWind;
+ int dInstability;
+ int dBlur;
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ #define DEFAULTS1 1
+ #define DEFAULTS2 2
+ #define DEFAULTS3 3
+@@ -606,7 +609,7 @@ void setDefaults(int which){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void handleCommandLine(int argc, char* argv[]){
+ 	int defaults = DEFAULTS1;
+ 	setDefaults(defaults);
+@@ -654,7 +657,7 @@ void initSaver(HWND hwnd){
+ 	glLoadIdentity();
+ 	gluPerspective(100.0, aspectRatio, 0.01, 200.0);
+ #endif
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void initSaver(){
+ #endif
+ 	int i, j;
+@@ -749,7 +752,7 @@ void initSaver(){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void cleanUp(){
+ 	// Free memory
+ 	delete[] fluxes;
+diff --git a/src/Flux/Makefile b/src/Flux/Makefile
+index 903cfd4..0b14ab8 100644
+--- a/src/Flux/Makefile
++++ b/src/Flux/Makefile
+@@ -1,6 +1,6 @@
+ INCLUDE = -I../../include
+-LIBRARY = -L../../lib -lm -lGL -lGLU ../../lib/rsXScreenSaver.a ../../lib/Rgbhsl.a ../../lib/rsText.a
+-CFLAGS = -O3 -DRS_XSCREENSAVER $(INCLUDE)
++LIBRARY = -L../../lib -shared -lGL -lGLU ../../lib/rsHaikuScreenSaver.a ../../lib/Rgbhsl.a ../../lib/rsText.a # -lm 
++CFLAGS = -O3 -DRS_HAIKUSCREENSAVER $(INCLUDE)
+ 
+ OBJECTS = Flux.o
+ 
+diff --git a/src/Hyperspace/Hyperspace.cpp b/src/Hyperspace/Hyperspace.cpp
+index 490db7b..c9998d3 100644
+--- a/src/Hyperspace/Hyperspace.cpp
++++ b/src/Hyperspace/Hyperspace.cpp
+@@ -35,6 +35,9 @@
+ #ifdef RS_XSCREENSAVER
+ #include <rsXScreenSaver/rsXScreenSaver.h>
+ #endif
++#ifdef RS_HAIKUSCREENSAVER
++#include <rsHaikuScreenSaver/rsHaikuScreenSaver.h>
++#endif
+ 
+ #include <stdio.h>
+ #include <rsText/rsText.h>
+@@ -446,7 +449,7 @@ void setDefaults(){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void handleCommandLine(int argc, char* argv[]){
+ 	setDefaults();
+ 	getArgumentsValue(argc, argv, std::string("-speed"), dSpeed, 1, 100);
+@@ -506,7 +509,7 @@ void initSaver(HWND hwnd){
+ 
+ 	reshape(rect.right, rect.bottom);
+ #endif
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void initSaver(){
+ #endif
+ 	// Seed random number generator
+@@ -630,7 +633,7 @@ void initSaver(){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void cleanUp(){
+ 	// Free memory
+ 	if(dUseGoo)
+diff --git a/src/Hyperspace/Makefile b/src/Hyperspace/Makefile
+index 99f26cb..721b982 100644
+--- a/src/Hyperspace/Makefile
++++ b/src/Hyperspace/Makefile
+@@ -1,6 +1,6 @@
+ INCLUDE = -I. -I../../include
+-LIBRARY = -lm -lGL -lGLU ../../lib/rsXScreenSaver.a ../../lib/rsMath.a ../../lib/Implicit.a ../../lib/rsText.a  ../../lib/Rgbhsl.a
+-CFLAGS = -O3 -DRS_XSCREENSAVER -DGL_GLEXT_PROTOTYPES $(INCLUDE)
++LIBRARY = -shared -lGL -lGLU ../../lib/rsHaikuScreenSaver.a ../../lib/rsMath.a ../../lib/Implicit.a ../../lib/rsText.a  ../../lib/Rgbhsl.a # -lm
++CFLAGS = -O3 -DRS_HAIKUSCREENSAVER -DGL_GLEXT_PROTOTYPES $(INCLUDE)
+ 
+ OBJECTS = Hyperspace.o \
+ 	causticTextures.o \
+diff --git a/src/Implicit/Makefile b/src/Implicit/Makefile
+index 8659f8b..3ce93f1 100644
+--- a/src/Implicit/Makefile
++++ b/src/Implicit/Makefile
+@@ -1,5 +1,5 @@
+ INCLUDE = -I../../include
+-COMPILE = gcc $(INCLUDE) -O3 -DGL_GLEXT_PROTOTYPES -msse -mfpmath=sse
++COMPILE = gcc $(INCLUDE) -shared -O3 -DGL_GLEXT_PROTOTYPES # -msse -mfpmath=sse
+ OBJECTS = impCubeTables.o \
+ 	impCubeVolume.o \
+ 	impSurface.o \
+diff --git a/src/Microcosm/Makefile b/src/Microcosm/Makefile
+index ddaade3..2262be1 100644
+--- a/src/Microcosm/Makefile
++++ b/src/Microcosm/Makefile
+@@ -1,6 +1,6 @@
+ INCLUDE = -I. -I../../include
+-LIBRARY = -lm -lGL -lGLU ../../lib/rsXScreenSaver.a ../../lib/rsMath.a ../../lib/Implicit.a ../../lib/Rgbhsl.a ../../lib/rsText.a -pthread
+-CFLAGS = -O3 -DRS_XSCREENSAVER -DGL_GLEXT_PROTOTYPES $(INCLUDE) -msse -mfpmath=sse
++LIBRARY = -lGL -lGLU ../../lib/rsHaikuScreenSaver.a ../../lib/rsMath.a ../../lib/Implicit.a ../../lib/Rgbhsl.a ../../lib/rsText.a # -pthread -lm 
++CFLAGS = -O3 -shared -DRS_HAIKUSCREENSAVER -DGL_GLEXT_PROTOTYPES $(INCLUDE) # -msse -mfpmath=sse
+ 
+ OBJECTS = Microcosm.o \
+ 	MirrorBox.o \
+diff --git a/src/Microcosm/Microcosm.cpp b/src/Microcosm/Microcosm.cpp
+index 3c6b2be..c05584e 100644
+--- a/src/Microcosm/Microcosm.cpp
++++ b/src/Microcosm/Microcosm.cpp
+@@ -31,6 +31,9 @@
+ #ifdef RS_XSCREENSAVER
+ #include <rsXScreenSaver/rsXScreenSaver.h>
+ #endif
++#ifdef RS_HAIKUSCREENSAVER
++#include <rsHaikuScreenSaver/rsHaikuScreenSaver.h>
++#endif
+ 
+ //#include <iostream>
+ #include <vector>
+@@ -869,7 +872,7 @@ void setDefaults(int which){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void handleCommandLine(int argc, char* argv[]){
+ 	setDefaults(0);
+ 	getArgumentsValue(argc, argv, std::string("-stime"), dSingleTime, 0, 300);
+@@ -921,7 +924,7 @@ void initSaver(HWND hwnd){
+ 
+ 	reshape(rect.right, rect.bottom);
+ #endif
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void initSaver(){
+ #endif
+ 	srand((unsigned)time(NULL));
+@@ -1132,7 +1135,7 @@ void initSaver(){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void cleanUp(){
+ 	// Free memory
+ }
+diff --git a/src/Plasma/Makefile b/src/Plasma/Makefile
+index 697ece9..18e152c 100644
+--- a/src/Plasma/Makefile
++++ b/src/Plasma/Makefile
+@@ -1,6 +1,6 @@
+ INCLUDE = -I../../include
+-LIBRARY = -L../../lib -lm -lGL -lGLU ../../lib/rsXScreenSaver.a ../../lib/rsText.a
+-CFLAGS = -O3 -DRS_XSCREENSAVER $(INCLUDE)
++LIBRARY = -shared -L../../lib -lGL -lGLU ../../lib/rsHaikuScreenSaver.a ../../lib/rsText.a
++CFLAGS = -O3 -DRS_HAIKUSCREENSAVER $(INCLUDE)
+ 
+ OBJECTS = Plasma.o
+ 
+diff --git a/src/Plasma/Plasma.cpp b/src/Plasma/Plasma.cpp
+index 82444e4..6011e6f 100644
+--- a/src/Plasma/Plasma.cpp
++++ b/src/Plasma/Plasma.cpp
+@@ -33,6 +33,9 @@
+ #ifdef RS_XSCREENSAVER
+ #include <rsXScreenSaver/rsXScreenSaver.h>
+ #endif
++#ifdef RS_HAIKUSCREENSAVER
++#include <rsHaikuScreenSaver/rsHaikuScreenSaver.h>
++#endif
+ 
+ #include <stdio.h>
+ #include <math.h>
+@@ -263,7 +266,7 @@ void setDefaults(){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void handleCommandLine(int argc, char* argv[]){
+ 	setDefaults();
+ 	getArgumentsValue(argc, argv, std::string("-zoom"), dZoom, 1, 100);
+@@ -302,7 +305,7 @@ void initSaver(HWND hwnd){
+ 	glLoadIdentity();
+ 	gluOrtho2D(0.0f, 1.0f, 0.0f, 1.0f);
+ #endif
+-#ifdef RS_XSCREENSAVER
++#ifndef WIN32
+ void initSaver(){
+ #endif
+ 	int i, j;
+@@ -339,7 +342,7 @@ void initSaver(){
+ }
+ 
+ 
+-#ifdef RS_XSCREENSAVER
++#if defined(RS_XSCREENSAVER) || defined(RS_HAIKUSCREENSAVER)
+ void cleanUp(){
+ 	;
+ }
+diff --git a/src/rsHaikuScreenSaver/Makefile b/src/rsHaikuScreenSaver/Makefile
+new file mode 100644
+index 0000000..5853683
+--- /dev/null
++++ b/src/rsHaikuScreenSaver/Makefile
+@@ -0,0 +1,17 @@
++INCLUDE = -I../../include
++COMPILE = gcc $(INCLUDE) -O3
++OBJECTS = rsHaikuScreenSaver.o \
++	../util/arguments.o
++
++
++all: $(OBJECTS)
++	ar cr ../../lib/rsHaikuScreenSaver.a $(OBJECTS)
++
++clean:
++	rm $(OBJECTS)
++
++
++.SUFFIXES: .cpp .o
++
++.cpp.o:
++	$(COMPILE) -o $@ -c $<
+diff --git a/src/rsHaikuScreenSaver/rsHaikuScreenSaver.cpp b/src/rsHaikuScreenSaver/rsHaikuScreenSaver.cpp
+new file mode 100644
+index 0000000..521bfe8
+--- /dev/null
++++ b/src/rsHaikuScreenSaver/rsHaikuScreenSaver.cpp
+@@ -0,0 +1,173 @@
++/*
++ * Copyright (C) 2014  Puck Meerburg.
++ *
++ * This file is part of rsHaikuScreenSaver.
++ *
++ * rsHaikuScreenSaver is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published
++ * by the Free Software Foundation; either version 2 of the License,
++ * or (at your option) any later version.
++ *
++ * rsHaikuScreenSaver 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.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <ScreenSaver.h>
++#include <View.h>
++#include <GLView.h>
++#include <stdio.h>
++
++int checkingPassword = 0;
++int isSuspended = 0;
++int doingPreview = 0;
++unsigned int dFrameRateLimit = 0;
++int kStatistics = 0;
++bool useRootWindow = false;
++
++bool quit = false;
++
++// Functions that must be implemented by screensaver
++extern void handleCommandLine(int argc, char* argv[]);
++extern void initSaver();
++extern void cleanUp();
++extern void idleProc();
++extern void reshape(int, int);
++
++class ScreenSaverGLView : public BGLView {
++	public:
++							ScreenSaverGLView(BRect bounds);
++		void				FrameResized(float width, float height);
++		void				EnableDirectMode(bool enabled);
++		void				DrawSaver();
++	private:
++		bool 				mConnected;
++		bool				mFirst;
++};
++
++ScreenSaverGLView::ScreenSaverGLView(BRect bounds) :
++	BGLView(bounds, (const char *)NULL, B_FOLLOW_ALL,
++		B_FRAME_EVENTS | B_WILL_DRAW,
++		BGL_RGB | BGL_ALPHA | BGL_DEPTH | BGL_DOUBLE) {
++	mFirst = true;
++}
++
++
++void
++ScreenSaverGLView::DrawSaver()
++{
++	if (mConnected) {
++		LockGL();
++		if (mFirst) {
++			char *stuff[2] = { "saver", 0 };
++			handleCommandLine(1, stuff);
++			initSaver();
++			reshape((int)Bounds().Width(), (int)Bounds().Height());
++			mFirst = false;
++		}
++		idleProc();
++		SwapBuffers();
++		UnlockGL();	
++	}
++}
++
++
++void
++ScreenSaverGLView::EnableDirectMode(bool enabled)
++{
++	BGLView::EnableDirectMode(enabled);
++	mConnected = enabled;
++}
++
++
++void
++ScreenSaverGLView::FrameResized(float width, float height)
++{
++	if (mConnected) {
++		LockGL();
++		reshape((int)width, (int)height);
++		UnlockGL();
++	}
++}
++
++class rsHaikuScreenSaver : public BScreenSaver
++{
++	public:
++							rsHaikuScreenSaver(BMessage *archive, image_id);
++		void				DirectConnected(direct_buffer_info* info);
++		void				Draw(BView *, int32 frame);
++		void				StopSaver();
++		void				StartConfig(BView *view);
++		status_t			StartSaver(BView *view, bool preview);
++		
++	private:
++		ScreenSaverGLView  *fSaverView;
++};
++
++
++BScreenSaver* instantiate_screen_saver(BMessage *msg, image_id image) 
++{ 
++	return new rsHaikuScreenSaver(msg, image);
++} 
++
++
++rsHaikuScreenSaver::rsHaikuScreenSaver(BMessage *archive, image_id id)
++	:	
++	BScreenSaver(archive, id)
++{
++}
++
++
++void 
++rsHaikuScreenSaver::StartConfig(BView *view) 
++{
++} 
++
++
++status_t 
++rsHaikuScreenSaver::StartSaver(BView *view, bool preview)
++{
++	float viewWidth = view->Bounds().Width();
++	float viewHeight = view->Bounds().Height();
++
++	fSaverView = new ScreenSaverGLView(BRect(0, 0, viewWidth, viewHeight));
++	
++	view->AddChild(fSaverView);
++
++	// Set tick size to 50,000 microseconds = 0.05 seconds
++	SetTickSize(50000);
++	
++	return B_OK;
++}
++
++void
++rsHaikuScreenSaver::Draw(BView *, int32 frame)
++{
++	fSaverView->DrawSaver();
++}
++
++void
++rsHaikuScreenSaver::DirectConnected(direct_buffer_info* info)
++{
++	if (fSaverView) {
++		fSaverView->DirectConnected(info);
++		fSaverView->EnableDirectMode(true);
++	}
++}
++
++void 
++rsHaikuScreenSaver::StopSaver()
++{
++	if (fSaverView)
++		fSaverView->EnableDirectMode(false);
++
++	fSaverView->LockGL();
++	cleanUp();
++	fSaverView->UnlockGL();
++}
++
+-- 
+1.8.3.4
+