Merge branch 'package-management'

Conflicts:
	app-arch/p7zip/p7zip-9.04.bep
	app-arch/p7zip/p7zip-9.13.bep
	app-arch/tar/tar-1.22.bep
	app-arch/tar/tar-1.23.bep
	app-arch/tar/tar-1.25.bep
	app-arch/xz-utils/xz-utils-4.999.9.bep
	app-cdr/bchunk/bchunk-1.2.0.bep
	app-cdr/cdrtools/cdrtools-2.01.01a66.bep
	app-cdr/cdrtools/cdrtools-3.01a01.bep
	app-crypt/gnupg/gnupg-1.4.11.bep
	app-doc/doxygen/doxygen-1.6.3.bep
	app-editors/nano/nano-2.2.6.bep
	app-editors/vim/vim-7.3.bep
	app-text/antiword/antiword-0.37.bep
	app-text/libpaper/libpaper-1.1.23.bep
	app-text/libpaper/libpaper-1.1.24.bep
	app-text/rman/rman-3.2.bep
	dev-db/sqlite/sqlite-3.6.22.bep
	dev-db/sqlite/sqlite-3.6.23.bep
	dev-db/sqlite/sqlite-3.7.2.bep
	dev-db/sqlite/sqlite-3.7.3.bep
	dev-db/sqlite/sqlite-3.7.4.bep
	dev-db/sqlite/sqlite-3.7.5.bep
	dev-lang/lua/lua-5.1.4.bep
	dev-lang/nasm/nasm-2.08.01.bep
	dev-lang/perl/patches/perl-5.10.0.patch
	dev-lang/python/python-2.5.4.bep
	dev-lang/python/python-2.6.4.bep
	dev-lang/python/python-2.6.5.bep
	dev-lang/python/python-2.6.6.bep
	dev-lang/python/python-2.6.7.bep
	dev-lang/python/python-2.6.8.bep
	dev-lang/python/python-3.2.bep
	dev-lang/python/python-3.2.recipe
	dev-lang/python/python-3.2a4.bep
	dev-lang/yasm/yasm-1.1.0.bep
	dev-libs/apr-util/apr-util-1.3.10.bep
	dev-libs/apr-util/apr-util-1.3.9.bep
	dev-libs/apr/apr-1.3.8.bep
	dev-libs/apr/apr-1.3.9.bep
	dev-libs/apr/apr-1.4.2.bep
	dev-libs/apr/patches/apr-1.4.2.patch
	dev-libs/expat/expat-2.0.1.bep
	dev-libs/fribidi/fribidi-0.19.2.bep
	dev-libs/icu/icu-4.4.1.bep
	dev-libs/libedit/libedit-20090923.bep
	dev-libs/libedit/libedit-20100424.bep
	dev-libs/libevent/libevent-1.4.11.bep
	dev-libs/libevent/libevent-1.4.13.bep
	dev-libs/libevent/libevent-1.4.14b.bep
	dev-libs/libevent/libevent-2.0.10.bep
	dev-libs/libiconv/libiconv-1.12.bep
	dev-libs/libiconv/libiconv-1.13.1.bep
	dev-libs/libpcre/libpcre-8.00.bep
	dev-libs/libpcre/libpcre-8.02.bep
	dev-libs/libpcre/libpcre-8.12.bep
	dev-libs/libxml2/libxml2-2.7.3.bep
	dev-libs/libxml2/libxml2-2.7.6.bep
	dev-libs/libxml2/libxml2-2.7.7.bep
	dev-libs/libxml2/libxml2-2.7.8.bep
	dev-libs/openssl/openssl-0.9.8l.bep
	dev-libs/openssl/openssl-0.9.8m.bep
	dev-libs/openssl/openssl-1.0.0.bep
	dev-libs/openssl/openssl-1.0.0a.bep
	dev-libs/openssl/openssl-1.0.0c.bep
	dev-qt/qtcore/qtcore-4.8.x-git.bep
	dev-qt/qtcore/qtcore-4.8.x.recipe
	dev-util/ccache/ccache-3.0.1.bep
	dev-util/cmake/cmake-2.6.4.bep
	dev-util/cmake/cmake-2.8.0.bep
	dev-util/cmake/cmake-2.8.1.bep
	dev-util/cmake/cmake-2.8.2.bep
	dev-util/cmake/cmake-2.8.3.bep
	dev-util/cmake/cmake-2.8.4.bep
	dev-util/ctags/ctags-5.8.bep
	dev-util/fastdep/fastdep-0.16.bep
	dev-util/gperf/gperf-3.0.4.bep
	dev-util/pkgconfig/pkgconfig-0.23.bep
	dev-util/pkgconfig/pkgconfig-0.25.bep
	dev-vcs/cvs/cvs-1.12.13.1.bep
	dev-vcs/cvs/cvs-1.12.13.bep
	dev-vcs/subversion/subversion-1.6.11.bep
	dev-vcs/subversion/subversion-1.6.12.bep
	dev-vcs/subversion/subversion-1.6.13.bep
	dev-vcs/subversion/subversion-1.6.15.bep
	dev-vcs/subversion/subversion-1.6.6.bep
	dev-vcs/subversion/subversion-1.6.9.bep
	dev-vcs/subversion/subversion-1.7.xx-svn.bep
	haiku-apps/bepdf/bepdf-1.1.1b4.bep
	haiku-apps/libwalter/libwalter-97.bep
	haiku-apps/paladin/paladin-1.3-hg.bep
	haiku-apps/pe/pe-2.4.3-600.bep
	haiku-apps/vision/patches/vision-908-gcc4.patch
	haiku-apps/vision/vision-0.9.7.bep
	haiku-libs/libwalter/libwalter-97.bep
	haiku-libs/libwalter/libwalter-97.recipe
	media-gfx/graphviz/graphviz-2.24.bep
	media-gfx/graphviz/graphviz-2.26.3.bep
	media-libs/flac/flac-1.2.1.bep
	media-libs/freetype/freetype-2.3.11.bep
	media-libs/freetype/freetype-2.4.2.bep
	media-libs/freetype/freetype-2.4.4.bep
	media-libs/ftgl/ftgl-2.1-svn.bep
	media-libs/guilib/guilib-1.2.1.bep
	media-libs/jpeg/jpeg-7.bep
	media-libs/jpeg/jpeg-8b.bep
	media-libs/jpeg/jpeg-8c.bep
	media-libs/libao/libao-1.0.0.bep
	media-libs/libmad/libmad-0.15.1b.bep
	media-libs/libmng/libmng-1.0.10.bep
	media-libs/libogg/libogg-1.1.4.bep
	media-libs/libogg/libogg-1.2.0.bep
	media-libs/libogg/libogg-1.2.2.bep
	media-libs/libpng/libpng-1.2.29.bep
	media-libs/libpng/libpng-1.2.30.bep
	media-libs/libpng/libpng-1.2.40.bep
	media-libs/libpng/libpng-1.2.41.bep
	media-libs/libpng/libpng-1.2.43.bep
	media-libs/libpng/libpng-1.2.44.bep
	media-libs/libpng/libpng-1.4.1.bep
	media-libs/libpng/libpng-1.4.2.bep
	media-libs/libpng/libpng-1.4.3.bep
	media-libs/libpng/libpng-1.4.4.bep
	media-libs/libpng/libpng-1.5.0.bep
	media-libs/libsdl/patches/libsdl-1.2-hg.patch
	media-libs/libtheora/libtheora-1.1.1.bep
	media-libs/libvorbis/libvorbis-1.2.3.bep
	media-libs/libvorbis/libvorbis-1.3.1.bep
	media-libs/libvorbis/libvorbis-1.3.2.bep
	media-libs/libvpx/libvpx-0.9.2-git.bep
	media-libs/smpeg/smpeg-0.4.5.bep
	media-libs/speex/speex-1.2-git.bep
	media-libs/speex/speex-1.2rc1.bep
	media-sound/lame/lame-3.98.4.bep
	media-sound/lame/lame-398-2.bep
	media-sound/vorbis-tools/vorbis-tools-1.2.0.bep
	media-sound/vorbis-tools/vorbis-tools-1.4.0.bep
	media-video/ffmpeg/ffmpeg-0.5.bep
	media-video/ffmpeg/ffmpeg-0.6.bep
	net-misc/curl/curl-7.18.2.bep
	net-misc/curl/curl-7.19.1.bep
	net-misc/curl/curl-7.19.2.bep
	net-misc/curl/curl-7.19.5.bep
	net-misc/curl/curl-7.19.7.bep
	net-misc/curl/curl-7.20.0.bep
	net-misc/curl/curl-7.20.1.bep
	net-misc/curl/curl-7.21.1.bep
	net-misc/curl/curl-7.21.2.bep
	net-misc/curl/curl-7.21.3.bep
	net-misc/openssh/openssh-5.4p1.bep
	net-misc/openssh/openssh-5.5p1.bep
	net-misc/openssh/openssh-5.6p1.bep
	net-misc/openssh/openssh-5.7p1.bep
	net-misc/openssh/openssh-5.8p1.bep
	net-wireless/b43-fwcutter/b43-fwcutter-012.bep
	sci-libs/gsl/gsl-1.14.bep
	sys-apps/ed/ed-1.4.bep
	sys-apps/gawk/gawk-3.1.8.bep
	sys-apps/grep/grep-2.5.4.bep
	sys-apps/grep/grep-2.7.bep
	sys-apps/groff/groff-1.20.1.bep
	sys-apps/man/man-1.6f.bep
	sys-apps/sed/sed-4.2.1.bep
	sys-apps/texinfo/texinfo-4.13a.bep
	sys-devel/autoconf/autoconf-2.68.bep
	sys-devel/automake/automake-1.11.1.bep
	sys-devel/bison/bison-2.4.1.bep
	sys-devel/bison/bison-2.4.bep
	sys-devel/flex/flex-2.5.35.bep
	sys-devel/gettext/gettext-0.18.1.1-dev.bep
	sys-devel/gettext/gettext-0.18.1.1.bep
	sys-devel/jam/jam-2.5.bep
	sys-devel/m4/m4-1.4.14.bep
	sys-libs/ncurses/ncurses-5.6.bep
	sys-libs/ncurses/ncurses-5.7.bep
	sys-libs/readline/readline-5.2.bep
	sys-libs/readline/readline-6.0.bep
	sys-libs/readline/readline-6.1.bep
	sys-libs/zlib/zlib-1.2.3.bep
	sys-libs/zlib/zlib-1.2.5.bep
	x11-libs/qt/qt-4.8.x-git.bep

.gitignore

@@ -0,0 +1,4 @@
+packages
+repository
+*/*/download
+*/*/work-*

app-admin/pwgen/pwgen-2.06.recipe

@@ -5,13 +5,15 @@ CHECKSUM_MD5="935aebcbe610fbc9de8125e7b7d71297"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pwgen-2.06
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pwgen-2.06
 	make install
 }

app-admin/pwgen/pwgen-2.06.sh

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-PACKAGE="app-admin/pwgen"
-VERSION="2.06"
-HOMEPAGE="http://sourceforge.net/projects/pwgen/"
-URL="http://voxel.dl.sourceforge.net/sourceforge/pwgen/"
-FILE="pwgen-2.06.tar.gz"
-
-PREFIX=--prefix=/boot/common
-HAIKUPORTS="http://ports.haiku-files.org/wiki"
-CWD=`pwd`
-
-if [ ! -d ${PACKAGE}/${VERSION} ] ; then
-	mkdir -p ${PACKAGE}/${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}/${VERSION}
-tar xvf ${CWD}/${FILE}
-cd pwgen-2.06
-configure ${PREFIX}
-`make && make install && echo  && echo "  Installation complete."` || echo "  Installation FAILED !"
-
-echo "  For more information, see ${HAIKUPORTS}/${PACKAGE}"
-echo

app-arch/arc/arc-5.21o.recipe

@@ -5,12 +5,14 @@ CHECKSUM_MD5="3b30c739b42b2fe8ac4ec0a05f34f284"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd arc-5.21o
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd arc-5.21o
 	install arc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY`
 	install marc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY`

app-arch/bzip2/bzip2-1.0.5-1.build

@@ -1,3 +0,0 @@
-cd bzip2-1.0.5
-make
-make -f Makefile-libbz2_so

app-arch/bzip2/bzip2-1.0.5-1.install

@@ -1,4 +0,0 @@
-cd bzip2-1.0.5
-make install PREFIX=/boot/common
-cp libbz2.so.1.0.4 /boot/common/lib
-cp libbz2.so.1.0 /boot/common/lib

app-arch/bzip2/bzip2-1.0.5.bep

@@ -1,21 +0,0 @@
-DESCRIPTION="bzip2" 
-HOMEPAGE="http://www.bzip.org/" 
-SRC_URI="http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz"
-CHECKSUM_MD5="3c15a0c8d1d3ee1c46a1634d00617b1a"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd bzip2-1.0.5
-	make
-	make -f Makefile-libbz2_so
-}
-
-INSTALL {
-	cd bzip2-1.0.5
-	make install PREFIX=/boot/common
-	cp libbz2.so.1.0.4 /boot/common/lib
-	cp libbz2.so.1.0 /boot/common/lib
-}
-LICENSE="bzip2"
-COPYRIGHT="1996-2007 Julian R Seward"

