Merged haikuports/haikuports into master

2026-04-29 19:48:53 +02:00 · 2013-12-12 22:30:36 +01:00
parent d3b82442d7 ea45b3079f
commit 497d3b57c3
36 changed files with 944 additions and 382 deletions
--- a/app-cdr/bchunk/bchunk-1.2.0.recipe
+++ b/app-cdr/bchunk/bchunk-1.2.0.recipe
@@ -10,9 +10,9 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2004 Heikki Hannikainen"
 HOMEPAGE="http://he.fi/bchunk/"
 SRC_URI="http://he.fi/bchunk/bchunk-1.2.0.tar.gz"
-REVISION="1"
+REVISION="2"
 CHECKSUM_MD5="6a613da3f34f9a303f202d2e9731d231"
-ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+ARCHITECTURES="x86 x86_gcc2 x86_64"

 PROVIDES="
 	bchunk = $portVersion
--- a/app-shells/fish/fish-1.23.1_git.recipe
+++ b/app-shells/fish/fish-1.23.1_git.recipe
@@ -1,32 +1,63 @@
+SUMMARY="The friendly interactive shell" 
 DESCRIPTION="The friendly interactive shell" 
 HOMEPAGE="http://ridiculousfish.com/shell/" 
 SRC_URI="git://git.gitorious.org/fish-shell/fish-shell.git"
 #CHECKSUM_MD5=""
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="app-doc/doxygen >= 1.7.4
-	sys-libs/ncurses >= 5.9"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2009 Axel Liljencrantz"
+
+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="
+	fish$secondaryArchSuffix = $portVersion
+	cmd:fish = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libgettextlib_0.18.1$secondaryArchSuffix >= 0.18.1.1
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix >= 5.9
+	devel:libgettextlib$secondaryArchSuffix
+	doxygen >= 1.6.3
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:libtoolize
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:which
+	"
+
+
 BUILD()
 {
-    cd fish-1.23.1-git
 	libtoolize --force --copy --install
    autoconf
-    ./configure --without-xsel --prefix=`finddir B_COMMON_DIRECTORY`
+    ./configure --without-xsel --prefix=$prefix
    make
 }

 INSTALL()
 {
-    cd fish-1.23.1-git
    make install DESTDIR=${DESTDIR}
 }

 TEST()
 {
-	cd fish-1.23.1-git
 	make test
 }

-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2009 Axel Liljencrantz"
--- a/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
+++ b/dev-libs/libcss/libcss-0.2.0_HEAD.recipe
@@ -1,21 +0,0 @@
-DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
-SRC_URI="git://git.netsurf-browser.org/libcss.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/libparserutils >= 0.1.1"
-
-BUILD()
-{
-	cd libcss-0.2.0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libcss-0.2.0-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
--- a/dev-libs/libcss/libcss-0.2.0_git.recipe
+++ b/dev-libs/libcss/libcss-0.2.0_git.recipe
@@ -0,0 +1,54 @@
+#TODO:split out _devel
+SUMMARY="LibCSS is a CSS parser and selection engine" 
+DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
+SRC_URI="git://git.netsurf-browser.org/libcss.git"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="2007 - 2013 J-M Bell"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libcss$secondaryArchSuffix = $portVersion
+	lib:libcss$secondaryArchSuffix = $portVersion
+	devel:libcss$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libparserutils${secondaryArchSuffix}
+	lib:libwapcaplet${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libparserutils${secondaryArchSuffix} >= 0.1.1
+	devel:libwapcaplet${secondaryArchSuffix} >= 0.1.1
+	netsurf_buildsystem >= 0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		I=/develop/headers/libcss
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+}
--- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
@@ -1,3 +1,4 @@
+#TODO:split out _devel
 SUMMARY="LibParserUtils is a library for building efficient parsers" 
 DESCRIPTION="LibParserUtils is a library for building efficient parsers" 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" 
@@ -11,6 +12,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	libparserutils$secondaryArchSuffix = $portVersion
+	lib:libparserutils$secondaryArchSuffix = $portVersion
+	devel:libparserutils$secondaryArchSuffix = $portVersion
 	"

 REQUIRES="
@@ -42,5 +45,7 @@ INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
 		I=/develop/headers/libparserutils
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
 }
-
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe
+++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe
@@ -1,21 +0,0 @@
-DESCRIPTION="libpthread-stubs" 
-HOMEPAGE="http://xcb.freedesktop.org/" 
-SRC_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz"
-CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
-BUILD()
-{
-	cd libpthread-stubs-0.3
-	libtoolize --force --copy --install
-	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd libpthread-stubs-0.3
-	make install
-}
--- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
+++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe
@@ -1,21 +1,50 @@
+SUMMARY="libpthread-stubs" 
 DESCRIPTION="libpthread-stubs" 
 HOMEPAGE="http://xcb.freedesktop.org/" 
 SRC_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz"
 CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+
