From be6e033d7fe05fd7ff9318a79404f34d8757e1c2 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 4 Apr 2015 11:40:55 +0200
Subject: [PATCH 01/13] dumb, new updated recipe

---
 media-libs/dumb/dumb-0.9.3.recipe        | 87 ++++++++++++++++++-----
 media-libs/dumb/patches/dumb-0.9.3.patch | 89 ------------------------
 2 files changed, 69 insertions(+), 107 deletions(-)
 delete mode 100644 media-libs/dumb/patches/dumb-0.9.3.patch

diff --git a/media-libs/dumb/dumb-0.9.3.recipe b/media-libs/dumb/dumb-0.9.3.recipe
index 187e82fb2..d5b5691d7 100644
--- a/media-libs/dumb/dumb-0.9.3.recipe
+++ b/media-libs/dumb/dumb-0.9.3.recipe
@@ -1,33 +1,84 @@
-DESCRIPTION="dumb - Dynamic Universal Music Bibliotheque" 
+SUMMARY="A Dynamic Universal Music Library"
+DESCRIPTION="DUMB is an IT, XM, S3M and MOD player library" 
 HOMEPAGE="http://dumb.sourceforge.net/" 
+LICENSE="DUMB-0.9.3"
+COPYRIGHT="2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere"
 SRC_URI="http://downloads.sourceforge.net/project/dumb/dumb/0.9.3/dumb-0.9.3.tar.gz"
+CHECKSUM_SHA256="8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33"
+SRC_URI_2="http://prdownloads.sourceforge.net/dumb/dumb-0.9.3-autotools.tar.gz"
+CHECKSUM_SHA256_2="9e3fa1e0932e00e31f2314cefb3ea0343ee4f850b6a8e6a6a9627a35b2dc0dbd"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/allegro >= 4.4.1.1"
-CHECKSUM_MD5="f48da5b990aa8aa822d3b6a951baf5c2"
+
+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="
+	dumb$secondaryArchSuffix = $portVersion
+	lib:libdumb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9
+	lib:libaldmb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9
+	cmd:dumb2wav$secondaryArchSuffix = $portVersion
+	cmd:dumbout$secondaryArchSuffix = $portVersion
+	cmd:dumbplay$secondaryArchSuffix = $portVersion
+	"
+
+PROVIDES_devel="
+	dumb${secondaryArchSuffix}_devel = $portVersion
+	devel:libdumb$secondaryArchSuffix = $portVersion
+	devel:libdumb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9
+	devel:libaldmb$secondaryArchSuffix = $portVersion
+	devel:libaldmb_0.9.3$secondaryArchSuffix = 0.9.3 compat >= 0.9
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:liballeg$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	dumb$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:liballeg$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	"
+
 BUILD()
 {
-	if [ ! -f dumb-0.9.3-autotools.tar.gz ]; then
-#	get the autotools to help in building dumb	
-	wget http://prdownloads.sourceforge.net/dumb/dumb-0.9.3-autotools.tar.gz?download
-	fi
-	tar -xvf dumb-0.9.3-autotools.tar.gz
-	cd dumb-0.9.3
 	mkdir -p m4
-	haikuporter -y -b allegro-4.4.1.1
-	cp $(haikuporter -t)/media-libs/allegro/work/allegro-4.4.1.1/misc/allegro.m4 m4
+	cp -R ../../sources-2/dumb-0.9.3 ../
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in
+	echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 	libtoolize --force --copy --install
 	aclocal -I m4 --warnings=none
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make 
+	runConfigure --omit-dirs "dataRootDir" ./configure
+
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd dumb-0.9.3
-		make install DESTDIR=${DESTDIR}
+	make install
+	prepareInstalledDevelLibs libdumb libaldmb libdumb-0.9.3 libaldmb-0.9.3
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
 }