app-arch/bzip2/bzip2-1.0.5.sh

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-HOMEPAGE="http://www.bzip.org/"
-PACKAGE="app-arch/bzip2/"
-VERSION="1.0.5"
-URL="http://www.bzip.org/1.0.5/"
-FILE="bzip2-1.0.5.tar.gz"
-
-# ------- This should not be edited ------- 
-PFX=/boot/common/
-HAIKUPORTS="http://ports.haiku-files.org/wiki/"
-CWD=`pwd`/
-if [ ! -d ${PACKAGE}${VERSION} ] ; then
-	mkdir -p ${PACKAGE}${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}${VERSION}
-if [ ${FILE:(-7)} = "tar.bz2" ] ; then
-	tar -jxvf ${CWD}${FILE}
-elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
-	tar xvf ${CWD}${FILE}
-fi
-# ------- Begin Instructions ------- 
-cd bzip2-1.0.5
-make PREFIX=${PFX} && make install PREFIX=${PFX} && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
-
-
-echo "  For more information, see:"
-echo "    ${HAIKUPORTS}${PACKAGE}"
-echo "    ${HOMEPAGE}"
-echo

app-arch/bzip2/bzip2-1.0.6.bep

@@ -1,21 +0,0 @@
-DESCRIPTION="bzip2" 
-HOMEPAGE="http://www.bzip.org/" 
-SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
-CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd bzip2-1.0.6
-	make
-	make -f Makefile-libbz2_so
-}
-
-INSTALL {
-	cd bzip2-1.0.6
-	make install PREFIX=/boot/common
-	cp libbz2.so.1.0.6 /boot/common/lib
-	cp libbz2.so.1.0 /boot/common/lib
-}
-LICENSE="bzip2"
-COPYRIGHT="1996-2010 Julian R Seward"

app-arch/bzip2/bzip2-1.0.6.recipe

@@ -0,0 +1,83 @@
+SUMMARY="bzip2 data compression utilities and libraries"
+DESCRIPTION="bzip2 is a freely available, patent free (see below), high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression."
+HOMEPAGE="http://www.bzip.org/"
+LICENSE="bzip2"
+COPYRIGHT="1996-2010 Julian R Seward"
+SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
+CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	bzip2 = $portVersion compat >= 1
+	cmd:bzcat = $portVersion compat >= 1
+	cmd:bzcmp = $portVersion compat >= 1
+	cmd:bzdiff = $portVersion compat >= 1
+	cmd:bzegrep = $portVersion compat >= 1
+	cmd:bzfgrep = $portVersion compat >= 1
+	cmd:bzgrep = $portVersion compat >= 1
+	cmd:bzip2 = $portVersion compat >= 1
+	cmd:bzip2recover = $portVersion compat >= 1
+	cmd:bzless = $portVersion compat >= 1
+	cmd:bzmore = $portVersion compat >= 1
+	cmd:bunzip2 = $portVersion compat >= 1
+	lib:libbz2 = $portVersion compat >= 1.0
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:ar
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	make $jobArgs
+	make $jobArgs -f Makefile-libbz2_so
+		# shared libary not built by default
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix
+
+	# also install shared lib
+	cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir
+
+	# move man pages
+	mkdir -p $manDir
+	mv $prefix/man/* $manDir
+	rmdir $prefix/man
+
+	# move headers
+	bzip2IncludeDir=$includeDir
+	mkdir -p $bzip2IncludeDir
+	mv $prefix/include/* $bzip2IncludeDir
+	rmdir $prefix/include
+
+	# prepare development lib links
+	prepareInstalledDevelLibs libbz2
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	bzip2_devel = $portVersion compat >= 1
+	devel:libbz2 = $portVersion compat >= 1.0
+	"
+REQUIRES_devel="
+	bzip2 == $portVersion base
+	"

app-arch/bzip2/patches/bzip2-1.0.5.patch

@@ -1,97 +0,0 @@
-diff -urN work/bzip2-1.0.5/Makefile work-haiku/bzip2-1.0.5/Makefile
---- bzip2-1.0.5/Makefile	2008-02-14 12:39:18.000000000 +0000
-+++ bzip2-1.0.5-haiku/Makefile	2009-12-27 00:29:38.000000000 +0000
-@@ -24,7 +24,8 @@
- CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
- 
- # Where you want it installed when you do 'make install'
--PREFIX=/usr/local
-+PREFIX=/boot/common
-+DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
- 
- 
- OBJS= blocksort.o  \
-@@ -70,43 +70,46 @@
- 	@cat words3
- 
- install: bzip2 bzip2recover
--	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
--	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
--	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
--	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
--	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
--	cp -f bzip2 $(PREFIX)/bin/bzip2
--	cp -f bzip2 $(PREFIX)/bin/bunzip2
--	cp -f bzip2 $(PREFIX)/bin/bzcat
--	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
--	chmod a+x $(PREFIX)/bin/bzip2
--	chmod a+x $(PREFIX)/bin/bunzip2
--	chmod a+x $(PREFIX)/bin/bzcat
--	chmod a+x $(PREFIX)/bin/bzip2recover
--	cp -f bzip2.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzip2.1
--	cp -f bzlib.h $(PREFIX)/include
--	chmod a+r $(PREFIX)/include/bzlib.h
--	cp -f libbz2.a $(PREFIX)/lib
--	chmod a+r $(PREFIX)/lib/libbz2.a
--	cp -f bzgrep $(PREFIX)/bin/bzgrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
--	chmod a+x $(PREFIX)/bin/bzgrep
--	cp -f bzmore $(PREFIX)/bin/bzmore
--	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
--	chmod a+x $(PREFIX)/bin/bzmore
--	cp -f bzdiff $(PREFIX)/bin/bzdiff
--	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
--	chmod a+x $(PREFIX)/bin/bzdiff
--	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzgrep.1
--	chmod a+r $(PREFIX)/man/man1/bzmore.1
--	chmod a+r $(PREFIX)/man/man1/bzdiff.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
--	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
--	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
-+	if ( test ! -d $(DESTDIR)$(DOCDIR)/man ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man ; fi
-+	if ( test ! -d $(DESTDIR)$(DOCDIR)/man/man1 ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man/man1 ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
-+	cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+	cp -f bzip2.1 $(DESTDIR)$(DOCDIR)/man/man1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzip2.1
-+	cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
-+	chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
-+	cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib
-+	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
-+	cp -f libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/lib
-+	ln -s -f $(PREFIX)/lib/libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0
-+	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0.4
-+	cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
-+	ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
-+	ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
-+	cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
-+	ln -s -f $(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
-+	cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
-+	ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
-+	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(DOCDIR)/man/man1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzgrep.1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzmore.1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzdiff.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzegrep.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzfgrep.1
-+	echo ".so man1/bzmore.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzless.1
-+	echo ".so man1/bzdiff.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzcmp.1
- 
- clean: 
- 	rm -f *.o libbz2.a bzip2 bzip2recover \

app-arch/bzip2/patches/bzip2-1.0.6.patch

@@ -1,97 +0,0 @@
-diff -urN work/bzip2-1.0.6/Makefile work-haiku/bzip2-1.0.6/Makefile
---- bzip2-1.0.6/Makefile	2008-02-14 12:39:18.000000000 +0000
-+++ bzip2-1.0.6-haiku/Makefile	2009-12-27 00:29:38.000000000 +0000
-@@ -24,7 +24,8 @@
- CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
- 
- # Where you want it installed when you do 'make install'
--PREFIX=/usr/local
-+PREFIX=/boot/common
-+DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
- 
- 
- OBJS= blocksort.o  \
-@@ -70,43 +70,46 @@
- 	@cat words3
- 
- install: bzip2 bzip2recover
--	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
--	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
--	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
--	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
--	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
--	cp -f bzip2 $(PREFIX)/bin/bzip2
--	cp -f bzip2 $(PREFIX)/bin/bunzip2
--	cp -f bzip2 $(PREFIX)/bin/bzcat
--	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
--	chmod a+x $(PREFIX)/bin/bzip2
--	chmod a+x $(PREFIX)/bin/bunzip2
--	chmod a+x $(PREFIX)/bin/bzcat
--	chmod a+x $(PREFIX)/bin/bzip2recover
--	cp -f bzip2.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzip2.1
--	cp -f bzlib.h $(PREFIX)/include
--	chmod a+r $(PREFIX)/include/bzlib.h
--	cp -f libbz2.a $(PREFIX)/lib
--	chmod a+r $(PREFIX)/lib/libbz2.a
--	cp -f bzgrep $(PREFIX)/bin/bzgrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
--	chmod a+x $(PREFIX)/bin/bzgrep
--	cp -f bzmore $(PREFIX)/bin/bzmore
--	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
--	chmod a+x $(PREFIX)/bin/bzmore
--	cp -f bzdiff $(PREFIX)/bin/bzdiff
--	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
--	chmod a+x $(PREFIX)/bin/bzdiff
--	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzgrep.1
--	chmod a+r $(PREFIX)/man/man1/bzmore.1
--	chmod a+r $(PREFIX)/man/man1/bzdiff.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
--	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
--	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
-+	if ( test ! -d $(DESTDIR)$(DOCDIR)/man ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man ; fi
-+	if ( test ! -d $(DESTDIR)$(DOCDIR)/man/man1 ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man/man1 ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
-+	cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+	cp -f bzip2.1 $(DESTDIR)$(DOCDIR)/man/man1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzip2.1
-+	cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
-+	chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
-+	cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib
-+	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
-+	cp -f libbz2.so.1.0.6 $(DESTDIR)$(PREFIX)/lib
-+	ln -s -f $(PREFIX)/lib/libbz2.so.1.0.6 $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0
-+	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0.6
-+	cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
-+	ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
-+	ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
-+	cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
-+	ln -s -f $(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
-+	cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
-+	ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
-+	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(DOCDIR)/man/man1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzgrep.1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzmore.1
-+	chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzdiff.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzegrep.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzfgrep.1
-+	echo ".so man1/bzmore.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzless.1
-+	echo ".so man1/bzdiff.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzcmp.1
- 
- clean: 
- 	rm -f *.o libbz2.a bzip2 bzip2recover \

app-arch/cabextract/cabextract-1.2.recipe

@@ -5,13 +5,15 @@ CHECKSUM_MD5="dc421a690648b503265c82ade84e143e"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cabextract-1.2
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cabextract-1.2
 	make install
 }

app-arch/cabextract/cabextract-1.3.recipe

@@ -5,13 +5,15 @@ CHECKSUM_MD5="cb9a4a38470d2a71a0275968e7eb64d3"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cabextract-1.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cabextract-1.3
 	make install
 }

app-arch/cpio/cpio-2.10.recipe

@@ -5,7 +5,8 @@ CHECKSUM_MD5="351ab3d38d8949913e478cc23b9d6ad4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cpio-2.10
 	sed -i 's/restrict//g' gnu/string.in.h
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cpio-2.10
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cpio-2.10
 	make check
 }

app-arch/cpio/cpio-2.11.recipe

@@ -5,7 +5,8 @@ CHECKSUM_MD5="1112bb6c45863468b5496ba128792f6c"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cpio-2.11
 #	sed -i 's/restrict//g' gnu/string.in.h
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -15,12 +16,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cpio-2.11
 	make install
 }
 
-TEST {
+TEST()
+{
 	cd cpio-2.11
 	make check
 }

app-arch/fastjar/fastjar-0.97.sh

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-HOMEPAGE="https://savannah.nongnu.org/projects/fastjar/"
-PACKAGE="app-arch/fastjar/"
-VERSION="0.97"
-URL="http://mirror.its.uidaho.edu/pub/savannah/fastjar/"
-FILE="fastjar-0.97.tar.gz"
-
-# ------- This should not be edited ------- 
-PFX=/boot/common/
-HAIKUPORTS="http://ports.haiku-files.org/wiki/"
-CWD=`pwd`/
-if [ ! -d ${PACKAGE}${VERSION} ] ; then
-	mkdir -p ${PACKAGE}${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}${VERSION}
-if [ ${FILE:(-7)} = "tar.bz2" ] ; then
-	tar -jxvf ${CWD}${FILE}
-elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
-	tar xvf ${CWD}${FILE}
-fi
-# ------- Begin Instructions ------- 
-cd fastjar-0.97
-libtoolize --force --install
-aclocal --force 
-automake --force-missing
-autoconf --force
-configure --prefix=${PREFIX} 
-make && make install && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
-
-echo "  For more information, see:"
-echo "    ${HAIKUPORTS}${PACKAGE}"
-echo "    ${HOMEPAGE}"
-echo
-

app-arch/fastjar/fastjar-0.98.recipe

@@ -5,14 +5,16 @@ CHECKSUM_MD5="d2d264d343d4d0e1575832cc1023c3bf"
 REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd fastjar-0.98
 	autoreconf -vfi
 	configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd fastjar-0.98
 	make install
 }

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

@@ -5,13 +5,15 @@ CHECKSUM_MD5="39053e044b18ecd0627f80fbe7cfeaad"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gzip-1.2.4a
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gzip-1.2.4a
 	make install
 }

app-arch/gzip/gzip-1.3.12.recipe

@@ -5,13 +5,15 @@ CHECKSUM_MD5="b5bac2d21840ae077e0217bc5e4845b1"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gzip-1.3.12
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gzip-1.3.12
 	make install
 }

app-arch/gzip/gzip-1.3.12.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-HOMEPAGE="http://www.gnu.org/software/gzip/"
-PACKAGE="app-arch/gzip/"
-VERSION="1.3.12"
-URL="http://ftp.gnu.org/gnu/gzip/"
-FILE="gzip-1.3.12.tar.gz"
-PATCH_URL="http://ports.haiku-files.org/svn/haikuports/trunk/"
-PATCH_FILE="gzip-1.3.12-downstream.patch"
-
-# ------- This should not be edited ------- 
-PFX=/boot/common/
-HAIKUPORTS="http://ports.haiku-files.org/wiki/"
-CWD=`pwd`/
-if [ ! -d ${PACKAGE}${VERSION} ] ; then
-	mkdir -p ${PACKAGE}${VERSION}
-fi
-if [ ! -e ${FILE} ] ; then
-	wget ${URL}${FILE}
-fi
-cd ${PACKAGE}${VERSION}
-if [ ${FILE:(-7)} = "tar.bz2" ] ; then
-	tar -jxvf ${CWD}${FILE}
-elif [ ${FILE:(-7)} = ".tar.gz" ] ; then
-	tar xvf ${CWD}${FILE}
-fi
-# ------- Begin Instructions ------- 
-cd gzip-1.3.12
-wget ${PATCH_URL}${PACKAGE}/${PATCH_FILE}
-patch -p1 -i ${PATCH_FILE}
-libtoolize --force --install
-configure --prefix=${PFX}
-make && make install && echo  && echo "  Installation complete." || echo "  Installation FAILED !"
-
-echo "  For more information, see:"
-echo "    ${HAIKUPORTS}${PACKAGE}"
-echo "    ${HOMEPAGE}"
-echo
-

app-arch/gzip/gzip-1.4.recipe

@@ -5,13 +5,15 @@ CHECKSUM_MD5="e381b8506210c794278f5527cba0e765"
 REVISION="1"
 STATUS_HAIKU="untested"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gzip-1.4
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gzip-1.4
 	make install
 }

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

@@ -1,5 +1,5 @@
---- ./gzip-1.4/inflate.c       2010-01-20 14:15:12.017039360 +0100
-+++ ./gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100
+--- gzip-1.4/inflate.c       2010-01-20 14:15:12.017039360 +0100
++++ gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100
 @@ -588,6 +588,7 @@
        /* do the copy */
        do {

app-arch/ha/ha-0999.recipe

@@ -5,11 +5,13 @@ REVISION="1"
 CHECKSUM_MD5="77f3266a451712bec55d60df67f61486"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	make -f makefile.nix
 }
 
