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
This commit is contained in:
Oliver Tappe
2013-10-15 22:48:02 +02:00
1452 changed files with 31199 additions and 33804 deletions

View File

@@ -1,27 +0,0 @@
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
HOMEPAGE="http://www.ffmpeg.org"
SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="media-libs/libogg >= 1.3.0
media-libs/speex >= 1.2rc1
media-libs/libtheora >= 1.1.0
media-libs/libvorbis >= 1.3.2
media-libs/libvpx >= 1.0.0"
BUILD {
cd ffmpeg-0.10.2
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
--enable-gpl --datadir=`finddir B_COMMON_DATA_DIRECTORY`
make
}
INSTALL {
cd ffmpeg-0.10.2
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="2000-2003 Fabrice Bellard
2003-2012 the FFmpeg developers"

View File

@@ -1,28 +0,0 @@
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
HOMEPAGE="http://www.ffmpeg.org"
SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="media-libs/libogg >= 1.3.0
media-libs/speex >= 1.2rc1
media-libs/libtheora >= 1.1.0
media-libs/libvorbis >= 1.3.2
media-libs/libvpx >= 1.0.0"
BUILD {
cd ffmpeg-0.10.2
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
--datadir=`finddir B_COMMON_DATA_DIRECTORY`
make
}
INSTALL {
cd ffmpeg-0.10.2
make install
}
LICENSE="GNU LGPL v2.1
GNU GPL v2"
COPYRIGHT="2000-2003 Fabrice Bellard
2003-2012 the FFmpeg developers"

View File

@@ -0,0 +1,154 @@
SUMMARY="Audio and video recording, conversion, and streaming library"
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
HOMEPAGE="http://www.ffmpeg.org"
LICENSE="
GNU LGPL v2.1
GNU GPL v2
"
COPYRIGHT="
2000-2003 Fabrice Bellard
2003-2012 the FFmpeg developers
"
SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
REVISION="4"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="ffmpeg-0.10.2-gcc2.patch"
PROVIDES="
ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.10
lib:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53
lib:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53
lib:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2
lib:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53
lib:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51
lib:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0
lib:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:ffmpeg = $portVersion compat >= 0.10
cmd:ffprobe = $portVersion compat >= 0.10
cmd:ffserver = $portVersion compat >= 0.10
"
fi
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libogg$secondaryArchSuffix
lib:libspeex$secondaryArchSuffix
lib:libtheoradec$secondaryArchSuffix
lib:libtheoraenc$secondaryArchSuffix
lib:libvorbis$secondaryArchSuffix
lib:libvorbisenc$secondaryArchSuffix
lib:libvpx$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libogg$secondaryArchSuffix
devel:libspeex$secondaryArchSuffix
devel:libtheora$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libvpx$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
cmd:pkg_config
cmd:texi2html
cmd:yasm
"
GLOBAL_WRITABLE_FILES="
settings/ffserver.conf
"
PATCH()
{
# patch hard-coded config file path
sed -i "s,/etc/ffserver.conf,$sysconfDir/ffserver.conf," \
ffserver.c \
doc/ffserver.texi
# patch hard-coded paths to perl
sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \
Doxyfile \
doc/texi2pod.pl
}
BUILD()
{
# not an auto tools configure
./configure \
--prefix=$prefix \
--bindir=$binDir \
--datadir=$dataDir/$portName \
--incdir=$includeDir \
--libdir=$libDir \
--shlibdir=$libDir \
--mandir=$manDir \
--disable-debug \
--enable-shared \
--enable-libvorbis \
--enable-libspeex \
--enable-libtheora \
--enable-libvpx
make $jobArgs
}
INSTALL()
{
make install
rm $binDir/ffprobe
# TODO: Determine and fix what is wrong with ffprobe! The executable
# seems to be broken. The NEEDED entries in the dynamic section look
# weird and the runtime loader fails relocating with "Operation not
# allowed".
prepareInstalledDevelLibs \
libavcodec \
libavdevice \
libavfilter \
libavformat \
libavutil \
libswresample \
libswscale
fixPkgconfig
# include the documented ffserver.conf
mkdir -p $docDir
cp doc/ffserver.conf $docDir
# devel package
packageEntries devel \
$developDir
# Remove stuff we don't need in the secondary architecture base package.
if [ -n "$secondaryArchSuffix" ]; then
rm -rf $prefix/bin
rm -rf $documentationDir
fi
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 0.10
devel:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53
devel:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53
devel:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2
devel:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53
devel:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51
devel:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0
devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2
"
REQUIRES_devel="
ffmpeg$secondaryArchSuffix == $portVersion
"

View File

@@ -1,27 +0,0 @@
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
HOMEPAGE="http://www.ffmpeg.org"
SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.tar.bz2"
CHECKSUM_MD5="dc665cc599a739e3c5262ccdac13d129"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="media-libs/libogg >= 1.3.0
media-libs/speex >= 1.2rc1
media-libs/libtheora >= 1.1.0
media-libs/libvorbis >= 1.3.2
media-libs/libvpx >= 1.0.0"
BUILD {
cd ffmpeg-0.10
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx
make
}
INSTALL {
cd ffmpeg-0.10
make install
}
LICENSE="GNU LGPL v2.1
GNU GPL v2"
COPYRIGHT="2000-2003 Fabrice Bellard
2003-2012 the FFmpeg developers"

View File

@@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0
media-libs/libtheora >= 1.1.0
media-libs/libvorbis >= 1.3.2
media-libs/libvpx >= 1.0.0"
BUILD {
BUILD()
{
cd ffmpeg-0.11.1
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \
--enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \
@@ -17,7 +18,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd ffmpeg-0.11.1
make install
}

View File

@@ -1,17 +0,0 @@
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
HOMEPAGE="http://www.ffmpeg.org"
SRC_URI="http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2"
CHECKSUM_MD5="be8503f15c3b81ba00eb8379ca8dcf33"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd ffmpeg-0.5
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared
make
}
INSTALL {
cd ffmpeg-0.5
make install
}

View File

@@ -1,22 +0,0 @@
DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library."
HOMEPAGE="http://www.ffmpeg.org"
SRC_URI="http://ffmpeg.org/releases/ffmpeg-0.6.tar.bz2"
CHECKSUM_MD5="d6142a9a5821d6a6262a6edb903faa24"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd ffmpeg-0.6
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared
make
}
INSTALL {
cd ffmpeg-0.6
make install
}
LICENSE="GNU LGPL v2.1
GNU GPL v2"
COPYRIGHT="2000-2003 Fabrice Bellard
2003-2010 the FFmpeg developers"

View File

@@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#23081"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd ffmpeg-23081
chmod 777 configure
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl
make
}
INSTALL {
INSTALL()
{
cd ffmpeg-23081
make install
}

View File

@@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#7407"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND=""
BUILD {
BUILD()
{
cd ffmpeg-7407
chmod 777 configure
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl --enable-pp
make
}
INSTALL {
INSTALL()
{
cd ffmpeg-7407
make install
}

View File

@@ -210,8 +210,8 @@ index e1ba799..3820056 100644
av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n",
av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat));
diff --git a/configure b/configure
--- ffmpeg-0.10.2/configure 2012-01-26 22:15:59.047710208 +0000
+++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000
--- ffmpeg-0.10.2/configure
+++ ffmpeg-0.10-haiku/configure
@@ -1359,7 +1359,6 @@
aligned_stack_if_any="ppc x86"

View File

@@ -1,26 +0,0 @@
diff -urN ffmpeg-0.5/configure ffmpeg-0.5-haiku/configure
--- ffmpeg-0.5/configure 2009-03-01 17:57:14.000000000 +0000
+++ ffmpeg-0.5-haiku/configure 2009-10-18 22:24:38.000000000 +0000
@@ -1483,7 +1483,7 @@
# OS specific
case $target_os in
- beos|haiku|zeta)
+ beos|zeta)
prefix_default="$HOME/config"
# helps building libavcodec
add_cflags -DPIC -fomit-frame-pointer
@@ -1509,6 +1509,13 @@
enable beos_netserver
network_extralibs="-lnet"
fi ;;
+ haiku)
+ prefix_default="/boot/common"
+ SHFLAGS=' -shared'
+ disable audio_beos
+ enable beosthreads
+ network_extralibs="-lnetwork"
+ ;;
sunos)
FFSERVERLDFLAGS=""
SHFLAGS='-shared -Wl,-h,$$(@F)'

View File

@@ -1,22 +0,0 @@
--- ffmpeg-0.6/configure 2010-06-15 19:44:30.020447232 +0000
+++ ffmpeg-0.6-haiku/configure 2010-07-13 20:40:48.244056064 +0000
@@ -2127,7 +2127,7 @@
# OS specific
case $target_os in
- beos|haiku|zeta)
+ beos|zeta)
prefix_default="$HOME/config"
# 3 gcc releases known for BeOS, each with ugly bugs
gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
@@ -2151,6 +2148,10 @@
enable beos_netserver
network_extralibs="-lnet"
fi ;;
+ haiku)
+ prefix_default="/boot/common"
+ network_extralibs="-lnetwork"
+ ;;
sunos)
FFSERVERLDFLAGS=""
SHFLAGS='-shared -Wl,-h,$$(@F)'