+COPYRIGHT="2006 Diego Pettenò"
+LICENSE="MIT"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libpthread_stubs$secondaryArchSuffix = $portVersion
+	devel:libpthread_stubs$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+SOURCE_DIR="libpthread-stubs-$portVersion"
+
 BUILD()
 {
-	cd libpthread-stubs-0.3
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }

 INSTALL()
 {
-	cd libpthread-stubs-0.3
 	make install
 }
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
@@ -1,3 +1,4 @@
+#TODO:split out _devel
 SUMMARY="LibWapcaplet is a string internment library" 
 DESCRIPTION="LibWapcaplet is a string internment library" 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" 
@@ -11,6 +12,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
 	libwapcaplet$secondaryArchSuffix = $portVersion
+	lib:libwapcaplet$secondaryArchSuffix = $portVersion
+	devel:libwapcaplet$secondaryArchSuffix = $portVersion
 	"

 REQUIRES="
@@ -39,5 +42,7 @@ INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
 		I=/develop/headers/libwapcaplet
+	mkdir -p $prefix/develop/lib
+	mv -f $prefix/lib/*.a $prefix/develop/lib/
+	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
 }
-
--- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
+++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe
@@ -7,28 +7,29 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz"
 CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PATCHES="pkgconfig-0.27.1.patchset"

 PROVIDES="
-	pkgconfig = $portVersion compat >= 0.27
-	cmd:pkg_config = $portVersion compat >= 0.27
+	pkgconfig$secondaryArchSuffix = $portVersion compat >= 0.27
+	cmd:pkg_config$secondaryArchSuffix = $portVersion compat >= 0.27
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libiconv
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libiconv$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libiconv
+	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
 	cmd:autoreconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
@@ -46,7 +47,7 @@ BUILD()
 	autoconf
 	automake --add-missing

-	pcPathSubdir="develop/lib/pkgconfig"
+	pcPathSubdir="develop/lib${secondaryArchSuffix/_//}/pkgconfig"
 	pcPath="/boot/home/config/non-packaged/$pcPathSubdir"
 	pcPath="$pcPath:/boot/home/config/$pcPathSubdir"
 	pcPath="$pcPath:/boot/system/$pcPathSubdir"
--- a/dev-vcs/fossil/fossil-1.27.recipe
+++ b/dev-vcs/fossil/fossil-1.27.recipe
@@ -0,0 +1,48 @@
+SUMMARY="Simple, high-reliability, distributed software configuration management" 
+DESCRIPTION="Simple, high-reliability, distributed software configuration management" 
+HOMEPAGE="http://www.fossil-scm.org/" 
+SRC_URI="http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz"
+CHECKSUM_MD5="fa4ea3eb25d2a8cfb0edbd0c30c268b9"
+REVISION="1"
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2007 D. Richard Hipp"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	fossil = $portVersion
+	cms:fossil = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	openssl >= 1.0.0
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libz >= 1.2.3
+	openssl_devel >= 1.0.0
+	"
+# tests require cmd:tclsh
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+SOURCE_DIR="fossil-src-20130911114349"
+
+BUILD()
+{
+	./configure --prefix=$prefix
+	make
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make test
+}
--- a/haiku-apps/behappy/behappy-1.06e_git.recipe
+++ b/haiku-apps/behappy/behappy-1.06e_git.recipe
@@ -0,0 +1,44 @@
+SUMMARY="HTML documentation viewer" 
+DESCRIPTION="HTML documentation viewer" 
+HOMEPAGE="http://www.becoz.org/beos-en/behappy" 
+SRC_URI="git+https://github.com/HaikuArchives/BeHappy.git"
+REVISION="1"
+#CHECKSUM_MD5=""
+LICENSE="MIT"
+COPYRIGHT="2006 Sylvain Tertois
+	2008-2009 François Revol"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	behappy = $portVersion
+	app:behappy = $portVersion
+"
+REQUIRES="
+	haiku >= $haikuVersion
+#	app:netsurf >= 2.6
+"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	cmd:ld
+"
+
+
+BUILD()
+{
+	cd trunk
+	make BUILDHOME=/system/develop
+}
+
+INSTALL()
+{
+	cd trunk
+	make install BUILDHOME=/system/develop
+}
+
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe
@@ -8,7 +8,7 @@ DESCRIPTION="
 	section you select.
 	"
 HOMEPAGE="https://github.com/jackburton79/bescreencapture"
-SRC_URI="git+git://github.com/jackburton79/bescreencapture.git#87886da2972fd4bbabb3fc5caae301c6dc14e7fd"
+SRC_URI="git://github.com/jackburton79/bescreencapture.git#fb7de7c5dec3768509072e3f3ee2a433bc9285bb"
 LICENSE="
 	BSD (3-clause)
 	MIT
--- a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
+++ b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe
@@ -0,0 +1,51 @@
+SUMMARY="A screen recorder utility"
+DESCRIPTION="
+	BeScreenCapture, created by Stefano Ceccherini, is a screen
+	recorder utility for Haiku. It allows you to record what happens on your
+	screen, then save it to any media format that Haiku supports.
+	
+	BeScreenCapture can record either the entire screen, or just a
+	section you select.
+	"
+HOMEPAGE="https://github.com/jackburton79/bescreencapture"
+SRC_URI="https://github.com/jackburton79/bescreencapture/archive/v1.9.3.tar.gz"
+LICENSE="
+	BSD (3-clause)
+	MIT
+	"
+COPYRIGHT="2013 Stefano Ceccherini"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	bescreencapture = $portVersion
+	app:bescreencapture = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:make
+	cmd:gcc
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp -a objects/BeScreenCapture $appsDir
+	addAppDeskbarSymlink $appsDir/BeScreenCapture
+}
--- a/haiku-apps/burnitnow/burnitnow-trunk.recipe
+++ b/haiku-apps/burnitnow/burnitnow-trunk.recipe
@@ -1,15 +1,15 @@
 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#3e7e69d048"
+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"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	burnitnow = $portVersion
@@ -31,7 +31,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	"

-SOURCE_DIR="$portName/burnitnow2"
+#SOURCE_DIR="$portName/burnitnow2"

 BUILD()
 {
--- a/haiku-apps/pe/pe-2.4.3_hg614.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg614.recipe
@@ -0,0 +1,72 @@
+SUMMARY="A programmer's editor"
+DESCRIPTION="A programmer's editor"
+HOMEPAGE="http://pe-editor.berlios.de/"
+LICENSE="
+	BSD (4-clause)
+	MIT
+	"
+
+COPYRIGHT="
+	1996-2002 Maarteen Hekkelman
+	2003-2013 Team Pe
+	"
+
+SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#614"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	pe = $portVersion
+	cmd:Pe = $portVersion compat >= 2
+	cmd:lpe = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku
+	lib:libpcre
+	lib:libpcreposix
+	"
+
+BUILD_REQUIRES="
+	devel:libpcre
+	devel:libpcreposix
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:bison
+	cmd:flex
+	cmd:gcc
+	cmd:jam
+	cmd:ld
+	"
+
+USER_SETTINGS_FILES="
+	settings/pe directory
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+PATCHES="
+	pe-2.4.3_hg611.patch3
+	"
+
+BUILD()
+{
+	jam -q
+		# multi-job builds don't work reliably
+}
+
+INSTALL()
+{
+	peDir=$appsDir/Pe
+
+	mkdir -p $appsDir
+	cp -a generated/distro $peDir
+	cp -a doc $peDir/Documentation
+
+	mkdir $binDir
+	ln -sfn $peDir/lpe $binDir
+
+	addAppDeskbarSymlink $peDir/Pe
+}
--- a/haiku-apps/pe/pe-2.4.3_hg615.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg615.recipe
@@ -0,0 +1,68 @@
+SUMMARY="A programmer's editor"
+DESCRIPTION="A programmer's editor"
+HOMEPAGE="http://pe-editor.berlios.de/"
+LICENSE="
+	BSD (4-clause)
+	MIT
+	"
+
+COPYRIGHT="
+	1996-2002 Maarteen Hekkelman
+	2003-2013 Team Pe
+	"
+
+SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#615"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	pe = $portVersion
+	cmd:Pe = $portVersion compat >= 2
+	cmd:lpe = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku
+	lib:libpcre
+	lib:libpcreposix
+	"
+
+BUILD_REQUIRES="
+	devel:libpcre
+	devel:libpcreposix
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:bison
+	cmd:flex
+	cmd:gcc
+	cmd:jam
+	cmd:ld
+	"
+
+USER_SETTINGS_FILES="
+	settings/pe directory
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	jam -q
+		# multi-job builds don't work reliably
+}
+
+INSTALL()
+{
+	peDir=$appsDir/Pe
+
+	mkdir -p $appsDir
+	cp -a generated/distro $peDir
+	cp -a doc $peDir/Documentation
+
+	mkdir $binDir
+	ln -sfn $peDir/lpe $binDir
+
+	addAppDeskbarSymlink $peDir/Pe
+}
--- a/haiku-games/guitarmaster/guitarmaster-r21.recipe
+++ b/haiku-games/guitarmaster/guitarmaster-r21.recipe
@@ -6,7 +6,7 @@ DESCRIPTION="
 	Usage: GuitarMaster [/path/to/songsDirectory]
 	"
 HOMEPAGE="http://code.google.com/p/guitarmaster/"
-SRC_URI="svn+http://guitarmaster.googlecode.com/svn/trunk/@20"
+SRC_URI="svn+http://guitarmaster.googlecode.com/svn/trunk/@21"
 LICENSE="MIT"
 COPYRIGHT="Toxic Labs 2008-2009"
 REVISION="1"
@@ -27,10 +27,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"

-PATCHES="
-	guitarmaster-r20.patch
-	"
-
 SRC_FILENAME="download"
 SOURCE_DIR="$portName"

--- a/haiku-games/guitarmaster/patches/guitarmaster-r20.patch
+++ b/haiku-games/guitarmaster/patches/guitarmaster-r20.patch
@@ -1,212 +0,0 @@
-From 4929c586441b40f7046487bc9b9a7dd887e3e605 Mon Sep 17 00:00:00 2001
-From: Luke <noryb009@gmail.com>
-Date: Sun, 24 Nov 2013 07:51:48 +0000
-Subject: [PATCH] Search for songs directory
-
---
- TApp.cpp        |  5 +++--
- TApp.h          |  4 +++-
- TMainWindow.cpp | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- TMainWindow.h   |  4 +++-
- main.cpp        | 11 +++++++++-
- 5 files changed, 79 insertions(+), 8 deletions(-)
-
-diff --git a/TApp.cpp b/TApp.cpp
-index b38dbe1..a9d89ec 100644
--- a/TApp.cpp
-+++ b/TApp.cpp
-@@ -10,10 +10,11 @@ using namespace org::toxic;
- using namespace std;
- 
- 
-TApp::TApp():BApplication("application/x-vnd.guitar-master")
-+TApp::TApp(BString * UserSpecifiedSongDir):BApplication("application/x-vnd.guitar-master")
- {
- 	cout<<"Guitar Master project"<<endl;
- 	cout<<"Toxic Labs 2008/2009"<<endl;
-+	this->UserSpecifiedSongDir = UserSpecifiedSongDir;
- }
- 
- 
-@@ -27,5 +28,5 @@ void TApp::ReadyToRun()
- {
- 	cout<<"ready!!"<<endl;
- 	
-	window = new TMainWindow(BRect(50,50,300,300));
-+	window = new TMainWindow(BRect(50,50,300,300), UserSpecifiedSongDir);
- }
-diff --git a/TApp.h b/TApp.h
-index f9a6a93..ecf8f00 100644
--- a/TApp.h
-+++ b/TApp.h
-@@ -5,6 +5,7 @@
- #ifndef _TApp_
- #define _TApp_
- 
-+#include <String.h>
- #include <Application.h>
- #include "TMainWindow.h"
- 
-@@ -16,9 +17,10 @@ namespace org
- 		{
- 			private:
- 			TMainWindow * window;
-+			BString * UserSpecifiedSongDir;
- 			public:
- 		
-			TApp();
-+			TApp(BString * UserSpecifiedSongDir = NULL);
- 			~TApp();
- 			
- 			virtual void ReadyToRun();
-diff --git a/TMainWindow.cpp b/TMainWindow.cpp
-index d84cbd4..f16be1d 100644
--- a/TMainWindow.cpp
-+++ b/TMainWindow.cpp
-@@ -11,12 +11,17 @@
- #include <String.h>
- #include <iostream>
- 
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include <stdlib.h>
-+
- using namespace org::toxic;
- using namespace org::toxic::resources;
- using namespace std;
- 
- 
-TMainWindow::TMainWindow(BRect frame): BWindow(frame,"Guitar Master",B_TITLED_WINDOW,B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
-+TMainWindow::TMainWindow(BRect frame, BString * UserSpecifiedSongDir): BWindow(frame,"Guitar Master",B_TITLED_WINDOW,B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
- {
- 	cout<<"Main window"<<endl;
- 	
-@@ -46,9 +51,61 @@ TMainWindow::TMainWindow(BRect frame): BWindow(frame,"Guitar Master",B_TITLED_WI
- 	//Songs menu
- 	menu = new BMenu("Songs");
- 	// fill with available song list...
-+	
-+	BString homeDir = getenv("HOME");
-+	if(homeDir == NULL) {
-+		struct passwd *pw = getpwuid(getuid());
-+		homeDir = pw->pw_dir;
-+ 	}
-+	
-+	BString * songLocations[13];
-+	songLocations[0] = UserSpecifiedSongDir;
-+	songLocations[1] = new BString("songs");
-+	songLocations[2] = new BString("/music/GuitarMaster");
-+	songLocations[2]->Prepend(homeDir);
-+	songLocations[3] = new BString("/music/guitarmaster");
-+	songLocations[3]->Prepend(homeDir);
-+	songLocations[4] = new BString("/music/Guitar Master");
-+	songLocations[4]->Prepend(homeDir);
-+	songLocations[5] = new BString("/music/guitar master");
-+	songLocations[5]->Prepend(homeDir);
-+	songLocations[6] = new BString("/Music/GuitarMaster");
-+	songLocations[6]->Prepend(homeDir);
-+	songLocations[7] = new BString("/Music/guitarmaster");
-+	songLocations[7]->Prepend(homeDir);
-+	songLocations[8] = new BString("/Music/Guitar Master");
-+	songLocations[8]->Prepend(homeDir);
-+	songLocations[9] = new BString("/Music/guitar master");
-+	songLocations[9]->Prepend(homeDir);
-+	songLocations[10] = new BString("/music");
-+	songLocations[10]->Prepend(homeDir);
-+	songLocations[11] = new BString("/Music");
-+	songLocations[11]->Prepend(homeDir);
-+	songLocations[12] = new BString(homeDir);
-+	
-+	cout<<"Searching for songs directory..."<<endl;
-+	
-+	BDirectory * songs_dir_check;
-+	for(int i=0; i<sizeof(songLocations)/sizeof(BString *); i++) {
-+		if(songLocations[i] != NULL) {
-+			cout<<"  Checking "<<songLocations[i]->String()<<endl;
-+			songs_dir_check = new BDirectory(songLocations[i]->String());
-+			if(songs_dir_check->InitCheck() == B_OK) {
-+				SongsDirLocation = new BString(*songLocations[i]);
-+				delete songs_dir_check;
-+				break;
-+			}
-+			delete songs_dir_check;
-+		}
-+	}
-+	
-+	for(int i=0; i<sizeof(songLocations)/sizeof(BString *); i++) {
-+		delete songLocations[i];
-+	}
-+	
- 	cout<<"Reading songs directory..."<<endl;
- 	
-	BDirectory songs_dir("songs");
-+	BDirectory songs_dir(SongsDirLocation->String());
- 	BEntry entry;
- 	char str[B_FILE_NAME_LENGTH];
- 	BMessage * message;
-@@ -128,7 +185,7 @@ void TMainWindow::MessageReceived(BMessage * mesg)
- 		case T_MSG_SELECT_SONG:
- 			mesg->FindString("song",&str);
- 			
-			spath<<"songs/"<<str<<"/notes.mid";
-+			spath<<SongsDirLocation->String()<<"/"<<str<<"/notes.mid";
- 			
- 			cout<<"Selected: "<<spath.String()<<endl;
- 			
-diff --git a/TMainWindow.h b/TMainWindow.h
-index b5a3ea4..db632ec 100644
--- a/TMainWindow.h
-+++ b/TMainWindow.h
-@@ -5,6 +5,7 @@
- 
- #include <Window.h>
- #include <MessageRunner.h>
-+#include <String.h>
- #include "TGameView.h"
- 
- #define T_MSG_FRAME 0x00FF0011
-@@ -20,10 +21,11 @@ namespace org
- 			
- 			TGameView * gameview;
- 			BMessageRunner * timer;
-+			BString * SongsDirLocation;
- 				
- 			public:
- 		
-			TMainWindow(BRect frame);
-+			TMainWindow(BRect frame, BString * songDirectory = NULL);
- 			~TMainWindow();
- 			
- 		
-diff --git a/main.cpp b/main.cpp
-index 6e9a650..da8d16b 100644
--- a/main.cpp
-+++ b/main.cpp
-@@ -3,13 +3,22 @@
- * Toxic Labs
- */
- 
-+#include <String.h>
- #include "TApp.h"
- 
- using namespace org::toxic;
- 
- int main (int argc,char * argv[])
- {
-	TApp app;
-+	BString * UserSpecifiedSongDir;
-+	UserSpecifiedSongDir = NULL;
-+	// see if song directory was specified
-+	if(argc > 1)
-+	{
-+		UserSpecifiedSongDir = new BString(argv[1]);
-+	}
-+	
-+	TApp app(UserSpecifiedSongDir);
- 	
- 	app.Run();
- 
-- 
-1.8.3.4
-
--- a/media-libs/jasper/jasper-1.900.1.recipe
+++ b/media-libs/jasper/jasper-1.900.1.recipe
@@ -1,26 +1,102 @@
-DESCRIPTION="jasper - software-based implementation of the codec specified in the JPEG-2000 Part-1 standard" 
-HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" 
+DESCRIPTION="The JasPer Project is an open-source initiative to provide a free software-based reference implementation of the codec specified in the JPEG-2000 Part-1 standard. More details about this software can be found in the JasPer Software Reference Manual."
+SUMMARY="Implementation of the codec specified in the JPEG-2000 Part-1 standard."
+HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
 SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip"
 REVISION="1"
-STATUS_HAIKU="stable"
 CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754"
-DEPEND=""
+
+LICENSE="JasPer v2"
+COPYRIGHT="1999-2007 Michael D. Adams"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libjasper$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:libtoolize
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:chmod
+	"
+
+
+
 BUILD()
 {
-	cd jasper-1.900.1
 	libtoolize --force --copy --install
 	aclocal -I acaux
 	autoconf
 	automake
 	chmod 777 configure
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared
+	runConfigure ./configure --enable-shared
 	make
 }

 INSTALL()
 {
-	cd  jasper-1.900.1
 	make install
+	
+	prepareInstalledDevelLibs libjasper
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# tools package
+	if [ -z "$secondaryArchSuffix" ]; then
+		packageEntries tools \
+			$binDir \
+			$documentationDir
+	fi
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }
-LICENSE="JasPer v2"
-COPYRIGHT="1999-2007 Michael D. Adams"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	jasper${secondaryArchSuffix}_devel = $portVersion
+	devel:libjasper$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	jasper$secondaryArchSuffix == $portVersion base
+	"
+
+# ----- tools package -------------------------------------------------------
+
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The jasper tools"
+	PROVIDES_tools="
+		jasper_tools = $portVersion
+		cmd:imgcmp = $portVersion
+		cmd:imginfo = $portVersion
+		cmd:jasper = $portVersion
+		cmd:tmrdemo = $portVersion
+		"
+	REQUIRES_tools="
+		haiku >= $haikuVersion
+		jasper == $portVersion base
+		"
+fi
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -148,7 +148,7 @@ TEST()

 PROVIDES_devel="
 	libsdl${secondaryArchSuffix}_devel = 1.2.15 compat >= 1.2
-	cmd:sdl_config = $portVersion compat >= 1.2
+	cmd:sdl_config$secondaryArchSuffix = $portVersion compat >= 1.2
 	devel:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
 	devel:libSDLmain$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0
 	devel:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0
--- a/media-sound/ocp/ocp-0.1.21_git.recipe
+++ b/media-sound/ocp/ocp-0.1.21_git.recipe
@@ -12,7 +12,7 @@ COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"
 ##		media-libs/flac >= 1.2.1"
 ## ncurses zlib ... cf. ocp.spec

-ARCHITECTURES="x86 x86_64"
+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.
@@ -30,6 +30,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	libsdl$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix >= 0.8.0
 	lib:libvorbis$secondaryArchSuffix >= 0.4.5
@@ -47,20 +48,16 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sdl_config$secondaryArchSuffix
 	"
-#XXX: this one pulls gcc2 SDL package in... which we don't need
-#	cmd:sdl_config
-

 SOURCE_DIR="code"

-# TODO: fix configure.ac to use sdl-config
-# XXX: dwmixfa_8087.c:39:2: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
 BUILD()
 {
 	autoconf
-	export CFLAGS="$(sdl-config --cflags)"
-	./configure --prefix=$prefix 
+	runConfigure ./configure
 	make
 }

--- a/net-libs/enet/enet-1.3.0.recipe
+++ b/net-libs/enet/enet-1.3.0.recipe
@@ -1,24 +1,69 @@
-DESCRIPTION="enet" 
+DESCRIPTION="ENet's purpose is to provide a relatively thin, simple and robust network communication layer on top of UDP (User Datagram Protocol). The primary feature it provides is optional reliable, in-order delivery of packets.
+ENet omits certain higher level networking features such as authentication, lobbying, server discovery, encryption, or other similar tasks that are particularly application specific so that the library remains flexible, portable, and easily embeddable."
+SUMMARY="ENet is simple and robust network communication layer."
 HOMEPAGE="http://enet.bespin.org" 
 SRC_URI="http://enet.bespin.org/download/enet-1.3.0.tar.gz"
 CHECKSUM_MD5="3ea50cc5f2f4bbea32abae0d50b64e3c"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+
+LICENSE="MIT"
+COPYRIGHT="2002-2010 Lee Salzman"
+
+PROVIDES="
+	enet$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	lib:libenet$secondaryArchSuffix = $portVersion compat >= 1.0.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:libtoolize
+	cmd:make
+	cmd:sed
+	"

 BUILD()
 {
-	cd enet-1.3.0
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }

 INSTALL()
 {
-	cd enet-1.3.0
 	make install
+	prepareInstalledDevelLibs libenet
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }

-LICENSE="MIT"
-COPYRIGHT="2002-2010 Lee Salzman"
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	enet${secondaryArchSuffix}_devel = $portVersion
+	devel:libenet$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	enet$secondaryArchSuffix == $portVersion base
+	"
--- a/sys-apps/dmidecode/dmidecode-2.12.recipe
+++ b/sys-apps/dmidecode/dmidecode-2.12.recipe
@@ -0,0 +1,39 @@
+SUMMARY="Decodes BIOS SMBIOS/DMI tables"
+DESCRIPTION="Reports information about your system's hardware as described in your system BIOS according to the SMBIOS/DMI standard"
+HOMEPAGE="http://www.nongnu.org/dmidecode/"
+SRC_URI="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.12.tar.gz"
+CHECKSUM_MD5="02ee243e1ecac7fe0d04428aec85f63a"
+REVISION="2"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2000-2002 Alan Cox, 2002-2010 Jean Delvare"
+
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	dmidecode = $portVersion
+	cmd:dmidecode = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make install prefix=$prefix \
+		sbindir=$prefix/bin \
+		mandir=$prefix/documentation/man \
+		docdir=$prefix/documentation/dmidecode
+}
+
--- a/www-client/links/links-2.3pre2.recipe
+++ b/www-client/links/links-2.3pre2.recipe
@@ -1,16 +1,56 @@
+SUMMARY="links web browser" 
 DESCRIPTION="links web browser" 