-INSTALL {
+INSTALL()
+{
 	mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
 	cp ha ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/ha
 }

app-arch/lha/lha-1.14i.recipe

@@ -5,20 +5,23 @@ CHECKSUM_MD5="9f52430410928ba4390a73a41a36d56f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd lha-1.14i-ac20050924p1
 	autoreconf -vfi
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`/
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd lha-1.14i-ac20050924p1
 	make install DESTDIR=${DESTDIR}
 
 }
 
-TEST {
+TEST()
+{
 	cd lha-1.14i-ac20050924p1
 	make check
 }

app-arch/libarchive/libarchive-2.8.3.recipe

@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="e4fb38b224f623e1cf1122631bf35b82"
-BUILD {
+BUILD()
+{
 	cd libarchive-2.8.3
 	libtoolize --force --copy --install
 	aclocal -I build/autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libarchive-2.8.3
 	make install
 }
 
-TEST { 
+TEST()
+{ 
         cd libarchive-2.8.3 
         make check 
 }

app-arch/libarchive/libarchive-2.8.4.recipe

@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="83b237a542f27969a8d68ac217dc3796"
-BUILD {
+BUILD()
+{
 	cd libarchive-2.8.4
 	libtoolize --force --copy --install
 	aclocal -I build/autoconf
@@ -16,12 +17,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libarchive-2.8.4
 	make install
 }
 
-TEST { 
+TEST()
+{ 
         cd libarchive-2.8.4 
         make check 
 }

app-arch/libarchive/libarchive-2.8.5.recipe

@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="58d1b202b4878e9da45cfe6d2a740881"
-BUILD {
+BUILD()
+{
 	cd libarchive-2.8.5
 	libtoolize --force --copy --install
 	aclocal -I build/autoconf
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libarchive-2.8.5
 	make install
 }
 
-TEST { 
+TEST()
+{ 
         cd libarchive-2.8.5
         make check 
 }

app-arch/libarchive/libarchive-3.0.3.recipe

@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="ca4090f0099432a9ac5a8b6618dc3892"
-BUILD {
+BUILD()
+{
 	cd libarchive-3.0.3
 	libtoolize --force --copy --install
 	aclocal -I build/autoconf
@@ -20,12 +21,14 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libarchive-3.0.3
 	make install
 }
 
-TEST { 
+TEST()
+{ 
 	cd libarchive-3.0.3
 	make check 
 }

app-arch/p7zip/additional-files/p7zip-expander-rules

@@ -0,0 +1 @@
+"application/x-7z-compressed"	.7z	"7za l %s"	"7za x -y %s"

app-arch/p7zip/p7zip-9.04.bep

@@ -1,23 +0,0 @@
-DESCRIPTION="p7zip"
-HOMEPAGE="http://p7zip.sourceforge.net"
-SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.04/p7zip_9.04_src_all.tar.bz2?use_mirror=cdnetworks-us-2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="9194ebf9a2b3735d236aed001de5f6f8"
-BUILD {
-	cd p7zip_9.04
-	cp makefile.beos makefile.machine
-	make
-}
-
-INSTALL {
-	cd p7zip_9.04
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	make install DEST_DIR=${DESTDIR} \
-		DEST_HOME=`finddir B_COMMON_DIRECTORY` \
-		DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \
-		DEST_MAN=$COMMON_DOCS/man
-}
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2009 7-Zip Igor Pavlov."

app-arch/p7zip/p7zip-9.13.bep

@@ -1,22 +0,0 @@
-DESCRIPTION="p7zip"
-HOMEPAGE="http://p7zip.sourceforge.net"
-SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779"
-BUILD {
-	cd p7zip_9.13
-	cp makefile.haiku makefile.machine
-	make
-}
-
-INSTALL {
-	cd p7zip_9.13
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \
-		DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \
-		DEST_MAN=$COMMON_DOCS/man
-}
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2010 7-Zip Igor Pavlov."

app-arch/p7zip/p7zip-9.13.recipe

@@ -0,0 +1,41 @@
+SUMMARY="7-zip file compression program"
+DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
+HOMEPAGE="http://p7zip.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2"
+CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="1999-2010 7-Zip Igor Pavlov."
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="p7zip-9.13.patch"
+
+PROVIDES="
+	p7zip = $portVersion
+	cmd:7za = $portVersion compat >= 9
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+
+SOURCE_DIR="p7zip_9.13"
+
+BUILD()
+{
+	cp makefile.haiku makefile.machine
+	make
+}
+
+INSTALL()
+{
+	make install DEST_DIR=$prefix DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \
+		DEST_MAN=$manDir
+}

app-arch/p7zip/p7zip-9.20.1.bep

@@ -1,22 +0,0 @@
-DESCRIPTION="p7zip"
-HOMEPAGE="http://p7zip.sourceforge.net"
-SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"
-BUILD {
-	cd p7zip_9.20.1
-	cp makefile.haiku makefile.machine
-	make
-}
-
-INSTALL {
-	cd p7zip_9.20.1
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \
-		DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \
-		DEST_MAN=$COMMON_DOCS/man
-}
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2011 7-Zip Igor Pavlov."

app-arch/p7zip/p7zip-9.20.1.recipe

@@ -0,0 +1,48 @@
+SUMMARY="7-zip file compression program"
+DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
+HOMEPAGE="http://p7zip.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2"
+CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
+REVISION="5"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="p7zip-9.20.1.patch"
+
+ADDITIONAL_FILES="p7zip-expander-rules"
+
+PROVIDES="
+	p7zip = $portVersion
+	cmd:7za = $portVersion compat >= 9
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+
+SOURCE_DIR="p7zip_9.20.1"
+
+BUILD()
+{
+	cp makefile.haiku makefile.machine
+	make
+}
+
+INSTALL()
+{
+	make install DEST_DIR="" DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \
+		DEST_MAN=$manDir
+
+	expanderRulesDir=$dataDir/expander/rules
+	mkdir -p $expanderRulesDir
+	cp "$portDir/additional-files/p7zip-expander-rules" \
+		"$expanderRulesDir/p7zip"
+}

app-arch/p7zip/patches/p7zip-9.04.patch

@@ -1,137 +0,0 @@
-diff -up p7zip_9.04/install.sh.orig p7zip_9.04/install.sh
---- p7zip_9.04/install.sh.orig	2010-04-23 23:59:47.153092096 -0600
-+++ p7zip_9.04/install.sh	2010-04-24 00:00:57.560201728 -0600
-@@ -56,10 +56,10 @@ then
-     cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za"
-     chmod 777 "${DEST_DIR}${DEST_SHARE}/7za"
-     strip     "${DEST_DIR}${DEST_SHARE}/7za"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7za"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7za"
-     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za"
-     echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za"
--    chmod 555 "${DEST_DIR}${DEST_BIN}/7za"
-+    chmod 755 "${DEST_DIR}${DEST_BIN}/7za"
-   fi
- 
-   if [ -x bin/7zr ]
-@@ -68,10 +68,10 @@ then
-     cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr"
-     chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr"
-     strip     "${DEST_DIR}${DEST_SHARE}/7zr"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr"
-     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr"
-     echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr"
--    chmod 555 "${DEST_DIR}${DEST_BIN}/7zr"
-+    chmod 755 "${DEST_DIR}${DEST_BIN}/7zr"
-   fi
- 
-   if [ -x bin/7zCon.sfx ]
-@@ -80,7 +80,7 @@ then
-     cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-     chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-     strip     "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-   fi
- 
-   if [ -x bin/7z ]
-@@ -89,14 +89,14 @@ then
-     cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z"
-     chmod 777 "${DEST_DIR}${DEST_SHARE}/7z"
-     strip     "${DEST_DIR}${DEST_SHARE}/7z"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7z"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7z"
-     cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/*
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/*
-     cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so"
-     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z"
-     echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z"
--    chmod 555 "${DEST_DIR}${DEST_BIN}/7z"
-+    chmod 755 "${DEST_DIR}${DEST_BIN}/7z"
-   fi
- 
- else
-@@ -105,7 +105,7 @@ else
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
-     mkdir -p "${DEST_DIR}${DEST_BIN}"
-     cp bin/7za "${DEST_DIR}${DEST_BIN}/7za"
--    chmod 555  "${DEST_DIR}${DEST_BIN}/7za"
-+    chmod 755  "${DEST_DIR}${DEST_BIN}/7za"
-   fi
- 
-   if [ -x bin/7zr ]
-@@ -113,7 +113,7 @@ else
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
-     mkdir -p "${DEST_DIR}${DEST_BIN}"
-     cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr"
--    chmod 555  "${DEST_DIR}${DEST_BIN}/7zr"
-+    chmod 755  "${DEST_DIR}${DEST_BIN}/7zr"
-   fi
- fi
- 
-@@ -122,27 +122,27 @@ if [ -d DOCS ]
- then
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
- else
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
- fi
- 
- if [ -f README ]
-@@ -150,7 +150,7 @@ then
-   echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README"
-   mkdir -p  "${DEST_DIR}${DEST_SHARE_DOC}"
-   cp README "${DEST_DIR}${DEST_SHARE_DOC}/README"
--  chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README"
-+  chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README"
- fi
- 
- if [ -f ChangeLog ]
-@@ -158,7 +158,7 @@ then
-   echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
-   mkdir -p     "${DEST_DIR}${DEST_SHARE_DOC}"
-   cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
--  chmod 444    "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
-+  chmod 644    "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
- fi
- 
- if [ -d DOCS ]
-@@ -166,7 +166,7 @@ then
-   echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
-   mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
-   cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
--  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \;
--  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \;
-+  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \;
-+  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \;
- fi
- 

app-arch/pigz/pigz-2.1.6.recipe

@@ -5,21 +5,24 @@ CHECKSUM_MD5="cbe9030c4be3d0ef2438ee5f8b169ca4"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd pigz-2.1.6
 	sed -i 's/-lpthread/ /g' Makefile
 	sed -i 's/ln -f pigz unpigz/cp pigz unpigz/' Makefile
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd pigz-2.1.6
 	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
 	cp pigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/pigz
 	cp unpigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/unpigz
 }
 
-TEST {
+TEST()
+{
 	cd pigz-2.1.6
 	make test
 }

app-arch/sharutils/sharutils-4.10.recipe

@@ -6,7 +6,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-BUILD {
+BUILD()
+{
 	cd sharutils-4.10
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sharutils-4.10
 	make install
 }

app-arch/sharutils/sharutils-4.6.3.recipe

@@ -5,13 +5,15 @@ CHECKSUM_MD5="74127a560e59be6dfa8b59993eb0ca91"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd sharutils-4.6.3
 	./configure --prefix=/boot/home/common
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd sharutils-4.6.3
 	make install
 }

app-arch/tar/patches/tar-1.22.patch

@@ -1,11 +0,0 @@
-diff -up tar-1.22/lib/string.in.h.orig tar-1.22/lib/string.in.h
---- tar-1.22/lib/string.in.h.orig	2009-12-29 20:13:44.000000000 -0700
-+++ tar-1.22/lib/string.in.h	2009-12-29 20:14:22.000000000 -0700
-@@ -39,6 +39,7 @@
- /* The attribute __pure__ was added in gcc 2.96.  */
- # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
- #  define __pure__ /* empty */
-+#  define restrict __restrict
- # endif
- #endif
- 

app-arch/tar/patches/tar-1.23.patch

@@ -1,11 +0,0 @@
-diff -up tar-1.22/lib/string.in.h.orig tar-1.22/lib/string.in.h
---- tar-1.23/gnu/string.in.h.orig	2009-12-29 20:13:44.000000000 -0700
-+++ tar-1.23/gnu/string.in.h	2009-12-29 20:14:22.000000000 -0700
-@@ -39,6 +39,7 @@
- /* The attribute __pure__ was added in gcc 2.96.  */
- # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
- #  define __pure__ /* empty */
-+#  define restrict __restrict
- # endif
- #endif
- 

app-arch/tar/tar-1.22.bep

@@ -1,21 +0,0 @@
-DESCRIPTION="tar saves and restores files from a tape or disk archive." 
-HOMEPAGE="http://www.gnu.org/software/tar/" 
-SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.22.tar.bz2"
-CHECKSUM_MD5="07fa517027f426bb80f5f5ff91b63585"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd tar-1.22
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--libexecdir=`finddir B_COMMON_BIN_DIRECTORY`
-	make
-}
-
-INSTALL {
-	cd tar-1.22
-	make install
-}
-LICENSE="GNU GPL v3"
-COPYRIGHT="1990-2010 Free Software Foundation, Inc."

app-arch/tar/tar-1.23.bep

@@ -1,19 +0,0 @@
-DESCRIPTION="tar saves and restores files from a tape or disk archive." 
-HOMEPAGE="http://www.gnu.org/software/tar/" 
-SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.23.tar.bz2"
-CHECKSUM_MD5="41e2ca4b924ec7860e51b43ad06cdb7e"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-BUILD {
-	cd tar-1.23
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL {
-	cd tar-1.23
-	make install
-}
-LICENSE="GNU GPL v3"
-COPYRIGHT="1990-2010 Free Software Foundation, Inc."

app-arch/tar/tar-1.25.bep

@@ -1,41 +0,0 @@
-DESCRIPTION="tar saves and restores files from a tape or disk archive."
-HOMEPAGE="http://www.gnu.org/software/tar/"
-SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.25.tar.bz2"
-CHECKSUM_MD5="6e497f861c77bbba2f7da4e10270995b"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/gnulib = 9999"
-BUILD {
-	cd tar-1.25
-	if [ ! -e `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999 ] ; then
-		echo "gnulib not found, so updating it now..."
-		haikuporter -i gnulib
-	fi
-	echo "Copying gnulib to tar work directory..."
-	cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fseek* gnu/
-	cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/iswblank* gnu/
-	cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fcntl* gnu/
-	sed -i 's/@GNULIB_NONBLOCKING@/0/' gnu/fcntl*
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--infodir=$COMMON_DOCS/info \
-		--libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \
-		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--disable-nls \
-		LDFLAGS="-lnetwork" \
-		FORCE_UNSAFE_CONFIGURE=1
-	make
-}
-
-INSTALL {
-	cd tar-1.25
-	make install
-}
-
-TEST {
-	cd tar-1.25
-	make check
-}
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1990-2010 Free Software Foundation, Inc."

