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
2026-04-23 20:20:06 +02:00 · 2013-10-15 22:48:02 +02:00
parent 79f735cb8b c69048fe86
commit f3532dc2cb
1452 changed files with 31199 additions and 33804 deletions
--- a/app-text/antiword/antiword-0.37.recipe
+++ b/app-text/antiword/antiword-0.37.recipe
@@ -5,12 +5,14 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="f868e2a269edcbc06bf77e89a55898d1"
-BUILD {
+BUILD()
+{
 	cd antiword-0.37
 	make --makefile Makefile.haiku
 }

-INSTALL {
+INSTALL()
+{
 	cd antiword-0.37
 	make --makefile Makefile.haiku global_install
 }
--- a/app-text/asciidoc/asciidoc-8.6.8.recipe
+++ b/app-text/asciidoc/asciidoc-8.6.8.recipe
@@ -0,0 +1,51 @@
+SUMMARY="Highly configurable text format for writing documentation" 
+DESCRIPTION="
+	AsciiDoc is a text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs. AsciiDoc files can be translated to many formats including HTML, PDF, EPUB, man page.
+
+	AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user."
+HOMEPAGE="http://asciidoc.org" 
+LICENSE="GNU GPL v2"
+COPYRIGHT="2002-2011 Stuart Rackham"
+SRC_URI="http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.8/asciidoc-8.6.8.tar.gz"
+CHECKSUM_MD5="6ffff1ab211f30481741ce4d1e4b12bf"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	asciidoc = $portVersion compat >= 8.6.8
+	cmd:a2x = $portVersion compat >= 8
+	cmd:asciidoc = $portVersion compat >= 8
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+PATCH()
+{
+	sed -i -e 's|/usr/bin/env|/bin/env|' *.py
+}
+
+BUILD()
+{
+	# TODO: separate data and configuration files.
+	runConfigure ./configure \
+		--sysconfdir=$dataDir/asciidoc
+	make
+}
+
+INSTALL()
+{
+	make install
+}
--- a/app-text/aspell/aspell-0.60.6.recipe
+++ b/app-text/aspell/aspell-0.60.6.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="bc80f0198773d5c05086522be67334eb"
-BUILD {
+BUILD()
+{
 	cd aspell-0.60.6
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -15,7 +16,8 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd aspell-0.60.6
 	make install
 }
--- a/app-text/convmv/convmv-1.15.recipe
+++ b/app-text/convmv/convmv-1.15.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/perl >= 5.8"
 CHECKSUM_MD5="b1bb703c08c6355868d15890ff193f7d"
-BUILD {
+BUILD()
+{
 	cd convmv-1.15
 	sed -i "s#/usr/bin/perl#`finddir B_COMMON_BIN_DIRECTORY`/perl#" convmv
 	make \
@@ -13,14 +14,16 @@ BUILD {
 		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 }

-INSTALL {
+INSTALL()
+{
 	cd convmv-1.15
 	make install \
 		PREFIX=`finddir B_COMMON_DIRECTORY` \
 		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 }

-TEST {
+TEST()
+{
 	cd convmv-1.15
 	make test
 }
--- a/app-text/discount/discount-2.1.3.recipe
+++ b/app-text/discount/discount-2.1.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98"
-BUILD {
+BUILD()
+{
 	cd discount-2.1.3
 	./configure.sh --prefix=$(finddir B_COMMON_DIRECTORY) \
 	--mandir=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man \
@@ -13,7 +14,8 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd discount-2.1.3
 	make install.everything
 }
--- a/app-text/dos2unix/dos2unix-1.0.bep
+++ b/app-text/dos2unix/dos2unix-1.0.bep
@@ -1,18 +0,0 @@
-DESCRIPTION="dos2unix and unix2dos end of line file converters." 
-HOMEPAGE="http://www.programmersheaven.com/download/3118/download.aspx" 
-SRC_URI="svn+http://ports.haiku-files.org/svn/haikuports/trunk/app-text/dos2unix"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD {
-	cd dos2unix-1.0
-	gcc -O -o dos2unix DOS2UNIX.C
-	gcc -O -o unix2dos UNIX2DOS.C
-}
-
-INSTALL {
-	cd dos2unix-1.0
-	mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`
-	cp dos2unix ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dos2unix
-	cp unix2dos ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/unix2dos
-}
--- a/app-text/dos2unix/dos2unix-1.0.recipe
+++ b/app-text/dos2unix/dos2unix-1.0.recipe
@@ -0,0 +1,39 @@
+SUMMARY="dos2unix and unix2dos end of line file convertors."
+DESCRIPTION="DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have just LF.  Dos2unix and unix2dos are simple parser/converter command line programs to convert between the two formats." 
+HOMEPAGE="http://www.programmersheaven.com/download/3118/download.aspx" 
+SRC_URI="http://ports-space.haiku-files.org/source/dos2unix-1.0.zip"
+CHECKSUM_MD5="76c4991341219d71072474255714b010"
+REVISION="1"
+COPYRIGHT="Public Domain"
+LICENSE="Public Domain"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+PROVIDES="
+	dos2unix = 1.0 compat >= 1
+	cmd:dos2unix
+	cmd:unix2dos
+	"
+	
+REQUIRES="
+	lib:libroot >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	gcc -O -o dos2unix DOS2UNIX.C
+	gcc -O -o unix2dos UNIX2DOS.C
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp dos2unix $binDir/dos2unix
+	cp unix2dos $binDir/unix2dos
+}
--- a/app-text/dos2unix/sources/DOS2UNIX.C
+++ b/app-text/dos2unix/sources/DOS2UNIX.C
--- a/app-text/dos2unix/sources/UNIX2DOS.C
+++ b/app-text/dos2unix/sources/UNIX2DOS.C
--- a/app-text/ebook_tools/ebook_tools-0.2.1.recipe
+++ b/app-text/ebook_tools/ebook_tools-0.2.1.recipe
@@ -7,14 +7,16 @@ STATUS_HAIKU="stable"
 MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
 DEPEND="libzip >= 0.10"

-BUILD {
+BUILD()
+{
 	cd ebook-tools-0.2.1
 	sed -i 's/-Wmissing-format-attribute//' CMakeLists.txt
 	cmake .
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd ebook-tools-0.2.1
 	make install
 }
--- a/app-text/enchant/enchant-1.6.0.recipe
+++ b/app-text/enchant/enchant-1.6.0.recipe
@@ -1,7 +1,7 @@
 DESCRIPTION="Generic spell-checking dictionary library"
 HOMEPAGE="http://abisource.com/projects/enchant/"
 SRC_URI="http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz"
-REVISION= "2"
+REVISION="2"

 STATUS_HAIKU="broken"

@@ -12,7 +12,8 @@ DEPEND="dev-util/pkgconfig >= 0.23

 CHECKSUM_MD5="de11011aff801dc61042828041fb59c7"

-BUILD {
+BUILD()
+{
        cd enchant-1.6.0
        cp /boot/common/share/libtool/config/config.* .
        libtoolize --force --copy
@@ -23,7 +24,8 @@ BUILD {
        make
 }

-INSTALL {
+INSTALL()
+{
        cd enchant-1.6.0
        make install DESTDIR=${DESTDIR}
 }
--- a/app-text/gocr/gocr-0.49.recipe
+++ b/app-text/gocr/gocr-0.49.recipe
@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="4e527bc4bdd97c2be15fdd818857507f"

-BUILD {
+BUILD()
+{
 	cd gocr-0.49
 	libtoolize --force --copy --install
 	aclocal
@@ -17,7 +18,8 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd gocr-0.49
 	make install DESTDIR=${DESTDIR}
 }
--- a/app-text/gpp/gpp-2.4.recipe
+++ b/app-text/gpp/gpp-2.4.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="f04c2a23312ab3d0c462c7972d1c6aa6"
-BUILD {
+BUILD()
+{
 	cd gpp-2.24
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd gpp-2.24
 	make install
 }
--- a/app-text/htmldoc/htmldoc-1.8.27.bep
+++ b/app-text/htmldoc/htmldoc-1.8.27.bep
@@ -1,33 +0,0 @@
-DESCRIPTION="HTMLDOC converts HTML files and web pages into index HTML, Adobe Postscript or Adobe Portable Documenrt Format files (pdf)." 
-HOMEPAGE="http://www.htmldoc.org" 
-SRC_URI="http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="cb45c2823e282e3cd0cc05172e305072"
-BUILD {
-	cd htmldoc-1.8.27
-	autoconf
-	chmod 755 configure
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--docdir=$COMMON_DOCS \
-		--mandir=$COMMON_DOCS/man
-	make
-}
-
-INSTALL {
-	cd htmldoc-1.8.27
-	make install
-}
-
-TEST {
-	cd htmldoc-1.8.27
-#	make test
-#	make check
-}
-
-#LICENSE=""
-#COPYRIGHT=""
--- a/app-text/htmldoc/htmldoc-1.8.27.recipe
+++ b/app-text/htmldoc/htmldoc-1.8.27.recipe
@@ -0,0 +1,59 @@
+SUMMARY="HTML file processor and converter"
+DESCRIPTION="
+	HTMLDOC converts HTML files and web pages into index HTML, Adobe
+	Postscript or Adobe Portable Document Format files (pdf).
+	"
+HOMEPAGE="http://www.msweet.org/projects.php?Z1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1997-2006 Easy Software Products"
+SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2"
+CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="htmldoc-1.8.27.patchset"
+
+PROVIDES="
+	htmldoc = $portVersion compat >= 1.8
+	cmd:htmldoc = $portVersion compat >= 1.8
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libjpeg
+	lib:libpng
+	lib:libz
+	"
+BUILD_REQUIRES="
+	devel:libjpeg
+	devel:libpng
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:autoconf
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:sed
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	autoconf
+	chmod 755 configure
+    runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# move html documentation out of man-dir
+	mkdir -p $docDir
+	mv $manDir/doc/htmldoc/* $docDir/
+	rm -r $manDir/doc
+}
--- a/app-text/htmldoc/patches/htmldoc-1.8.27.patchset
+++ b/app-text/htmldoc/patches/htmldoc-1.8.27.patchset
@@ -0,0 +1,273 @@
+From 71b6617cdb5042458030b3aec5bfce81273e6de0 Mon Sep 17 00:00:00 2001
+From: Scott McCreary <scottmc2@gmail.com>
+Date: Mon May 23 16:13:13 2011 +0000
+Subject: Fixed directories for htmldoc.
+
+
+diff --git a/configure.in b/configure.in
+index 640f8ac..5ef51a8 100644
+--- a/configure.in
+++ b/configure.in
+@@ -109,7 +109,7 @@ LDFLAGS="${LDFLAGS:=}"
+ AC_SUBST(LDFLAGS)
+ 
+ AC_CHECK_LIB(m,pow)
+-AC_SEARCH_LIBS(socket, socket)
+AC_SEARCH_LIBS(socket, network socket)
+ AC_SEARCH_LIBS(gethostbyaddr, nsl)
+ AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
+ AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
+@@ -316,8 +316,8 @@ if test "$bindir" = "\${exec_prefix}/bin"; then
+     bindir="$exec_prefix/bin"
+ fi
+ 
+-AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/htmldoc")
+-AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/share/htmldoc")
+AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/data/doc/htmldoc")
+AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/data/htmldoc")
+ 
+ dnl Update compiler options...
+ if test -n "$GXX"; then
+diff --git a/data/Makefile b/data/Makefile
+index ee9b7de..f416fad 100644
+--- a/data/Makefile
+++ b/data/Makefile
+@@ -53,11 +53,11 @@ all:
+ #
+ 
+ install:
+-	if [ ! -d $(datadir)/htmldoc/data ]; then\
+-		$(MKDIR) $(datadir)/htmldoc/data;\
+	if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\
+		$(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\
+ 	fi
+-	$(CP) $(FILES) $(datadir)/htmldoc/data
+-	$(CHMOD) ugo+r $(datadir)/htmldoc/data/*
+	$(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data
+	$(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/*
+ 
+ 
+ #
+diff --git a/doc/Makefile b/doc/Makefile
+index 87292f6..666c80d 100644
+--- a/doc/Makefile
+++ b/doc/Makefile
+@@ -57,16 +57,16 @@ all: $(DOCUMENTS)
+ #
+ 
+ install: $(DOCUMENTS)
+-	if [ ! -d $(datadir)/doc/htmldoc ]; then\
+-		$(MKDIR) $(datadir)/doc/htmldoc;\
+	if [ ! -d $(DESTDIR)$(mandir)/doc/htmldoc ]; then\
+		$(MKDIR) $(DESTDIR)$(mandir)/doc/htmldoc;\
+ 	fi
+-	$(CP) $(DOCFILES) $(datadir)/doc/htmldoc
+-	$(CHMOD) ugo+r $(datadir)/doc/htmldoc/*
+-	if [ ! -d $(mandir)/man1 ]; then\
+-		$(MKDIR) $(mandir)/man1;\
+	$(CP) $(DOCFILES) $(DESTDIR)/$(mandir)/doc/htmldoc
+	$(CHMOD) ugo+r $(DESTDIR)/$(mandir)/doc/htmldoc/*
+	if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\
+		$(MKDIR) $(DESTDIR)/$(mandir)/man1;\
+ 	fi
+-	$(CP) htmldoc.man $(mandir)/man1/htmldoc.1
+-	$(CHMOD) ugo+r $(mandir)/man1/htmldoc.1
+	$(CP) htmldoc.man $(DESTDIR)/$(mandir)/man1/htmldoc.1
+	$(CHMOD) ugo+r $(DESTDIR)/$(mandir)/man1/htmldoc.1
+ 
+ 
+ #
+diff --git a/fonts/Makefile b/fonts/Makefile
+index 3afefa3..a0a396a 100644
+--- a/fonts/Makefile
+++ b/fonts/Makefile
+@@ -75,14 +75,14 @@ all:
+ 
+ install:
+ 	echo "Installing font files in $(datadir)/htmldoc/fonts..."
+-	if [ ! -d $(datadir)/htmldoc/fonts ]; then\
+-		$(MKDIR) $(datadir)/htmldoc/fonts;\
+	if [ ! -d $(DESTDIR)/$(datadir)/htmldoc/fonts ]; then\
+		$(MKDIR) $(DESTDIR)/$(datadir)/htmldoc/fonts;\
+ 	fi
+ 	for font in $(FONTS); do \
+-		$(CP) $$font.afm $(datadir)/htmldoc/fonts; \
+-		$(CP) $$font.pfa $(datadir)/htmldoc/fonts; \
+		$(CP) $$font.afm $(DESTDIR)/$(datadir)/htmldoc/fonts; \
+		$(CP) $$font.pfa $(DESTDIR)/$(datadir)/htmldoc/fonts; \
+ 	done
+-	$(CHMOD) ugo+r $(datadir)/htmldoc/fonts/*
+	$(CHMOD) ugo+r $(DESTDIR)/$(datadir)/htmldoc/fonts/*
+ 
+ 
+ #
+diff --git a/htmldoc/Makefile b/htmldoc/Makefile
+index 9ebc412..c17b6d0 100644
+--- a/htmldoc/Makefile
+++ b/htmldoc/Makefile
+@@ -50,11 +50,11 @@ all:	htmldoc$(EXEEXT)
+ #
+ 
+ install:	all
+-	if [ ! -d $(bindir) ]; then\
+-		$(MKDIR) $(bindir);\
+	if [ ! -d $(DESTDIR)/$(bindir) ]; then\
+		$(MKDIR) $(DESTDIR)/$(bindir);\
+ 	fi
+-	cp htmldoc$(EXEEXT) $(bindir)
+-	chmod ugo+rx $(bindir)/htmldoc$(EXEEXT)
+	cp htmldoc$(EXEEXT) $(DESTDIR)/$(bindir)
+	chmod ugo+rx $(DESTDIR)/$(bindir)/htmldoc$(EXEEXT)
+ 
+ 
+ #
+diff --git a/htmldoc/http.h b/htmldoc/http.h
+index 4012f92..b3b9b09 100644
+--- a/htmldoc/http.h
+++ b/htmldoc/http.h
+@@ -102,6 +102,8 @@ extern "C" {
+ #    define s6_addr32	_S6_un._S6_u32
+ #  elif defined(__FreeBSD__) || defined(__APPLE__)
+ #    define s6_addr32	__u6_addr.__u6_addr32
+#  elif defined(__HAIKU__)
+#    define s6_addr32   s6_addr
+ #  elif defined(__osf__)
+ #    define s6_addr32	s6_un.sa6_laddr
+ #  elif defined(WIN32)
+-- 
+1.7.5
+
+
+From 33b0369d77315b32c03d311112add0df8eb63fad Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Sun, 16 Jun 2013 02:59:17 +0200
+Subject: image.cxx: libpng 1.5 fixes
+
+
+diff --git a/htmldoc/image.cxx b/htmldoc/image.cxx
+index 574ff7c..9a35db2 100644
+--- a/htmldoc/image.cxx
+++ b/htmldoc/image.cxx
+@@ -55,6 +55,7 @@ extern "C" {		/* Workaround for JPEG header problems... */
+ #include <jpeglib.h>	/* JPEG/JFIF image definitions */
+ }
+ 
+#define PNG_SETJMP_SUPPORTED
+ #include <png.h>	/* Portable Network Graphics (PNG) definitions */
+ 
+ 
+@@ -1472,6 +1473,9 @@ image_load_png(image_t *img,	/* I - Image pointer */
+   png_bytep	*rows;		/* PNG row pointers */
+   uchar		*inptr,		/* Input pixels */
+ 		*outptr;	/* Output pixels */
+  png_bytep trans_alpha;
+  png_color_16p trans_color;
+  int num_trans = 0;
+ 
+ 
+  /*
+@@ -1499,7 +1503,7 @@ image_load_png(image_t *img,	/* I - Image pointer */
+ 
+   rows = NULL;
+ 
+-  if (setjmp(pp->jmpbuf)) 
+  if (setjmp(png_jmpbuf(pp))) 
+   {
+     progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
+ 
+@@ -1526,7 +1530,7 @@ image_load_png(image_t *img,	/* I - Image pointer */
+ 
+   png_read_info(pp, info);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE)
+  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+   {
+     png_set_expand(pp);
+ 
+@@ -1535,15 +1539,15 @@ image_load_png(image_t *img,	/* I - Image pointer */
+     if (Encryption)
+       img->use ++;
+   }
+-  else if (info->bit_depth < 8)
+  else if (png_get_bit_depth(pp, info) < 8)
+   {
+     png_set_packing(pp);
+     png_set_expand(pp);
+   }
+-  else if (info->bit_depth == 16)
+  else if (png_get_bit_depth(pp, info) == 16)
+     png_set_strip_16(pp);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
+  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+   {
+     depth      = 3;
+     img->depth = gray ? 1 : 3;
+@@ -1554,10 +1558,12 @@ image_load_png(image_t *img,	/* I - Image pointer */
+     img->depth = 1;
+   }
+ 
+-  img->width  = info->width;
+-  img->height = info->height;
+  img->width  = png_get_image_width(pp, info);
+  img->height = png_get_image_height(pp, info);
+ 
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
+  png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color);
+
+  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+   {
+     if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3)
+       image_need_mask(img, 8);
+@@ -1571,14 +1577,14 @@ image_load_png(image_t *img,	/* I - Image pointer */
+ 
+ #ifdef DEBUG
+   printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d, img->depth=%d\n",
+-         info->color_type, depth, img->width, img->height, img->depth);
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
+         png_get_color_type(pp, info), depth, img->width, img->height, img->depth);
+  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+     puts("    COLOR");
+   else
+     puts("    GRAYSCALE");
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
+  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+     puts("    ALPHA");
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE)
+  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+     puts("    PALETTE");
+ #endif // DEBUG
+ 
+@@ -1594,9 +1600,9 @@ image_load_png(image_t *img,	/* I - Image pointer */
+   * Allocate pointers...
+   */
+ 
+-  rows = (png_bytep *)calloc(info->height, sizeof(png_bytep));
+  rows = (png_bytep *)calloc(img->height, sizeof(png_bytep));
+ 
+-  for (i = 0; i < (int)info->height; i ++)
+  for (i = 0; i < (int)img->height; i ++)
+     rows[i] = img->pixels + i * img->width * depth;
+ 
+  /*
+@@ -1610,7 +1616,7 @@ image_load_png(image_t *img,	/* I - Image pointer */
+   * Generate the alpha mask as necessary...
+   */
+ 
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
+  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+   {
+ #ifdef DEBUG
+     for (inptr = img->pixels, i = 0; i < img->height; i ++)
+@@ -1639,7 +1645,7 @@ image_load_png(image_t *img,	/* I - Image pointer */
+   * Reformat the data as necessary for the reader...
+   */
+ 
+-  if (gray && info->color_type & PNG_COLOR_MASK_COLOR)
+  if (gray && png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+   {
+    /*
+     * Greyscale output needed...
+-- 
+1.7.5
+
--- a/app-text/htmltidy/htmltidy-20092812.recipe
+++ b/app-text/htmltidy/htmltidy-20092812.recipe
@@ -6,11 +6,13 @@ STATUS_HAIKU="stable"
 DEPEND=""
 LICENSE="MIT"
 COPYRIGHT="1998-2008 World Wide Web Consortium"
-BUILD {
+BUILD()
+{
 	cd htmltidy-20092812/build/gmake
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd htmltidy-20092812/build/gmake
 	make installexes installhdrs installib
 }
--- a/app-text/hunspell/hunspell-1.3.2.recipe
+++ b/app-text/hunspell/hunspell-1.3.2.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="3121aaf3e13e5d88dfff13fb4a5f1ab8"
-BUILD {
+BUILD()
+{
 	cd hunspell-1.3.2
 	libtoolize --force --copy --install
 	aclocal -I m4
@@ -19,7 +20,8 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd hunspell-1.3.2
 	make install
 }
--- a/app-text/libpaper/libpaper-1.1.23.bep
+++ b/app-text/libpaper/libpaper-1.1.23.bep
@@ -1,24 +0,0 @@
-DESCRIPTION="Library for handling paper characteristics" 
-HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" 
-SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.23+nmu2.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="30e58b56c0b891b89e7d8c287be368b8"
-BUILD {
-	cd libpaper-1.1.23+nmu2
-	libtoolize --force --copy --install
-	aclocal
-#	automake
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` 
-	make
-}
-
-INSTALL {
-	cd libpaper-1.1.23+nmu2
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1996 Yves Arrouye
-	2000 Adrian Bunk"
--- a/app-text/libpaper/libpaper-1.1.24.bep
+++ b/app-text/libpaper/libpaper-1.1.24.bep
@@ -1,32 +0,0 @@
-DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
-SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834"
-BUILD {
-	cd libpaper-1.1.24
-	mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-	libtoolize --force --copy --install
-	aclocal --install -I m4
-	autoconf
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$COMMON_DOCS/man \
-		--sbindir=$COMMON_BIN
-	make
-}
-
-INSTALL {
-	cd libpaper-1.1.24
-	make install
-	
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1996 Yves Arrouye
-	2000 Adrian Bunk"
--- a/app-text/libpaper/libpaper-1.1.24.recipe
+++ b/app-text/libpaper/libpaper-1.1.24.recipe
@@ -0,0 +1,73 @@
+SUMMARY="Library for handling paper characteristics"
+DESCRIPTION="The libpaper paper-handling library automates recognition of many different paper types and sizes for programs that need to deal with printed output."
+HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
+SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz"
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="1996 Yves Arrouye
+	2000 Adrian Bunk"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86"
+
+CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834"
+
+REQUIRES="
+	lib:libroot >= $haikuVersion
+	"
+
+BUILD_REQUIRES=""
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:ld
+	cmd:libtool
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	cmd:sed
+	"
+
+PROVIDES="
+	cmd:paperconf
+	cmd:paperconfig
+	lib:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1
+	"
+
+BUILD()
+{
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
+	echo "AM_PROG_CC_C_O" >> configure.ac
+	libtoolize --force --copy --install
+	aclocal --install -I m4
+	autoconf
+	touch NEWS
+	touch AUTHORS
+	automake --add-missing
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs \
+		libpaper
+
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	devel:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1
+	"
+
+REQUIRES_devel="
+	libpaper$secondaryArchSuffix  == $portVersion base
+	"
--- a/app-text/libwpd/libwpd-0.9.6.recipe
+++ b/app-text/libwpd/libwpd-0.9.6.recipe
@@ -6,7 +6,8 @@ CHECKSUM_MD5="979fc276bcecb1f3220b529ffa68d52c"
 REVISION="1"
 DEPEND="glib >= 2.0.0
 	libgsf >= 1.6.0"
-BUILD {
+BUILD()
+{
 	cd libwpd-0.9.6
 	libtoolize --force --copy --install
 	aclocal
@@ -16,7 +17,8 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd libwpd-0.9.6
 	make install
 }
--- a/app-text/libwpg/libwpg-0.2.1.recipe
+++ b/app-text/libwpg/libwpg-0.2.1.recipe
@@ -6,7 +6,8 @@ CHECKSUM_MD5="7f292980b5c458a58bf89ebba1ed07b6"
 REVISION="1"
 DEPEND="pkg-config >= 0.2
 	libwpd >= 0.8"
-BUILD {
+BUILD()
+{
 	cd libwpg-0.2.1
 	libtoolize --force --copy --install
 	aclocal
@@ -15,7 +16,8 @@ BUILD {
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
-INSTALL {
+INSTALL()
+{
 	cd libwpg-0.2.1
 	make install
 }
--- a/app-text/psiconv/psiconv-0.9.8.recipe
+++ b/app-text/psiconv/psiconv-0.9.8.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="8d7548e3c6b9cd408544736133728acd"
-BUILD {
+BUILD()
+{
 	cd psiconv-0.9.8
 	libtoolize --force --copy --install
 	aclocal
@@ -14,7 +15,8 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd psiconv-0.9.8
 	make install
 }
--- a/app-text/rman/rman-3.2.bep
+++ b/app-text/rman/rman-3.2.bep
@@ -1,24 +0,0 @@
-DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan"
-HOMEPAGE="http://www.sourceforge.net/project/polyglotman"
-SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6"
-BUILD {
-	cd rman-3.2
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-	make BINDIR=$COMMON_BIN MANDIR=$COMMON_DOCS/man
-}
-
-INSTALL {
-	cd rman-3.2
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-	mkdir -p ${DESTDIR}/$COMMON_BIN
-	mkdir -p ${DESTDIR}/$COMMON_DOCS/man
-	make install BINDIR=${DESTDIR}/$COMMON_BIN MANDIR=${DESTDIR}/$COMMON_DOCS/man
-}
-LICENSE="Artistic"
-COPYRIGHT="2003 Thomas A. Phelps"
--- a/app-text/rman/rman-3.2.recipe
+++ b/app-text/rman/rman-3.2.recipe
@@ -0,0 +1,42 @@
+SUMMARY="Man page viewer and translator"
+DESCRIPTION="
+	Parse formatted man pages and man page source from most flavors of UNIX. 
+	Convert to HTML, ASCII, TkMan, DocBook, and other formats.
+	"
+HOMEPAGE="http://www.sourceforge.net/project/polyglotman"
+LICENSE="Artistic"
+COPYRIGHT="2003 Thomas A. Phelps"
+SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz"
+CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6"
+PATCHES="rman-3.2.patch"
+SOURCE_DIR="$portVersionedName"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	rman = $portVersion
+	cmd:rman = $portVersion compat >= 3
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:ld
+	"
+
+BUILD()
+{
+	make BINDIR=$binDir MANDIR=$manDir
+}
+
+INSTALL()
+{
+	mkdir -p $binDir $manDir
+	make install BINDIR=$binDir MANDIR=$manDir
+}
--- a/app-text/sablotron/sablotron-1.0.3.recipe
+++ b/app-text/sablotron/sablotron-1.0.3.recipe
@@ -5,7 +5,8 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="72654c4b832e7562f8240ea675577f5e"
-BUILD {
+BUILD()
+{
 	cd Sablot-1.0.3
 	touch NEWS
 	touch AUTHORS
@@ -19,7 +20,8 @@ BUILD {
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd Sablot-1.0.3
 	make install
 }
--- a/app-text/tesseract/tesseract-3.x_svn.recipe
+++ b/app-text/tesseract/tesseract-3.x_svn.recipe
@@ -5,19 +5,22 @@ REVISION="1"
 STATUS_HAIKU="broken"
 DEPEND=""
 #CHECKSUM_MD5="cc812a261088ea0c3d2da735be35d09f"
-BUILD {
+BUILD()
+{
 	cd tesseract-3.x-svn
 	./runautoconf
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd tesseract-3.x-svn	
 	make install
 }

-TEST {
+TEST()
+{
 	cd tesseract-ocr-3.x
 #	make test
 #	make check
--- a/app-text/texi2html/patches/texi2html-1.82.patchset
+++ b/app-text/texi2html/patches/texi2html-1.82.patchset
@@ -0,0 +1,22 @@
+From 280524560a17d59215d9641b50abaf0e87ca296a Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Sun, 30 Jun 2013 10:24:11 +0200
+Subject: doc/Makefile.am: fix location of HTML documentation
+
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index f27b3bf..4567c56 100644
+--- a/doc/Makefile.am
+++ b/doc/Makefile.am
+@@ -5,7 +5,7 @@ info_TEXINFOS = texi2html.texi
+ #             texi2html.ascii
+ #
+ texinfodata = $(datadir)/texinfo
+-texinfohtmldir = $(texinfodata)/html
+texinfohtmldir = $(htmldir)/html
+ texinfohtml_DATA    = texi2html.html
+ 
+ # use the script out of the distribution NOT
+-- 
+1.7.10.2
+
--- a/app-text/texi2html/texi2html-1.82.bep
+++ b/app-text/texi2html/texi2html-1.82.bep
@@ -1,27 +0,0 @@
-DESCRIPTION="Perl script that converts Texinfo to HTML" 
-HOMEPAGE="http://www.nongnu.org/texi2html/" 
-SRC_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb"
-BUILD {
-	cd texi2html-1.82
-	libtoolize --force --copy --install
-	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL {
-	cd texi2html-1.82
-	make install
-}
-
-TEST {
-	cd texi2html-1.82
-	make check
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others."
--- a/app-text/texi2html/texi2html-1.82.recipe
+++ b/app-text/texi2html/texi2html-1.82.recipe
@@ -0,0 +1,54 @@
+SUMMARY="Perl script that converts Texinfo to HTML"
+DESCRIPTION="Texi2HTML is a Perl script which converts Texinfo source files to HTML output, licensed under the GNU General Public License, version 3, or any later version.
+
+This is an evolving version of the script originally developed by Lionel Cons and later maintained for a time by Olaf Bachmann.  It now supports many advanced features, such as internationalization and extremely configurable output formats.  Development of Texi2HTML moved to the GNU Texinfo repository in 2010, since it was meant to replace the makeinfo implementation in GNU Texinfo.  There was no release of GNU Texinfo with makeinfo based on Texi2HTML, however, because the implementation based on Texi2HTML was abandoned in favor of the current program in GNU Texinfo, which parses the Texinfo input into a tree for processing and supports nearly all the features of Texi2HTML.  Latest Texi2HTML sources are thus in the GNU Texinfo repository, although development of Texi2HTML and of the Texi2HTML based makeinfo implementation stopped in 2011.
+
+There are some differences between Texi2HTML and the GNU Texinfo makeinfo/texi2any implementation, even in the Texi2HTML compatibility mode, they are documented in the GNU Texinfo manual.  Nevertheless, the route forward for authors is, in most cases, to alter manuals and build processes as necessary to use the new features of the makeinfo/texi2any implementation of GNU Texinfo.  The Texi2HTML maintainers (one of whom is the principal author of the GNU Texinfo implementation) do not intend to make further releases of Texi2HTML.  If you have difficulties using the new implementation, you could try to ask on the GNU Texinfo mailing lists."
+HOMEPAGE="http://www.nongnu.org/texi2html/" 
+COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others."
+LICENSE="GNU GPL v2"
+SRC_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2"
+CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb"
+REVISION="2"
+ARCHITECTURES="any"
+
+PATCHES="texi2html-1.82.patchset"
+
+PROVIDES="
+	texi2html = $portVersion compat >= 1.82
+	cmd:texi2html = $portVersion compat >= 1.82
+	"
+REQUIRES="
+	cmd:perl
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:libtoolize
+	cmd:make
+	cmd:perl
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	./autogen.sh
+	PERL="$portPackageLinksDir/cmd~perl/bin/perl" runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}
--- a/app-text/tree/tree-1.6.0.recipe
+++ b/app-text/tree/tree-1.6.0.recipe
@@ -5,21 +5,19 @@ REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="04e967a3f4108d50cde3b4b0e89e970a"
-BUILD {
+BUILD()
+{
 	cd tree-1.6.0
 	make
 }

-INSTALL {
+INSTALL()
+{
 	cd tree-1.6.0
 	make install \
 		BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` \
 		MANDIR=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
 }

-TEST {
-	# none
-}
-
 LICENSE="GNU GPL v2"
 COPYRIGHT="1996-2011 Steve Baker"