-HOMEPAGE="http://links.twibright.com" 
+HOMEPAGE="http://links.twibright.com/" 
 SRC_URI="http://links.twibright.com/download/links-2.3pre2.tar.gz"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="bb2a4e058c88b8ec0c9f6c0e1640555c"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1999 - 2011 Mikulas Patocka
+	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
+
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+
+PROVIDES="
+	links$secondaryArchSuffix = $portVersion
+	cmd:links$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+#	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	openssl >= 1.0.0
+	"
+
+BUILD_REQUIRES="
+#	devel:libGL$secondaryArchSuffix
+	devel:libglu$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+#	devel:libtiff$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	openssl_devel >= 1.0.0
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+PATCHES="links-2.3pre2.patch"
+
 BUILD()
 {
-	cd links-2.3pre2
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+	runConfigure ./configure \
 		--without-x \
 		--enable-utf-8 \
 		--enable-graphics
@@ -22,10 +62,6 @@ BUILD()

 INSTALL()
 {
-	cd links-2.3pre2
-	make install DESTDIR=${DESTDIR}
+	make install
 }

-LICENSE="GNU GPL v2"
-COPYRIGHT="1999 - 2011 Mikulas Patocka
-	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
--- a/www-servers/haproxy/haproxy-1.4.22.recipe
+++ b/www-servers/haproxy/haproxy-1.4.22.recipe
@@ -1,24 +1,46 @@
-DESCRIPTION="Reliable, high performace TCP/HTTP load balancer"
+DESCRIPTION="HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing."
+SUMMARY="Reliable, high performace TCP/HTTP load balancer"
 HOMEPAGE="http://haproxy.1wt.eu/"
 SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz"
 CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c"
-STATUS_HAIKU="stable"
 REVISION="1"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2012 Willy Tarreau"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	haproxy = $portVersion
+	cmd:haproxy = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:make
+	cmd:gcc
+	"
+PATCHES="haproxy-1.4.22.patch"
+
+
 BUILD()
 {
-	cd haproxy-1.4.22
-	make TARGET=haiku PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
+	make TARGET=haiku PREFIX="$prefix"
 }

 INSTALL()
 {
-	cd haproxy-1.4.22
-	make install DESTDIR=$DESTDIR PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-}
+	mkdir -p "${sbinDir}"
+	mkdir -p "${manDir}"
+	mkdir -p "${docDir}"
+	

-LICENSE="GNU GPL v2"
-COPYRIGHT="2012 Willy Tarreau"
+	make install DESTDIR="" \
+		PREFIX="$prefix"\
+		SBINDIR="${sbinDir}" \
+		MANDIR="${manDir}" \
+		DOCDIR="${docDir}"
+}
--- a/x11-libs/libx11/libx11-1.3.3.recipe
+++ b/x11-libs/libx11/libx11-1.3.3.recipe
--- a/x11-libs/libx11/patches/libx11-1.3.3.patch
+++ b/x11-libs/libx11/patches/libx11-1.3.3.patch
--- a/x11-libs/libxau/libxau-1.0.5.recipe
+++ b/x11-libs/libxau/libxau-1.0.5.recipe
--- a/x11-libs/libxau/patches/libxau-1.0.5.patch
+++ b/x11-libs/libxau/patches/libxau-1.0.5.patch
--- a/x11-libs/xtrans/xtrans-1.2.5.recipe
+++ b/x11-libs/xtrans/xtrans-1.2.5.recipe
@@ -1,23 +1,53 @@
+SUMMARY="xtrans" 
 DESCRIPTION="xtrans" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.gz"
 CHECKSUM_MD5="b2f47d49faf1f24e8294b624b21b9b93"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.23