app-arch/tar/tar-1.26.bep

@@ -1,26 +0,0 @@
-DESCRIPTION="tar saves and restores files from a tape or disk archive." 
-HOMEPAGE="http://www.gnu.org/software/tar/" 
-SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2"
-CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd tar-1.26
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-    ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--infodir=$COMMON_DOCS/info \
-		--libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \
-		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--disable-nls \
-		LDFLAGS="-lnetwork" \
-		FORCE_UNSAFE_CONFIGURE=1
-	make
-}
-
-INSTALL {
-	cd tar-1.26
-	make install
-}
-LICENSE="GNU GPL v3"
-COPYRIGHT="1990-2011 Free Software Foundation, Inc."

app-arch/tar/tar-1.26.recipe

@@ -0,0 +1,62 @@
+SUMMARY="Saves and restores files to/from a tape or disk archive."
+DESCRIPTION="
+	The Tar program provides the ability to create tar archives, as well as
+	various other kinds of manipulation. For example, you can use Tar on
+	previously created archives to extract files, to store additional files,
+	or to update or list files which were already stored.
+
+	Initially, tar archives were used to store files conveniently on magnetic
+	tape. The name "Tar" comes from this use; it stands for tape archiver.
+	Despite the utility's name, Tar can direct its output to available
+	devices, files, or other programs (using pipes), it can even access remote
+	devices or files (as archives).
+	"
+HOMEPAGE="http://www.gnu.org/software/tar/"
+COPYRIGHT="1990-2011 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2"
+CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519"
+REVISION="6"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="tar-1.26.patch"
+
+PROVIDES="
+	tar = $portVersion compat >= 1
+	cmd:tar = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:automake
+	cmd:autoreconf
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+defineDebugInfoPackage tar \
+	$binDir/tar
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	runConfigure ./configure \
+		--disable-nls \
+		LDFLAGS="-lnetwork" \
+		FORCE_UNSAFE_CONFIGURE=1
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/charset.alias
+}

app-arch/unrar/patches/unrar-4.2.4.patchset

@@ -0,0 +1,285 @@
+From 8f6a22fb6cb4dcaf80049a7c82973251ffd07f80 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Wed, 2 Oct 2013 18:45:05 +0200
+Subject: Convert existing patch to patchset format.
+
+
+diff --git a/arcread.cpp b/arcread.cpp
+index a524a96..19cca29 100644
+--- a/arcread.cpp
++++ b/arcread.cpp
+@@ -666,7 +666,7 @@ void Archive::ConvertUnknownHeader()
+   {
+     if (*s=='/' || *s=='\\')
+       *s=CPATHDIVIDER;
+-#if defined(_APPLE) && !defined(UNICODE_SUPPORTED)
++#if (defined(_APPLE) || defined(_BEOS)) && !defined(UNICODE_SUPPORTED)
+     if ((byte)*s<32 || (byte)*s>127)
+       *s='_';
+ #endif
+diff --git a/consio.cpp b/consio.cpp
+index 42b72a6..90d22c9 100644
+--- a/consio.cpp
++++ b/consio.cpp
+@@ -141,7 +141,7 @@ void GetPasswordText(wchar *Str,uint MaxLength)
+   SetConsoleMode(hConOut,ConOutMode);
+ #else
+   char StrA[MAXPASSWORD];
+-#if defined(_EMX) || defined(_BEOS) || defined(__sparc) || defined(sparc) || defined (__VMS)
++#if defined(_EMX) || defined(__sparc) || defined(sparc) || defined (__VMS)
+   fgets(StrA,ASIZE(StrA)-1,stdin);
+ #else
+   strncpyz(StrA,getpass(""),ASIZE(StrA));
+diff --git a/extract.cpp b/extract.cpp
+index ddd71a0..adccadf 100644
+--- a/extract.cpp
++++ b/extract.cpp
+@@ -311,7 +311,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,size_t HeaderS
+   bool WideName=false;
+ #endif
+ 
+-#ifdef _APPLE
++#if defined(_APPLE) || defined(_BEOS)
+   if (WideName)
+   {
+     // Prepare UTF-8 name for OS X. Since we are sure that destination
+diff --git a/file.cpp b/file.cpp
+index dcf4e61..7a26155 100644
+--- a/file.cpp
++++ b/file.cpp
+@@ -304,6 +304,8 @@ void File::Write(const void *Data,size_t Size)
+         hFile=stderr;
+ #endif
+         break;
++      default:
++        break;
+     }
+ #endif
+   while (1)
+diff --git a/find.cpp b/find.cpp
+index 7ba14c0..0f7c3c0 100644
+--- a/find.cpp
++++ b/find.cpp
+@@ -104,7 +104,7 @@ bool FindFile::Next(struct FindData *fd,bool GetSymLink)
+     }
+   }
+   *fd->NameW=0;
+-#ifdef _APPLE
++#if defined(_APPLE) || defined(_BEOS)
+   if (!LowAscii(fd->Name))
+     UtfToWide(fd->Name,fd->NameW,sizeof(fd->NameW));
+ #elif defined(UNICODE_SUPPORTED)
+@@ -170,7 +170,7 @@ bool FindFile::FastFind(const char *FindMask,const wchar *FindMaskW,FindData *fd
+   strcpy(fd->Name,FindMask);
+ 
+   *fd->NameW=0;
+-#ifdef _APPLE
++#if defined(_APPLE) || defined(_BEOS)
+   if (!LowAscii(fd->Name))
+     UtfToWide(fd->Name,fd->NameW,sizeof(fd->NameW));
+ #elif defined(UNICODE_SUPPORTED)
+diff --git a/makefile.unix b/makefile.unix
+index bd06092..b5e3815 100644
+--- a/makefile.unix
++++ b/makefile.unix
+@@ -7,7 +7,11 @@ CXXFLAGS=-O2
+ LIBFLAGS=-fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ STRIP=strip
+-DESTDIR=/usr
++LDFLAGS=-lbsd
++RC=rc
++XRES=xres
++MIMESET=mimeset
++DESTDIR=$(shell finddir B_COMMON_DIRECTORY)
+ 
+ # Linux using LCC
+ #CXX=lcc
+@@ -114,12 +118,14 @@ install:	install-unrar
+ uninstall:	uninstall-unrar
+ 
+ clean:
+-	@rm -f *.o *.bak *~
++	@rm -f *.o *.bak *~ *.rsrc
+ 
+ unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f unrar
+ 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
+-	$(STRIP) unrar
++	$(RC) -o unrar.rsrc unrar.rdef
++	$(XRES) -o unrar unrar.rsrc
++	$(MIMESET) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+ sfx:	clean $(OBJECTS)
+@@ -144,3 +150,29 @@ install-lib:
+ 
+ uninstall-lib:
+ 		rm -f $(DESTDIR)/lib/libunrar.so
++
++MACHINE=$(shell uname -m)
++ifeq ($(MACHINE), BePC)
++	MACHINE = x86-gcc$(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion))))
++endif
++
++VERSION=4.2.4
++DATE := `date +%F`
++PACKAGE_NAME := unrar-$(VERSION)-$(MACHINE)-$(DATE)
++COMMENT = .OptionalPackageDescription
++DESCRIPTION = dist/$(COMMENT)
++
++haiku_package: unrar
++	-rm -rf dist/common
++	-mkdir -p dist/common/bin
++	-cp unrar dist/common/bin
++	-mkdir -p dist/common/data/licenses
++	-cp license.txt dist/common/data/licenses/UnRAR
++	echo "Package: UnRAR" > $(DESCRIPTION)
++	echo "Version: $(VERSION)-$(MACHINE)-$(DATE)" >> $(DESCRIPTION)
++	echo "Copyright: Alexander Roshal." >> $(DESCRIPTION)
++	echo "Description: Utility to list, test and expand RAR archives." >> $(DESCRIPTION)
++	echo "License: UnRAR" >> $(DESCRIPTION)
++	echo "URL: http://www.rarlab.com/" >> $(DESCRIPTION)
++	cd dist && zip -9 -r -z -y $(PACKAGE_NAME).zip common $(COMMENT) < $(COMMENT)
++
+diff --git a/os.hpp b/os.hpp
+index 21488a8..ae2d0be 100644
+--- a/os.hpp
++++ b/os.hpp
+@@ -134,8 +134,9 @@
+ #define  NM  1024
+ 
+ #ifdef _BEOS
+-#include <be/kernel/fs_info.h>
+-#include <be/kernel/fs_attr.h>
++#include <endian.h>
++#include <fs_info.h>
++#include <fs_attr.h>
+ #endif
+ 
+ #include <unistd.h>
+@@ -206,6 +207,16 @@
+   #endif
+ #endif
+ 
++#ifdef _BEOS
++#if LITTLE_ENDIAN
++  #undef BIG_ENDIAN
++#elif BIG_ENDIAN
++  #undef LITTLE_ENDIAN
++#else
++  #error "Byte order must be defined!"
++#endif
++#endif
++
+ #if defined(__sparc) || defined(sparc) || defined(__hpux)
+   #ifndef BIG_ENDIAN
+      #define BIG_ENDIAN
+diff --git a/raros.hpp b/raros.hpp
+index ce853bd..b63d0f0 100644
+--- a/raros.hpp
++++ b/raros.hpp
+@@ -29,7 +29,7 @@
+   #endif
+ #endif
+ 
+-#ifdef __BEOS__
++#if defined(__BEOS__) || defined(__HAIKU__)
+   #define _UNIX
+   #define _BEOS
+ #endif
+diff --git a/rartypes.hpp b/rartypes.hpp
+index a2d8b44..d8249b1 100644
+--- a/rartypes.hpp
++++ b/rartypes.hpp
+@@ -7,6 +7,7 @@ typedef unsigned int     uint;   // 32 bits or more
+ 
+ #define PRESENT_INT32 // undefine if signed 32 bits is not available
+ 
++#ifndef _BEOS 
+ typedef unsigned int     uint32; // 32 bits exactly
+ typedef   signed int     int32;  // signed 32 bits exactly
+ 
+@@ -20,6 +21,7 @@ typedef     signed __int64  int64; // signed 64 bits
+ typedef unsigned long long uint64; // unsigned 64 bits
+ typedef   signed long long  int64; // signed 64 bits
+ #endif
++#endif // #ifndef _BEOS
+ 
+ 
+ #if defined(_WIN_ALL) || defined(__GNUC__) || defined(__sgi) || defined(_AIX) || defined(__sun) || defined(__hpux) || defined(_OSF_SOURCE)
+diff --git a/rarvm.cpp b/rarvm.cpp
+index 8b85800..1f06581 100644
+--- a/rarvm.cpp
++++ b/rarvm.cpp
+@@ -792,6 +792,8 @@ void RarVM::Optimize(VM_PreparedProgram *Prg)
+       case VM_CMP:
+         Cmd->OpCode=Cmd->ByteMode ? VM_CMPB:VM_CMPD;
+         continue;
++      default:
++		break;
+     }
+     if ((VM_CmdFlags[Cmd->OpCode] & VMCF_CHFLAGS)==0)
+       continue;
+@@ -835,6 +837,8 @@ void RarVM::Optimize(VM_PreparedProgram *Prg)
+       case VM_NEG:
+         Cmd->OpCode=Cmd->ByteMode ? VM_NEGB:VM_NEGD;
+         continue;
++      default:
++		break;
+     }
+   }
+ }
+@@ -1102,6 +1106,8 @@ void RarVM::ExecuteStandardFilter(VM_StandardFilters FilterType)
+         SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize);
+       }
+       break;
++    default:
++      break;
+   }
+ }
+ 
+diff --git a/unicode.cpp b/unicode.cpp
+index a3022d2..3e29127 100644
+--- a/unicode.cpp
++++ b/unicode.cpp
+@@ -13,7 +13,7 @@ bool WideToChar(const wchar *Src,char *Dest,size_t DestSize)
+   if (WideCharToMultiByte(CP_ACP,0,Src,-1,Dest,(int)DestSize,NULL,NULL)==0)
+     RetCode=false;
+ 
+-#elif defined(_APPLE)
++#elif defined(_APPLE) || defined(_BEOS)
+   WideToUtf(Src,Dest,DestSize);
+ 
+ #elif defined(MBFUNCTIONS)
+@@ -73,7 +73,7 @@ bool CharToWide(const char *Src,wchar *Dest,size_t DestSize)
+   if (MultiByteToWideChar(CP_ACP,0,Src,-1,Dest,(int)DestSize)==0)
+     RetCode=false;
+ 
+-#elif defined(_APPLE)
++#elif defined(_APPLE) || defined(_BEOS)
+   UtfToWide(Src,Dest,DestSize);
+ 
+ #elif defined(MBFUNCTIONS)
+diff --git a/unrar.rdef b/unrar.rdef
+new file mode 100644
+index 0000000..ab085d2
+--- /dev/null
++++ b/unrar.rdef
+@@ -0,0 +1,13 @@
++
++resource app_signature "application/x-vnd.Roshal-UnRAR";
++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
++
++resource app_version {
++	major = 4,
++	middle = 2,
++	minor = 4,
++	variety = 0,
++	internal = 0,
++	short_info = "4.2.4", 
++	long_info = "4.2.4 Alexander Roshal"
++};
+-- 
+1.8.3.4
+