-LICENSE="DUMB-0.9.3"
-COPYRIGHT="2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere"
diff --git a/media-libs/dumb/patches/dumb-0.9.3.patch b/media-libs/dumb/patches/dumb-0.9.3.patch
deleted file mode 100644
index 427c09857..000000000
--- a/media-libs/dumb/patches/dumb-0.9.3.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN dumb-0.9.3/Makefile dumb-0.9.3-haiku/Makefile
---- dumb-0.9.3/Makefile	2005-08-08 00:18:41.049283072 +0000
-+++ dumb-0.9.3-haiku/Makefile	2010-09-04 07:41:53.857473024 +0000
-@@ -64,11 +64,11 @@
- -include make/config.txt
- 
- 
--ifeq "$(OSTYPE)" "beos"
-+ifeq "$(OSTYPE)" "haiku"
- 
--INCLUDE_INSTALL_PATH := /boot/develop/headers
--LIB_INSTALL_PATH := /boot/develop/lib/x86
--BIN_INSTALL_PATH := /boot/home/config/bin
-+INCLUDE_INSTALL_PATH := /boot/common/include
-+LIB_INSTALL_PATH := /boot/common/lib
-+BIN_INSTALL_PATH := /boot/common/bin
- # DEFAULT_PREFIX is not set, so config.sh will not prompt for PREFIX.
- LINK_MATH :=
- 
-@@ -80,9 +80,9 @@
- DEFAULT_PREFIX := /usr/local
- endif
- export DEFAULT_PREFIX
--INCLUDE_INSTALL_PATH := $(PREFIX)/include
--LIB_INSTALL_PATH := $(PREFIX)/lib
--BIN_INSTALL_PATH := $(PREFIX)/bin
-+INCLUDE_INSTALL_PATH := $(DESTDIR)$(PREFIX)/include
-+LIB_INSTALL_PATH := $(DESTDIR)$(PREFIX)/lib
-+BIN_INSTALL_PATH := $(DESTDIR)$(PREFIX)/bin
- 
- endif
- 
-diff -urN dumb-0.9.3/make/dumbask.c dumb-0.9.3-haiku/make/dumbask.c
---- dumb-0.9.3/make/dumbask.c	2005-08-08 00:18:40.048758784 +0000
-+++ dumb-0.9.3-haiku/make/dumbask.c	2010-09-04 07:20:26.941621248 +0000
-@@ -21,10 +21,10 @@
- 	printf("%s", argv[1]);
- 
- 	for (;;) {
-+		int i;
- 		char c = getchar();
- 		if (c == EOF) return 0;
- 		c = toupper(c);
--		int i;
- 		for (i = 0; options[i]; i++)
- 			if (c == toupper(options[i]))
- 				return i;
-diff -urN dumb-0.9.3/make/unix.inc dumb-0.9.3-haiku/make/unix.inc
---- dumb-0.9.3/make/unix.inc	2005-08-08 00:18:40.048496640 +0000
-+++ dumb-0.9.3-haiku/make/unix.inc	2010-09-04 07:29:01.080216064 +0000
-@@ -15,7 +15,7 @@
- 
- EXE_SUFFIX :=
- 
--LINK_MATH := -lm
-+LINK_MATH :=
- LINK_ALLEGRO := `allegro-config --libs`
- 
- # PREFIX is set by config.sh.
-diff -urN dumb-0.9.3/make/config.sh dumb-0.9.3-haiku/make/config.sh
---- dumb-0.9.3/make/config.sh	2005-08-08 00:18:40.012320768 +0000
-+++ dumb-0.9.3-haiku/make/config.sh	2010-09-07 23:23:38.653787136 +0000
-@@ -14,24 +14,14 @@
- 
- echo 'ALL_TARGETS := core core-examples core-headers' >> make/config.tmp
- 
--if make/dumbask 'Would you like support for Allegro (Y/N)? ' YN; then
--  echo 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> make/config.tmp
--fi
-+echo 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> make/config.tmp
- 
--
--if [ ! -z $DEFAULT_PREFIX ]; then
--echo "Please specify an installation prefix (default $DEFAULT_PREFIX)."
--echo -n '> '
--read PREFIX
-+PREFIX := `/boot/common`
- if [ -z $PREFIX ]; then PREFIX=$DEFAULT_PREFIX; fi
- echo "PREFIX := `echo "$PREFIX" | \
-   sed -e 's/\${\([A-Za-z_][A-Za-z0-9_]*\)}/$(\1)/g' \
-       -e 's/\$\([A-Za-z_][A-Za-z0-9_]*\)/$(\1)/g'`" >> make/config.tmp
--fi
- 
- mv -f make/config.tmp make/config.txt
- 
- echo 'Configuration complete.'
--echo "Run 'make config' to change it in the future."
--echo -n 'Press Enter to continue ... '
--read dummy

From 0b67f7396e26f58d8596fbfcd6ab382ae8e43499 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson>
Date: Sat, 18 Apr 2015 13:58:07 +0000
Subject: [PATCH 02/13] Hi, I found out that the cdrtools-3.01~a25.patch used
 in the recipes for 3.01a25, 3.01a27 and 3.01a28 could be simplified by
 mergeing the diffs on cdrtools-3.01/RULES/x86_64-haiku-{cc,gcc}.rul into a
 smaller (and yet equivalent) diff on cdrtools-3.01/RULES/MKLINKS. In
 cdrtools-3.01~a25.patch : x86_64-haiku-{cc,gcc].rul are identical to
 bepc-haiku-{cc,gcc}.rul whereas in cdrtools-3.01~a28.patch :
 x86_64-haiku-{cc,gcc].rul are symlinks to bepc-haiku-{cc,gcc}.rul (which get
 created at build time thanks to the 2 lines added in MKLINKS). Thanks & kind
 regards

---
 .../cdrtools/patches/cdrtools-3.01~a28.patch  | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01~a28.patch

diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a28.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a28.patch
new file mode 100644
index 000000000..9556802e1
--- /dev/null
+++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a28.patch
@@ -0,0 +1,64 @@
+diff -urp cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
+--- cdrtools-3.01/DEFAULTS/Defaults.haiku	2013-11-04 20:58:20.000000000 +0000
++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
+@@ -30,16 +30,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 -ur cdrtools-3.01/libscg/scsi-beos.c cdrtools-3.01-haiku/libscg/scsi-beos.c
+--- cdrtools-3.01/libscg/scsi-beos.c	2009-06-30 18:34:03.000000000 +0000
++++ cdrtools-3.01-haiku/libscg/scsi-beos.c
+@@ -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),
+diff -ur cdrtools-3.01/RULES/MKLINKS cdrtools-3.01-haiku/RULES/MKLINKS
+--- cdrtools-3.01/RULES/MKLINKS	2014-06-05 22:12:13.000000000 +0000
++++ cdrtools-3.01-haiku/RULES/MKLINKS
+@@ -392,4 +392,6 @@
+ $symlink	bepc-beos-gcc.rul	bemac-beos-gcc.rul
+ $symlink	bepc-haiku-cc.rul	bemac-haiku-cc.rul
+ $symlink	bepc-haiku-gcc.rul	bemac-haiku-gcc.rul
++$symlink	bepc-haiku-cc.rul	x86_64-haiku-cc.rul
++$symlink	bepc-haiku-gcc.rul	x86_64-haiku-gcc.rul
+ $symlink	alpha-openvms-cc.rul	alphaserver_ds20_500_mhz-openvms-cc.rul
\ No newline at end of file

From 2a157734ed4600406711f9a9301b420887aae9ee Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson>
Date: Sat, 18 Apr 2015 14:09:47 +0000
Subject: [PATCH 03/13] Fixed the description of cdrtools and switched to a
 smaller (and yet equivalent) patch. cdrtools-3.01~a28.patch is a rewrite of
 cdrtools-3.01~a25.patch.

---
 app-cdr/cdrtools/cdrtools-3.01~a28.recipe | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-cdr/cdrtools/cdrtools-3.01~a28.recipe b/app-cdr/cdrtools/cdrtools-3.01~a28.recipe
index 16085b0f4..cbd6713e2 100644
--- a/app-cdr/cdrtools/cdrtools-3.01~a28.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01~a28.recipe
@@ -6,7 +6,7 @@ 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 \
+- mkisofs   A program to create hybrid ISO9660/JOLIET/HFS filesystems with \
 optional Rock Ridge attributes 
 - isodebug  A program to print mkisofs debug information from media 
 - isodump   A program to dump ISO-9660 media 
@@ -16,8 +16,8 @@ optional Rock Ridge attributes
 "
 HOMEPAGE="http://cdrecord.org" 
 COPYRIGHT="
-	1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs)
-	1995-2013 J. Schilling (cdrecord)
+	1993-1997 Eric Youngdale, 1997-2015 J. Schilling (mkisofs)
+	1995-2015 J. Schilling (cdrecord)
 	"
 LICENSE="
 	GNU GPL v2
@@ -28,7 +28,7 @@ CHECKSUM_SHA256="3da9ad914cd5fb68037f7508cadfa05a31e3bb39c655b2dd0933345d44f86c7
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
-PATCHES='cdrtools-3.01~a25.patch'
+PATCHES='cdrtools-3.01~a28.patch'
 
 PROVIDES="
 	cdrtools = $portVersion compat >= 3