-        x11-misc/util-macros >= 1.7.0"
-        
+COPYRIGHT="1993, 1994, 1998  The Open Group
+	1993, 1994 NCR Corporation - Dayton, Ohio, USA
+	2002, 2005 Sun Microsystems, Inc.  All rights reserved.
+	Copyright 1996 by Sebastien Marineau and Holger Veit
+	2003 Keith Packard, Noah Levitt"
+LICENSE="MIT (no promotion)"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	xtrans$secondaryArchSuffix = $portVersion
+	devel:xtrans$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+
 BUILD()
 {
-	cd xtrans-1.2.5
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY`
+	runConfigure ./configure
 }

 INSTALL()
 {
-	cd xtrans-1.2.5
 	make install
+	mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//}
+	mv -f $prefix/data/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/
 }
--- a/x11-misc/util_macros/util_macros-1.17.0_git.recipe
+++ b/x11-misc/util_macros/util_macros-1.17.0_git.recipe
@@ -1,3 +1,4 @@
+SUMMARY="xorg util-macros" 
 DESCRIPTION="xorg util-macros" 
 HOMEPAGE="http://cgit.freedesktop.org/xorg/util/macros/" 
 COPYRIGHT="2005 Red Hat, Inc.
@@ -7,19 +8,42 @@ LICENSE="MIT"
 SRC_URI="git://anongit.freedesktop.org/xorg/util/macros"
 #CHECKSUM_MD5=""
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	util_macros$secondaryArchSuffix = $portVersion
+	devel:util_macros$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+
 BUILD()
 {
-	cd util-macros-1.17.0-git
 	./autogen.sh -V
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_LIB_DIRECTORY`
+	runConfigure ./configure
 	make
 }

 INSTALL()
 {
-	cd util-macros-1.17.0-git
 	make install
+	#fixPkgconfig
+	mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//}
+	mv -f $prefix/data/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/
 }