app-arch/unrar/unrar-4.2.4.bep

@@ -1,19 +0,0 @@
-DESCRIPTION="unrar"
-HOMEPAGE="http://www.rarlab.com/"
-SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4"
-BUILD {
-	cd unrar
-	make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY`
-}
-
-INSTALL {
-	cd unrar
-	make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` install
-}
-
-LICENSE="UnRAR"
-COPYRIGHT="Alexander Roshal"

app-arch/unrar/unrar-4.2.4.recipe

@@ -0,0 +1,34 @@
+SUMMARY="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/"
+SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86"
+CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4"
+
+PROVIDES="
+	unrar = $portVersion
+	cmd:unrar = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:make
+	cmd:g++
+	"
+
+SOURCE_DIR="unrar"
+BUILD()
+{
+	LDFLAGS=-lbsd make -f makefile.unix DESTDIR=$prefix
+}
+
+INSTALL()
+{
+	make -f makefile.unix DESTDIR=$prefix install
+}
+
+LICENSE="UnRAR"
+COPYRIGHT="Alexander Roshal"
+DESCRIPTION="Uncompress rar files"

app-arch/unzip/unzip-6.0.recipe

@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="62b490407489521db863b523a7f86375"
-BUILD {
+BUILD()
+{
 	cd unzip60
 	make -f beos/Makefile \
 		PREFIX=`finddir B_COMMON_DIRECTORY` \
@@ -13,12 +14,14 @@ BUILD {
 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd unzip60
 	make -f beos/Makefile install
 }
 
-TEST {
+TEST()
+{
 	cd unzip60
 #	make test
 #	make check

app-arch/xar/xar-1.5.2.recipe

@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
 MESSAGE="This port builds only with gcc4. Use 'setgcc gcc4' before building."
 DEPEND=""
 
-BUILD {
+BUILD()
+{
 	cd xar-1.5.2
 	libtoolize --force --copy --install
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd xar-1.5.2
 	make install
 }

app-arch/xz-utils/xz-utils-4.999.9.bep

@@ -1,34 +0,0 @@
-DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." 
-HOMEPAGE="http://tukaani.org/xz/" 
-SRC_URI="http://tukaani.org/xz/xz-4.999.9beta.tar.bz2"
-CHECKSUM_MD5="cc4044fcc073b8bcf3164d1d0df82161"
-REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND=""
-BUILD {
-	cd xz-4.999.9beta
-	cp -f `finddir B_COMMON_BIN_DIRECTORY`/libtool .
-	libtoolize -c -f
-	aclocal -I m4
-	autoconf
-	autoheader
-	automake -acf --foreign
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL {
-	cd xz-4.999.9beta
-	make install
-}
-
-TEST {
-	cd xz-4.999.9beta
-	make check
-}
-
-LICENSE="GNU LGPL v2.1
-	GNU GPL v2
-	GNU GPL v3"
-COPYRIGHT="2005-2009 Lasse Collin"

app-arch/xz-utils/xz-utils-5.0.1.bep

@@ -1,34 +0,0 @@
-DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files."
-HOMEPAGE="http://tukaani.org/xz/"
-SRC_URI="http://tukaani.org/xz/xz-5.0.1.tar.bz2"
-CHECKSUM_MD5="cb6c7a58cec4d663a395c54d186ca0c6"
-REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="This port only builds with gcc4."
-DEPEND=""
-BUILD {
-	cd xz-5.0.1
-	touch po/t-cs.gmo
-	libtoolize --force --copy --install
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--docdir=$COMMON_DOCS/doc/xz \
-		--mandir=$COMMON_DOCS/man \
-		--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale
-	make
-}
-
-INSTALL {
-	cd xz-5.0.1
-	make install
-}
-
-TEST {
-	cd xz-5.0.1
-	make check
-}
-
-LICENSE="GNU LGPL v2.1
-	GNU GPL v2
-	GNU GPL v3"
-COPYRIGHT="2005-2011 Lasse Collin"

app-arch/xz-utils/xz-utils-5.0.4.bep

@@ -1,34 +0,0 @@
-DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files."
-HOMEPAGE="http://tukaani.org/xz/"
-SRC_URI="http://tukaani.org/xz/xz-5.0.4.tar.bz2"
-CHECKSUM_MD5="741cd3a5f64b23b7bac56ec5b2258715"
-REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="This port only builds with gcc4."
-DEPEND=""
-BUILD {
-	cd xz-5.0.4
-	touch po/t-cs.gmo
-	libtoolize --force --copy --install
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--docdir=$COMMON_DOCS/doc/xz \
-		--mandir=$COMMON_DOCS/man \
-		--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale
-	make
-}
-
-INSTALL {
-	cd xz-5.0.4
-	make install
-}
-
-TEST {
-	cd xz-5.0.4
-	make check
-}
-
-LICENSE="GNU LGPL v2.1
-	GNU GPL v2
-	GNU GPL v3"
-COPYRIGHT="2005-2012 Lasse Collin"

app-arch/xz_utils/additional-files/xz_utils-expander-rules

@@ -0,0 +1,3 @@
+"application/x-xz"	.tar.xz	"tar -Jtvf %s"	"tar -Jxvf %s"
+"application/x-xz"	.txz	"tar -Jtvf %s"	"tar -Jxvf %s"
+"application/x-xz"	.xz	"echo %s | sed 's/.xz$//g'"	"xz -df %s"

app-arch/xz_utils/xz_utils-5.0.1.recipe

@@ -0,0 +1,91 @@
+SUMMARY="Free general-purpose data compression software"
+HOMEPAGE="http://tukaani.org/xz/"
+SRC_URI="http://tukaani.org/xz/xz-5.0.1.tar.bz2"
+CHECKSUM_MD5="cb6c7a58cec4d663a395c54d186ca0c6"
+LICENSE="
+	GNU LGPL v2.1
+	GNU GPL v2
+	GNU GPL v3
+	"
+COPYRIGHT="2005-2011 Lasse Collin"
+REVISION="3"
+ARCHITECTURES="!x86_gcc2 ?x86"
+
+PROVIDES="
+	xz_utils = $portVersion compat >= 5
+	cmd:lzcat = 5.0.1 compat >= 5
+	cmd:lzcmp = 5.0.1 compat >= 5
+	cmd:lzdiff = 5.0.1 compat >= 5
+	cmd:lzegrep = 5.0.1 compat >= 5
+	cmd:lzfgrep = 5.0.1 compat >= 5
+	cmd:lzgrep = 5.0.1 compat >= 5
+	cmd:lzless = 5.0.1 compat >= 5
+	cmd:lzma = 5.0.1 compat >= 5
+	cmd:lzmadec = 5.0.1 compat >= 5
+	cmd:lzmainfo = 5.0.1 compat >= 5
+	cmd:lzmore = 5.0.1 compat >= 5
+	cmd:unlzma = 5.0.1 compat >= 5
+	cmd:unxz = 5.0.1 compat >= 5
+	cmd:xz = 5.0.1 compat >= 5
+	cmd:xzcat = 5.0.1 compat >= 5
+	cmd:xzcmp = 5.0.1 compat >= 5
+	cmd:xzdec = 5.0.1 compat >= 5
+	cmd:xzdiff = 5.0.1 compat >= 5
+	cmd:xzegrep = 5.0.1 compat >= 5
+	cmd:xzfgrep = 5.0.1 compat >= 5
+	cmd:xzgrep = 5.0.1 compat >= 5
+	cmd:xzless = 5.0.1 compat >= 5
+	cmd:xzmore = 5.0.1 compat >= 5
+	lib:liblzma = 5.0.1 compat >= 5
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="xz-5.0.1"
+
+BUILD()
+{
+	touch po/t-cs.gmo
+	libtoolize --force --copy --install
+	./configure $configureDirArgs
+#		--localedir=$dataRootDir/locale
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	expanderRulesDir=$dataDir/expander/rules
+	mkdir -p $expanderRulesDir
+	cp "$portDir/sources/xz_utils-expander-rules" "$expanderRulesDir/xz_utils"
+}
+
+TEST()
+{
+	make check
+}
+
+DESCRIPTION="XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
+
+The core of the XZ Utils compression code is based on LZMA SDK, but it has been modified quite a lot to be suitable for XZ Utils. The primary compression algorithm is currently LZMA2, which is used inside the .xz container format. With typical files, XZ Utils create 30 % smaller output than gzip and 15 % smaller output than bzip2.
+
+XZ Utils consist of several components:
+
+    * liblzma is a compression library with API similar to that of zlib.
+    * xz is a command line tool with syntax similar to that of gzip.
+    * xzdec is a decompression-only tool smaller than the full-featured xz tool.
+    * A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to ease viewing, grepping, and comparing compressed files.
+    * Emulation of command line tools of LZMA Utils eases transition from LZMA Utils to XZ Utils.
+
+While liblzma has a zlib-like API, liblzma doesn't include any file I/O functions. A separate I/O library is planned, which would abstract handling of .gz, .bz2, and .xz files with an easy to use API."

app-arch/xz_utils/xz_utils-5.0.4.recipe

@@ -0,0 +1,111 @@
+SUMMARY="Free general-purpose data compression software"
+HOMEPAGE="http://tukaani.org/xz/"
+SRC_URI="http://tukaani.org/xz/xz-5.0.4.tar.bz2"
+CHECKSUM_MD5="741cd3a5f64b23b7bac56ec5b2258715"
+LICENSE="
+	GNU LGPL v2.1
+	GNU GPL v2
+	GNU GPL v3
+	"
+COPYRIGHT="2005-2012 Lasse Collin"
+REVISION="2"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+ADDITIONAL_FILES="xz_utils-expander-rules"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	xz_utils$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:lzcat$commandSuffix = $portVersion compat >= 5
+	cmd:lzcmp$commandSuffix = $portVersion compat >= 5
+	cmd:lzdiff$commandSuffix = $portVersion compat >= 5
+	cmd:lzegrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzfgrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzgrep$commandSuffix = $portVersion compat >= 5
+	cmd:lzless$commandSuffix = $portVersion compat >= 5
+	cmd:lzma$commandSuffix = $portVersion compat >= 5
+	cmd:lzmadec$commandSuffix = $portVersion compat >= 5
+	cmd:lzmainfo$commandSuffix = $portVersion compat >= 5
+	cmd:lzmore$commandSuffix = $portVersion compat >= 5
+	cmd:unlzma$commandSuffix = $portVersion compat >= 5
+	cmd:unxz$commandSuffix = $portVersion compat >= 5
+	cmd:xz$commandSuffix = $portVersion compat >= 5
+	cmd:xzcat$commandSuffix = $portVersion compat >= 5
+	cmd:xzcmp$commandSuffix = $portVersion compat >= 5
+	cmd:xzdec$commandSuffix = $portVersion compat >= 5
+	cmd:xzdiff$commandSuffix = $portVersion compat >= 5
+	cmd:xzegrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzfgrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzgrep$commandSuffix = $portVersion compat >= 5
+	cmd:xzless$commandSuffix = $portVersion compat >= 5
+	cmd:xzmore$commandSuffix = $portVersion compat >= 5
+	lib:liblzma$secondaryArchSuffix = $portVersion compat >= 5
+	devel:liblzma$secondaryArchSuffix = $portVersion compat >= 5
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="xz-$portVersion"
+
+BUILD()
+{
+	touch po/t-cs.gmo
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	expanderRulesDir=$dataDir/expander/rules
+	mkdir -p $expanderRulesDir
+	cp "$portDir/additional-files/xz_utils-expander-rules" \
+		"$expanderRulesDir/xz_utils"
+
+	prepareInstalledDevelLibs liblzma
+}
+
+TEST()
+{
+	make check
+}
+
+DESCRIPTION="XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils were written for POSIX-like systems, but also work on some not-so-POSIX systems. XZ Utils are the successor to LZMA Utils.
+
+The core of the XZ Utils compression code is based on LZMA SDK, but it has been modified quite a lot to be suitable for XZ Utils. The primary compression algorithm is currently LZMA2, which is used inside the .xz container format. With typical files, XZ Utils create 30 % smaller output than gzip and 15 % smaller output than bzip2.
+
+XZ Utils consist of several components:
+
+    * liblzma is a compression library with API similar to that of zlib.
+    * xz is a command line tool with syntax similar to that of gzip.
+    * xzdec is a decompression-only tool smaller than the full-featured xz tool.
+    * A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to ease viewing, grepping, and comparing compressed files.
+    * Emulation of command line tools of LZMA Utils eases transition from LZMA Utils to XZ Utils.
+
+While liblzma has a zlib-like API, liblzma doesn't include any file I/O functions. A separate I/O library is planned, which would abstract handling of .gz, .bz2, and .xz files with an easy to use API."

app-arch/zip/zip-3.0.recipe

@@ -5,19 +5,22 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="7b74551e63f8ee6aab6fbc86676c0d37"
-BUILD {
+BUILD()
+{
 	cd zip30
 	make -f beos/Makefile \
 		PREFIX=`finddir B_COMMON_DIRECTORY` \
 		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 }
 
-INSTALL {
+INSTALL()
+{
 	cd zip30
 	make -f beos/Makefile install
 }
 
-TEST {
+TEST()
+{
 	cd zip30
 #	make test
 #	make check

app-arch/zoo/zoo-2.10.recipe

@@ -5,11 +5,13 @@ CHECKSUM_MD5="70a0a785ecc8f7f747be1421e495d837"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	make haiku
 }
 
-INSTALL {
+INSTALL()
+{
 	make inst_prod
 }
 LICENSE="zoo"

app-benchmarks/bonnie++/bonnie++-1.03e.recipe

@@ -1,11 +1,12 @@
 DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism in python"
 HOMEPAGE="http://www.coker.com.au/bonnie++/"
 SRC_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz"
-REVISION= "1"
+REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968"
-BUILD {
+BUILD()
+{
         cd bonnie++-1.03e
         COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
         COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
@@ -15,7 +16,8 @@ BUILD {
 		--sbindir=$COMMON_BIN
         make
 }
-INSTALL {
+INSTALL()
+{
         cd bonnie++-1.03e
         make install DESTDIR=${DESTDIR}
 

app-benchmarks/ffsb/ffsb-6.0_rc2.recipe

@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="cabfc1021c2ec6c6b168fefc84210891"
-BUILD {
+BUILD()
+{
 	cd ffsb-6.0-rc2
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd ffsb-6.0-rc2
 	make install
 }

app-benchmarks/iozone/iozone-3.326.recipe

@@ -5,11 +5,13 @@ CHECKSUM_MD5="e80f06da89d314f7fc08fcef4046d367"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd iozone3_326/src/current/
 	make haiku
 }
-INSTALL {
+INSTALL()
+{
 	cd iozone3_326/src/current/
     mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`
     cp iozone ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/iozone

app-benchmarks/libmicro/libmicro-0.4.1.recipe

@@ -5,18 +5,21 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 CHECKSUM_MD5="2b6e1ff22164e4ae0c21c11e6c28f7ed"
-BUILD {
+BUILD()
+{
 	cd libMicro-0.4.1
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd libMicro-0.4.1
 	cd bin-BePC
 	ls
 }
 
-TEST {
+TEST()
+{
 	cd libMicro-0.4.1
 #	make test
 #	make check

app-benchmarks/piozone/piozone-1.0.recipe

@@ -5,12 +5,14 @@ CHECKSUM_MD5="e48370a9aa80aed212b18e16c08b9056"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd piozone-1.0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd piozone-1.0	
 	mkdir -p $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`
 	cp -a piozone $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`/piozone

app-cdr/bchunk/bchunk-1.2.0.recipe

@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="6a613da3f34f9a303f202d2e9731d231"
-BUILD {
+BUILD()
+{
 	cd bchunk-1.2.0
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd bchunk-1.2.0
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
 	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`

app-cdr/cdrdao/cdrdao-1.2.3.recipe

@@ -5,7 +5,8 @@ CHECKSUM_MD5="8d15ba6280bb7ba2f4d6be31d28b3c0c"
 REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd cdrdao-1.2.3
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd cdrdao-1.2.3
 	make install
 }

app-cdr/cdrtools/cdrtools-2.01.01a66.bep

@@ -1,17 +0,0 @@
-DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" 
-HOMEPAGE="http://cdrecord.berlios.de" 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a66.tar.gz"
-CHECKSUM_MD5="b9d40bddf1ce75989d0a36b939f0c3fb"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd cdrtools-2.01.01
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL {
-	cd cdrtools-2.01.01
-	make install
-}

app-cdr/cdrtools/cdrtools-2.01.01a77.bep

@@ -1,16 +0,0 @@
-DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" 
-HOMEPAGE="http://cdrecord.berlios.de" 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a77.tar.gz"
-CHECKSUM_MD5="d0b4c56f1215be636996b8e1e3d2b284"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd cdrtools-2.01.01
-	make
-}
-
-INSTALL {
-	cd cdrtools-2.01.01
-	make install
-}

app-cdr/cdrtools/cdrtools-3.00.bep

@@ -1,16 +0,0 @@
-DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" 
-HOMEPAGE="http://cdrecord.berlios.de" 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-3.00.tar.bz2"
-CHECKSUM_MD5="f9fbab08fbd458b0d2312976d8c5f558"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd cdrtools-3.00
-	make GMAKE_NOWARN=true
-}
-
-INSTALL {
-	cd cdrtools-3.00
-	make install
-}

app-cdr/cdrtools/cdrtools-3.01a01.bep

@@ -1,27 +0,0 @@
-DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" 
-HOMEPAGE="http://cdrecord.berlios.de" 
-SRC_URI="http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a01.tar.bz2"
-CHECKSUM_MD5="6c81803b1e2bedefc1ad75fabd1c8474"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd cdrtools-3.01
-	sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc
-	sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype
-	sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r*
-	sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype
-	sed -i 's/sbin/bin/' rscsi/Makefile
-	make GMAKE_NOWARN=true
-}
-
-INSTALL {
-	cd cdrtools-3.01
-	make GMAKE_NOWARN=true DEFMANBASE=documentation install
-}

app-cdr/cdrtools/cdrtools-3.01a06.bep

@@ -1,27 +0,0 @@
-DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" 
-HOMEPAGE="http://cdrecord.berlios.de" 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a06.tar.bz2"
-CHECKSUM_MD5="00b6c2128023186e712cf27e629ed246"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd cdrtools-3.01
-	sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc
-	sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype
-	sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r*
-	sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype
-	sed -i 's/sbin/bin/' rscsi/Makefile
-	make GMAKE_NOWARN=true
-}
-
-INSTALL {
-	cd cdrtools-3.01
-	make GMAKE_NOWARN=true DEFMANBASE=documentation install
-}

app-cdr/cdrtools/cdrtools-3.01a07.bep

@@ -1,27 +0,0 @@
-DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" 
-HOMEPAGE="http://cdrecord.berlios.de" 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2"
-CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd cdrtools-3.01
-	sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc
-	sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype
-	sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M*
-	sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r*
-	sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype
-	sed -i 's/sbin/bin/' rscsi/Makefile
-	make GMAKE_NOWARN=true
-}
-
-INSTALL {
-	cd cdrtools-3.01
-	make GMAKE_NOWARN=true DEFMANBASE=documentation install
-}

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

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

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

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

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

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

app-cdr/cdrtools/cdrtools.OptionalPackageDescription

@@ -1,12 +0,0 @@
-Package:		cdrecord
-Version:		3.00
-Copyright:		1995-2010 J. Schilling
-License:		CDDL v1
-URL:			http://cdrecord.berlios.de
-
-Package:		mkisofs
-Version:		3.00
-Copyright:		1993-1997 Eric Youngdale, 1997-2010 J. Schilling
-License:		GNU GPL v2
-License:		CDDL v1
-URL:			http://cdrecord.berlios.de

app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch

@@ -1,33 +0,0 @@
-diff -urN cdrtools-2.01.01/DEFAULTS/Defaults.haiku cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku
---- cdrtools-2.01.01/DEFAULTS/Defaults.haiku	2009-07-25 15:36:53.000000000 +0000
-+++ cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku	2009-10-12 04:53:52.000000000 +0000
-@@ -1,7 +1,7 @@
--#ident "@(#)Defaults.haiku	1.3 09/07/25 "
-+#ident "@(#)Defaults.beos	1.5 09/06/04 "
- ###########################################################################
- #
--# global definitions for Haiku Systems
-+# global definitions for BeOS Systems
- #
- ###########################################################################
- #
-@@ -29,16 +29,16 @@
- CWARNOPTS=
- 
- DEFINCDIRS=	$(SRCROOT)/include
--LDPATH=		-L/opt/schily/lib
-+LDPATH=		-L$(shell finddir B_APPS_DIRECTORY)/cdrtools/lib
- #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_APPS_DIRECTORY)/cdrtools
- INS_KBASE=	/
- INS_RBASE=	/
- #

app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch

@@ -1,33 +0,0 @@
-diff -urN cdrtools-2.01.01/DEFAULTS/Defaults.haiku cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku
---- cdrtools-2.01.01/DEFAULTS/Defaults.haiku	2009-07-25 15:36:53.000000000 +0000
-+++ cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku	2009-10-12 04:53:52.000000000 +0000
-@@ -1,7 +1,7 @@
--#ident "@(#)Defaults.haiku	1.3 09/07/25 "
-+#ident "@(#)Defaults.beos	1.5 09/06/04 "
- ###########################################################################
- #
--# global definitions for Haiku Systems
-+# global definitions for BeOS Systems
- #
- ###########################################################################
- #
-@@ -29,16 +29,16 @@
- CWARNOPTS=
- 
- DEFINCDIRS=	$(SRCROOT)/include
--LDPATH=		-L/opt/schily/lib
-+LDPATH=		-L$(shell finddir B_APPS_DIRECTORY)/cdrtools/lib
- #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_APPS_DIRECTORY)/cdrtools
- INS_KBASE=	/
- INS_RBASE=	/
- #

app-cdr/cdrtools/patches/cdrtools-3.00.patch

@@ -1,33 +0,0 @@
-diff -urN cdrtools-3.00/DEFAULTS/Defaults.haiku cdrtools-3.00-haiku/DEFAULTS/Defaults.haiku
---- cdrtools-3.00/DEFAULTS/Defaults.haiku	2009-07-25 15:36:53.000000000 +0000
-+++ cdrtools-3.00-haiku/DEFAULTS/Defaults.haiku	2009-10-12 04:53:52.000000000 +0000
-@@ -1,7 +1,7 @@
--#ident "@(#)Defaults.haiku	1.3 09/07/25 "
-+#ident "@(#)Defaults.beos	1.5 09/06/04 "
- ###########################################################################
- #
--# global definitions for Haiku Systems
-+# global definitions for BeOS Systems
- #
- ###########################################################################
- #
-@@ -29,16 +29,16 @@
- CWARNOPTS=
- 
- DEFINCDIRS=	$(SRCROOT)/include
--LDPATH=		-L/opt/schily/lib
-+LDPATH=		-L$(shell finddir B_COMMON_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_COMMON_DIRECTORY)
- INS_KBASE=	/
- INS_RBASE=	/
- #

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

@@ -0,0 +1,139 @@
+diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
+--- cdrtools-3.01/DEFAULTS/Defaults.haiku	
++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku	
+@@ -29,16 +29,16 @@
+ CWARNOPTS=
+ 
+ DEFINCDIRS=	$(SRCROOT)/include
+-LDPATH=		-L/opt/schily/lib
++LDPATH=		-L$(shell finddir B_COMMON_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_COMMON_DIRECTORY)
+ INS_KBASE=	/
+ INS_RBASE=	/
+ #
+diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul
+--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul	1970-01-01 00:00:00.000000000 +0000
++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul	2012-12-08 19:24:57.418643968 +0000
+@@ -0,0 +1,54 @@
++#ident "@(#)bepc-haiku-cc.rul	1.3 09/02/05 "
++###########################################################################
++# Written 1996 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for Haiku, a BeOS like OS
++#
++###########################################################################
++# Copyright (c) J. Schilling
++###########################################################################
++# The contents of this file are subject to the terms of the
++# Common Development and Distribution License, Version 1.0 only
++# (the "License").  You may not use this file except in compliance
++# with the License.
++#
++# See the file CDDL.Schily.txt in this distribution for details.
++#
++# When distributing Covered Code, include this CDDL HEADER in each
++# file and include the License file CDDL.Schily.txt from this distribution.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul
++
++#
++# XXX Old BeOS needs libroot.so to get [efg]cvt()
++# XXX New BeOS seems to have this in libc and in addition we include
++# XXX strtod.c for floating point conversion on OS without such code.
++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been
++# XXX removed and printing floating numbers will work with old/new BeOS
++#
++#OSDEFS +=	-DNO_FLOATINGPOINT -DUSE_FLOATINGARGS
++OSDEFS +=
++
++KDEFINES=	-DKERNEL -D_KERNEL
++
++#CONFFLAGS=	i586
++
++LIB_PREFIX=	lib
++LIB_SUFFIX=	.a
++SHL_SUFFIX=	.so
++
++#LIB_SOCKET=	-lsocket -lbind
++LIB_SOCKET=	-lnetwork
++LIB_MATH=
++LIB_KVM=	
++
++#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
++LDOPTS=		$(LIBS_PATH) $(LDPATH)
++
++LORDER=		echo
++TSORT=		cat
++
++LN=             /bin/ln -s
+diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul
+--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul	1970-01-01 00:00:00.000000000 +0000
++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul	2012-12-08 19:24:57.421265408 +0000
+@@ -0,0 +1,54 @@
++#ident "@(#)bepc-haiku-gcc.rul	1.3 09/02/05 "
++###########################################################################
++# Written 1996 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for Haiku, a BeOS like OS
++#
++###########################################################################
++# Copyright (c) J. Schilling
++###########################################################################
++# The contents of this file are subject to the terms of the
++# Common Development and Distribution License, Version 1.0 only
++# (the "License").  You may not use this file except in compliance
++# with the License.
++#
++# See the file CDDL.Schily.txt in this distribution for details.
++#
++# When distributing Covered Code, include this CDDL HEADER in each
++# file and include the License file CDDL.Schily.txt from this distribution.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul
++
++#
++# XXX Old BeOS needs libroot.so to get [efg]cvt()
++# XXX New BeOS seems to have this in libc and in addition we include
++# XXX strtod.c for floating point conversion on OS without such code.
++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been
++# XXX removed and printing floating numbers will work with old/new BeOS
++#
++#OSDEFS +=	-DNO_FLOATINGPOINT -DUSE_FLOATINGARGS
++OSDEFS +=
++
++KDEFINES=	-DKERNEL -D_KERNEL
++
++#CONFFLAGS=	i586
++
++LIB_PREFIX=	lib
++LIB_SUFFIX=	.a
++SHL_SUFFIX=	.so
++
++#LIB_SOCKET=	-lsocket -lbind
++LIB_SOCKET=	-lnetwork
++LIB_MATH=
++LIB_KVM=	
++
++#LDOPTS=		$(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)
++LDOPTS=		$(LIBS_PATH) $(LDPATH)
++
++LORDER=		echo
++TSORT=		cat
++
++LN=             /bin/ln -s

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

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

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

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

app-cdr/daa2iso/daa2iso-0.1.7e.recipe

@@ -6,12 +6,14 @@ DEPEND=""
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="6930ebcd8568e8ade0a175352d4a3481"
 
-BUILD {
+BUILD()
+{
 	cd src
 	make CFLAGS="-DNOLFS -O2 -s"
 }
 
-INSTALL {
+INSTALL()
+{
 	cd src
 	make install PREFIX=${DESTDIR}/$(finddir B_COMMON_DIRECTORY)
 }

app-cdr/uif2iso/uif2iso-0.1.7c.recipe

@@ -6,12 +6,14 @@ DEPEND=""
 STATUS_HAIKU="stable"
 CHECKSUM_MD5="2eb9797ec463c38253014d45591a7043"
 
-BUILD {
+BUILD()
+{
 	cd src
 	make CFLAGS="-DNOLFS -O2 -s"
 }
 
-INSTALL {
+INSTALL()
+{
 	cd src
 	make install prefix=$(finddir B_COMMON_DIRECTORY) DESTDIR="${DESTDIR}"
 }

app-crypt/gnupg/gnupg-1.4.10.recipe

@@ -5,7 +5,8 @@ CHECKSUM_MD5="dcf7ed712997888d616e029637bfc303"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd gnupg-1.4.10
 	libtoolize --force --copy --install
 	autoconf
@@ -13,7 +14,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd gnupg-1.4.10
 	make install
 }

app-crypt/gnupg/gnupg-1.4.11.bep

@@ -1,21 +0,0 @@
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement." 
-HOMEPAGE="http://www.gnupg.org/" 
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2"
-CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd gnupg-1.4.11
-	libtoolize --force --copy --install
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL {
-	cd gnupg-1.4.11
-	make install
-}
-LICENSE="GNU GPL v3"
-COPYRIGHT="1998-2010 Free Software Foundation, Inc."

app-crypt/gnupg/gnupg-1.4.11.recipe

@@ -0,0 +1,50 @@
+SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard." 
+DESCRIPTION="GnuPG is the GNU project's complete and free implementation of the OpenPGP standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data and communication, features a versatile key management system as well as access modules for all kinds of public key directories. GnuPG, also known as GPG, is a command line tool with features for easy integration with other applications." 
+HOMEPAGE="http://www.gnupg.org/" 
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2"
+CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1"
+REVISION="1"
+LICENSE="GNU GPL v3"
+COPYRIGHT="1998-2010 Free Software Foundation, Inc."
+
+ARCHITECTURES="x86  x86_gcc2"
+
+PROVIDES="gnupg = $portVersion
+	cmd:gpg = $portVersion compat >= 1.4
+	cmd:gpg_zip = $portVersion compat >= 1.4
+	cmd:gpgsplit = $portVersion compat >= 1.4
+	cmd:gpgv = $portVersion compat >= 1.4
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	"
+PATCHES="gnupg-1.4.11.patch"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	autoconf
+	runConfigure ./configure 
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}

app-doc/doxygen/doxygen-1.6.1.bep

@@ -1,19 +0,0 @@
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." 
-HOMEPAGE="http://www.doxygen.org" 
-SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.1.src.tar.gz"
-CHECKSUM_MD5="2ec343643e134f0d3ce2069420bcb4f0"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd doxygen-1.6.1
-	./configure --prefix /boot/common
-	make
-}
-
-INSTALL {
-	cd doxygen-1.6.1
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1997-2010 Dimitri van Heesch"

app-doc/doxygen/doxygen-1.6.2.bep

@@ -1,19 +0,0 @@
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." 
-HOMEPAGE="http://www.doxygen.org" 
-SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.2.src.tar.gz"
-CHECKSUM_MD5="70260101ef60952cb99484700241c99e"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd doxygen-1.6.2
-	./configure --prefix /boot/common
-	make
-}
-
-INSTALL {
-	cd doxygen-1.6.2
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1997-2010 Dimitri van Heesch"

app-doc/doxygen/doxygen-1.6.3.bep

@@ -1,20 +0,0 @@
-DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D." 
-HOMEPAGE="http://www.doxygen.org" 
-SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz"
-CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd doxygen-1.6.3
-	sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in
-	./configure --prefix `finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL {
-	cd doxygen-1.6.3
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1997-2010 Dimitri van Heesch"

app-doc/doxygen/doxygen-1.6.3.recipe

@@ -0,0 +1,58 @@
+SUMMARY="Generate documentation from source code"
+DESCRIPTION="Doxygen is the de facto standard tool for generating documentation from annotated C++ sources, but it also supports other popular programming languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D.
+
+Doxygen can help you in three ways:
+
+   1. It can generate an on-line documentation browser (in HTML) and/or an off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source files. There is also support for generating output in RTF (MS-Word), PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The documentation is extracted directly from the sources, which makes it much easier to keep the documentation consistent with the source code.
+   2. You can configure doxygen to extract the code structure from undocumented source files. This is very useful to quickly find your way in large source distributions. Doxygen can also visualize the relations between the various elements by means of include dependency graphs, inheritance diagrams, and collaboration diagrams, which are all generated automatically.
+   3. You can also use doxygen for creating normal documentation (as I did for the doxygen user manual and web-site)."
+HOMEPAGE="http://www.doxygen.org"
+COPYRIGHT="1997-2010 Dimitri van Heesch"
+LICENSE="GNU GPL v2"
+SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz"
+CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="doxygen-1.6.3.patchset"
+
+PROVIDES="
+	doxygen = $portVersion compat >= 1.6
+	cmd:doxygen = $portVersion compat >= 1.6
+	cmd:doxytag = $portVersion compat >= 1.6
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libiconv
+	"
+BUILD_REQUIRES="
+	devel:libiconv
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:bison
+	cmd:flex
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:perl
+	cmd:sed
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+PATCH()
+{
+	sed -i "s,MAN1DIR = man/man1,MAN1DIR = $relativeManDir/man1," Makefile.in
+}
+
+BUILD()
+{
+	./configure --prefix $prefix --docdir $docDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}

app-doc/doxygen/doxygen-1.7.4.recipe

@@ -5,14 +5,16 @@ CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
-BUILD {
+BUILD()
+{
 	cd doxygen-1.7.4
 	sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in
 	./configure --prefix `finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd doxygen-1.7.4
 	make install
 }

app-doc/doxygen/patches/doxygen-1.6.1.patch

@@ -1,120 +0,0 @@
-diff -Naur doxygen-1.6.1/PLATFORMS doxygen-1.6.1-haiku/PLATFORMS
---- doxygen-1.6.1/PLATFORMS	2007-11-24 09:12:35.000000000 -0700
-+++ doxygen-1.6.1-haiku/PLATFORMS	2009-11-07 13:02:41.000000000 -0700
-@@ -4,6 +4,7 @@
- dgux-g++
- freebsd-g++
- gnu-g++
-+haiku-g++
- hpux-acc
- hpux-cc
- hpux-g++
-diff -Naur doxygen-1.6.1/configure doxygen-1.6.1-haiku/configure
---- doxygen-1.6.1/configure	2009-08-25 03:49:10.000000000 -0600
-+++ doxygen-1.6.1-haiku/configure	2009-11-07 13:01:31.000000000 -0700
-@@ -180,6 +180,9 @@
-         f_insttool=/usr/bin/install
-       fi
-       ;;
-+    Haiku:*)
-+      f_platform=haiku-g++
-+      ;;
-     HP-UX:*)
-       f_platform=hpux-g++
-       if test "$f_insttool" = NO; then
-diff -Naur doxygen-1.6.1/qtools/qglobal.h doxygen-1.6.1-haiku/qtools/qglobal.h
---- doxygen-1.6.1/qtools/qglobal.h	2008-12-06 06:16:20.000000000 -0700
-+++ doxygen-1.6.1-haiku/qtools/qglobal.h	2009-11-07 13:09:09.000000000 -0700
-@@ -147,6 +147,8 @@
- #define _OS_CYGWIN_
- #elif defined(__BEOS__)
- #define _OS_BEOS_
-+#elif defined(__HAIKU__)
-+#define _OS_HAIKU_
- #elif defined(__MINT__)
- #define _OS_MINT_
- #else
-diff -Naur doxygen-1.6.1/src/doxygen.pro.in doxygen-1.6.1-haiku/src/doxygen.pro.in
---- doxygen-1.6.1/src/doxygen.pro.in	2009-08-02 07:55:02.000000000 -0600
-+++ doxygen-1.6.1-haiku/src/doxygen.pro.in	2009-11-07 13:19:57.000000000 -0700
-@@ -19,6 +19,7 @@
- HEADERS      =	doxygen.h 
- SOURCES      =	main.cpp 
- unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
-+haiku-g++:LIBS             += -L/boot/common/lib -liconv
- win32:INCLUDEPATH          += .
- win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
- win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
-diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/app.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t
---- doxygen-1.6.1/tmake/lib/haiku-g++/app.t	1969-12-31 17:00:00.000000000 -0700
-+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t	2009-11-07 13:04:20.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/app.t");
-diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/lib.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t
---- doxygen-1.6.1/tmake/lib/haiku-g++/lib.t	1969-12-31 17:00:00.000000000 -0700
-+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t	2009-11-07 13:04:20.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/lib.t");
-diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t
---- doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t	1969-12-31 17:00:00.000000000 -0700
-+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t	2009-11-07 13:04:20.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/subdirs.t");
-diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf
---- doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf	1969-12-31 17:00:00.000000000 -0700
-+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf	2009-11-07 13:09:42.000000000 -0700
-@@ -0,0 +1,51 @@
-+#
-+# 
-+#
-+# tmake configuration for haiku-g++
-+#
-+
-+TEMPLATE		= app
-+CONFIG			= qt warn_on release
-+
-+TMAKE_CC		= gcc
-+TMAKE_CFLAGS		=
-+TMAKE_CFLAGS_WARN_ON	= -Wall -W
-+TMAKE_CFLAGS_WARN_OFF	=
-+TMAKE_CFLAGS_RELEASE	=
-+TMAKE_CFLAGS_DEBUG	= -g
-+TMAKE_CFLAGS_SHLIB	= -fPIC
-+TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-+
-+TMAKE_CXX		= g++
-+TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-+TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-+TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-+TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-+TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-+TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-+TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-+
-+TMAKE_INCDIR		=
-+TMAKE_LIBDIR		=
-+TMAKE_INCDIR_QT		= $(QTDIR)/include
-+TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-+
-+TMAKE_LINK		= g++
-+TMAKE_LINK_SHLIB	= g++
-+TMAKE_LFLAGS		= -Wl,-rpath=/lib:$(QTDIR)/lib
-+TMAKE_LFLAGS_RELEASE	=
-+TMAKE_LFLAGS_DEBUG	=
-+TMAKE_LFLAGS_SHLIB	= -shared
-+TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-+
-+TMAKE_LIBS		=
-+TMAKE_LIBS_QT		= -lqt
-+TMAKE_LIBS_QT_MT	= -lqt-mt
-+
-+TMAKE_MOC		= moc
-+
-+TMAKE_AR		= ar cqs
-+TMAKE_RANLIB		=
-+
-+TMAKE_TAR		= tar -cf
-+TMAKE_GZIP		= gzip -9f

app-doc/doxygen/patches/doxygen-1.6.2.patch

@@ -1,120 +0,0 @@
-diff -up doxygen-1.6.2/PLATFORMS.orig doxygen-1.6.2/PLATFORMS
---- doxygen-1.6.2/PLATFORMS.orig	2007-11-24 09:12:35.000000000 -0700
-+++ doxygen-1.6.2/PLATFORMS	2010-01-06 17:27:33.000000000 -0700
-@@ -4,6 +4,7 @@ beos-g++
- dgux-g++
- freebsd-g++
- gnu-g++
-+haiku-g++
- hpux-acc
- hpux-cc
- hpux-g++
-diff -up doxygen-1.6.2/configure.orig doxygen-1.6.2/configure
---- doxygen-1.6.2/configure.orig	2009-12-29 05:57:53.000000000 -0700
-+++ doxygen-1.6.2/configure	2010-01-06 17:27:33.000000000 -0700
-@@ -180,6 +180,9 @@ if test -z "$f_platform"; then
-         f_insttool=/usr/bin/install
-       fi
-       ;;
-+    Haiku:*)
-+      f_platform=haiku-g++
-+      ;;
-     HP-UX:*)
-       f_platform=hpux-g++
-       if test "$f_insttool" = NO; then
-diff -up doxygen-1.6.2/qtools/qglobal.h.orig doxygen-1.6.2/qtools/qglobal.h
---- doxygen-1.6.2/qtools/qglobal.h.orig	2009-10-25 09:44:29.000000000 -0600
-+++ doxygen-1.6.2/qtools/qglobal.h	2010-01-06 17:27:33.000000000 -0700
-@@ -150,6 +150,8 @@
- #define _OS_CYGWIN_
- #elif defined(__BEOS__)
- #define _OS_BEOS_
-+#elif defined(__HAIKU__)
-+#define _OS_HAIKU_
- #elif defined(__MINT__)
- #define _OS_MINT_
- #else
-diff -up doxygen-1.6.2/src/doxygen.pro.in.orig doxygen-1.6.2/src/doxygen.pro.in
---- doxygen-1.6.2/src/doxygen.pro.in.orig	2009-08-02 07:55:02.000000000 -0600
-+++ doxygen-1.6.2/src/doxygen.pro.in	2010-01-06 17:27:33.000000000 -0700
-@@ -19,6 +19,7 @@ CONFIG       =	console warn_on $extraopt
- HEADERS      =	doxygen.h 
- SOURCES      =	main.cpp 
- unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
-+haiku-g++:LIBS             += -L/boot/common/lib -liconv
- win32:INCLUDEPATH          += .
- win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
- win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
-diff -up doxygen-1.6.2/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/app.t
---- doxygen-1.6.2/tmake/lib/haiku-g++/app.t.orig	2010-01-06 17:27:33.000000000 -0700
-+++ doxygen-1.6.2/tmake/lib/haiku-g++/app.t	2010-01-06 17:27:33.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/app.t");
-diff -up doxygen-1.6.2/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/lib.t
---- doxygen-1.6.2/tmake/lib/haiku-g++/lib.t.orig	2010-01-06 17:27:33.000000000 -0700
-+++ doxygen-1.6.2/tmake/lib/haiku-g++/lib.t	2010-01-06 17:27:33.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/lib.t");
-diff -up doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t
---- doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t.orig	2010-01-06 17:27:33.000000000 -0700
-+++ doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t	2010-01-06 17:27:33.000000000 -0700
-@@ -0,0 +1,2 @@
-+#! Use the common Unix template
-+#$ IncludeTemplate("../unix/subdirs.t");
-diff -up doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf
---- doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf.orig	2010-01-06 17:27:33.000000000 -0700
-+++ doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf	2010-01-06 17:27:33.000000000 -0700
-@@ -0,0 +1,51 @@
-+#
-+# 
-+#
-+# tmake configuration for haiku-g++
-+#
-+
-+TEMPLATE		= app
-+CONFIG			= qt warn_on release
-+
-+TMAKE_CC		= gcc
-+TMAKE_CFLAGS		=
-+TMAKE_CFLAGS_WARN_ON	= -Wall -W
-+TMAKE_CFLAGS_WARN_OFF	=
-+TMAKE_CFLAGS_RELEASE	=
-+TMAKE_CFLAGS_DEBUG	= -g
-+TMAKE_CFLAGS_SHLIB	= -fPIC
-+TMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-+
-+TMAKE_CXX		= g++
-+TMAKE_CXXFLAGS		= $$TMAKE_CFLAGS
-+TMAKE_CXXFLAGS_WARN_ON	= $$TMAKE_CFLAGS_WARN_ON
-+TMAKE_CXXFLAGS_WARN_OFF	= $$TMAKE_CFLAGS_WARN_OFF
-+TMAKE_CXXFLAGS_RELEASE	= $$TMAKE_CFLAGS_RELEASE
-+TMAKE_CXXFLAGS_DEBUG	= $$TMAKE_CFLAGS_DEBUG
-+TMAKE_CXXFLAGS_SHLIB	= $$TMAKE_CFLAGS_SHLIB
-+TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YACC
-+
-+TMAKE_INCDIR		=
-+TMAKE_LIBDIR		=
-+TMAKE_INCDIR_QT		= $(QTDIR)/include
-+TMAKE_LIBDIR_QT		= $(QTDIR)/lib
-+
-+TMAKE_LINK		= g++
-+TMAKE_LINK_SHLIB	= g++
-+TMAKE_LFLAGS		= -Wl,-rpath=/lib:$(QTDIR)/lib
-+TMAKE_LFLAGS_RELEASE	=
-+TMAKE_LFLAGS_DEBUG	=
-+TMAKE_LFLAGS_SHLIB	= -shared
-+TMAKE_LFLAGS_SONAME	= -Wl,-soname,
-+
-+TMAKE_LIBS		=
-+TMAKE_LIBS_QT		= -lqt
-+TMAKE_LIBS_QT_MT	= -lqt-mt
-+
-+TMAKE_MOC		= moc
-+
-+TMAKE_AR		= ar cqs
-+TMAKE_RANLIB		=
-+
-+TMAKE_TAR		= tar -cf
-+TMAKE_GZIP		= gzip -9f

app-doc/doxygen/patches/doxygen-1.6.3.patchset

@@ -1,6 +1,13 @@
-diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in
---- doxygen-1.6.3/Makefile.in.orig	2010-03-18 22:18:10.189005824 -0600
-+++ doxygen-1.6.3/Makefile.in	2010-03-18 22:18:16.079953920 -0600
+From 9612cfcd716d5924547e90229bd6e3cb51c950e9 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Wed, 21 Aug 2013 12:02:33 +0200
+Subject: add support for Haiku
+
+
+diff --git a/Makefile.in b/Makefile.in
+index 781d359..9cd43eb 100644
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -2,7 +2,7 @@
  #	cd qtools ; $(MAKE)
  #	cd src ; $(MAKE)
@@ -10,9 +17,10 @@ diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in
  
  clean: FORCE
  	cd examples ; $(MAKE) clean
-diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS
---- doxygen-1.6.3/PLATFORMS.orig	2007-11-24 09:12:35.009437184 -0700
-+++ doxygen-1.6.3/PLATFORMS	2010-03-18 22:17:57.002097152 -0600
+diff --git a/PLATFORMS b/PLATFORMS
+index c358a1d..18c4ed5 100644
+--- a/PLATFORMS
++++ b/PLATFORMS
 @@ -4,6 +4,7 @@ beos-g++
  dgux-g++
  freebsd-g++
@@ -21,9 +29,10 @@ diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS
  hpux-acc
  hpux-cc
  hpux-g++
-diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure
---- doxygen-1.6.3/configure.orig	2010-02-20 15:19:31.059244544 -0700
-+++ doxygen-1.6.3/configure	2010-03-18 22:17:57.024903680 -0600
+diff --git a/configure b/configure
+index c0db1c6..d631e47 100755
+--- a/configure
++++ b/configure
 @@ -180,6 +180,9 @@ if test -z "$f_platform"; then
          f_insttool=/usr/bin/install
        fi
@@ -34,9 +43,10 @@ diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure
      HP-UX:*)
        f_platform=hpux-g++
        if test "$f_insttool" = NO; then
-diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h
---- doxygen-1.6.3/qtools/qglobal.h.orig	2009-10-25 09:44:29.014680064 -0600
-+++ doxygen-1.6.3/qtools/qglobal.h	2010-03-18 22:17:57.054001664 -0600
+diff --git a/qtools/qglobal.h b/qtools/qglobal.h
+index 700cb80..259446d 100644
+--- a/qtools/qglobal.h
++++ b/qtools/qglobal.h
 @@ -150,6 +150,8 @@
  #define _OS_CYGWIN_
  #elif defined(__BEOS__)
@@ -46,10 +56,11 @@ diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h
  #elif defined(__MINT__)
  #define _OS_MINT_
  #else
-diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in
---- doxygen-1.6.3/src/doxygen.pro.in.orig	2010-01-01 04:53:11.034078720 -0700
-+++ doxygen-1.6.3/src/doxygen.pro.in	2010-03-18 22:17:57.078381056 -0600
-@@ -19,6 +19,7 @@ CONFIG       =	console warn_on $extraopt
+diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in
+index cc93820..c8a8d50 100644
+--- a/src/doxygen.pro.in
++++ b/src/doxygen.pro.in
+@@ -19,6 +19,7 @@ CONFIG       =	console warn_on $extraopts
  HEADERS      =	doxygen.h 
  SOURCES      =	main.cpp 
  unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
@@ -57,27 +68,35 @@ diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in
  win32:INCLUDEPATH          += .
  win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
  win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
-diff -up doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/app.t
---- doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig	2010-03-18 22:17:57.103284736 -0600
-+++ doxygen-1.6.3/tmake/lib/haiku-g++/app.t	2010-03-18 22:17:57.105119744 -0600
+diff --git a/tmake/lib/haiku-g++/app.t b/tmake/lib/haiku-g++/app.t
+new file mode 100644
+index 0000000..867725e
+--- /dev/null
++++ b/tmake/lib/haiku-g++/app.t
 @@ -0,0 +1,2 @@
 +#! Use the common Unix template
 +#$ IncludeTemplate("../unix/app.t");
-diff -up doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/lib.t
---- doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig	2010-03-18 22:17:57.126615552 -0600
-+++ doxygen-1.6.3/tmake/lib/haiku-g++/lib.t	2010-03-18 22:17:57.128188416 -0600
+diff --git a/tmake/lib/haiku-g++/lib.t b/tmake/lib/haiku-g++/lib.t
+new file mode 100644
+index 0000000..2523b2f
+--- /dev/null
++++ b/tmake/lib/haiku-g++/lib.t
 @@ -0,0 +1,2 @@
 +#! Use the common Unix template
 +#$ IncludeTemplate("../unix/lib.t");
-diff -up doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t
---- doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig	2010-03-18 22:17:57.152043520 -0600
-+++ doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t	2010-03-18 22:17:57.153354240 -0600
+diff --git a/tmake/lib/haiku-g++/subdirs.t b/tmake/lib/haiku-g++/subdirs.t
+new file mode 100644
+index 0000000..5e888af
+--- /dev/null
++++ b/tmake/lib/haiku-g++/subdirs.t
 @@ -0,0 +1,2 @@
 +#! Use the common Unix template
 +#$ IncludeTemplate("../unix/subdirs.t");
-diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf
---- doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig	2010-03-18 22:17:57.175112192 -0600
-+++ doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf	2010-03-18 22:17:57.176685056 -0600
+diff --git a/tmake/lib/haiku-g++/tmake.conf b/tmake/lib/haiku-g++/tmake.conf
+new file mode 100644
+index 0000000..23a2738
+--- /dev/null
++++ b/tmake/lib/haiku-g++/tmake.conf
 @@ -0,0 +1,51 @@
 +#
 +# 
@@ -130,3 +149,29 @@ diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/l
 +
 +TMAKE_TAR		= tar -cf
 +TMAKE_GZIP		= gzip -9f
+-- 
+1.8.3.4
+
+
+From 2e7199416501ace72e5ab2a548cc07ab25ef910e Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Wed, 21 Aug 2013 12:21:09 +0200
+Subject: qvaluestack.h: fix gcc 4 build
+
+
+diff --git a/qtools/qvaluestack.h b/qtools/qvaluestack.h
+index 3fb61fd..7438fcb 100644
+--- a/qtools/qvaluestack.h
++++ b/qtools/qvaluestack.h
+@@ -49,7 +49,7 @@ class Q_EXPORT QValueStack : public QValueList<T>
+ public:
+     QValueStack() {}
+    ~QValueStack() {}
+-    void  push( const T& d ) { append(d); }
++    void  push( const T& d ) { this->append(d); }
+     T pop()
+     {
+ 	T elem( this->last() );
+-- 
+1.8.3.4
+

app-editors/jed/jed-0.99_19.recipe

@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND="ncurses >= 5.7
 	slang >= 2.2.2"
 CHECKSUM_MD5="c9b2f58a3defc6f61faa1ce7d6d629ea"
-BUILD {
+BUILD()
+{
 	cd jed-0.99-19
 	cd autoconf
 	cp /boot/common/share/libtool/config/config.guess .
@@ -16,7 +17,8 @@ BUILD {
 	make 
 }
 
-INSTALL {
+INSTALL()
+{
 	cd jed-0.99-19
 	touch src/objs/xjed
 	make install DESTDIR=${DESTDIR}

app-editors/joe/joe-3.8_hg.recipe

@@ -5,7 +5,8 @@ REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND=""
 #CHECKSUM_MD5="66de1b073e869ba12abbfcde3885c577"
-BUILD {
+BUILD()
+{
 	cd joe-3.8-hg
 	autojoe
 	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
@@ -17,7 +18,8 @@ BUILD {
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd joe-3.8-hg
 	make install
 }

app-editors/nano/nano-2.2.3.recipe

@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/ncurses >= 5.6"
 CHECKSUM_MD5="91918a484f54f94fedaebe00dc393a50"
-BUILD {
+BUILD()
+{
 	cd nano-2.2.3
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd nano-2.2.3
 	make install
 }

app-editors/nano/nano-2.2.5.recipe

@@ -5,13 +5,15 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="sys-libs/ncurses >= 5.6"
 CHECKSUM_MD5="77a10a49589f975ce98350a4527a2ebf"
-BUILD {
+BUILD()
+{
 	cd nano-2.2.5
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
-INSTALL {
+INSTALL()
+{
 	cd nano-2.2.5
 	make install
 }