From f82814a7b7d5692a879f6692d901b7cf2c6f76d5 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 09:33:49 +0200
Subject: [PATCH 04/13] Fix goonies provides (haikuports bug #219)

---
 games-arcade/goonies/goonies-1.4.1528.recipe | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-arcade/goonies/goonies-1.4.1528.recipe b/games-arcade/goonies/goonies-1.4.1528.recipe
index c32d7b600..ece5f6a85 100644
--- a/games-arcade/goonies/goonies-1.4.1528.recipe
+++ b/games-arcade/goonies/goonies-1.4.1528.recipe
@@ -19,7 +19,7 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2006-2009 Brain Games"
 SRC_URI="http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz"
 CHECKSUM_SHA256="9e9c1e67a41dfae512e975b6931828cdc82f07397921ca0a41a81c3020a73799"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -29,7 +29,8 @@ fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	goonies = $portVersion
+	goonies$secondaryArchSuffix = $portVersion
+	app:goonies
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix

From f4e03cbd7113295b0dbf39a65c61910e061d366b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 10:04:02 +0200
Subject: [PATCH 05/13] goonies: fix requires.

---
 games-arcade/goonies/goonies-1.4.1528.recipe | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/games-arcade/goonies/goonies-1.4.1528.recipe b/games-arcade/goonies/goonies-1.4.1528.recipe
index ece5f6a85..6cea47c53 100644
--- a/games-arcade/goonies/goonies-1.4.1528.recipe
+++ b/games-arcade/goonies/goonies-1.4.1528.recipe
@@ -43,11 +43,11 @@ REQUIRES="
 	"
 BUILD_REQUIRES="
 	devel:libsdl$secondaryArchSuffix
-	devel:libSDL_image$secondaryArchSuffix
-	devel:libSDL_mixer$secondaryArchSuffix
-#	devel:libSDL_sound$secondaryArchSuffix
-#	devel:libSDL_ttf$secondaryArchSuffix
-	devel:libGLU$secondaryArchSuffix
+	devel:libsdl_image$secondaryArchSuffix
+	devel:libsdl_mixer$secondaryArchSuffix
+#	devel:libsdl_sound$secondaryArchSuffix
+#	devel:libsdl_ttf$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel

From 1c52019e0b481ad69d5ff88521b625858e903083 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 10:12:19 +0200
Subject: [PATCH 06/13] twolame: fix requires.

---
 media-sound/twolame/twolame-0.3.13.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/twolame/twolame-0.3.13.recipe b/media-sound/twolame/twolame-0.3.13.recipe
index 8bc76293d..8a5deacb5 100644
--- a/media-sound/twolame/twolame-0.3.13.recipe
+++ b/media-sound/twolame/twolame-0.3.13.recipe
@@ -31,7 +31,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	devel:libsndfile$secondaryArchSuffix
-	devel:libFLAC$secondaryArchSuffix
+	devel:libflac$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 "

From 5e3ff62a2fc5da0ae2ca18ff487617a298f1c5a2 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 19 Apr 2015 16:54:16 +0300
Subject: [PATCH 07/13] Caya: cleanup INSTALL

---
 haiku-apps/caya/caya-2013.10.12.recipe | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/haiku-apps/caya/caya-2013.10.12.recipe b/haiku-apps/caya/caya-2013.10.12.recipe
index 173caa088..8dfa67c0d 100644
--- a/haiku-apps/caya/caya-2013.10.12.recipe
+++ b/haiku-apps/caya/caya-2013.10.12.recipe
@@ -3,8 +3,8 @@ DESCRIPTION="
 Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \
 google talk, and facebook.
 "
-HOMEPAGE="http://www.versut.com/caya/" 
-REVISION="1"
+HOMEPAGE="http://www.versut.com/caya" 
+REVISION="2"
 ARCHITECTURES="x86 x86_gcc2"
 
 SRC_URI="git+https://github.com/Barrett17/Caya.git#0746cacb94f78b656226d8679baa3a4d968a03e6"
@@ -55,20 +55,17 @@ INSTALL()
 	mkdir -p $appsDir/Caya
 	mkdir -p $appsDir/Caya/smileys
 	mkdir -p $appsDir/Caya/protocols
-	mkdir -p $includeDir/caya/
+	mkdir -p $includeDir/caya
 
-	cp generated/distro-haiku-*-release/Caya $appsDir/Caya
-	cp generated/distro-haiku-*-release/aim $appsDir/Caya/protocols
-	cp generated/distro-haiku-*-release/msn $appsDir/Caya/protocols
-	cp generated/distro-haiku-*-release/gtalk $appsDir/Caya/protocols
-	cp generated/distro-haiku-*-release/facebook $appsDir/Caya/protocols
-	cp generated/distro-haiku-*-release/jabber $appsDir/Caya/protocols
-	cp generated/distro-haiku-*-release/yahoo $appsDir/Caya/protocols
+	cd generated/distro-haiku-*-release
+	cp Caya $appsDir/Caya
+	cp aim msn gtalk facebook jabber yahoo $appsDir/Caya/protocols
+	cd ../..
 	cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys
-	cp application/Caya.h $includeDir/caya/
-	cp application/CayaProtocol.h $includeDir/caya/
-	cp application/CayaConstants.h $includeDir/caya/
-	cp application/CayaProtocolMessages.h $includeDir/caya/
+	cp application/Caya.h $includeDir/caya
+	cp application/CayaProtocol.h $includeDir/caya
+	cp application/CayaConstants.h $includeDir/caya
+	cp application/CayaProtocolMessages.h $includeDir/caya
 
 	addAppDeskbarSymlink $appsDir/Caya/Caya
 }

From ac0682d657d64a2004b1f7f8f23ffab19dca43a0 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 15:59:40 +0200
Subject: [PATCH 08/13] libsigc++: fix recipes.

- 1.2 is not backwards compatible so keep it around,
- Upgrade 2.2 to 2.4 which is easier to build.
---
 dev-libs/libsigc++/libsigc++-1.2.7.recipe     | 75 ++++++++++++++-----
 dev-libs/libsigc++/libsigc++-2.2.7.recipe     | 25 -------
 dev-libs/libsigc++/libsigc++-2.4.1.recipe     | 72 ++++++++++++++++++
 .../patches/libsigc++-1.2.7.patchset          | 35 +++++++++
 4 files changed, 164 insertions(+), 43 deletions(-)
 delete mode 100644 dev-libs/libsigc++/libsigc++-2.2.7.recipe
 create mode 100644 dev-libs/libsigc++/libsigc++-2.4.1.recipe
 create mode 100644 dev-libs/libsigc++/patches/libsigc++-1.2.7.patchset

diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.recipe b/dev-libs/libsigc++/libsigc++-1.2.7.recipe
index 246950f41..34d11ce2b 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.recipe
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.recipe
@@ -1,29 +1,68 @@
-DESCRIPTION="libsigc++ is a typesafe callback system for standard C++" 
+SUMMARY="Callback Framework for C++"
+DESCRIPTION="A typesafe callback system for standard C++. It allows you to \
+define signals and to connect those signals to any callback function, either \
+global or a member function, regardless of whether it is static or virtual.
+
+It also contains adaptor classes for connection of dissimilar callbacks and \
+has an ease of use unmatched by other C++ callback libraries."
+
 HOMEPAGE="http://libsigc.sourceforge.net/stable.shtml" 
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-1.2.7.tar.gz"
-REVISION="2"
-STATUS_HAIKU="stable"
-DEPEND="dev-cpp/mm-common >= 0.9.2"
-CHECKSUM_MD5="b939751dff0db9652c5dbfc9de685efa"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-$portVersion.tar.gz"
+CHECKSUM_SHA256="c995a4623d9f71455d8c7d62307a13e68e0f8313f47adb7221421455bbdfcb98"
+PATCHES="libsigc++-$portVersion.patchset"
+
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	libsigc++$secondaryArchSuffix = $portVersion
+	lib:libsigc_1.2$secondaryArchSuffix = 0.0.0 compat = 0
+"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+"
+
+PROVIDES_devel="
+	libsigc++${secondaryArchSuffix}_devel = $portVersion
+	devel:libsigc_1.2$secondaryArchSuffix = 0.0.0 compat = 0
+"
+
+REQUIRES_devel="
+	libsigc++$secondaryArchSuffix == $portVersion base
+"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+"
+
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+"
+
 BUILD()
 {
-	cd libsigc++-1.2.7
 	libtoolize --force --copy --install
-	aclocal -I scripts
-	autoconf
-	automake
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make -i
-# There's name make file for tests and examples directories so just ignore (-i)
-# those errors and we really don't need either one
+	aclocal
+	sh autogen.sh
+	runConfigure --omit-dirs "docDir dataRootDir" ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd libsigc++-1.2.7
-	make -i install
+	make install
+
+	prepareInstalledDevelLib libsigc-1.2
+	rm $developLibDir/*.la
+	fixPkgconfig
+
+	packageEntries devel $relativeDevelopDir
 }
 
 LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2002, 2003, 2005 The libsigc++ Development Team"
+COPYRIGHT="2002-2005 The libsigc++ Development Team"
diff --git a/dev-libs/libsigc++/libsigc++-2.2.7.recipe b/dev-libs/libsigc++/libsigc++-2.2.7.recipe
deleted file mode 100644
index 8ab2d197f..000000000
--- a/dev-libs/libsigc++/libsigc++-2.2.7.recipe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="libsigc++ is a typesafe callback system for standard C++" 
-HOMEPAGE="http://libsigc.sourceforge.net/stable.shtml" 
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-2.2.7.tar.gz"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="dev-cpp/mm-common >= 0.9.2"
-CHECKSUM_MD5="48afe53ba0e3958f6ac5f072afed1c53"
-BUILD()
-{
-	cd libsigc++-2.2.7
-	libtoolize --force --copy
-	aclocal
-	sh autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libsigc++-2.2.7
-	make install
-}
-
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2002, 2003, 2005 The libsigc++ Development Team"
diff --git a/dev-libs/libsigc++/libsigc++-2.4.1.recipe b/dev-libs/libsigc++/libsigc++-2.4.1.recipe
new file mode 100644
index 000000000..a129a986d
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.4.1.recipe
@@ -0,0 +1,72 @@
+SUMMARY="Callback Framework for C++"
+DESCRIPTION="A typesafe callback system for standard C++. It allows you to \
+define signals and to connect those signals to any callback function, either \
+global or a member function, regardless of whether it is static or virtual.
+
+It also contains adaptor classes for connection of dissimilar callbacks and \
+has an ease of use unmatched by other C++ callback libraries."
+
+HOMEPAGE="http://libsigc.sourceforge.net/stable.shtml" 
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.4/libsigc++-$portVersion.tar.xz"
+#CHECKSUM_SHA256="355f2a580ea105514a1589610305ab1e3e0980aea19c3b427027dc160f6be06c"
+REVISION="1"
+ARCHITECTURES=""
+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="
+	libsigc++$secondaryArchSuffix = $portVersion
+	lib:libsigc_2.0$secondaryArchSuffix = 0.0.0 compat = 0
+"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+"
+
+PROVIDES_devel="
+	libsigc++${secondaryArchSuffix}_devel = $portVersion
+	devel:libsigc_2.0$secondaryArchSuffix = 0.0.0 compat = 0
+"
+
+REQUIRES_devel="
+	libsigc++$secondaryArchSuffix == $portVersion base
+"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+"
+
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+"
+
+BUILD()
+{
+#	libtoolize --force --copy --install
+#	aclocal
+#	sh autogen.sh
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib libsigc-2.0
+	rm $developLibDir/*.la
+	fixPkgconfig
+
+	packageEntries devel $relativeDevelopDir
+}
+
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2002-2015 The libsigc++ Development Team"
diff --git a/dev-libs/libsigc++/patches/libsigc++-1.2.7.patchset b/dev-libs/libsigc++/patches/libsigc++-1.2.7.patchset
new file mode 100644
index 000000000..e68f0e495
--- /dev/null
+++ b/dev-libs/libsigc++/patches/libsigc++-1.2.7.patchset
@@ -0,0 +1,35 @@
+From 24b160684e82a2f3fe8c76e3f53e66aa7f8cd2cf Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Sun, 19 Apr 2015 15:58:32 +0200
+Subject: Modernize autotools scripts.
+
+
+diff --git a/configure.in b/configure.in
+index 0a0915f..36e3162 100644
+--- a/configure.in
++++ b/configure.in
+@@ -49,7 +49,7 @@ dnl Initialize automake stuff
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+ 
+ dnl Specify a configuration file
+-AM_CONFIG_HEADER(sigc++/config/sigcconfig.h)
++AC_CONFIG_HEADERS(sigc++/config/sigcconfig.h)
+ 
+ AM_MAINTAINER_MODE
+ 
+diff --git a/sigc++/Makefile.am b/sigc++/Makefile.am
+index 9b13ca2..2c212b4 100644
+--- a/sigc++/Makefile.am
++++ b/sigc++/Makefile.am
+@@ -12,7 +12,7 @@ sigc_built_cc	=
+ sigc_built_h	= bind_return.h	\
+ 		  object_slot.h retype_return.h slot.h bind.h		\
+ 		  class_slot.h hide.h retype.h signal.h       \
+-                  method_slot.h method_slot.h
++                  method_slot.h
+ 
+ built_sources	= $(sigc_built_cc) $(sigc_built_h)
+ dist_sources	= $(sigc_fixed_cc) $(sigc_fixed_h)
+-- 
+2.2.2
+

From 1e2667e645255c3896580d78a3be18a7522476fc Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 16:16:21 +0200
Subject: [PATCH 09/13] physfs: missing escaping in description

---
 dev-games/physfs/physfs-2.0.3.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe
index 25c519be8..e8172f9f5 100644
--- a/dev-games/physfs/physfs-2.0.3.recipe
+++ b/dev-games/physfs/physfs-2.0.3.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="
 Physfs is short for PhysicsFS. It's a C library that provides abstract \
 access to various archives. It is intended for use in video games, and the \
 design was somewhat inspired by Quake 3's file subsystem. The programmer \
-defines a "write directory" on the physical filesystem. No file writing done \
+defines a \"write directory\" on the physical filesystem. No file writing done \
 through the PhysicsFS API can leave that write directory, for security.
 PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are \
 available, the user's home directory, where in the real filesystem your \

From 08af75dccee669a99320154884bbd4e833ab1d31 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 17:06:58 +0200
Subject: [PATCH 10/13] Paragui: add recipe.

Fixes http://ports.haiku-files.org/ticket/83
---
 media-libs/paragui/paragui-1.1.8.recipe       | 82 +++++++++++++++++++
 .../paragui/patches/paragui-1.1.8.patch       | 28 -------
 .../paragui/patches/paragui-1.1.8.patchset    | 66 +++++++++++++++
 3 files changed, 148 insertions(+), 28 deletions(-)
 create mode 100644 media-libs/paragui/paragui-1.1.8.recipe
 delete mode 100644 media-libs/paragui/patches/paragui-1.1.8.patch
 create mode 100644 media-libs/paragui/patches/paragui-1.1.8.patchset

diff --git a/media-libs/paragui/paragui-1.1.8.recipe b/media-libs/paragui/paragui-1.1.8.recipe
new file mode 100644
index 000000000..d30e8cef7
--- /dev/null
+++ b/media-libs/paragui/paragui-1.1.8.recipe
@@ -0,0 +1,82 @@
+SUMMARY="crossplatform widgetset"
+DESCRIPTION="ParaGUI is a cross-platform high-level application framework and \
+GUI (graphical user interface) library. It can be compiled on various \
+platforms (Linux, Win32, BeOS, MacOS, ...)"
+HOMEPAGE="http://www.nongnu.org/paragui/"
+REVISION="1"
+LICENSE="GNU LGPL v2"
+COPYRIGHT="2000-2004 Alexander Pipelka"
+
+ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+SRC_URI="http://download.savannah.gnu.org/releases/paragui/paragui-$portVersion.tar.gz"
+CHECKSUM_SHA256="5a6663d3be6819bce8a8ca0bf8a0d33c7508e28d8e9f220649cef19e9d5260c3"
+PATCHES="paragui-$portVersion.patchset"
+
+PROVIDES="
+	paragui$secondaryArchSuffix = $portVersion
+	lib:libparagui_1.1 = 8.0.0 compat = 8
+	lib:libparagui
+"
+
+REQUIRES="
+	haiku
+	lib:libexpat
+	lib:libphysfs
+	lib:libSDL_1.2
+	lib:libGL
+	lib:libpng16
+	lib:libz
+	lib:libsigc_1.2
+"
+
+PROVIDES_devel="
+	cmd:paragui_config
+	devel:libparagui_1.1 = 8.0.0 compat = 8
+	devel:libparagui
+"
+
+REQUIRES_devel="
+	paragui$secondaryArchSuffix == $portVersion base
+"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libsigc_1.2$secondaryArchSuffix
+	devel:libsdl$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libexpat$secondaryArchSuffix
+	devel:libphysfs$secondaryArchSuffix
+"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:autoconf
+	cmd:automake
+	cmd:find
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	runConfigure --omit-dirs "docDir dataRootDir" ./configure --with-libstdcpp=stdc++.r4
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib libparagui
+	rm $developLibDir/*.la
+
+	fixPkgconfig
+
+	packageEntries devel $relativeDevelopDir $relativeBinDir
+}
diff --git a/media-libs/paragui/patches/paragui-1.1.8.patch b/media-libs/paragui/patches/paragui-1.1.8.patch
deleted file mode 100644
index 5428680aa..000000000
--- a/media-libs/paragui/patches/paragui-1.1.8.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN paragui-1.1.8/Makefile.am paragui-1.1.8-haiku/Makefile.am
---- paragui-1.1.8/Makefile.am	2004-10-18 18:48:10.047710208 +0000
-+++ paragui-1.1.8-haiku/Makefile.am	2010-05-29 01:02:52.581435392 +0000
-@@ -59,8 +59,8 @@
- 	mkdir $(distdir)/lib
- 	cp $(srcdir)/lib/README.txt $(distdir)/lib
- 
--install-hook:
--	-ldconfig
-+#install-hook:
-+#	-ldconfig
- 
- rpm: $(PACKAGE)-$(VERSION).tar.gz
- 	cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
-diff -urN paragui-1.1.8/configure.in paragui-1.1.8-haiku/configure.in
---- paragui-1.1.8/configure.in	2004-10-18 18:58:09.047710208 +0000
-+++ paragui-1.1.8-haiku/configure.in	2010-05-29 01:01:16.400818176 +0000
-@@ -1,8 +1,9 @@
- dnl Process this file with autoconf to produce a configure script.
- 
-+m4_pattern_allow([^PKG_SIGC$])
- AC_INIT(README)
- AM_CONFIG_HEADER(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
--
-+AC_CONFIG_MACRO_DIR([m4])
- TOP_BUILDDIR=`pwd`
- 
- AC_SUBST(TOP_BUILDDIR)
diff --git a/media-libs/paragui/patches/paragui-1.1.8.patchset b/media-libs/paragui/patches/paragui-1.1.8.patchset
new file mode 100644
index 000000000..21fa97c7c
--- /dev/null
+++ b/media-libs/paragui/patches/paragui-1.1.8.patchset
@@ -0,0 +1,66 @@
+From 441d86baff3474f78b156f4217660896a5cb0d23 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Sun, 19 Apr 2015 17:03:19 +0200
+Subject: Modernize autotools scripts.
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 576f832..7300ac6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -59,8 +59,8 @@ dist-hook:
+ 	mkdir $(distdir)/lib
+ 	cp $(srcdir)/lib/README.txt $(distdir)/lib
+ 
+-install-hook:
+-	-ldconfig
++#install-hook:
++#	-ldconfig
+ 
+ rpm: $(PACKAGE)-$(VERSION).tar.gz
+ 	cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
+diff --git a/configure.in b/configure.in
+index 3913ed9..54afe8f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(README)
+-AM_CONFIG_HEADER(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
++AC_CONFIG_HEADERS(include/paraconfig_gnu.h:include/paraconfig_gnu.h.in)
+ 
+ TOP_BUILDDIR=`pwd`
+ 
+@@ -12,7 +12,6 @@ SDL_VERSION=1.2.6
+ 
+ dnl we also need libSigC++ (yeah)
+ SIGC_VERSION=1.2.5
+-PKG_SIGC="sigc++-1.2"
+ 
+ dnl Set various version strings - taken gratefully from the GTk sources
+ 
+@@ -227,7 +226,7 @@ AC_SUBST(LIBSTDCPP)
+ 
+ dnl Check for libSigC++
+ 
+-PKG_CHECK_MODULES(SIGC, $PKG_SIGC >= $SIGC_VERSION)
++PKG_CHECK_MODULES(SIGC, "sigc++-1.2" >= $SIGC_VERSION)
+ AC_SUBST(SIGC_CFLAGS)
+ AC_SUBST(SIGC_LIBS)
+ 
+@@ -388,9 +387,10 @@ else
+     PHYSFS_LIB="./physfs/libphysfs.la"
+     PHYSFS_SUBDIR="physfs"
+     LIBPHYSFS=""
++
++#    AC_CONFIG_SUBDIRS(src/physfs)
+ fi
+ 
+-AC_CONFIG_SUBDIRS(src/physfs)
+ 
+ AC_SUBST(PHYSFS_INCLUDE)
+ AC_SUBST(PHYSFS_LIB)
+-- 
+2.2.2
+

From 9dab2505718b781e58110be1fb2ecef486c180bc Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 17:08:54 +0200
Subject: [PATCH 11/13] sigc++-1.2: missing include in install scripts

---
 dev-libs/libsigc++/libsigc++-1.2.7.recipe | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.recipe b/dev-libs/libsigc++/libsigc++-1.2.7.recipe
index 34d11ce2b..962ecd3a8 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.recipe
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.recipe
@@ -61,6 +61,8 @@ INSTALL()
 	rm $developLibDir/*.la
 	fixPkgconfig
 
+	cp sigc++/config/sigcconfig.h $includeDir
+
 	packageEntries devel $relativeDevelopDir
 }
 

From cb2aa6e7ff5173ff1b1788320626ae4c3d80747a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 19 Apr 2015 21:44:18 +0200
Subject: [PATCH 12/13] Add cmake 3.2.2.

* Most of our patches were upstreamed.
---
 dev-util/cmake/cmake-3.2.2.recipe           | 73 +++++++++++++++++++++
 dev-util/cmake/patches/cmake-3.2.2.patchset | 22 +++++++
 2 files changed, 95 insertions(+)
 create mode 100644 dev-util/cmake/cmake-3.2.2.recipe
 create mode 100644 dev-util/cmake/patches/cmake-3.2.2.patchset

diff --git a/dev-util/cmake/cmake-3.2.2.recipe b/dev-util/cmake/cmake-3.2.2.recipe
new file mode 100644
index 000000000..c9c81d3ba
--- /dev/null
+++ b/dev-util/cmake/cmake-3.2.2.recipe
@@ -0,0 +1,73 @@
+SUMMARY="Cross-platform Make"
+DESCRIPTION="CMake is a cross-platform, open-source build system. It is a \
+family of tools designed to build, test and package software. CMake is used \
+to control the software compilation process using simple platform and \
+compiler independent configuration files. CMake generates native makefiles \
+and workspaces that can be used in the compiler environment of your choice."
+HOMEPAGE="http://www.cmake.org" 
+COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium. All rights reserved."
+LICENSE="CMake"
+SRC_URI="http://www.cmake.org/files/v3.2/cmake-$portVersion.tar.gz"
+CHECKSUM_SHA256="ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78"
+SOURCE_DIR="cmake-$portVersion"
+REVISION="1"
+ARCHITECTURES="x86 x86_64 arm"
+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"
+
+PATCHES="cmake-3.2.2.patchset"
+
+PROVIDES="
+	cmake$secondaryArchSuffix = $portVersion compat >= 3.2
+	cmd:cmake = $portVersion compat >= 3.2
+	cmd:ccmake = $portVersion compat >= 3.2
+	cmd:cpack = $portVersion compat >= 3.2
+	cmd:ctest = $portVersion compat >= 3.2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	devel:libncurses$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	haiku_devel
+	cmd:gcc$secondaryArchSuffix
+	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	cmd:sed
+	"
+
+BUILD()
+{
+	# not an autotools configure
+	./configure --prefix=$prefix \
+		--datadir=/$relativeDataDir/cmake \
+		--docdir=/$relativeDocDir \
+		--mandir=/$relativeManDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# No way to tell this to configure...
+	mv $prefix/share/aclocal $dataDir
+	rmdir $prefix/share
+}
+
+TEST()
+{
+	cp bin/ctest Bootstrap.cmk/
+	make test VERBOSE=1
+}
diff --git a/dev-util/cmake/patches/cmake-3.2.2.patchset b/dev-util/cmake/patches/cmake-3.2.2.patchset
new file mode 100644
index 000000000..ac5897ac5
--- /dev/null
+++ b/dev-util/cmake/patches/cmake-3.2.2.patchset
@@ -0,0 +1,22 @@
+From 39333f7fd44b281cdaafb98820d549c923103011 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 22:30:55 +0200
+Subject: Fix OpenAL search path.
+
+
+diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
+index 8150ff2..e0276f8 100644
+--- a/Modules/FindOpenAL.cmake
++++ b/Modules/FindOpenAL.cmake
+@@ -68,7 +68,7 @@
+ find_path(OPENAL_INCLUDE_DIR al.h
+   HINTS
+     ENV OPENALDIR
+-  PATH_SUFFIXES include/AL include/OpenAL include
++	PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-- 
+2.2.2
+

From b09ca6740256f9121aab38a0a30215647c60ff02 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 20 Apr 2015 10:40:29 +0300
Subject: [PATCH 13/13] BeZilla: rename recipe to include version * make use of
 browser.mozconfig * move $libDir/firefox-2.0.0.22pre to $appsDir/BeZilla *
 rearrange libs * create devel package * add Deskbar link * use
 haiku-widget-theme * add missing zip requires * mozconfig clean-up

---
 www-client/bezilla/bezilla-2.0.0.22.recipe    | 111 ++++++++++++++++++
 www-client/bezilla/bezilla-git.recipe         |  72 ------------
 .../bezilla/patches/bezilla-2.0.0.22.patchset |  89 ++++++++++++++
 .../bezilla/patches/bezilla-git.patchset      |  31 -----
 4 files changed, 200 insertions(+), 103 deletions(-)
 create mode 100644 www-client/bezilla/bezilla-2.0.0.22.recipe
 delete mode 100644 www-client/bezilla/bezilla-git.recipe
 create mode 100644 www-client/bezilla/patches/bezilla-2.0.0.22.patchset
 delete mode 100644 www-client/bezilla/patches/bezilla-git.patchset

diff --git a/www-client/bezilla/bezilla-2.0.0.22.recipe b/www-client/bezilla/bezilla-2.0.0.22.recipe
new file mode 100644
index 000000000..00a190503
--- /dev/null
+++ b/www-client/bezilla/bezilla-2.0.0.22.recipe
@@ -0,0 +1,111 @@
+SUMMARY="Bezilla is a version of Firefox 2 for Haiku"
+DESCRIPTION="Bezilla is an open source web browser. \
+It achieves balance between ease of use and customization, catering to the \
+needs of both casual and power users."
+HOMEPAGE="https://github.com/mmadia/bezilla"
+SRC_URI="git+https://github.com/mmadia/bezilla.git#686254"
+REVISION="1"
+LICENSE="MPL v1.1"
+COPYRIGHT="1998-1999 Netscape Communications Corporation"
+
+ARCHITECTURES="x86_gcc2 x86 ?arm"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?arm"
+
+PROVIDES="
+	bezilla$secondaryArchSuffix = $portVersion
+	cmd:firefox$secondaryArchSuffix = $portVersion
+	app:BeZilla$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:libidl$secondaryArchSuffix
+	devel:libglib$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:m4
+	cmd:gawk
+	cmd:perl
+	cmd:xargs
+	cmd:tar
+	cmd:zip
+	cmd:autoconf_2.13$secondaryArchSuffix
+	"
+
+PATCHES="bezilla-2.0.0.22.patchset"
+
+BUILD()
+{
+	cd mozilla
+	autoconf-2.13
+
+	pushd nsprpub
+	autoconf-2.13
+	popd
+
+	pushd directory/c-sdk
+	autoconf-2.13
+	popd
+
+	export MOZCONFIG=../supporting-files/mozilla-configs/browser.mozconfig
+
+	runConfigure --omit-dirs 'docDir dataRootDir' configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd mozilla
+	make install
+
+	mkdir $appsDir
+
+	mv $libDir/firefox-2.0.0.22pre $appsDir/BeZilla
+	mv $appsDir/BeZilla/firefox-bin $appsDir/BeZilla/BeZilla
+
+	# creating the lib and add-ons
+	mkdir $appsDir/BeZilla/lib
+	mkdir $appsDir/BeZilla/add-ons
+
+	# arranging the files in lib and add-ons directories
+	cd $appsDir/BeZilla
+	mv libnspr4.so libnss3.so libnssutil3.so libplc4.so libplds4.so \
+	libsmime3.so libsoftokn3.so libsqlite3.so libssl3.so libxpcom.so \
+	libxpcom_compat.so libxpcom_core.so lib
+
+	mv libfreebl3.so libnssckbi.so libnssdbm3.so libxpistub.so add-ons
+
+	cp $sourceDir/supporting-files/persdict.dat $appsDir/BeZilla/defaults/profile
+	cp $sourceDir/supporting-files/haiku-widget-theme/browser/classic.jar $appsDir/BeZilla/chrome
+
+	ln -sf ../lib/libsoftokn3.so add-ons
+
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir \
+		$dataDir/idl \
+		$dataDir/aclocal \
+		$binDir/firefox-config
+
+	# TODO: fix $dist_bin/$MOZILLA_BIN in cmd:firefox script
+
+	addAppDeskbarSymlink $appsDir/BeZilla/BeZilla
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	bezilla${secondaryArchSuffix}_devel = $portVersion
+	cmd:firefox_config$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	bezilla$secondaryArchSuffix == $portVersion base
+	"
diff --git a/www-client/bezilla/bezilla-git.recipe b/www-client/bezilla/bezilla-git.recipe
deleted file mode 100644
index 3d8e1893a..000000000
--- a/www-client/bezilla/bezilla-git.recipe
+++ /dev/null
@@ -1,72 +0,0 @@
-SUMMARY="Bezilla is a version of Firefox 2 for Haiku"
-DESCRIPTION="Bezilla is an open source web browser. \
-It achieves balance between ease of use and customization, catering to the \
-needs of both casual and power users."
-HOMEPAGE="https://github.com/mmadia/bezilla"
-SRC_URI="git+https://github.com/mmadia/bezilla.git#686254"
-REVISION="1"
-LICENSE="MPL v1.1"
-COPYRIGHT="1998-1999 Netscape Communications Corporation"
-
-ARCHITECTURES="x86_gcc2 x86 ?arm"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?arm"
-
-PROVIDES="
-	bezilla$secondaryArchSuffix = $portVersion
-	app:Bezilla$secondaryArchSuffix = $portVersion
-	cmd:Bezilla_config$secondaryArchSuffix = $portVersion
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	devel:libidl$secondaryArchSuffix
-	devel:libglib$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:m4
-	cmd:gawk
-	cmd:perl
-	cmd:xargs
-	cmd:tar
-	cmd:autoconf_2.13$secondaryArchSuffix
-	"
-	
-PATCHES="bezilla-git.patchset"
-
-BUILD()
-{
-	cd mozilla
-	autoconf-2.13
-	
-	cd nsprpub
-	autoconf-2.13
-	cd ..
-	
-	cd directory/c-sdk
-	autoconf-2.13
-	cd ../..
-	
-	runConfigure --omit-dirs 'docDir dataRootDir' ./configure \
-							 --enable-application=browser --disable-canvas \
-							 --disable-svg --disable-updater
-	make
-}
-
-INSTALL()
-{
-	cd mozilla
-	make install
-	
-	mkdir $appsDir
-	
-	mv $binDir/firefox $appsDir/Bezilla
-	mv $libDir/firefox-2.0.0.22pre/firefox-bin $libDir/firefox-2.0.0.22pre/Bezilla-bin
-	mv $binDir/firefox-config $binDir/Bezilla-config
-}
diff --git a/www-client/bezilla/patches/bezilla-2.0.0.22.patchset b/www-client/bezilla/patches/bezilla-2.0.0.22.patchset
new file mode 100644
index 000000000..b3aab1ef7
--- /dev/null
+++ b/www-client/bezilla/patches/bezilla-2.0.0.22.patchset
@@ -0,0 +1,89 @@
+From efbeffb0cdcd1322ef47fb433767ef6f81e7a1a8 Mon Sep 17 00:00:00 2001
+From: Theodore Kokkoris <t.kokkoris@gmail.com>
+Date: Fri, 12 Dec 2014 13:45:46 +0200
+Subject: Enable Haiku support in configure.in
+
+
+diff --git a/mozilla/configure.in b/mozilla/configure.in
+index 23cc7e7..9bd8cb5 100755
+--- a/mozilla/configure.in
++++ b/mozilla/configure.in
+@@ -885,12 +885,8 @@ if test -n "$CROSS_COMPILE"; then
+         mingw*)         OS_ARCH=WINNT ;;
+         wince*)         OS_ARCH=WINCE ;;
+         darwin*)        OS_ARCH=Darwin OS_TARGET=Darwin ;;   
+-        beos* | haiku*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
+-dnl -------------------------------------------------------
+-dnl Cross-compiling-haiku - This should probably be 
+-dnl        beos*)        OS_ARCH=BeOS OS_TARGET=BeOS ;;
+-dnl        haiku*)       OS_ARCH=Haiku OS_TARGET=Haiku ;;
+-dnl -------------------------------------------------------
++        beos*)          OS_ARCH=BeOS OS_TARGET=BeOS ;;
++        haiku*)         OS_ARCH=Haiku OS_TARGET=Haiku ;;
+     esac
+ else
+     OS_TARGET=`uname -s`
+-- 
+2.2.2
+
+
+From f5292ed6041e2642a85aa086355f11102ca8c659 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Sun, 19 Apr 2015 20:59:27 +0300
+Subject: mozconfig clean-up
+
+
+diff --git a/supporting-files/mozilla-configs/browser.mozconfig b/supporting-files/mozilla-configs/browser.mozconfig
+index 43bac3b..fd639b6 100644
+--- a/supporting-files/mozilla-configs/browser.mozconfig
++++ b/supporting-files/mozilla-configs/browser.mozconfig
+@@ -4,6 +4,8 @@
+
+ . $topsrcdir/browser/config/mozconfig
+ mk_add_options MOZ_CO_PROJECT=browser
++mk_add_options MOZ_APP_DISPLAYNAME=BeZilla
++mk_add_options MOZ_LIBDIR=$prefix/BeZilla
+
+ # Required to download the right version of the source code
+ mk_add_options MOZ_CO_TAG=MOZILLA_1_8_BRANCH
+@@ -13,19 +15,11 @@ mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
+
+ # -----------------------------------------------------
+ # --- EDIT THESE VALUES TO REFLECT YOUR LOCAL BUILD ---
+-export GLIB_CONFIG=/boot/common/bin/glib-config
+-mk_add_options GLIB_CONFIG=/boot/common/bin/glib-config
+-
+-export LIBIDL_CONFIG=/boot/common/bin/libIDL-config
+-mk_add_options LIBIDL_CONFIG=/boot/common/bin/libIDL-config
+
+ # --- Set the outputdir for the build ---
+ mk_add_options MOZ_OBJDIR=/moz_obj/browser
+
+-# autoconf 2.13 was built by
+-#./configure --prefix=/boot/common/autoconf-2.13 --program-suffix=-2.13 --bindir=/boot/common/bin/
+-# make && make install
+-export AUTOCONF='/boot/common/bin/autoconf-2.13 -m /boot/common/autoconf-2.13/share/autoconf'
++export AUTOCONF='autoconf-2.13'
+ # -----------------------------------------------------
+
+ # Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
+@@ -40,7 +34,7 @@ ac_add_options --disable-canvas
+
+ # Utilize Haiku's default shared libraries
+ ac_add_options --with-system-jpeg
+-#ac_add_options --with-system-png
++ac_add_options --with-system-png
+ ac_add_options --with-system-zlib
+
+ ac_add_options --enable-nspr-threads
+@@ -62,6 +56,7 @@ ac_add_options --enable-static --disable-shared
+ ac_add_options --enable-strip
+ ac_add_options --enable-reorder
+ ac_add_options --enable-js-static-build
++ac_add_options --disable-debug
+ #ac_add_options --enable-elf-dynstr-gc # doesn't build in gcc2.  gcc4 untested.
+
+ # ----------------------------------------------------------------------------
+--
+2.2.2
+
diff --git a/www-client/bezilla/patches/bezilla-git.patchset b/www-client/bezilla/patches/bezilla-git.patchset
deleted file mode 100644
index e37edf2c2..000000000
--- a/www-client/bezilla/patches/bezilla-git.patchset
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7b84740f39ed0292e8f726705590ba24581c2c52 Mon Sep 17 00:00:00 2001
-From: Theodore Kokkoris <t.kokkoris@gmail.com>
-Date: Fri, 12 Dec 2014 13:45:46 +0200
-Subject: [PATCH] Enable Haiku support in configure.in
-
----
- mozilla/configure.in | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/mozilla/configure.in b/mozilla/configure.in
-index 23cc7e7..9bd8cb5 100755
---- a/mozilla/configure.in
-+++ b/mozilla/configure.in
-@@ -885,12 +885,8 @@ if test -n "$CROSS_COMPILE"; then
-         mingw*)         OS_ARCH=WINNT ;;
-         wince*)         OS_ARCH=WINCE ;;
-         darwin*)        OS_ARCH=Darwin OS_TARGET=Darwin ;;   
--        beos* | haiku*) OS_ARCH=BeOS OS_TARGET=BeOS ;;
--dnl -------------------------------------------------------
--dnl Cross-compiling-haiku - This should probably be 
--dnl        beos*)        OS_ARCH=BeOS OS_TARGET=BeOS ;;
--dnl        haiku*)       OS_ARCH=Haiku OS_TARGET=Haiku ;;
--dnl -------------------------------------------------------
-+        beos*)          OS_ARCH=BeOS OS_TARGET=BeOS ;;
-+        haiku*)         OS_ARCH=Haiku OS_TARGET=Haiku ;;
-     esac
- else
-     OS_TARGET=`uname -s`
--- 
-1.8.3.4
-