--- a/x11-proto/inputproto/inputproto-2.0.recipe
+++ b/x11-proto/inputproto/inputproto-2.0.recipe
@@ -1,21 +1,50 @@
+SUMMARY="inputproto" 
 DESCRIPTION="inputproto" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.gz"
 CHECKSUM_MD5="13d91739cf70a781f1db24d8d3677574"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="1989, 1998  The Open Group
+	1989 by Hewlett-Packard Company, Palo Alto, California.
+	"
+LICENSE="MIT (no promotion)"
+
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	inputproto$secondaryArchSuffix = $portVersion
+	devel:inputproto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"

 BUILD()
 {
-	cd inputproto-2.0
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }

 INSTALL()
 {
-	cd inputproto-2.0
 	make install
+	fixPkgconfig
 }
--- a/x11-proto/kbproto/kbproto-1.0.4.recipe
+++ b/x11-proto/kbproto/kbproto-1.0.4.recipe
@@ -1,21 +1,47 @@
+SUMMARY="kbproto" 
 DESCRIPTION="kbproto" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.4.tar.gz"
 CHECKSUM_MD5="4deef518a03bc94a7a25902bb7c98dd6"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="1993 by Silicon Graphics Computer Systems, Inc."
+LICENSE="MIT"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	kbproto$secondaryArchSuffix = $portVersion
+	devel:kbproto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"

 BUILD()
 {
-	cd kbproto-1.0.4
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }

 INSTALL()
 {
-	cd kbproto-1.0.4
 	make install
+	fixPkgconfig
 }
--- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe
+++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
@@ -1,22 +1,50 @@
+SUMMARY="xcb-proto" 
 DESCRIPTION="xcb-proto" 
 HOMEPAGE="http://xcb.freedesktop.org/" 
 SRC_URI="http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.gz"
 CHECKSUM_MD5="8d29695e8faf5fcdce568c66eaeaa5ee"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett."
+LICENSE="MIT (no promotion)"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	xcb_proto$secondaryArchSuffix = $portVersion
+	devel:xcb_proto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:python$secondaryArchSuffix
+	"
+
+SOURCE_DIR="xcb-proto-$portVersion"

 BUILD()
 {
-	cd xcb-proto-1.6
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }

 INSTALL()
 {
-	cd xcb-proto-1.6
 	make install
 }
--- a/x11-proto/xextproto/xextproto-7.1.1.recipe
+++ b/x11-proto/xextproto/xextproto-7.1.1.recipe
@@ -1,21 +1,55 @@
+SUMMARY="xextproto" 
 DESCRIPTION="xextproto" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.gz"
 CHECKSUM_MD5="6c55283718dbeb826bcf899b9e89faba"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="1989, 1998  The Open Group
+	1997 by Silicon Graphics Computer Systems, Inc.
+	1992 Network Computing Devices
+	1994, 1995  Hewlett-Packard Company
+	1996 Digital Equipment Corporation, Maynard, Massachusetts.
+	1988, 1989, 1990, 1994 Network Computing Devices, Inc.
+	1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts, and Olivetti Research Limited, Cambridge, England.
+	1986, 1987, 1988 by Hewlett-Packard Corporation
+	2007-2008 Peter Hutterer"
+LICENSE="MIT (no promotion)"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	xextproto$secondaryArchSuffix = $portVersion
+	devel:xextproto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix >= 1.7.0
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"

 BUILD()
 {
-	cd xextproto-7.1.1
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 }

 INSTALL()
 {
-	cd xextproto-7.1.1
 	make install
+	fixPkgconfig
 }
--- a/x11-proto/xproto/xproto-7.0.23_git.recipe
+++ b/x11-proto/xproto/xproto-7.0.23_git.recipe
@@ -1,3 +1,4 @@
+SUMMARY="xproto" 
 DESCRIPTION="xproto" 
 HOMEPAGE="http://cgit.freedesktop.org/xorg/proto/xproto/" 
 COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved.
@@ -11,19 +12,44 @@ LICENSE="MIT (no promotion)"
 SRC_URI="git://anongit.freedesktop.org/xorg/proto/xproto"
 #CHECKSUM_MD5=""
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
+
+PATCHES="xproto-7.0.23_git.patch"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	xproto$secondaryArchSuffix = $portVersion
+	devel:xproto$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
 BUILD()
 {
-	cd xproto-7.0.23-git
 	./autogen.sh -V
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_LIB_DIRECTORY`
+	runConfigure ./configure
 	make
 }

 INSTALL()
 {
-	cd xproto-7.0.23-git
 	make install
+	fixPkgconfig
 }