haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'package-management'

Browse Source 
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
parent 79f735cb8b c69048fe86
commit f3532dc2cb
1452 changed files with 31199 additions and 33804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
dev-libs/apr-util/apr-util-1.3.10.bep
View File

@@ -1,49 +0,0 @@
DESCRIPTION="apr-util - Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/apr >= 1.3.9"
BUILD {
cd apr-util-1.3.10
rm -rf aclocal.m4
mkdir -p m4
haikuporter -b apr-1.4.2
libtoolize -fci
aclocal --install -I m4
autoconf -f
cd xml/expat
mkdir -p m4
echo `AM_INIT_AUTOMAKE` >> configure.in
libtoolize -fci
aclocal --install -I m4
autoconf --force
autoheader
touch libtool.m4
cd ../..
sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.2/build/gen-build.py
buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \
--prefix=`finddir B_COMMON_DIRECTORY`
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config
make
}
INSTALL {
cd apr-util-1.3.10
make install
}
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."

49
dev-libs/apr-util/apr-util-1.3.11.bep
View File

@@ -1,49 +0,0 @@
DESCRIPTION="apr-util - Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.11.tar.gz"
CHECKSUM_MD5="bfc16065a784785dd356dc4067fe2504"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/apr >= 1.3.9"
BUILD {
cd apr-util-1.3.11
rm -rf aclocal.m4
mkdir -p m4
haikuporter -b apr-1.4.2
libtoolize -fci
aclocal --install -I m4
autoconf -f
cd xml/expat
mkdir -p m4
echo `AM_INIT_AUTOMAKE` >> configure.in
libtoolize -fci
aclocal --install -I m4
autoconf --force
autoheader
touch libtool.m4
cd ../..
sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.2/build/gen-build.py
buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \
--prefix=`finddir B_COMMON_DIRECTORY`
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config
make
}
INSTALL {
cd apr-util-1.3.11
make install
}
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."

49
dev-libs/apr-util/apr-util-1.3.12.bep
View File

@@ -1,49 +0,0 @@
DESCRIPTION="apr-util - Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.12.tar.gz"
CHECKSUM_MD5="d1977289889592ef998e3f777f68efe4"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/apr >= 1.3.9"
BUILD {
cd apr-util-1.3.12
rm -rf aclocal.m4
mkdir -p m4
haikuporter -b apr-1.4.5
libtoolize -fci
aclocal --install -I m4
autoconf -f
cd xml/expat
mkdir -p m4
echo `AM_INIT_AUTOMAKE` >> configure.in
libtoolize -fci
aclocal --install -I m4
autoconf --force
autoheader
touch libtool.m4
cd ../..
sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.5/build/gen-build.py
buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.5 \
--prefix=`finddir B_COMMON_DIRECTORY`
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config
make
}
INSTALL {
cd apr-util-1.3.12
make install
}
LICENSE="Apache v2"
COPYRIGHT="2011 The Apache Software Foundation."

47
dev-libs/apr-util/apr-util-1.3.9.bep
View File

@@ -1,47 +0,0 @@
DESCRIPTION="apr-util - Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://apache.multihomed.net/apr/apr-util-1.3.9.tar.gz"
CHECKSUM_MD5="cc2ec0ba4f01d88375f1170f762518fa"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/apr >= 1.3.9"
BUILD {
cd apr-util-1.3.9
rm -rf aclocal.m4
mkdir -p m4
haikuporter -b apr-1.4.2
echo `AC_CONFIG_MACRO_DIR([m4])` >> configure.in
echo `AM_INIT_AUTOMAKE` >> configure.in
cp /boot/common/share/aclocal/libtool.m4 m4
cp /boot/common/share/aclocal/ltoptions.m4 m4
cp /boot/common/share/aclocal/ltversion.m4 m4
cp /boot/common/share/aclocal/ltsugar.m4 m4
cp /boot/common/share/aclocal/lt~obsolete.m4 m4
libtoolize --force --copy --install
aclocal -I m4
autoconf --force
APRDIR=`haikuporter -t`
buildconf --with-apr=${APRDIR}/dev-libs/apr/work/apr-1.4.2
cd xml/expat
mkdir -p m4
echo `AM_INIT_AUTOMAKE` >> configure.in
cp /boot/common/share/aclocal/libtool.m4 m4
cp /boot/common/share/aclocal/ltoptions.m4 m4
cp /boot/common/share/aclocal/ltversion.m4 m4
cp /boot/common/share/aclocal/ltsugar.m4 m4
cp /boot/common/share/aclocal/lt~obsolete.m4 m4
libtoolize --force --copy --install
aclocal -I m4
autoconf --force
autoheader
cd ../..
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config
make
}
INSTALL {
cd apr-util-1.3.9
make install
}
LICENSE="Apache v2"
COPYRIGHT="2009 The Apache Software Foundation."

49
dev-libs/apr-util/apr-util-1.4.1.bep
View File

@@ -1,49 +0,0 @@
DESCRIPTION="apr-util - Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz"
CHECKSUM_MD5="666a5d56098a9debf998510e304c8095"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/apr == 1.4.6"
BUILD {
cd apr-util-1.4.1
rm -rf aclocal.m4
mkdir -p m4
haikuporter -b apr-1.4.6
libtoolize -fci
aclocal --install -I m4
autoconf -f
cd xml/expat
mkdir -p m4
echo `AM_INIT_AUTOMAKE` >> configure.in
libtoolize -fci
aclocal --install -I m4
autoconf --force
autoheader
touch libtool.m4
cd ../..
sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.6/build/gen-build.py
buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.6 \
--prefix=`finddir B_COMMON_DIRECTORY`
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config
make
}
INSTALL {
cd apr-util-1.4.1
make install
}
LICENSE="Apache v2"
COPYRIGHT="2011 The Apache Software Foundation."

24
dev-libs/apr-util/patches/apr-util-0.9.x-haiku.diff
View File

@@ -1,24 +0,0 @@
diff -u apr-util-0.9.15-orig/config.layout apr-util-0.9.15/config.layout
--- apr-util-0.9.15-orig/config.layout 2004-11-24 23:45:40.000000000 +0000
+++ apr-util-0.9.15/config.layout 2008-05-14 15:03:22.000000000 +0000
@@ -229,3 +229,20 @@
infodir: ${exec_prefix}/share/info
libsuffix -${APRUTIL_MAJOR_VERSION}
</Layout>
+
+# Haiku layout
+<Layout haiku>
+ prefix: /boot/common
+ exec_prefix: ${prefix}
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/bin
+ libdir: ${exec_prefix}/lib
+ libexecdir: ${exec_prefix}/bin
+ mandir: ${prefix}/man
+ sysconfdir: ${prefix}/conf
+ datadir: ${prefix}
+ installbuilddir: ${datadir}/build
+ includedir: ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION}
+ localstatedir: ${prefix}
+ libsuffix: -${APRUTIL_MAJOR_VERSION}
+</Layout>

13
dev-libs/apr-util/patches/apr-util-0.9.x.diff
View File

@@ -1,13 +0,0 @@
Index: configure.in
===================================================================
--- configure.in (revision 645316)
+++ configure.in (working copy)
@@ -145,7 +145,7 @@
dnl ### apr and expat libraries to the build or it'll die a truly horrible
dnl ### death. We now use the apr-config tool to determine the correct
dnl ### library to link against :)
-*AIX*|*Darwin*|*BeOS*|CYGWIN*)
+*AIX*|*Darwin*|*BeOS*|*Haiku*|CYGWIN*)
dnl need such stuff as -liconv to be specified when building libaprutil.la
EXTRA_OS_LINK='$(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)'
;;

20
dev-libs/apr/apr-1.3.8.bep
View File

@@ -1,20 +0,0 @@
DESCRIPTION="apr - Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://www.apache.org/dist/apr/apr-1.3.8.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd apr-1.3.8
libtoolize --force --copy --install
buildconf
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
cd apr-1.3.8
make install
}
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."

21
dev-libs/apr/apr-1.3.9.bep
View File

@@ -1,21 +0,0 @@
DESCRIPTION="apr - Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://www.apache.org/dist/apr/apr-1.3.9.tar.gz"
CHECKSUM_MD5="85bcd8005153b8fa63b1e3f95ea31f07"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd apr-1.3.9
libtoolize --force --copy --install
buildconf
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
cd apr-1.3.9
make install
}
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."

39
dev-libs/apr/apr-1.4.2.bep
View File

@@ -1,39 +0,0 @@
DESCRIPTION="apr - Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz"
CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd"
REVISION="3"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd apr-1.4.2
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd apr-1.4.2
make install
}
TEST {
cd apr-1.4.2
make test
}
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."

39
dev-libs/apr/apr-1.4.4.bep
View File

@@ -1,39 +0,0 @@
DESCRIPTION="apr - Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://www.apache.org/dist/apr/apr-1.4.4.tar.gz"
CHECKSUM_MD5="9d70b96d4d7f7449f9c3cc81a691c5bf"
REVISION="3"
STATUS_HAIKU="broken"
DEPEND=""
BUILD {
cd apr-1.4.4
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd apr-1.4.4
make install
}
TEST {
cd apr-1.4.4
make test
}
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."

39
dev-libs/apr/apr-1.4.5.bep
View File

@@ -1,39 +0,0 @@
DESCRIPTION="apr - Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://www.apache.org/dist/apr/apr-1.4.5.tar.gz"
CHECKSUM_MD5="97262fe54dddaf583eaaee3497a426e1"
REVISION="4"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd apr-1.4.5
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd apr-1.4.5
make install
}
TEST {
cd apr-1.4.5
make test
}
LICENSE="Apache v2"
COPYRIGHT="2011 The Apache Software Foundation."

39
dev-libs/apr/apr-1.4.6.bep
View File

@@ -1,39 +0,0 @@
DESCRIPTION="apr - Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz"
CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
REVISION="4"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd apr-1.4.6
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd apr-1.4.6
make install
}
TEST {
cd apr-1.4.6
make test
}
LICENSE="Apache v2"
COPYRIGHT="2012 The Apache Software Foundation."

111
dev-libs/apr/apr-1.4.6.recipe Normal file
View File

@@ -0,0 +1,111 @@
SUMMARY="Apache Portable Runtime Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz"
COPYRIGHT="2012 The Apache Software Foundation."
LICENSE="Apache v2"
CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb"
REVISION="7"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="apr-1.4.6.patch"
PROVIDES="
apr = $portVersion compat >= 1
lib:libapr_1 = 0.4.6 compat >= 0
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
"
SOURCE_DIR="$portVersionedName"
BUILD()
{
libtoolize -fci
touch libtool.m4
aclocal -I build
autoconf
runConfigure ./configure \
--with-installbuilddir=$prefix/data/apr
# TODO: fix this hack (by finding out why top_builddir seems to be unset)!
ln -sfn $sourceDir/libtool /libtool
make $jobArgs
}
INSTALL()
{
make install
# prepare develop/lib
prepareInstalledDevelLibs libapr-1
fixPkgconfig
# fix apr-1-config
fixDevelopLibDirReferences $binDir/apr-1-config
# remove superfluous .exp file
rm $libDir/apr.exp
# devel package
packageEntries devel \
$binDir \
$dataDir \
$developDir
}
TEST()
{
make test
}
# ----- description ----------------------------------------------------------
DESCRIPTION="
The mission of the Apache Portable Runtime (APR) project is to create
and maintain software libraries that provide a predictable and consistent
interface to underlying platform-specific implementations. The primary
goal is to provide an API to which software developers may code and be
assured of predictable if not identical behaviour regardless of the
platform on which their software is built, relieving them of the need to
code special-case conditions to work around or take advantage of
platform-specific deficiencies or features.
To give a brief overview, the primary core subsystems of APR 1.x include
the following:
- atomic operations
- dynamic Shared Object loading
- file I/O
- locks (mutexes, condition variables, etc)
- memory management (high performance allocators)
- memory-mapped files
- multicast Sockets
- network I/O
- shared memory
- thread and Process management
- various data structures (tables, hashes, priority queues, etc)
"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
apr_devel = portVersion compat >= 1
cmd:apr_1_config = portVersion compat >= 1
devel:libapr_1 = 0.4.6 compat >= 0
"
REQUIRES_devel="
apr == $portVersion base
"

185
dev-libs/apr/patches/apr-0.9.x-haiku.diff
View File

@@ -1,185 +0,0 @@
diff -urN apr-0.9.17-orig/build/apr_hints.m4 apr-0.9.17/build/apr_hints.m4
--- apr-0.9.17-orig/build/apr_hints.m4 2006-03-16 09:41:51.000000000 +0000
+++ apr-0.9.17/build/apr_hints.m4 2008-05-13 22:10:51.000000000 +0000
@@ -390,6 +390,12 @@
APR_ADDTO(CPPFLAGS, [-DCYGWIN])
APR_ADDTO(LIBS, [-lcrypt])
;;
+ *-haiku*)
+ APR_ADDTO(LIBS, [-lnetwork])
+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+ APR_SETIFNULL(apr_posixsem_is_global, [yes])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ ;;
esac
fi
diff -urN apr-0.9.17-orig/configure.in apr-0.9.17/configure.in
--- apr-0.9.17-orig/configure.in 2007-11-03 14:18:38.000000000 +0000
+++ apr-0.9.17/configure.in 2008-05-13 22:10:51.000000000 +0000
@@ -219,7 +219,7 @@
dnl otherwise.
case $host in
- *os390)
+ *os390|*haiku*)
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -434,6 +434,13 @@
OSDIR="unix"
eolstr="\\n"
;;
+ *haiku*)
+ OSDIR="unix"
+ eolstr="\\n"
+ APR_ADDTO(CPPFLAGS,-I/boot/develop/headers/bsd)
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -656,6 +663,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS_ANON,
+ [BeOS areas])])
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -671,10 +682,6 @@
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2_ANON, [OS/2 DosAllocSharedMem()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS_ANON,
- [BeOS areas])])
case $host in
*linux* )
# Linux has problems with MM_SHMT_MMANON even though it reports
@@ -722,6 +729,9 @@
havebeosarea="0"
haveos2shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -735,9 +745,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
@@ -1270,7 +1277,7 @@
ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
size_t_fmt='#define APR_SIZE_T_FMT "lu"'
;;
- *beos*)
+ *beos*|*haiku*)
ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
size_t_fmt='#define APR_SIZE_T_FMT "ld"'
;;
diff -urN apr-0.9.17-orig/test/testoc.c apr-0.9.17/test/testoc.c
--- apr-0.9.17-orig/test/testoc.c 2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testoc.c 2008-05-13 22:10:51.000000000 +0000
@@ -78,6 +78,9 @@
rv = apr_procattr_create(&procattr, p);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
+ CuAssertIntEquals(tc, APR_SUCCESS, rv);
+
rv = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_NO_PIPE,
APR_NO_PIPE);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
diff -urN apr-0.9.17-orig/test/testpipe.c apr-0.9.17/test/testpipe.c
--- apr-0.9.17-orig/test/testpipe.c 2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testpipe.c 2008-05-13 22:10:51.000000000 +0000
@@ -152,6 +152,9 @@
rv = apr_procattr_create(&procattr, p);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
+ CuAssertIntEquals(tc, APR_SUCCESS, rv);
+
rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK,
APR_CHILD_BLOCK);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
diff -urN apr-0.9.17-orig/test/testpoll.c apr-0.9.17/test/testpoll.c
--- apr-0.9.17-orig/test/testpoll.c 2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testpoll.c 2008-05-13 22:10:51.000000000 +0000
@@ -197,6 +197,8 @@
send_msg(s, sa, 2, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -212,6 +214,8 @@
recv_msg(s, 1, p, tc);
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 1, tc);
@@ -318,6 +322,7 @@
int num;
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
CuAssertIntEquals(tc, 1, num);
@@ -348,6 +353,7 @@
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
CuAssertIntEquals(tc, 2, num);
@@ -380,6 +386,7 @@
int num;
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
CuAssertIntEquals(tc, 1, num);
diff -urN apr-0.9.17-orig/test/testproc.c apr-0.9.17/test/testproc.c
--- apr-0.9.17-orig/test/testproc.c 2006-09-20 16:04:09.000000000 +0000
+++ apr-0.9.17/test/testproc.c 2008-05-13 22:10:51.000000000 +0000
@@ -53,7 +53,7 @@
rv = apr_procattr_dir_set(attr, "data");
CuAssertIntEquals(tc, APR_SUCCESS, rv);
- rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
+ rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
args[0] = "proc_child" EXTENSION;
@@ -129,7 +129,7 @@
CuAssertIntEquals(tc, APR_SUCCESS, rv);
rv = apr_procattr_dir_set(attr, "data");
CuAssertIntEquals(tc, APR_SUCCESS, rv);
- rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
+ rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
args[0] = "proc_child";

2750
dev-libs/apr/patches/apr-0.9.x.diff
View File

File diff suppressed because it is too large Load Diff

2869
dev-libs/apr/patches/apr-1.0.1.diff
View File

File diff suppressed because it is too large Load Diff

23
dev-libs/apr/patches/apr-1.2.x.diff
View File

@@ -1,23 +0,0 @@
Index: Makefile.in
===================================================================
--- Makefile.in (revision 619048)
+++ Makefile.in (working copy)
@@ -18,7 +18,7 @@
INCDIR=./include
OSDIR=$(top_srcdir)/include/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include
#
# Macros for target determination
Index: build/gen-build.py
===================================================================
--- build/gen-build.py (revision 619048)
+++ build/gen-build.py (working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/env python
#
# USAGE: gen-build.py TYPE
#

201
dev-libs/apr/patches/apr-1.3.3.patch
View File

@@ -1,201 +0,0 @@
diff -urN apr-1.3.3/build/apr_hints.m4 apr-1.3.3-haiku/build/apr_hints.m4
--- apr-1.3.3/build/apr_hints.m4 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/build/apr_hints.m4 2009-04-28 02:01:57.000000000 +0000
@@ -35,7 +35,7 @@
dnl Generally, we force the setting of CC, and add flags
dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS.
dnl
-AC_DEFUN(APR_PRELOAD, [
+AC_DEFUN([APR_PRELOAD], [
if test "x$apr_preload_done" != "xyes" ; then
apr_preload_done="yes"
@@ -453,6 +453,12 @@
APR_SETIFNULL(have_proc_invoked, [1])
APR_SETIFNULL(apr_cv_use_lfs64, [yes])
;;
+ *-haiku*)
+ APR_ADDTO(LIBS, [-lnetwork])
+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+ APR_SETIFNULL(apr_posixsem_is_global, [yes])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ ;;
esac
fi
@@ -463,7 +469,7 @@
dnl
dnl Allows us to provide a default choice of compiler which
dnl the user can override.
-AC_DEFUN(APR_CC_HINTS, [
+AC_DEFUN([APR_CC_HINTS], [
case "$host" in
*-apple-aux3*)
APR_SETIFNULL(CC, [gcc])
diff -urN apr-1.3.3/build/apr_network.m4 apr-1.3.3-haiku/build/apr_network.m4
--- apr-1.3.3/build/apr_network.m4 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/build/apr_network.m4 2009-04-27 06:00:26.000000000 +0000
@@ -21,7 +21,7 @@
dnl
dnl check for type in_addr
dnl
-AC_DEFUN(APR_TYPE_IN_ADDR,[
+AC_DEFUN([APR_TYPE_IN_ADDR],[
AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[
AC_TRY_COMPILE([
#ifdef HAVE_SYS_TYPES_H
diff -urN apr-1.3.3/build/apr_threads.m4 apr-1.3.3-haiku/build/apr_threads.m4
--- apr-1.3.3/build/apr_threads.m4 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/build/apr_threads.m4 2009-04-27 05:51:44.000000000 +0000
@@ -26,7 +26,7 @@
dnl pthreads is not available.
dnl Turn off warnings if we're using gcc.
dnl
-AC_DEFUN(APR_CHECK_PTHREADS_H, [
+AC_DEFUN([APR_CHECK_PTHREADS_H], [
if test "$GCC" = "yes"; then
SAVE_FL="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -w"
@@ -41,7 +41,7 @@
dnl
dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [
+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [
AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -65,7 +65,7 @@
dnl
dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [
+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [
AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -91,7 +91,7 @@
dnl Try running a program which uses pthreads, executing the
dnl actions-if-success commands on success.
dnl
-AC_DEFUN(APR_PTHREADS_TRY_RUN, [
+AC_DEFUN([APR_PTHREADS_TRY_RUN], [
AC_TRY_RUN( [
#include <pthread.h>
#include <stddef.h>
@@ -182,12 +182,12 @@
dnl the checks for threading support so that they can restored if the
dnl result is not what the caller wanted.
dnl
-AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [
+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [
apr_pthsv_CFLAGS="$CFLAGS"
apr_pthsv_LIBS="$LIBS"
])dnl
-AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [
+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [
CFLAGS="$apr_pthsv_CFLAGS"
LIBS="$apr_pthsv_LIBS"
])dnl
diff -urN apr-1.3.3/configure.in apr-1.3.3-haiku/configure.in
--- apr-1.3.3/configure.in 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/configure.in 2009-04-28 02:02:02.000000000 +0000
@@ -244,7 +244,7 @@
dnl otherwise.
case $host in
- *os390)
+ *os390|*haiku*)
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -479,6 +479,12 @@
OSDIR="unix"
eolstr="\\n"
;;
+ *haiku*)
+ OSDIR="unix"
+ eolstr="\\n"
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -833,6 +840,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS_ANON,
+ [BeOS areas])])
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -904,6 +915,9 @@
haveos2shm="0"
havewin32shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -917,9 +931,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
diff -urN apr-1.3.3/test/testpoll.c apr-1.3.3-haiku/test/testpoll.c
--- apr-1.3.3/test/testpoll.c 2009-04-27 05:57:37.000000000 +0000
+++ apr-1.3.3-haiku/test/testpoll.c 2009-04-28 02:02:28.000000000 +0000
@@ -193,6 +193,8 @@
recv_msg(s, 2, p, tc);
send_msg(s, sa, 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -207,6 +209,8 @@
send_msg(s, sa, 2, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -381,6 +385,7 @@
int num;
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);
@@ -411,6 +416,7 @@
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 2, num);
@@ -443,6 +449,7 @@
int num;
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);

219
dev-libs/apr/patches/apr-1.3.8.patch
View File

@@ -1,219 +0,0 @@
diff -urN apr-1.3.8/build/apr_hints.m4 apr-1.3.8-haiku/build/apr_hints.m4
--- apr-1.3.8/build/apr_hints.m4 2009-06-02 09:15:46.000000000 -0700
+++ apr-1.3.8-haiku/build/apr_hints.m4 2009-08-29 21:04:14.000000000 -0700
@@ -35,7 +35,7 @@
dnl Generally, we force the setting of CC, and add flags
dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS.
dnl
-AC_DEFUN(APR_PRELOAD, [
+AC_DEFUN([APR_PRELOAD], [
if test "x$apr_preload_done" != "xyes" ; then
apr_preload_done="yes"
@@ -454,6 +454,12 @@
APR_SETIFNULL(have_proc_invoked, [1])
APR_SETIFNULL(apr_cv_use_lfs64, [yes])
;;
+ *-haiku*)
+ APR_ADDTO(LIBS, [-lnetwork])
+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+ APR_SETIFNULL(apr_posixsem_is_global, [yes])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ ;;
esac
fi
@@ -464,7 +470,7 @@
dnl
dnl Allows us to provide a default choice of compiler which
dnl the user can override.
-AC_DEFUN(APR_CC_HINTS, [
+AC_DEFUN([APR_CC_HINTS], [
case "$host" in
*-apple-aux3*)
APR_SETIFNULL(CC, [gcc])
diff -urN apr-1.3.8/build/apr_network.m4 apr-1.3.8-haiku/build/apr_network.m4
--- apr-1.3.8/build/apr_network.m4 2008-06-16 14:16:13.000000000 -0700
+++ apr-1.3.8-haiku/build/apr_network.m4 2009-08-29 21:04:14.000000000 -0700
@@ -21,7 +21,7 @@
dnl
dnl check for type in_addr
dnl
-AC_DEFUN(APR_TYPE_IN_ADDR,[
+AC_DEFUN([APR_TYPE_IN_ADDR],[
AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[
AC_TRY_COMPILE([
#ifdef HAVE_SYS_TYPES_H
diff -urN apr-1.3.8/build/apr_threads.m4 apr-1.3.8-haiku/build/apr_threads.m4
--- apr-1.3.8/build/apr_threads.m4 2006-08-03 03:46:47.000000000 -0700
+++ apr-1.3.8-haiku/build/apr_threads.m4 2009-08-29 21:04:14.000000000 -0700
@@ -26,7 +26,7 @@
dnl pthreads is not available.
dnl Turn off warnings if we're using gcc.
dnl
-AC_DEFUN(APR_CHECK_PTHREADS_H, [
+AC_DEFUN([APR_CHECK_PTHREADS_H], [
if test "$GCC" = "yes"; then
SAVE_FL="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -w"
@@ -41,7 +41,7 @@
dnl
dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [
+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [
AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -65,7 +65,7 @@
dnl
dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [
+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [
AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -91,7 +91,7 @@
dnl Try running a program which uses pthreads, executing the
dnl actions-if-success commands on success.
dnl
-AC_DEFUN(APR_PTHREADS_TRY_RUN, [
+AC_DEFUN([APR_PTHREADS_TRY_RUN], [
AC_TRY_RUN( [
#include <pthread.h>
#include <stddef.h>
@@ -182,12 +182,12 @@
dnl the checks for threading support so that they can restored if the
dnl result is not what the caller wanted.
dnl
-AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [
+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [
apr_pthsv_CFLAGS="$CFLAGS"
apr_pthsv_LIBS="$LIBS"
])dnl
-AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [
+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [
CFLAGS="$apr_pthsv_CFLAGS"
LIBS="$apr_pthsv_LIBS"
])dnl
diff -urN apr-1.3.8/build/gen-build.py apr-1.3.8-haiku/build/gen-build.py
--- apr-1.3.8/build/gen-build.py 2007-02-28 04:44:52.000000000 -0800
+++ apr-1.3.8-haiku/build/gen-build.py 2009-08-29 20:36:31.000000000 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/env python
#
# USAGE: gen-build.py TYPE
#
diff -urN apr-1.3.8/configure.in apr-1.3.8-haiku/configure.in
--- apr-1.3.8/configure.in 2009-07-17 16:14:25.000000000 -0700
+++ apr-1.3.8-haiku/configure.in 2009-08-29 20:48:05.000000000 -0700
@@ -135,7 +135,7 @@
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)
@@ -248,7 +248,7 @@
dnl otherwise.
case $host in
- *os390)
+ *os390|*haiku*)
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -486,6 +486,12 @@
OSDIR="unix"
eolstr="\\n"
;;
+ *haiku*)
+ OSDIR="unix"
+ eolstr="\\n"
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -962,6 +968,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS_ANON,
+ [BeOS areas])])
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -1033,6 +1043,9 @@
haveos2shm="0"
havewin32shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -1046,9 +1059,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
diff -urN apr-1.3.8/test/testpoll.c apr-1.3.8-haiku/test/testpoll.c
--- apr-1.3.8/test/testpoll.c 2008-04-13 04:37:52.000000000 -0700
+++ apr-1.3.8-haiku/test/testpoll.c 2009-08-29 21:04:14.000000000 -0700
@@ -193,6 +193,8 @@
recv_msg(s, 2, p, tc);
send_msg(s, sa, 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -207,6 +209,8 @@
send_msg(s, sa, 2, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -381,6 +385,7 @@
int num;
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);
@@ -411,6 +416,7 @@
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 2, num);
@@ -443,6 +449,7 @@
int num;
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);

219
dev-libs/apr/patches/apr-1.3.9.patch
View File

@@ -1,219 +0,0 @@
diff -urN apr-1.3.9/build/apr_hints.m4 apr-1.3.9-haiku/build/apr_hints.m4
--- apr-1.3.9/build/apr_hints.m4 2009-06-02 09:15:46.000000000 -0700
+++ apr-1.3.9-haiku/build/apr_hints.m4 2009-08-29 21:04:14.000000000 -0700
@@ -35,7 +35,7 @@
dnl Generally, we force the setting of CC, and add flags
dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS.
dnl
-AC_DEFUN(APR_PRELOAD, [
+AC_DEFUN([APR_PRELOAD], [
if test "x$apr_preload_done" != "xyes" ; then
apr_preload_done="yes"
@@ -454,6 +454,12 @@
APR_SETIFNULL(have_proc_invoked, [1])
APR_SETIFNULL(apr_cv_use_lfs64, [yes])
;;
+ *-haiku*)
+ APR_ADDTO(LIBS, [-lnetwork])
+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE])
+ APR_SETIFNULL(apr_posixsem_is_global, [yes])
+ APR_SETIFNULL(apr_process_lock_is_global, [yes])
+ ;;
esac
fi
@@ -464,7 +470,7 @@
dnl
dnl Allows us to provide a default choice of compiler which
dnl the user can override.
-AC_DEFUN(APR_CC_HINTS, [
+AC_DEFUN([APR_CC_HINTS], [
case "$host" in
*-apple-aux3*)
APR_SETIFNULL(CC, [gcc])
diff -urN apr-1.3.9/build/apr_network.m4 apr-1.3.9-haiku/build/apr_network.m4
--- apr-1.3.9/build/apr_network.m4 2008-06-16 14:16:13.000000000 -0700
+++ apr-1.3.9-haiku/build/apr_network.m4 2009-08-29 21:04:14.000000000 -0700
@@ -21,7 +21,7 @@
dnl
dnl check for type in_addr
dnl
-AC_DEFUN(APR_TYPE_IN_ADDR,[
+AC_DEFUN([APR_TYPE_IN_ADDR],[
AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[
AC_TRY_COMPILE([
#ifdef HAVE_SYS_TYPES_H
diff -urN apr-1.3.9/build/apr_threads.m4 apr-1.3.9-haiku/build/apr_threads.m4
--- apr-1.3.9/build/apr_threads.m4 2006-08-03 03:46:47.000000000 -0700
+++ apr-1.3.9-haiku/build/apr_threads.m4 2009-08-29 21:04:14.000000000 -0700
@@ -26,7 +26,7 @@
dnl pthreads is not available.
dnl Turn off warnings if we're using gcc.
dnl
-AC_DEFUN(APR_CHECK_PTHREADS_H, [
+AC_DEFUN([APR_CHECK_PTHREADS_H], [
if test "$GCC" = "yes"; then
SAVE_FL="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -w"
@@ -41,7 +41,7 @@
dnl
dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [
+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [
AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -65,7 +65,7 @@
dnl
dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
dnl
-AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [
+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [
AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[
AC_TRY_COMPILE([
#include <pthread.h>
@@ -91,7 +91,7 @@
dnl Try running a program which uses pthreads, executing the
dnl actions-if-success commands on success.
dnl
-AC_DEFUN(APR_PTHREADS_TRY_RUN, [
+AC_DEFUN([APR_PTHREADS_TRY_RUN], [
AC_TRY_RUN( [
#include <pthread.h>
#include <stddef.h>
@@ -182,12 +182,12 @@
dnl the checks for threading support so that they can restored if the
dnl result is not what the caller wanted.
dnl
-AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [
+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [
apr_pthsv_CFLAGS="$CFLAGS"
apr_pthsv_LIBS="$LIBS"
])dnl
-AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [
+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [
CFLAGS="$apr_pthsv_CFLAGS"
LIBS="$apr_pthsv_LIBS"
])dnl
diff -urN apr-1.3.9/build/gen-build.py apr-1.3.9-haiku/build/gen-build.py
--- apr-1.3.9/build/gen-build.py 2007-02-28 04:44:52.000000000 -0800
+++ apr-1.3.9-haiku/build/gen-build.py 2009-08-29 20:36:31.000000000 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/env python
#
# USAGE: gen-build.py TYPE
#
diff -urN apr-1.3.9/configure.in apr-1.3.9-haiku/configure.in
--- apr-1.3.9/configure.in 2009-07-17 16:14:25.000000000 -0700
+++ apr-1.3.9-haiku/configure.in 2009-08-29 20:48:05.000000000 -0700
@@ -135,7 +135,7 @@
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)
@@ -248,7 +248,7 @@
dnl otherwise.
case $host in
- *os390)
+ *os390|*haiku*)
if test "$ac_test_CFLAGS" != set; then
APR_REMOVEFROM(CFLAGS,-g)
fi
@@ -486,6 +486,12 @@
OSDIR="unix"
eolstr="\\n"
;;
+ *haiku*)
+ OSDIR="unix"
+ eolstr="\\n"
+ AC_CHECK_LIB(bsd, getpass)
+ AC_CHECK_LIB(network, socket)
+ ;;
*)
OSDIR="unix"
eolstr="\\n"
@@ -962,6 +968,10 @@
havemmapzero="0"
havemmapanon="0"
APR_BEGIN_DECISION([anonymous shared memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS_ANON,
+ [BeOS areas])])
APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmgetanon="1"
@@ -1033,6 +1043,9 @@
haveos2shm="0"
havewin32shm="0"
APR_BEGIN_DECISION([namebased memory allocation method])
+APR_IFALLYES(header:kernel/OS.h func:create_area,
+ [havebeosshm="1"
+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
[havemmaptmp="1"
APR_DECIDE(USE_SHMEM_MMAP_TMP,
@@ -1046,9 +1059,6 @@
func:shmget func:shmat func:shmdt func:shmctl,
[haveshmget="1"
APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
- [havebeosshm="1"
- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
APR_IFALLYES(header:os2.h,
[haveos2shm="1"
APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
diff -urN apr-1.3.9/test/testpoll.c apr-1.3.9-haiku/test/testpoll.c
--- apr-1.3.9/test/testpoll.c 2008-04-13 04:37:52.000000000 -0700
+++ apr-1.3.9-haiku/test/testpoll.c 2009-08-29 21:04:14.000000000 -0700
@@ -193,6 +193,8 @@
recv_msg(s, 2, p, tc);
send_msg(s, sa, 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -207,6 +209,8 @@
send_msg(s, sa, 2, tc);
+ apr_sleep(apr_time_make(0, 10000));
+
rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
check_sockets(pollarray, s, 0, 0, tc);
@@ -381,6 +385,7 @@
int num;
send_msg(s, sa, 0, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);
@@ -411,6 +416,7 @@
send_msg(s, sa, 2, tc);
send_msg(s, sa, 5, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 2, num);
@@ -443,6 +449,7 @@
int num;
send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
+ apr_sleep(apr_time_make(0, 10000));
rv = apr_pollset_poll(pollset, 0, &num, &descs);
ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
ABTS_INT_EQUAL(tc, 1, num);

39
dev-libs/apr/patches/apr-1.4.2.patch
View File

@@ -1,39 +0,0 @@
diff -urN apr-1.4.2/config.layout apr-1.4.2-haiku/config.layout
--- apr-1.4.2/config.layout 2004-11-24 22:51:51.065798144 +0000
+++ apr-1.4.2-haiku/config.layout 2011-03-24 11:36:30.742653952 +0000
@@ -60,6 +60,23 @@
runtimedir: ${localstatedir}/run
</Layout>
+# Haiku Layout making use of finddir
+<Layout haiku>
+ prefix: /boot/common
+ exec_prefix: /boot/common
+ bindir: /boot/common/bin
+ sbindir: /boot/common/servers
+ libdir: /boot/common/lib
+ libexecdir: /boot/common/servers
+ mandir: /boot/common/documentation/man
+ sysconfdir: /boot/common/settings
+ datadir: /boot/common/data
+ installbuilddir: /boot/develop/build
+ includedir: /boot/common/include
+ localstatedir: /boot/common/var
+ runtimedir: ${localstatedir}/log
+</Layout>
+
# Mac OS X Server (Rhapsody)
<Layout Mac OS X Server>
prefix: /Local/Library/WebServer
diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in
--- apr-1.4.2/configure.in 2009-11-16 07:45:28.064225280 +0000
+++ apr-1.4.2-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000
@@ -143,7 +143,7 @@
AC_PROG_CPP
AC_PROG_AWK
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_CHECK_PROG(RM, rm, rm)
AC_CHECK_PROG(AS, as, as)

100
dev-libs/apr_util/apr_util-1.3.10.recipe Normal file
View File

@@ -0,0 +1,100 @@
SUMMARY="Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
LICENSE="Apache v2"
COPYRIGHT="2010 The Apache Software Foundation."
CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
REVISION="4"
ARCHITECTURES="x86_gcc2 ?x86"
PROVIDES="
apr_util = $portVersion compat >= 1
lib:libaprutil = $portVersion compat >= 1
lib:libaprutil_1 = $portVersion compat >= 1
"
REQUIRES="
haiku >= $haikuVersion
apr >= 1.3.9
expat >= 2.0
"
BUILD_REQUIRES="
$REQUIRES
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:autoheader
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
"
SOURCE_DIR="$portVersionedName"
BUILD()
{
aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
aprInstallDir=$aprUtilPackageLinksDir/apr
expatInstallDir=$aprUtilPackageLinksDir/expat
rm -rf aclocal.m4
mkdir -p m4
libtoolize -fci
aclocal --install -I m4
autoconf -f
cd xml/expat
mkdir -p m4
echo 'AM_INIT_AUTOMAKE' >> configure.in
libtoolize -fci
aclocal --install -I m4
autoconf --force
autoheader
touch libtool.m4
cd ../..
# TODO: fix this hack!
cp /boot/common/bin/libtool .
ln -sfn $sourceDir/libtool /libtool
./configure $configureDirArgs \
--with-apr=$aprInstallDir \
--with-expat=$expatInstallDir
make
}
INSTALL()
{
make install
# prepare develop/lib
prepareInstalledDevelLibs libaprutil-1
fixPkgconfig
}
DESCRIPTION="
The mission of the Apache Portable Runtime (APR) project is to create
and maintain software libraries that provide a predictable and consistent
interface to underlying platform-specific implementations. The primary
goal is to provide an API to which software developers may code and be
assured of predictable if not identical behaviour regardless of the
platform on which their software is built, relieving them of the need to
code special-case conditions to work around or take advantage of
platform-specific deficiencies or features.
To give a brief overview, the primary core subsystems of APR 1.x include
the following:
- atomic operations
- dynamic Shared Object loading
- file I/O
- locks (mutexes, condition variables, etc)
- memory management (high performance allocators)
- memory-mapped files
- multicast Sockets
- network I/O
- shared memory
- thread and Process management
- various data structures (tables, hashes, priority queues, etc)
"

130
dev-libs/apr_util/apr_util-1.4.1.recipe Normal file
View File

@@ -0,0 +1,130 @@
SUMMARY="Apache Portable Runtime Utility Library"
HOMEPAGE="http://apr.apache.org/"
SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz"
LICENSE="Apache v2"
COPYRIGHT="2011 The Apache Software Foundation."
CHECKSUM_MD5="666a5d56098a9debf998510e304c8095"
REVISION="4"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="apr_util-1.4.1.patch"
PROVIDES="
apr_util = $portVersion compat >= 1
lib:libaprutil_1 = 0.4.1 compat >= 0
"
REQUIRES="
haiku >= $haikuVersion
lib:libapr_1
lib:libexpat
lib:libiconv
"
BUILD_REQUIRES="
devel:libapr_1 >= 0.4.6
devel:libexpat >= 1.5.2
devel:libiconv
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:autoheader
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
"
SOURCE_DIR="apr-util-$portVersion"
PATCH()
{
echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in
}
BUILD()
{
aprInstallDir=$portPackageLinksDir/lib~libapr_1
expatInstallDir=$portPackageLinksDir/lib~libexpat
rm -rf aclocal.m4
mkdir -p m4
libtoolize -fci
aclocal --install -I m4
autoconf -f
cd xml/expat
mkdir -p m4
libtoolize -fci
aclocal --install -I m4
autoconf --force
autoheader
touch libtool.m4
cd ../..
# TODO: fix this hack!
cp /boot/system/bin/libtool .
ln -sfn $sourceDir/libtool /libtool
runConfigure ./configure \
--with-apr=$aprInstallDir \
--with-expat=$expatInstallDir
make $jobArgs
}
INSTALL()
{
make install
# prepare develop/lib
prepareInstalledDevelLibs libaprutil-1
fixPkgconfig
# fix apu-1-config
fixDevelopLibDirReferences $binDir/apu-1-config
# remove superfluous .exp file
rm $libDir/aprutil.exp
# devel package
packageEntries devel \
$binDir \
$developDir
}
DESCRIPTION="
The mission of the Apache Portable Runtime (APR) project is to create
and maintain software libraries that provide a predictable and consistent
interface to underlying platform-specific implementations. The primary
goal is to provide an API to which software developers may code and be
assured of predictable if not identical behaviour regardless of the
platform on which their software is built, relieving them of the need to
code special-case conditions to work around or take advantage of
platform-specific deficiencies or features.
To give a brief overview, the primary core subsystems of APR 1.x include
the following:
- atomic operations
- dynamic Shared Object loading
- file I/O
- locks (mutexes, condition variables, etc)
- memory management (high performance allocators)
- memory-mapped files
- multicast Sockets
- network I/O
- shared memory
- thread and Process management
- various data structures (tables, hashes, priority queues, etc)
"
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
apr_util_devel = portVersion compat >= 1
cmd:apu_1_config = $portVersion compat >= 1
devel:libaprutil_1 = 0.4.1 compat >= 0
"
REQUIRES_devel="
apr_util == $portVersion base
"

45
dev-libs/apr_util/patches/apr_util-1.4.1.patch Normal file
View File

@@ -0,0 +1,45 @@
diff -ur orig/apr-util-1.4.1/build/apu-conf.m4 apr_util-1.4.1/build/apu-conf.m4
--- orig/apr-util-1.4.1/build/apu-conf.m4 2011-08-08 11:32:27.026738688 +0200
+++ apr_util-1.4.1/build/apu-conf.m4 2013-04-30 21:28:37.100401152 +0200
@@ -145,10 +145,10 @@
else
# Add given path to standard search paths if appropriate:
if test "$withval" != "/usr"; then
- APR_ADDTO(LDFLAGS, [-L$withval/lib])
- APR_ADDTO(CPPFLAGS, [-I$withval/include])
- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
+ APR_ADDTO(LDFLAGS, [-L$withval/develop/lib])
+ APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers])
+ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers])
+ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib])
fi
# ...and refuse to fall back on the builtin expat.
apu_try_builtin_expat=0
diff -ur orig/apr-util-1.4.1/config.layout apr_util-1.4.1/config.layout
--- orig/apr-util-1.4.1/config.layout 2005-02-09 13:18:43.064749568 +0100
+++ apr_util-1.4.1/config.layout 2013-04-30 21:27:27.079953920 +0200
@@ -60,6 +60,23 @@
runtimedir: ${localstatedir}/run
</Layout>
+# Haiku Layout making use of finddir
+<Layout haiku>
+ prefix: /boot/common
+ exec_prefix: /boot/common
+ bindir: /boot/common/bin
+ sbindir: /boot/common/servers
+ libdir: /boot/common/lib
+ libexecdir: /boot/common/servers
+ mandir: /boot/common/documentation/man
+ sysconfdir: /boot/common/settings
+ datadir: /boot/common/data
+ installbuilddir: /boot/develop/build
+ includedir: /boot/common/include
+ localstatedir: /boot/common/var
+ runtimedir: ${localstatedir}/log
+</Layout>
+
# Mac OS X Server (Rhapsody)
<Layout Mac OS X Server>
prefix: /Local/Library/WebServer

6
dev-libs/atk/atk-1.29.2.bep → dev-libs/atk/atk-1.29.2.recipe
View File

@@ -6,7 +6,8 @@ REVISION="1"
STATUS_HAIKU="broken"
DEPEND="sys-devel/gettext >= 0.17
dev-libs/glib >= 2.24.0"
BUILD {
BUILD()
{
cd atk-1.29.2
libtoolize --force --copy --install
aclocal
@@ -16,7 +17,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd atk-1.29.2
make isntall
}

6
dev-libs/atk/atk-1.30.0.bep → dev-libs/atk/atk-1.30.0.recipe
View File

@@ -7,7 +7,8 @@ STATUS_HAIKU="broken"
DEPEND="sys-devel/gettext >= 0.17
dev-libs/glib >= 2.24.0
dev-util/gtk-doc >= 1.15"
BUILD {
BUILD()
{
cd atk-1.30.0
libtoolize --force --copy --install
aclocal
@@ -17,7 +18,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd atk-1.30.0
make isntall
}

9
dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep → dev-libs/boehm_gc/boehm_gc-7.2_alpha6.recipe
View File

@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="319d0b18cc4eb735c8038ece9df055e4"
BUILD {
BUILD()
{
cd gc-7.2alpha6
libtoolize --force --copy --install
autoconf -f
@@ -16,12 +17,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd gc-7.2alpha6
make install
}
TEST {
TEST()
{
cd gc-7.2alpha6
make check
}

9
dev-libs/boehm-gc/boehm-gc-7.2d.bep → dev-libs/boehm_gc/boehm_gc-7.2d.recipe
View File

@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2"
BUILD {
BUILD()
{
cd gc-7.2
libtoolize --force --copy --install
autoconf -f
@@ -16,12 +17,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd gc-7.2
make install
}
TEST {
TEST()
{
cd gc-7.2
make check
}

29
dev-libs/boehm_gc/licenses/BOEHM Normal file
View File

@@ -0,0 +1,29 @@
Copyright (c) 1988, 1989 Hans-J. Boehm, Alan J. Demers
Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved.
Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved.
Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
The file linux_threads.c is also
Copyright (c) 1998 by Fergus Henderson. All rights reserved.
The files Makefile.am, and configure.in are
Copyright (c) 2001 by Red Hat Inc. All rights reserved.
Several files supporting GNU-style builds are copyrighted by the Free
Software Foundation, and carry a different license from that given
below.
THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
Permission is hereby granted to use or copy this program
for any purpose, provided the above notices are retained on all copies.
Permission to modify the code and to distribute modified code is granted,
provided the above notices are retained, and a notice that the code was
modified is included with the above copyright notice.
A few of the files needed to use the GNU-style build procedure come with
slightly different licenses, though they are all similar in spirit. A few
are GPL'ed, but with an exception that should cover all uses in the
collector. (If you are concerned about such things, I recommend you look
at the notice in config.guess or ltmain.sh.)

247
dev-libs/boehm_gc/patches/boehm_gc-7.2_alpha6.patch Normal file
View File

@@ -0,0 +1,247 @@
diff -ru gc-7.2alpha6-orig/configure.ac gc-7.2alpha6/configure.ac
--- gc-7.2alpha6-orig/configure.ac 2011-06-14 12:34:55.000000000 +0000
+++ gc-7.2alpha6/configure.ac 2012-03-16 00:46:16.500695040 +0000
@@ -83,6 +83,7 @@
AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.])
AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.])
AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.])
+AH_TEMPLATE([GC_HAIKU_THREADS], [Define to support Haiku pthreads.])
AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.])
AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.])
AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.])
@@ -127,6 +128,10 @@
AC_DEFINE(GC_AIX_THREADS)
AC_DEFINE(_REENTRANT)
;;
+ *-*-haiku*)
+ AC_DEFINE(GC_HAIKU_THREADS)
+ AC_DEFINE(_REENTRANT)
+ ;;
*-*-hpux11*)
AC_MSG_WARN("Only HP/UX 11 POSIX threads are supported.")
AC_DEFINE(GC_HPUX_THREADS)
diff -ru gc-7.2alpha6-orig/dyn_load.c gc-7.2alpha6/dyn_load.c
--- gc-7.2alpha6-orig/dyn_load.c 2011-05-31 15:27:11.000000000 +0000
+++ gc-7.2alpha6/dyn_load.c 2012-03-23 22:11:06.758906880 +0000
@@ -63,7 +63,7 @@
!(defined(FREEBSD) && defined(__ELF__)) && \
!(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \
!(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
- !defined(DARWIN) && !defined(CYGWIN32)
+ !defined(DARWIN) && !defined(CYGWIN32) && !defined(HAIKU)
--> We only know how to find data segments of dynamic libraries for the
--> above. Additional SVR4 variants might not be too
--> hard to add.
@@ -1419,6 +1419,22 @@
#endif /* DARWIN */
+#ifdef HAIKU
+#include <kernel/image.h>
+
+GC_INNER void GC_register_dynamic_libraries()
+{
+ image_info info;
+ int32 cookie = 0;
+ while (get_next_image_info(0, &cookie, &info) == B_OK)
+ {
+ void *data = info.data;
+ GC_add_roots_inner(data, data + info.data_size, TRUE);
+ }
+}
+
+#endif /* HAIKU */
+
#elif defined(PCR)
# include "il/PCR_IL.h"
diff -ru gc-7.2alpha6-orig/include/gc_config_macros.h gc-7.2alpha6/include/gc_config_macros.h
--- gc-7.2alpha6-orig/include/gc_config_macros.h 2011-04-24 13:09:21.000000000 +0000
+++ gc-7.2alpha6/include/gc_config_macros.h 2012-03-16 00:44:30.556793856 +0000
@@ -65,7 +65,7 @@
|| defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \
|| defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \
|| defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \
- || defined(GC_WIN32_THREADS)
+ || defined(GC_WIN32_THREADS) || defined(GC_HAIKU_THREADS)
# ifndef GC_THREADS
# define GC_THREADS
# endif
diff -ru gc-7.2alpha6-orig/include/private/config.h.in gc-7.2alpha6/include/private/config.h.in
--- gc-7.2alpha6-orig/include/private/config.h.in 2010-09-11 11:27:06.000000000 +0000
+++ gc-7.2alpha6/include/private/config.h.in 2012-03-16 00:49:30.038273024 +0000
@@ -45,6 +45,9 @@
/* Define to support GNU pthreads. */
#undef GC_GNU_THREADS
+/* Define to support Haiku pthreads. */
+#undef GC_HAIKU_THREADS
+
/* Define if backtrace information is supported. */
#undef GC_HAVE_BUILTIN_BACKTRACE
Only in gc-7.2alpha6/include/private: config.h.in~
diff -ru gc-7.2alpha6-orig/include/private/gcconfig.h gc-7.2alpha6/include/private/gcconfig.h
--- gc-7.2alpha6-orig/include/private/gcconfig.h 2011-05-31 15:27:12.000000000 +0000
+++ gc-7.2alpha6/include/private/gcconfig.h 2012-03-23 22:28:55.210501632 +0000
@@ -234,6 +234,11 @@
# define BEOS
# define mach_type_known
# endif
+# if defined(__HAIKU__) && defined(_X86_)
+# define I386
+# define HAIKU
+# define mach_type_known
+# endif
# if defined(OPENBSD) && defined(__amd64__)
# define X86_64
# define mach_type_known
@@ -1110,6 +1115,15 @@
extern int etext[];
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
# endif
+# ifdef HAIKU
+# define OS_TYPE "HAIKU"
+# include <OS.h>
+# define GETPAGESIZE() B_PAGE_SIZE
+ extern int etext[];
+# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
+# define DYNAMIC_LOADING
+# define MPROTECT_VDB
+# endif
# ifdef SOLARIS
# define OS_TYPE "SOLARIS"
extern int _etext[], _end[];
@@ -2345,7 +2359,7 @@
#if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
|| defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
|| defined(DGUX) || defined(BSD) || defined(HURD) \
- || defined(AIX) || defined(DARWIN) || defined(OSF1)
+ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU)
# define UNIX_LIKE /* Basic Unix-like system calls work. */
#endif
@@ -2423,7 +2437,8 @@
#if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
|| defined(OPENBSD) || defined(ARM32) \
- || defined(MIPS) || defined(AVR32))) \
+ || defined(MIPS) || defined(AVR32) \
+ || defined(HAIKU))) \
|| (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
|| (defined(RTEMS) && defined(I386))) && !defined(NO_GETCONTEXT)
# define NO_GETCONTEXT
@@ -2721,6 +2736,9 @@
# elif defined(SN_TARGET_PS3)
void *ps3_get_mem(size_t size);
# define GET_MEM(bytes) (struct hblk*)ps3_get_mem(bytes)
+# elif defined(HAIKU)
+ ptr_t GC_haiku_get_mem(GC_word bytes);
+# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes)
# else
ptr_t GC_unix_get_mem(GC_word bytes);
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
diff -ru gc-7.2alpha6-orig/include/private/thread_local_alloc.h gc-7.2alpha6/include/private/thread_local_alloc.h
--- gc-7.2alpha6-orig/include/private/thread_local_alloc.h 2011-05-13 14:40:31.000000000 +0000
+++ gc-7.2alpha6/include/private/thread_local_alloc.h 2012-03-16 00:55:25.252706816 +0000
@@ -47,7 +47,7 @@
# define USE_COMPILER_TLS
# elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \
|| defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \
- || defined(GC_NETBSD_THREADS)
+ || defined(GC_NETBSD_THREADS) || defined(GC_HAIKU_THREADS)
# define USE_PTHREAD_SPECIFIC
# elif defined(GC_HPUX_THREADS)
# ifdef __GNUC__
diff -ru gc-7.2alpha6-orig/os_dep.c gc-7.2alpha6/os_dep.c
--- gc-7.2alpha6-orig/os_dep.c 2011-05-31 15:27:11.000000000 +0000
+++ gc-7.2alpha6/os_dep.c 2012-03-23 22:32:31.656932864 +0000
@@ -790,7 +790,7 @@
}
#endif /* !MSWIN32 */
-#ifdef BEOS
+#if defined(BEOS) || defined(HAIKU)
# include <kernel/OS.h>
GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
@@ -801,7 +801,7 @@
return GC_SUCCESS;
}
# define HAVE_GET_STACK_BASE
-#endif /* BEOS */
+#endif /* BEOS || HAIKU */
#ifdef OS2
GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
@@ -1127,7 +1127,7 @@
# define GET_MAIN_STACKBASE_SPECIAL
#elif !defined(BEOS) && !defined(AMIGA) && !defined(OS2) \
&& !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) \
- && !defined(GC_OPENBSD_THREADS) \
+ && !defined(GC_OPENBSD_THREADS) && !defined(HAIKU) \
&& (!defined(GC_SOLARIS_THREADS) || defined(_STRICT_STDC))
# if defined(LINUX) && defined(USE_GET_STACKBASE_FOR_MAIN)
@@ -1977,7 +1977,7 @@
# if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \
&& !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \
&& !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS) \
- && !defined(__CC_ARM)
+ && !defined(__CC_ARM) && !defined(HAIKU)
# define SBRK_ARG_T ptrdiff_t
@@ -2302,6 +2302,19 @@
}
#endif
+#ifdef HAIKU
+#include <stdlib.h>
+
+ptr_t GC_haiku_get_mem(word bytes)
+{
+ void* mem;
+ if (posix_memalign(&mem, GC_page_size, bytes) == 0)
+ return mem;
+ else
+ return NULL;
+}
+#endif
+
#ifdef USE_MUNMAP
/* For now, this only works on Win32/WinCE and some Unix-like */
@@ -2903,7 +2916,9 @@
# elif !defined(MSWIN32) && !defined(MSWINCE)
# include <sys/mman.h>
# include <signal.h>
-# include <sys/syscall.h>
+# if !defined(HAIKU)
+# include <sys/syscall.h>
+# endif
# define PROTECT(addr, len) \
if (mprotect((caddr_t)(addr), (size_t)(len), \
@@ -3062,6 +3077,8 @@
/* Empirically c.trapno == 14, on IA32, but is that useful? */
/* Should probably consider alignment issues on other */
/* architectures. */
+# elif defined(HAIKU)
+# define CODE_OK TRUE
# elif defined(HPUX)
# define CODE_OK (si -> si_code == SEGV_ACCERR \
|| si -> si_code == BUS_ADRERR \
diff -ru gc-7.2alpha6-orig/pthread_support.c gc-7.2alpha6/pthread_support.c
--- gc-7.2alpha6-orig/pthread_support.c 2011-05-31 15:27:11.000000000 +0000
+++ gc-7.2alpha6/pthread_support.c 2012-03-16 00:39:06.171442176 +0000
@@ -938,7 +938,8 @@
GC_nprocs = pthread_num_processors_np();
# elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \
|| defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \
- || defined(PLATFORM_ANDROID) || defined(NACL)
+ || defined(PLATFORM_ANDROID) || defined(NACL) \
+ || defined(GC_HAIKU_THREADS)
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
if (GC_nprocs <= 0) GC_nprocs = 1;
# elif defined(GC_IRIX_THREADS)

248
dev-libs/boehm_gc/patches/boehm_gc-7.2d.patch Normal file
View File

@@ -0,0 +1,248 @@
diff -urN gc-7.2/configure.ac gc-7.2-haiku/configure.ac
--- gc-7.2/configure.ac 2012-08-09 13:25:13.047185920 -0700
+++ gc-7.2-haiku/configure.ac 2013-03-27 00:43:42.665321472 -0700
@@ -89,6 +89,7 @@
AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.])
AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.])
AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.])
+AH_TEMPLATE([GC_HAIKU_THREADS], [Define to support Haiku pthreads.])
AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.])
AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.])
AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.])
@@ -140,6 +141,10 @@
AC_DEFINE(GC_AIX_THREADS)
AC_DEFINE(_REENTRANT)
;;
+ *-*-haiku*)
+ AC_DEFINE(GC_HAIKU_THREADS)
+ AC_DEFINE(_REENTRANT)
+ ;;
*-*-hpux11*)
AC_MSG_WARN("Only HP/UX 11 POSIX threads are supported.")
AC_DEFINE(GC_HPUX_THREADS)
diff -urN gc-7.2/dyn_load.c gc-7.2-haiku/dyn_load.c
--- gc-7.2/dyn_load.c 2012-08-09 13:25:13.034603008 -0700
+++ gc-7.2-haiku/dyn_load.c 2013-03-27 00:43:42.670564352 -0700
@@ -63,7 +63,7 @@
!(defined(FREEBSD) && defined(__ELF__)) && \
!(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \
!(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
- !defined(DARWIN) && !defined(CYGWIN32)
+ !defined(DARWIN) && !defined(CYGWIN32) && !defined(HAIKU)
--> We only know how to find data segments of dynamic libraries for the
--> above. Additional SVR4 variants might not be too
--> hard to add.
@@ -1426,6 +1426,22 @@
#endif /* DARWIN */
+#ifdef HAIKU
+#include <kernel/image.h>
+
+GC_INNER void GC_register_dynamic_libraries()
+{
+ image_info info;
+ int32 cookie = 0;
+ while (get_next_image_info(0, &cookie, &info) == B_OK)
+ {
+ void *data = info.data;
+ GC_add_roots_inner(data, data + info.data_size, TRUE);
+ }
+}
+
+#endif /* HAIKU */
+
#elif defined(PCR)
# include "il/PCR_IL.h"
diff -urN gc-7.2/include/gc_config_macros.h gc-7.2-haiku/include/gc_config_macros.h
--- gc-7.2/include/gc_config_macros.h 2012-08-09 13:25:13.028835840 -0700
+++ gc-7.2-haiku/include/gc_config_macros.h 2013-03-27 00:51:21.900726784 -0700
@@ -68,7 +68,8 @@
|| defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \
|| defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \
|| defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \
- || defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS)
+ || defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS) \
+ || defined(GC_HAIKU_THREADS)
# ifndef GC_THREADS
# define GC_THREADS
# endif
diff -urN gc-7.2/include/private/config.h.in gc-7.2-haiku/include/private/config.h.in
--- gc-7.2/include/private/config.h.in 2012-08-09 13:25:13.029884416 -0700
+++ gc-7.2-haiku/include/private/config.h.in 2013-03-27 00:44:56.633602048 -0700
@@ -48,6 +48,9 @@
/* Define to support GNU pthreads. */
#undef GC_GNU_THREADS
+/* Define to support Haiku pthreads. */
+#undef GC_HAIKU_THREADS
+
/* Define if backtrace information is supported. */
#undef GC_HAVE_BUILTIN_BACKTRACE
diff -urN gc-7.2/include/private/gcconfig.h gc-7.2-haiku/include/private/gcconfig.h
--- gc-7.2/include/private/gcconfig.h 2012-08-09 13:25:13.030408704 -0700
+++ gc-7.2-haiku/include/private/gcconfig.h 2013-03-27 00:45:52.350748672 -0700
@@ -234,6 +234,11 @@
# define BEOS
# define mach_type_known
# endif
+# if defined(__HAIKU__) && defined(_X86_)
+# define I386
+# define HAIKU
+# define mach_type_known
+# endif
# if defined(OPENBSD) && defined(__amd64__)
# define X86_64
# define mach_type_known
@@ -1115,6 +1120,15 @@
extern int etext[];
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
# endif
+# ifdef HAIKU
+# define OS_TYPE "HAIKU"
+# include <OS.h>
+# define GETPAGESIZE() B_PAGE_SIZE
+ extern int etext[];
+# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
+# define DYNAMIC_LOADING
+# define MPROTECT_VDB
+# endif
# ifdef SOLARIS
# define OS_TYPE "SOLARIS"
extern int _etext[], _end[];
@@ -2404,7 +2418,7 @@
#if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
|| defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
|| defined(DGUX) || defined(BSD) || defined(HURD) \
- || defined(AIX) || defined(DARWIN) || defined(OSF1)
+ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU)
# define UNIX_LIKE /* Basic Unix-like system calls work. */
#endif
@@ -2482,7 +2496,8 @@
#if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
|| defined(OPENBSD) || defined(ARM32) \
- || defined(MIPS) || defined(AVR32))) \
+ || defined(MIPS) || defined(AVR32) \
+ || defined(HAIKU))) \
|| (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
|| (defined(RTEMS) && defined(I386))) && !defined(NO_GETCONTEXT)
# define NO_GETCONTEXT
@@ -2789,6 +2804,9 @@
# elif defined(SN_TARGET_PS3)
void *ps3_get_mem(size_t size);
# define GET_MEM(bytes) (struct hblk*)ps3_get_mem(bytes)
+# elif defined(HAIKU)
+ ptr_t GC_haiku_get_mem(GC_word bytes);
+# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes)
# else
ptr_t GC_unix_get_mem(GC_word bytes);
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
diff -urN gc-7.2/include/private/thread_local_alloc.h gc-7.2-haiku/include/private/thread_local_alloc.h
--- gc-7.2/include/private/thread_local_alloc.h 2012-08-09 13:25:13.029884416 -0700
+++ gc-7.2-haiku/include/private/thread_local_alloc.h 2013-03-27 00:49:11.605290496 -0700
@@ -47,7 +47,8 @@
# define USE_COMPILER_TLS
# elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \
|| defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \
- || defined(GC_NETBSD_THREADS) || defined(GC_RTEMS_PTHREADS)
+ || defined(GC_NETBSD_THREADS) || defined(GC_RTEMS_PTHREADS) \
+ || || defined(GC_HAIKU_THREADS)
# define USE_PTHREAD_SPECIFIC
# elif defined(GC_HPUX_THREADS)
# ifdef __GNUC__
diff -urN gc-7.2/os_dep.c gc-7.2-haiku/os_dep.c
--- gc-7.2/os_dep.c 2012-08-09 13:25:13.034340864 -0700
+++ gc-7.2-haiku/os_dep.c 2013-03-27 00:46:12.884998144 -0700
@@ -790,7 +790,7 @@
}
#endif /* !MSWIN32 */
-#ifdef BEOS
+#if defined(BEOS) || defined(HAIKU)
# include <kernel/OS.h>
GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
@@ -801,7 +801,7 @@
return GC_SUCCESS;
}
# define HAVE_GET_STACK_BASE
-#endif /* BEOS */
+#endif /* BEOS || HAIKU */
#ifdef OS2
GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb)
@@ -1138,7 +1138,7 @@
# define GET_MAIN_STACKBASE_SPECIAL
#elif !defined(BEOS) && !defined(AMIGA) && !defined(OS2) \
&& !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) \
- && !defined(GC_OPENBSD_THREADS) \
+ && !defined(GC_OPENBSD_THREADS) && !defined(HAIKU) \
&& (!defined(GC_SOLARIS_THREADS) || defined(_STRICT_STDC))
# if defined(LINUX) && defined(USE_GET_STACKBASE_FOR_MAIN)
@@ -2001,7 +2001,7 @@
# if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \
&& !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \
&& !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS) \
- && !defined(__CC_ARM)
+ && !defined(__CC_ARM) && !defined(HAIKU)
# define SBRK_ARG_T ptrdiff_t
@@ -2326,6 +2326,19 @@
}
#endif
+#ifdef HAIKU
+#include <stdlib.h>
+
+ptr_t GC_haiku_get_mem(word bytes)
+{
+ void* mem;
+ if (posix_memalign(&mem, GC_page_size, bytes) == 0)
+ return mem;
+ else
+ return NULL;
+}
+#endif
+
#ifdef USE_MUNMAP
/* For now, this only works on Win32/WinCE and some Unix-like */
@@ -2927,7 +2940,9 @@
# elif !defined(MSWIN32) && !defined(MSWINCE)
# include <sys/mman.h>
# include <signal.h>
-# include <sys/syscall.h>
+# if !defined(HAIKU)
+# include <sys/syscall.h>
+# endif
# define PROTECT(addr, len) \
if (mprotect((caddr_t)(addr), (size_t)(len), \
@@ -3086,6 +3101,8 @@
/* Empirically c.trapno == 14, on IA32, but is that useful? */
/* Should probably consider alignment issues on other */
/* architectures. */
+# elif defined(HAIKU)
+# define CODE_OK TRUE
# elif defined(HPUX)
# define CODE_OK (si -> si_code == SEGV_ACCERR \
|| si -> si_code == BUS_ADRERR \
diff -urN gc-7.2/pthread_support.c gc-7.2-haiku/pthread_support.c
--- gc-7.2/pthread_support.c 2012-08-09 13:25:13.048234496 -0700
+++ gc-7.2-haiku/pthread_support.c 2013-03-27 00:46:12.896794624 -0700
@@ -999,7 +999,8 @@
GC_nprocs = pthread_num_processors_np();
# elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \
|| defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \
- || defined(PLATFORM_ANDROID) || defined(NACL)
+ || defined(PLATFORM_ANDROID) || defined(NACL) \
+ || defined(GC_HAIKU_THREADS)
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
if (GC_nprocs <= 0) GC_nprocs = 1;
# elif defined(GC_IRIX_THREADS)

6
dev-libs/boost/boost-1.42.0.bep → dev-libs/boost/boost-1.42.0.recipe
View File

@@ -6,7 +6,8 @@ REVISION="1"
STATUS_HAIKU="broken"
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
DEPEND=""
BUILD {
BUILD()
{
cd boost_1_42_0
./bootstrap.sh --prefix=`finddir B_COMMON_DIRECTORY`
./bjam --prefix=`finddir B_COMMON_DIRECTORY` \
@@ -18,7 +19,8 @@ BUILD {
runtime-link=shared
}
INSTALL {
INSTALL()
{
cd boost_1_42_0
./bjam install
}

6
dev-libs/boost/boost-1.50.0.bep → dev-libs/boost/boost-1.50.0.recipe
View File

@@ -6,7 +6,8 @@ REVISION="1"
STATUS_HAIKU="stable"
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
DEPEND="boehm-gc"
BUILD {
BUILD()
{
cd boost_1_50_0
./bootstrap.sh \
--without-icu \
@@ -34,7 +35,8 @@ BUILD {
runtime-link=shared
}
INSTALL {
INSTALL()
{
cd boost_1_50_0
./bjam install \
-d2 \

6
dev-libs/boost/boost-1.53.0.bep → dev-libs/boost/boost-1.53.0.recipe
View File

@@ -6,7 +6,8 @@ REVISION="1"
STATUS_HAIKU="broken"
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
DEPEND="boehm-gc"
BUILD {
BUILD()
{
cd boost_1_53_0
./bootstrap.sh \
--without-icu \
@@ -34,7 +35,8 @@ BUILD {
runtime-link=shared
}
INSTALL {
INSTALL()
{
cd boost_1_53_0
./bjam install \
-d2 \

6
dev-libs/chmlib/chmlib-0.40.bep → dev-libs/chmlib/chmlib-0.40.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="a20d86103b8ab369e5b93506d5ffa802"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd chmlib-0.40
rm aclocal.m4
rm acinclude.m4
@@ -19,7 +20,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd chmlib-0.40
make install
}

9
dev-libs/cyassl/cyassl-1.6.5.bep → dev-libs/cyassl/cyassl-1.6.5.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="98c2c6350acf1d089756a1de9ccb9903"
BUILD {
BUILD()
{
cd cyassl-1.6.5
libtoolize --force --copy --install
rm acinclude.m4
@@ -18,12 +19,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd cyassl-1.6.5
make install
}
TEST {
TEST()
{
cd cyassl-1.6.5
make check
cd testsuite

9
dev-libs/cyassl/cyassl-1.8.0.bep → dev-libs/cyassl/cyassl-1.8.0.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND="app-text/dos2unix >= 1.0"
CHECKSUM_MD5="d2ce70ffe04b6603eeb630258e236a58"
BUILD {
BUILD()
{
cd cyassl-1.8.0
dos2unix *
dos2unix include/*
@@ -22,12 +23,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd cyassl-1.8.0
make install
}
TEST {
TEST()
{
cd cyassl-1.8.0
make check
cd testsuite

9
dev-libs/cyassl/cyassl-2.0.2.bep → dev-libs/cyassl/cyassl-2.0.2.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND="app-text/dos2unix >= 1.0"
CHECKSUM_MD5="2f51752207132c161155508eeb517e38"
BUILD {
BUILD()
{
cd cyassl-2.0.2
dos2unix *
dos2unix include/*
@@ -20,12 +21,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd cyassl-2.0.2
make install
}
TEST {
TEST()
{
cd cyassl-2.0.2
make check
cd testsuite

9
dev-libs/cyassl/cyassl-2.5.0.bep → dev-libs/cyassl/cyassl-2.5.0.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="broken"
DEPEND="app-text/dos2unix >= 1.0"
CHECKSUM_MD5="8965fb76f89af827ace53e423453b7cd"
BUILD {
BUILD()
{
cd cyassl-2.5.0
dos2unix *
dos2unix include/*
@@ -20,12 +21,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd cyassl-2.5.0
make install
}
TEST {
TEST()
{
cd cyassl-2.5.0
make check
cd testsuite

27
dev-libs/expat/expat-2.0.1.bep
View File

@@ -1,27 +0,0 @@
DESCRIPTION="XML parsing libraries"
HOMEPAGE="http://expat.sourceforge.net/"
SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c"
BUILD {
cd expat-2.0.1
rm -f conftools/libtool.m4
echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
libtoolize --force --copy --install
aclocal -I conftools -I m4
autoconf
configure --prefix=`finddir B_COMMON_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd expat-2.0.1
make install DESTDIR="${DESTDIR}"
}
LICENSE="MIT"
COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
2001-2006 Expat maintainers."

81
dev-libs/expat/expat-2.0.1.recipe Normal file
View File

@@ -0,0 +1,81 @@
SUMMARY="XML parser toolkit"
DESCRIPTION="Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags)."
HOMEPAGE="http://expat.sourceforge.net/"
COPYRIGHT="
1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
2001-2006 Expat maintainers.
"
LICENSE="MIT"
SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c"
REVISION="7"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
expat$secondaryArchSuffix = $portVersion compat >= 2.0
lib:libexpat$secondaryArchSuffix = 1.5.2 compat >= 1
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:xmlwf = $portVersion compat >= 2.0
"
fi
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
PATCH()
{
echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
}
BUILD()
{
rm -f conftools/libtool.m4
libtoolize --force --copy --install
aclocal -I conftools -I m4
autoconf
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
# remove command for secondary architecture
if [ -n "$secondaryArchSuffix" ]; then
rm -rf $binDir
fi
# prepare develop/lib
prepareInstalledDevelLibs libexpat
# devel package
packageEntries devel \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
expat${secondaryArchSuffix}_devel = $portVersion
devel:libexpat${secondaryArchSuffix} = 1.5.2 compat >= 1
"
REQUIRES_devel="
expat${secondaryArchSuffix} == $portVersion base
"

32
dev-libs/fribidi/fribidi-0.19.2.bep
View File

@@ -1,32 +0,0 @@
DESCRIPTION="fribidi - A free implementation of the unicode bidirectional algorithm"
HOMEPAGE="http://fribidi.org/"
SRC_URI="http://fribidi.org/download/fribidi-0.19.2.tar.gz"
CHECKSUM_MD5="626db17d2d99b43615ad9d12500f568a"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd fribidi-0.19.2
rm -rf aclocal.m4
mkdir -p m4
libtoolize --force --copy --install
aclocal --install -I m4
automake
autoconf
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \
--mandir=$COMMON_DOCS
make
}
INSTALL {
cd fribidi-0.19.2
make install
}
LICENSE="GNU LGPL v2.1"
COPYRIGHT="2004 Sharif FarsiWeb, Inc
2001,2002 Behdad Esfahbod
1999,2000 Dov Grobgeld"

79
dev-libs/fribidi/fribidi-0.19.5.recipe Normal file
View File

@@ -0,0 +1,79 @@
SUMMARY="A free implementation of the unicode bidirectional algorithm"
DESCRIPTION="This is GNU FriBidi. The Free Implementation of the Unicode Bidirectional Algorithm. One of the missing links stopping the penetration of free software in Middle East is the lack of support for the Arabic and Hebrew alphabets. In order to have proper Arabic and Hebrew support, the BiDi algorithm should have been implemented. It is our hope that this library will stimulate more free software in the Middle Eastern countries."
HOMEPAGE="http://fribidi.org/"
SRC_URI="http://fribidi.org/download/fribidi-0.19.5.tar.bz2"
CHECKSUM_MD5="925bafb97afee8a2fc2d0470c072a155"
REVISION="1"
LICENSE="GNU LGPL v2.1"
COPYRIGHT="2004 Sharif FarsiWeb, Inc
2001,2002 Behdad Esfahbod
1999,2000 Dov Grobgeld"
ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
fribidi = $portVersion
cmd:fribidi = 0.19.5 compat >= 0.19
lib:libfribidi = 0.3.4 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
PATCH()
{
sed -i 's/PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION/#/' configure.ac
sed -i 's/FRIBIDI_USE_GLIB=1/FRIBIDI_USE_GLIB=0/' configure.ac
sed -i 's/FRIBIDI_USE_GLIB=0)/#/' configure.ac
}
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs \
libfribidi
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
TEST()
{
make test
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
fribidi_devel = $portVersion
cmd:fribidi$secondaryArchSuffix = $portVersion compat >= 0.19
devel:libfribidi = 0.3.4 compat >= 0
"
REQUIRES_devel="
fribidi == $portVersion base
"

6
dev-libs/glib/glib-2.22.2.bep → dev-libs/glib/glib-2.22.2.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="00eb873975e2ef9361b8177131c7c943"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd glib-2.22.2
rm -rf aclocal.m4
mkdir -p m4
@@ -22,7 +23,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd glib-2.22.2
make install
}

6
dev-libs/glib/glib-2.24.1.bep → dev-libs/glib/glib-2.24.1.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="e61f2e9636f9d57067c4e3a690b9911a"
REVISION="2"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd glib-2.24.1
rm -rf aclocal.m4
mkdir -p m4
@@ -19,7 +20,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd glib-2.24.1
make install
}

6
dev-libs/glib/glib-2.24.2.bep → dev-libs/glib/glib-2.24.2.recipe
View File

@@ -7,7 +7,8 @@ STATUS_HAIKU="stable"
DEPEND="dev-libs/pkgconfig >= 0.23
sys-devel/gettext >= 0.17
dev-libs/libpcre >= 8.00"
BUILD {
BUILD()
{
cd glib-2.24.2
rm -rf aclocal.m4
mkdir -p m4
@@ -27,7 +28,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd glib-2.24.2
make install
}

6
dev-libs/glib/glib-2.26.1.bep → dev-libs/glib/glib-2.26.1.recipe
View File

@@ -6,7 +6,8 @@ REVISION="1"
STATUS_HAIKU="broken"
DEPEND="dev-libs/pkgconfig >= 0.23
sys-devel/gettext >= 0.17"
BUILD {
BUILD()
{
cd glib-2.26.1
rm -rf aclocal.m4
mkdir -p m4
@@ -18,7 +19,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd glib-2.26.1
make install
}

9
dev-libs/gmp/gmp-4.3.1.bep → dev-libs/gmp/gmp-4.3.1.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="26cec15a90885042dd4a15c4003b08ae"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd gmp-4.3.1
libtoolize --force --copy --install
aclocal
@@ -15,12 +16,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd gmp-4.3.1
make install
}
TEST {
TEST()
{
cd gmp-4.3.1
make check
}

9
dev-libs/gmp/gmp-4.3.2.bep → dev-libs/gmp/gmp-4.3.2.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="dd60683d7057917e34630b4a787932e8"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd gmp-4.3.2
libtoolize --force --copy --install
aclocal
@@ -15,12 +16,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd gmp-4.3.2
make install
}
TEST {
TEST()
{
cd gmp-4.3.2
make check
}

9
dev-libs/gmp/gmp-5.0.1.bep → dev-libs/gmp/gmp-5.0.1.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="6bac6df75c192a13419dfd71d19240a7"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd gmp-5.0.1
libtoolize --force --copy --install
aclocal
@@ -15,12 +16,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd gmp-5.0.1
make install
}
TEST {
TEST()
{
cd gmp-5.0.1
make check
}

9
dev-libs/gmp/gmp-5.0.5.bep → dev-libs/gmp/gmp-5.0.5.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="8aef50959acec2a1ad41d144ffe0f3b5"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd gmp-5.0.5
libtoolize --force --copy --install
aclocal
@@ -15,12 +16,14 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd gmp-5.0.5
make install
}
TEST {
TEST()
{
cd gmp-5.0.5
make check
}

30
dev-libs/gmp/gmp-5.1.1.bep
View File

@@ -1,30 +0,0 @@
DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library"
HOMEPAGE="http://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz"
CHECKSUM_MD5="485b1296e6287fa381e6015b19767989"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd gmp-5.1.1
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
cd gmp-5.1.1
make install
}
TEST {
cd gmp-5.1.1
make check
}
LICENSE="GNU GPL v3
GNU LGPL v3"
COPYRIGHT="1991-2013 Free Software Foundation, Inc."

63
dev-libs/gmp/gmp-5.1.1.recipe Normal file
View File

@@ -0,0 +1,63 @@
SUMMARY="GMP - GNU Multiple Precision Arithmetic Library"
DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library"
HOMEPAGE="http://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz"
CHECKSUM_MD5="485b1296e6287fa381e6015b19767989"
LICENSE="GNU GPL v3
GNU LGPL v3"
COPYRIGHT="1991-2013 Free Software Foundation, Inc."
REVISION="1"
ARCHITECTURES="x86 x86_gcc2"
PROVIDES="cmp:gmp = $portVersion compat >= 5.1
lib:libgmp
lib:libgmp = 10
lib:libgmp = 10.1.1"
REQUIRES="haiku >= $haikuVersion"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
cmd:gcc
cmd:libtool
cmd:autoconf
cmd:automake
cmd:make
"
SOURE_DIR="$portVersionedName"
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
# prepare devel/lib
prepareInstalledDevelLibs libgmp
# devel package
packageEntries devel \
$developDir
}
TEST()
{
make check
}
# ----- devel package
PROVIDES_devel="
libgmp = $portVersion
devel:libgmp = 10.1.1 compat >= 0
"
REQUIRES_devel="
libgmp == $portVersion base
"

9
dev-libs/gnulib/gnulib-9999.bep → dev-libs/gnulib/gnulib-9999.recipe
View File

@@ -5,15 +5,18 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
#CHECKSUM_MD5=""
BUILD {
BUILD()
{
echo "gnulib isn't meant to be built."
}
INSTALL {
INSTALL()
{
echo "gnulib isn't meant to be installed."
}
TEST {
TEST()
{
make check
}

20
dev-libs/icu/icu-4.4.1.bep
View File

@@ -1,20 +0,0 @@
DESCRIPTION="icu"
HOMEPAGE="http://www.icu-project.org"
SRC_URI="http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz"
CHECKSUM_MD5="b6bc0a1153540b2088f8b03e0ba625d3"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd icu/source
CPPFLAGS="-D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1" ./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
cd icu/source
make install
}
LICENSE="ICU"
COPYRIGHT="1997-2010 IBM Corporation and others."

127
dev-libs/icu/icu-4.8.1.1.recipe Normal file
View File

@@ -0,0 +1,127 @@
SUMMARY="International Components for Unicode (ICU)"
HOMEPAGE="http://www.icu-project.org"
LICENSE="ICU"
COPYRIGHT="1997-2011 IBM Corporation and others."
SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz"
CHECKSUM_MD5="ea93970a0275be6b42f56953cd332c17"
REVISION="4"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="icu-4.8.1.1.patch"
PROVIDES="
icu$secondaryArchSuffix = $portVersion compat >= 4.8
lib:libicudata$secondaryArchSuffix = 48.1.1 compat >= 48
lib:libicui18n$secondaryArchSuffix = 48.1.1 compat >= 48
lib:libicuio$secondaryArchSuffix = 48.1.1 compat >= 48
lib:libicule$secondaryArchSuffix = 48.1.1 compat >= 48
lib:libiculx$secondaryArchSuffix = 48.1.1 compat >= 48
lib:libicutest$secondaryArchSuffix = 48.1.1 compat >= 48
lib:libicutu$secondaryArchSuffix = 48.1.1 compat >= 48
lib:libicuuc$secondaryArchSuffix = 48.1.1 compat >= 48
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:sed
"
SOURCE_DIR="icu"
BUILD()
{
cd source
runConfigure ./configure \
--disable-renaming --disable-samples --disable-extras
make $jobArgs
}
INSTALL()
{
cd source
make install
prepareInstalledDevelLibs \
libicudata \
libicui18n \
libicuio \
libicule \
libiculx \
libicutu \
libicuuc
fixPkgconfig
# Rename the data/icu directory when built for the secondary architecture,
# so that it doesn't clash with the primary package's.
if [ -n "$secondaryArchSuffix" ]; then
mv $dataDir/icu $dataDir/icu$secondaryArchSuffix
# TODO: The icu-config, the Makefile.inc, and possibly other files need
# to be adjusted as well. They are probably also not quite correct for
# the primary architecture (lib vs. develop/lib).
fi
# devel package
packageEntries devel \
$developDir \
$dataDir \
$libDir/icu \
$binDir/icu-config
# main package cleanup
rm -r $binDir
}
TEST()
{
cd source
make check
}
DESCRIPTION="ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications. ICU is widely portable and gives applications the same results on all platforms and between C/C++ and Java software.
ICU is released under a nonrestrictive open source license that is suitable for use with both commercial software and with other open source or free software.
Here are a few highlights of the services provided by ICU:
* Code Page Conversion: Convert text data to or from Unicode and nearly any other character set or encoding. ICU's conversion tables are based on charset data collected by IBM over the course of many decades, and is the most complete available anywhere.
* Collation: Compare strings according to the conventions and standards of a particular language, region or country. ICU's collation is based on the Unicode Collation Algorithm plus locale-specific comparison rules from the Common Locale Data Repository, a comprehensive source for this type of data.
* Formatting: Format numbers, dates, times and currency amounts according the conventions of a chosen locale. This includes translating month and day names into the selected language, choosing appropriate abbreviations, ordering fields correctly, etc. This data also comes from the Common Locale Data Repository.
* Time Calculations: Multiple types of calendars are provided beyond the traditional Gregorian calendar. A thorough set of timezone calculation APIs are provided.
* Unicode Support: ICU closely tracks the Unicode standard, providing easy access to all of the many Unicode character properties, Unicode Normalization, Case Folding and other fundamental operations as specified by the Unicode Standard.
* Regular Expression: ICU's regular expressions fully support Unicode while providing very competitive performance.
* Bidi: support for handling text containing a mixture of left to right (English) and right to left (Arabic or Hebrew) data.
* Text Boundaries: Locate the positions of words, sentences, paragraphs within a range of text, or identify locations that would be suitable for line wrapping when displaying the text."
# ----- devel package -------------------------------------------------------
SUMMARY_devel="The ICU development files"
PROVIDES_devel="
icu${secondaryArchSuffix}_devel = $portVersion
cmd:icu_config${secondaryArchSuffix} = $portVersion compat >= 4.8
devel:libicudata${secondaryArchSuffix} = 48.1.1 compat >= 48
devel:libicui18n${secondaryArchSuffix} = 48.1.1 compat >= 48
devel:libicuio${secondaryArchSuffix} = 48.1.1 compat >= 48
devel:libicule${secondaryArchSuffix} = 48.1.1 compat >= 48
devel:libiculx${secondaryArchSuffix} = 48.1.1 compat >= 48
devel:libicutest${secondaryArchSuffix} = 48.1.1 compat >= 48
devel:libicutu${secondaryArchSuffix} = 48.1.1 compat >= 48
devel:libicuuc${secondaryArchSuffix} = 48.1.1 compat >= 48
"
REQUIRES_devel="
icu${secondaryArchSuffix} == $portVersion base
"

20
dev-libs/icu/icu-4.8.1.bep
View File

@@ -1,20 +0,0 @@
DESCRIPTION="icu"
HOMEPAGE="http://www.icu-project.org"
SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1/icu4c-4_8_1-src.tgz"
CHECKSUM_MD5="af36f635271a239d76d038d6cf8da8df"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd icu/source
./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-renaming --disable-samples --disable-extras
make
}
INSTALL {
cd icu/source
make install
}
LICENSE="ICU"
COPYRIGHT="1997-2011 IBM Corporation and others."

510
dev-libs/icu/patches/icu-4.4.1.patch
View File

@@ -1,510 +0,0 @@
diff -ruwN icu/source/aclocal.m4 icu-haiku/source/aclocal.m4
--- icu/source/aclocal.m4 2010-04-28 17:28:54.011796480 +0200
+++ icu-haiku/source/aclocal.m4 2010-07-26 14:35:01.820248576 +0200
@@ -59,7 +59,8 @@
*-*-os400*) icu_cv_host_frag=mh-os400 ;;
*-apple-rhapsody*) icu_cv_host_frag=mh-darwin ;;
*-apple-darwin*) icu_cv_host_frag=mh-darwin ;;
-*-*-beos|*-*-haiku) icu_cv_host_frag=mh-beos ;;
+*-*-beos) icu_cv_host_frag=mh-beos ;;
+*-*-haiku) icu_cv_host_frag=mh-haiku ;;
*-*-irix*) icu_cv_host_frag=mh-irix ;;
*-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
*-*-nto*) icu_cv_host_frag=mh-qnx ;;
diff -ruwN icu/source/common/normalizer2.cpp icu-haiku/source/common/normalizer2.cpp
--- icu/source/common/normalizer2.cpp 2010-04-28 17:27:38.044040192 +0200
+++ icu-haiku/source/common/normalizer2.cpp 2010-07-26 19:29:38.945553408 +0200
@@ -221,7 +221,7 @@
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
impl.decompose(src, limit, &buffer, errorCode);
}
- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
virtual void
normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
@@ -231,7 +231,7 @@
spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const {
return impl.decompose(src, limit, NULL, errorCode);
}
- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const {
return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO;
}
@@ -251,7 +251,7 @@
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode);
}
- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
virtual void
normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
@@ -293,7 +293,7 @@
spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const {
return impl.composeQuickCheck(src, limit, onlyContiguous, NULL);
}
- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const {
return impl.getCompQuickCheck(impl.getNorm16(c));
}
@@ -320,7 +320,7 @@
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
impl.makeFCD(src, limit, &buffer, errorCode);
}
- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
virtual void
normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
@@ -330,7 +330,7 @@
spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const {
return impl.makeFCD(src, limit, NULL, errorCode);
}
- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); }
virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); }
virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); }
diff -ruwN icu/source/config/mh-haiku icu-haiku/source/config/mh-haiku
--- icu/source/config/mh-haiku 1970-01-01 01:00:00.000000000 +0100
+++ icu-haiku/source/config/mh-haiku 2010-07-26 21:54:15.739246080 +0200
@@ -0,0 +1,82 @@
+## -*-makefile-*-
+## haiku-specific setup
+## Copyright (c) 2009, International Business Machines Corporation and
+## others. All Rights Reserved.
+##
+
+## Commands to generate dependency files
+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+
+## Flags for position independent code
+SHAREDLIBCFLAGS = -fPIC
+SHAREDLIBCXXFLAGS = -fPIC
+SHAREDLIBCPPFLAGS = -DPIC
+
+## Additional flags when building libraries and with threads
+LIBCPPFLAGS =
+THREADSCPPFLAGS =
+
+## These are the library specific LDFLAGS
+LDFLAGSICUDT=-nodefaultlibs -nostdlib
+
+## Compiler switch to embed a runtime search path
+LD_RPATH=
+LD_RPATH_PRE = -Wl,-rpath,
+
+## Compiler switch to embed a library name
+LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
+
+## Shared library options
+LD_SOOPTIONS= -Wl,-Bsymbolic
+
+## Shared object suffix
+SO = so
+## Non-shared intermediate object suffix
+STATIC_O = ao
+
+## Compilation rules
+%.$(STATIC_O): $(srcdir)/%.c
+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
+%.o: $(srcdir)/%.c
+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
+
+%.$(STATIC_O): $(srcdir)/%.cpp
+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
+%.o: $(srcdir)/%.cpp
+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
+
+
+## Dependency rules
+%.d: $(srcdir)/%.c
+ @echo "generating dependency information for $<"
+ @$(SHELL) -ec '$(GEN_DEPS.c) $< \
+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
+ [ -s $@ ] || rm -f $@'
+
+%.d: $(srcdir)/%.cpp
+ @echo "generating dependency information for $<"
+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \
+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
+ [ -s $@ ] || rm -f $@'
+
+## Versioned libraries rules
+
+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
+ $(RM) $@ && ln -s ${<F} $@
+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
+
+## Bind internal references
+
+# LDflags that pkgdata will use
+BIR_LDFLAGS= -Wl,-Bsymbolic
+
+# Dependencies [i.e. map files] for the final library
+BIR_DEPS=
+
+# Use LIBRARY_PATH instead of LD_LIBRARY_PATH
+LDLIBRARYPATH_ENVVAR= LIBRARY_PATH
+
+## End haiku-specific setup
+
diff -ruwN icu/source/configure icu-haiku/source/configure
--- icu/source/configure 2010-04-28 17:28:54.051904512 +0200
+++ icu-haiku/source/configure 2010-07-26 17:24:25.573308928 +0200
@@ -5501,7 +5501,8 @@
*-*-os400*) icu_cv_host_frag=mh-os400 ;;
*-apple-rhapsody*) icu_cv_host_frag=mh-darwin ;;
*-apple-darwin*) icu_cv_host_frag=mh-darwin ;;
-*-*-beos|*-*-haiku) icu_cv_host_frag=mh-beos ;;
+*-*-beos) icu_cv_host_frag=mh-beos ;;
+*-*-haiku) icu_cv_host_frag=mh-haiku ;;
*-*-irix*) icu_cv_host_frag=mh-irix ;;
*-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
*-*-nto*) icu_cv_host_frag=mh-qnx ;;
@@ -11425,6 +11426,7 @@
*-*-nto*) platform=U_QNX ;;
*-dec-osf*) platform=U_OSF ;;
*-*-beos) platform=U_BEOS ;;
+ *-*-haiku) platform=U_HAIKU ;;
*-*-irix*) platform=U_IRIX ;;
*-ncr-*) platform=U_MPRAS ;;
*) platform=U_UNKNOWN_PLATFORM ;;
diff -ruwN icu/source/configure.in icu-haiku/source/configure.in
--- icu/source/configure.in 2010-04-28 17:28:54.012845056 +0200
+++ icu-haiku/source/configure.in 2010-07-26 17:23:17.328728576 +0200
@@ -1230,6 +1230,7 @@
*-*-nto*) platform=U_QNX ;;
*-dec-osf*) platform=U_OSF ;;
*-*-beos) platform=U_BEOS ;;
+ *-*-haiku) platform=U_HAIKU ;;
*-*-irix*) platform=U_IRIX ;;
*-ncr-*) platform=U_MPRAS ;;
*) platform=U_UNKNOWN_PLATFORM ;;
diff -ruwN icu/source/i18n/currfmt.h icu-haiku/source/i18n/currfmt.h
--- icu/source/i18n/currfmt.h 2010-04-28 17:27:08.025427968 +0200
+++ icu-haiku/source/i18n/currfmt.h 2010-07-26 19:08:17.175636480 +0200
@@ -63,7 +63,9 @@
virtual Format* clone() const;
+#if (__GNUC__ != 2)
using MeasureFormat::format;
+#endif
/**
* Override Format API.
diff -ruwN icu/source/i18n/digitlst.cpp icu-haiku/source/i18n/digitlst.cpp
--- icu/source/i18n/digitlst.cpp 2010-04-28 17:27:10.042467328 +0200
+++ icu-haiku/source/i18n/digitlst.cpp 2010-07-26 19:06:02.309329920 +0200
@@ -36,7 +36,9 @@
#include <limits.h>
#include <string.h>
#include <stdio.h>
+#if (__GNUC__ != 2)
#include <limits>
+#endif
// ***************************************************************************
// class DigitList
@@ -399,11 +401,15 @@
nonConstThis->fDouble /= -1;
}
} else if (isInfinite()) {
+#if (__GNUC__ != 2)
if (std::numeric_limits<double>::has_infinity) {
nonConstThis->fDouble = std::numeric_limits<double>::infinity();
} else {
nonConstThis->fDouble = std::numeric_limits<double>::max();
}
+#else
+ nonConstThis->fDouble = DBL_MAX;
+#endif
if (!isPositive()) {
nonConstThis->fDouble = -fDouble;
}
diff -ruwN icu/source/i18n/reldtfmt.h icu-haiku/source/i18n/reldtfmt.h
--- icu/source/i18n/reldtfmt.h 2010-04-28 17:27:10.049283072 +0200
+++ icu-haiku/source/i18n/reldtfmt.h 2010-07-26 19:08:52.212074496 +0200
@@ -78,7 +78,9 @@
virtual UBool operator==(const Format& other) const;
+#if (__GNUC__ != 2)
using DateFormat::format;
+#endif
/**
* Format a date or time, which is the standard millis since 24:00 GMT, Jan
diff -ruwN icu/source/i18n/smpdtfmt.cpp icu-haiku/source/i18n/smpdtfmt.cpp
--- icu/source/i18n/smpdtfmt.cpp 2010-04-28 17:27:08.050855936 +0200
+++ icu-haiku/source/i18n/smpdtfmt.cpp 2010-07-26 14:35:01.834142208 +0200
@@ -1054,7 +1054,7 @@
int32_t
SimpleDateFormat::parseGMTDefault(const UnicodeString &text, ParsePosition &pos) const {
int32_t start = pos.getIndex();
- NumberFormat *currentNumberFormat = getNumberFormat(UDAT_TIMEZONE_RFC_FIELD);
+ NumberFormat *currentNumberFormat = getNumberFormatByIndex(UDAT_TIMEZONE_RFC_FIELD);
if (start + kUtLen + 1 >= text.length()) {
pos.setErrorIndex(start);
@@ -1465,7 +1465,7 @@
return;
}
- currentNumberFormat = getNumberFormat(patternCharIndex);
+ currentNumberFormat = getNumberFormatByIndex(patternCharIndex);
switch (patternCharIndex) {
// for any "G" symbol, write out the appropriate era string
@@ -1730,7 +1730,7 @@
//----------------------------------------------------------------------
NumberFormat *
-SimpleDateFormat::getNumberFormat(UDateFormatField index) const {
+SimpleDateFormat::getNumberFormatByIndex(UDateFormatField index) const {
if (fNumberFormatters != NULL) {
return fNumberFormatters[index];
} else {
@@ -2365,7 +2365,7 @@
}
patternCharIndex = (UDateFormatField)(patternCharPtr - DateFormatSymbols::getPatternUChars());
- currentNumberFormat = getNumberFormat(patternCharIndex);
+ currentNumberFormat = getNumberFormatByIndex(patternCharIndex);
UCalendarDateFields field = fgPatternIndexToCalendarField[patternCharIndex];
// If there are any spaces here, skip over them. If we hit the end
diff -ruwN icu/source/i18n/unicode/choicfmt.h icu-haiku/source/i18n/unicode/choicfmt.h
--- icu/source/i18n/unicode/choicfmt.h 2010-04-28 17:27:04.037486592 +0200
+++ icu-haiku/source/i18n/unicode/choicfmt.h 2010-07-26 18:59:35.882114560 +0200
@@ -441,7 +441,9 @@
virtual const UnicodeString* getFormats(int32_t& count) const;
+#if (__GNUC__ != 2)
using NumberFormat::format;
+#endif
/**
* Format a double or long number using this object's choices.
diff -ruwN icu/source/i18n/unicode/datefmt.h icu-haiku/source/i18n/unicode/datefmt.h
--- icu/source/i18n/unicode/datefmt.h 2010-04-28 17:27:04.036962304 +0200
+++ icu-haiku/source/i18n/unicode/datefmt.h 2010-07-26 18:57:27.439615488 +0200
@@ -212,7 +212,9 @@
virtual UBool operator==(const Format&) const;
+#if (__GNUC__ != 2)
using Format::format;
+#endif
/**
* Format an object to produce a string. This method handles Formattable
diff -ruwN icu/source/i18n/unicode/decimfmt.h icu-haiku/source/i18n/unicode/decimfmt.h
--- icu/source/i18n/unicode/decimfmt.h 2010-04-28 17:27:04.032505856 +0200
+++ icu-haiku/source/i18n/unicode/decimfmt.h 2010-07-26 21:37:12.587202560 +0200
@@ -824,7 +824,16 @@
virtual UBool operator==(const Format& other) const;
+#if (__GNUC__ != 2)
using NumberFormat::format;
+#else
+ virtual UnicodeString& format(const Formattable& obj,
+ UnicodeString& appendTo,
+ FieldPositionIterator* posIter,
+ UErrorCode& status) const {
+ return NumberFormat::format(obj, appendTo, posIter, status);
+ }
+#endif
/**
* Format a double or long number using base-10 representation.
diff -ruwN icu/source/i18n/unicode/dtitvfmt.h icu-haiku/source/i18n/unicode/dtitvfmt.h
--- icu/source/i18n/unicode/dtitvfmt.h 2010-04-28 17:27:04.036700160 +0200
+++ icu-haiku/source/i18n/unicode/dtitvfmt.h 2010-07-26 19:12:22.191627264 +0200
@@ -363,7 +363,9 @@
UBool operator!=(const Format& other) const;
+#if (__GNUC__ != 2)
using Format::format;
+#endif
/**
* Format an object to produce a string. This method handles Formattable
diff -ruwN icu/source/i18n/unicode/msgfmt.h icu-haiku/source/i18n/unicode/msgfmt.h
--- icu/source/i18n/unicode/msgfmt.h 2010-04-28 17:27:04.033554432 +0200
+++ icu-haiku/source/i18n/unicode/msgfmt.h 2010-07-26 18:57:58.825753600 +0200
@@ -584,7 +584,9 @@
virtual const Format** getFormats(int32_t& count) const;
+#if (__GNUC__ != 2)
using Format::format;
+#endif
/**
* Formats the given array of arguments into a user-readable string.
diff -ruwN icu/source/i18n/unicode/numfmt.h icu-haiku/source/i18n/unicode/numfmt.h
--- icu/source/i18n/unicode/numfmt.h 2010-04-28 17:27:04.037224448 +0200
+++ icu-haiku/source/i18n/unicode/numfmt.h 2010-07-26 18:54:07.820510720 +0200
@@ -234,8 +234,9 @@
*/
virtual UBool operator==(const Format& other) const;
-
+#if (__GNUC__ != 2)
using Format::format;
+#endif
/**
* Format an object to produce a string. This method handles
diff -ruwN icu/source/i18n/unicode/plurfmt.h icu-haiku/source/i18n/unicode/plurfmt.h
--- icu/source/i18n/unicode/plurfmt.h 2010-04-28 17:27:04.031981568 +0200
+++ icu-haiku/source/i18n/unicode/plurfmt.h 2010-07-26 19:00:08.335282176 +0200
@@ -308,7 +308,9 @@
void applyPattern(const UnicodeString& pattern, UErrorCode& status);
+#if (__GNUC__ != 2)
using Format::format;
+#endif
/**
* Formats a plural message for a given number.
diff -ruwN icu/source/i18n/unicode/rbnf.h icu-haiku/source/i18n/unicode/rbnf.h
--- icu/source/i18n/unicode/rbnf.h 2010-04-28 17:27:04.039845888 +0200
+++ icu-haiku/source/i18n/unicode/rbnf.h 2010-07-26 19:01:11.091226112 +0200
@@ -722,7 +722,9 @@
const Locale& locale = Locale::getDefault());
+#if (__GNUC__ != 2)
using NumberFormat::format;
+#endif
/**
* Formats the specified 32-bit number using the default ruleset.
diff -ruwN icu/source/i18n/unicode/selfmt.h icu-haiku/source/i18n/unicode/selfmt.h
--- icu/source/i18n/unicode/selfmt.h 2010-04-28 17:27:04.039583744 +0200
+++ icu-haiku/source/i18n/unicode/selfmt.h 2010-07-26 19:00:39.130547712 +0200
@@ -220,7 +220,9 @@
void applyPattern(const UnicodeString& pattern, UErrorCode& status);
+#if (__GNUC__ != 2)
using Format::format;
+#endif
/**
* Selects the phrase for the given keyword
diff -ruwN icu/source/i18n/unicode/smpdtfmt.h icu-haiku/source/i18n/unicode/smpdtfmt.h
--- icu/source/i18n/unicode/smpdtfmt.h 2010-04-28 17:27:04.034603008 +0200
+++ icu-haiku/source/i18n/unicode/smpdtfmt.h 2010-07-26 18:58:52.592969728 +0200
@@ -368,7 +368,9 @@
virtual UBool operator==(const Format& other) const;
+#if (__GNUC__ != 2)
using DateFormat::format;
+#endif
/**
* Format a date or time, which is the standard millis since 24:00 GMT, Jan
@@ -1021,8 +1023,7 @@
/**
* Get the numbering system to be used for a particular field.
*/
- using DateFormat::getNumberFormat; // Do not hide visibility of base class function
- NumberFormat * getNumberFormat(UDateFormatField index) const;
+ NumberFormat * getNumberFormatByIndex(UDateFormatField index) const;
/**
* Parse the given override string and set up structures for number formats
diff -ruwN icu/source/i18n/unicode/tmutfmt.h icu-haiku/source/i18n/unicode/tmutfmt.h
--- icu/source/i18n/unicode/tmutfmt.h 2010-04-28 17:27:04.037486592 +0200
+++ icu-haiku/source/i18n/unicode/tmutfmt.h 2010-07-26 21:37:12.592969728 +0200
@@ -164,7 +164,16 @@
void setNumberFormat(const NumberFormat& format, UErrorCode& status);
+#if (__GNUC__ != 2)
using MeasureFormat::format;
+#else
+ virtual UnicodeString& format(const Formattable& obj,
+ UnicodeString& appendTo,
+ FieldPositionIterator* posIter,
+ UErrorCode& status) const {
+ return Format::format(obj, appendTo, posIter, status);
+ }
+#endif
/**
* Format a TimeUnitAmount.
diff -ruwN icu/source/i18n/uspoof_conf.cpp icu-haiku/source/i18n/uspoof_conf.cpp
--- icu/source/i18n/uspoof_conf.cpp 2010-04-28 17:27:08.050069504 +0200
+++ icu-haiku/source/i18n/uspoof_conf.cpp 2010-07-26 19:15:22.253231104 +0200
@@ -106,8 +106,10 @@
// Conforms to the type signature for a USortComparator in uvector.h
static int8_t U_CALLCONV SPUStringCompare(UHashTok left, UHashTok right) {
- const SPUString *sL = static_cast<const SPUString *>(left.pointer);
- const SPUString *sR = static_cast<const SPUString *>(right.pointer);
+ const SPUString *sL = const_cast<const SPUString *>(
+ static_cast<SPUString *>(left.pointer));
+ const SPUString *sR = const_cast<const SPUString *>(
+ static_cast<SPUString *>(right.pointer));
int32_t lenL = sL->fStr->length();
int32_t lenR = sR->fStr->length();
if (lenL < lenR) {
diff -ruwN icu/source/io/unicode/ustream.h icu-haiku/source/io/unicode/ustream.h
--- icu/source/io/unicode/ustream.h 2010-04-28 17:27:52.013369344 +0200
+++ icu-haiku/source/io/unicode/ustream.h 2010-07-26 14:35:01.843055104 +0200
@@ -27,8 +27,13 @@
*/
#if U_IOSTREAM_SOURCE >= 199711
+
+#if (__GNUC__ == 2)
+#include <iostream>
+#else
#include <istream>
#include <ostream>
+#endif
U_NAMESPACE_BEGIN
diff -ruwN icu/source/tools/gennorm2/n2builder.cpp icu-haiku/source/tools/gennorm2/n2builder.cpp
--- icu/source/tools/gennorm2/n2builder.cpp 2010-04-28 17:27:42.052953088 +0200
+++ icu-haiku/source/tools/gennorm2/n2builder.cpp 2010-07-26 19:18:33.715390976 +0200
@@ -674,7 +674,11 @@
}
int32_t length=p->compositions->size();
for(int32_t i=0; i<length; ++i) {
+#if (__GNUC__ == 2)
+ CompositionPair &pair=(*p->compositions)[i];
+#else
CompositionPair &pair=p->compositions->at(i);
+#endif
// 22 bits for the composite character and whether it combines forward.
UChar32 compositeAndFwd=pair.composite<<1;
if(getNormRef(pair.composite).compositions!=NULL) {
diff -ruwN icu/source/tools/pkgdata/pkgdata.cpp icu-haiku/source/tools/pkgdata/pkgdata.cpp
--- icu/source/tools/pkgdata/pkgdata.cpp 2010-04-28 17:27:46.008912896 +0200
+++ icu-haiku/source/tools/pkgdata/pkgdata.cpp 2010-07-26 18:30:06.726401024 +0200
@@ -472,7 +472,7 @@
}
static int runCommand(const char* command, UBool specialHandling) {
- char cmd[SMALL_BUFFER_MAX_SIZE];
+ char cmd[64000];
if (!specialHandling) {
#ifdef USING_CYGWIN

591
dev-libs/icu/patches/icu-4.8.1.1.patch Normal file
View File

@@ -0,0 +1,591 @@
diff -ruN icu/source/common/messagepattern.cpp icu-haiku/source/common/messagepattern.cpp
--- icu/source/common/messagepattern.cpp 2011-07-19 23:16:28.046137344 +0200
+++ icu-haiku/source/common/messagepattern.cpp 2011-08-19 15:48:48.211025920 +0200
@@ -88,8 +88,12 @@
int32_t length,
UErrorCode &errorCode);
UBool ensureCapacityForOneMore(int32_t oldLength, UErrorCode &errorCode);
- UBool memEquals(const MessagePatternList<T, stackCapacity> &other, int32_t length) const {
- return 0==uprv_memcmp(a.getAlias(), other.a.getAlias(), length*sizeof(T));
+ UBool equals(const MessagePatternList<T, stackCapacity> &other, int32_t length) const {
+ for (int32_t i=0; i<length; ++i) {
+ if (!(a.getAlias()[i] == other.a.getAlias()[i]))
+ return FALSE;
+ }
+ return TRUE;
}
MaybeStackArray<T, stackCapacity> a;
@@ -309,7 +313,7 @@
msg==other.msg &&
// parts.equals(o.parts)
partsLength==other.partsLength &&
- (partsLength==0 || partsList->memEquals(*other.partsList, partsLength));
+ (partsLength==0 || partsList->equals(*other.partsList, partsLength));
// No need to compare numericValues if msg and parts are the same.
}
diff -ruN icu/source/common/normalizer2.cpp icu-haiku/source/common/normalizer2.cpp
--- icu/source/common/normalizer2.cpp 2011-07-19 23:16:24.008912896 +0200
+++ icu-haiku/source/common/normalizer2.cpp 2011-08-19 15:46:55.276824064 +0200
@@ -239,7 +239,7 @@
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
impl.decompose(src, limit, &buffer, errorCode);
}
- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
virtual void
normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
UnicodeString &safeMiddle,
@@ -250,7 +250,7 @@
spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const {
return impl.decompose(src, limit, NULL, errorCode);
}
- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const {
return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO;
}
@@ -270,7 +270,7 @@
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode);
}
- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
virtual void
normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
UnicodeString &safeMiddle,
@@ -313,7 +313,7 @@
spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const {
return impl.composeQuickCheck(src, limit, onlyContiguous, NULL);
}
- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const {
return impl.getCompQuickCheck(impl.getNorm16(c));
}
@@ -340,7 +340,7 @@
ReorderingBuffer &buffer, UErrorCode &errorCode) const {
impl.makeFCD(src, limit, &buffer, errorCode);
}
- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function.
virtual void
normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize,
UnicodeString &safeMiddle,
@@ -351,7 +351,7 @@
spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const {
return impl.makeFCD(src, limit, NULL, errorCode);
}
- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function.
virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); }
virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); }
virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); }
diff -ruN icu/source/common/unicode/bytestrie.h icu-haiku/source/common/unicode/bytestrie.h
--- icu/source/common/unicode/bytestrie.h 2011-07-19 23:16:16.052953088 +0200
+++ icu-haiku/source/common/unicode/bytestrie.h 2011-08-19 15:46:55.331874304 +0200
@@ -338,6 +338,9 @@
// but the code looks more confusing that way.)
UVector32 *stack_;
};
+#if (__GNUC__ == 2)
+ friend class Iterator;
+#endif
private:
friend class BytesTrieBuilder;
diff -ruN icu/source/common/unicode/bytestriebuilder.h icu-haiku/source/common/unicode/bytestriebuilder.h
--- icu/source/common/unicode/bytestriebuilder.h 2011-07-19 23:16:16.053477376 +0200
+++ icu-haiku/source/common/unicode/bytestriebuilder.h 2011-08-19 15:46:55.333185024 +0200
@@ -141,6 +141,9 @@
private:
const char *s;
};
+#if (__GNUC__ == 2)
+ friend class BTLinearMatchNode;
+#endif
virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length,
Node *nextNode) const;
diff -ruN icu/source/common/unicode/platform.h.in icu-haiku/source/common/unicode/platform.h.in
--- icu/source/common/unicode/platform.h.in 2011-07-19 23:16:18.055574528 +0200
+++ icu-haiku/source/common/unicode/platform.h.in 2011-08-19 15:46:55.346554368 +0200
@@ -299,7 +299,7 @@
#ifdef U_STATIC_IMPLEMENTATION
#define U_EXPORT
-#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@
+#elif (@U_USE_GCC_VISIBILITY_ATTRIBUTE@) && (__GNUC__ > 2)
#define U_EXPORT __attribute__((visibility("default")))
#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \
|| (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550)
diff -ruN icu/source/common/unicode/stringtriebuilder.h icu-haiku/source/common/unicode/stringtriebuilder.h
--- icu/source/common/unicode/stringtriebuilder.h 2011-07-19 23:16:18.056623104 +0200
+++ icu-haiku/source/common/unicode/stringtriebuilder.h 2011-08-19 15:46:55.336068608 +0200
@@ -245,6 +245,9 @@
protected:
int32_t value;
};
+#if (__GNUC__ == 2)
+ friend class FinalValueNode;
+#endif
/** @internal */
class ValueNode : public Node {
@@ -272,6 +275,9 @@
protected:
Node *next;
};
+#if (__GNUC__ == 2)
+ friend class IntermediateValueNode;
+#endif
/** @internal */
class LinearMatchNode : public ValueNode {
@@ -323,6 +329,9 @@
int32_t values[kMaxBranchLinearSubNodeLength];
UChar units[kMaxBranchLinearSubNodeLength];
};
+#if (__GNUC__ == 2)
+ friend class ListBranchNode;
+#endif
/** @internal */
class SplitBranchNode : public BranchNode {
@@ -339,6 +348,9 @@
Node *lessThan;
Node *greaterOrEqual;
};
+#if (__GNUC__ == 2)
+ friend class SplitBranchNode;
+#endif
// Branch head node, for writing the actual node lead unit.
/** @internal */
@@ -354,6 +366,9 @@
int32_t length;
Node *next; // A branch sub-node.
};
+#if (__GNUC__ == 2)
+ friend class BranchHeadNode;
+#endif
/** @internal */
virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length,
diff -ruN icu/source/common/unicode/ucharstrie.h icu-haiku/source/common/unicode/ucharstrie.h
--- icu/source/common/unicode/ucharstrie.h 2011-07-19 23:16:18.058720256 +0200
+++ icu-haiku/source/common/unicode/ucharstrie.h 2011-08-19 15:46:55.338165760 +0200
@@ -368,6 +368,9 @@
// but the code looks more confusing that way.)
UVector32 *stack_;
};
+#if (__GNUC__ == 2)
+ friend class Iterator;
+#endif
private:
friend class UCharsTrieBuilder;
diff -ruN icu/source/common/unicode/ucharstriebuilder.h icu-haiku/source/common/unicode/ucharstriebuilder.h
--- icu/source/common/unicode/ucharstriebuilder.h 2011-07-19 23:16:18.059244544 +0200
+++ icu-haiku/source/common/unicode/ucharstriebuilder.h 2011-08-19 15:46:55.339738624 +0200
@@ -145,6 +145,9 @@
private:
const UChar *s;
};
+#if (__GNUC__ == 2)
+ friend class UCTLinearMatchNode;
+#endif
virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length,
Node *nextNode) const;
diff -ruN icu/source/config/mh-haiku icu-haiku/source/config/mh-haiku
--- icu/source/config/mh-haiku 2011-07-19 23:16:46.026214400 +0200
+++ icu-haiku/source/config/mh-haiku 2011-08-19 15:46:55.328990720 +0200
@@ -17,6 +17,9 @@
LIBCPPFLAGS =
THREADSCPPFLAGS =
+#
+CPPFLAGS += -D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1
+
## Compiler switch to embed a runtime search path
LD_RPATH=
LD_RPATH_PRE = -Wl,-rpath,
@@ -31,35 +34,35 @@
## Compilation rules
%.$(STATIC_O): $(srcdir)/%.c
- $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
%.o: $(srcdir)/%.c
- $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
%.$(STATIC_O): $(srcdir)/%.cpp
- $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
%.o: $(srcdir)/%.cpp
- $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
## Dependency rules
%.d: $(srcdir)/%.c
- @echo "generating dependency information for $<"
- @$(SHELL) -ec '$(GEN_DEPS.c) $< \
- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
- [ -s $@ ] || rm -f $@'
+ @echo "generating dependency information for $<"
+ @$(SHELL) -ec '$(GEN_DEPS.c) $< \
+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
+ [ -s $@ ] || rm -f $@'
%.d: $(srcdir)/%.cpp
- @echo "generating dependency information for $<"
- @$(SHELL) -ec '$(GEN_DEPS.cc) $< \
- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
- [ -s $@ ] || rm -f $@'
+ @echo "generating dependency information for $<"
+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \
+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
+ [ -s $@ ] || rm -f $@'
## Versioned libraries rules
%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
- $(RM) $@ && ln -s ${<F} $@
+ $(RM) $@ && ln -s ${<F} $@
%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
- $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
## Bind internal references
diff -ruN icu/source/configure icu-haiku/source/configure
--- icu/source/configure 2011-07-19 23:19:38.029884416 +0200
+++ icu-haiku/source/configure 2011-08-19 15:46:55.287834112 +0200
@@ -7748,6 +7748,7 @@
*-*-nto*) platform=U_QNX ;;
*-dec-osf*) platform=U_OSF ;;
*-*-beos) platform=U_BEOS ;;
+ *-*-haiku) platform=U_HAIKU ;;
*-*-irix*) platform=U_IRIX ;;
*-ncr-*) platform=U_MPRAS ;;
*) platform=U_UNKNOWN_PLATFORM ;;
diff -ruN icu/source/configure.in icu-haiku/source/configure.in
--- icu/source/configure.in 2011-07-19 23:19:38.029360128 +0200
+++ icu-haiku/source/configure.in 2011-08-19 15:46:55.290717696 +0200
@@ -1286,6 +1286,7 @@
*-*-nto*) platform=U_QNX ;;
*-dec-osf*) platform=U_OSF ;;
*-*-beos) platform=U_BEOS ;;
+ *-*-haiku) platform=U_HAIKU ;;
*-*-irix*) platform=U_IRIX ;;
*-ncr-*) platform=U_MPRAS ;;
*) platform=U_UNKNOWN_PLATFORM ;;
diff -ruN icu/source/i18n/alphaindex.cpp icu-haiku/source/i18n/alphaindex.cpp
--- icu/source/i18n/alphaindex.cpp 2011-07-19 23:16:04.049545216 +0200
+++ icu-haiku/source/i18n/alphaindex.cpp 2011-08-19 15:46:55.342884352 +0200
@@ -196,7 +196,7 @@
UnicodeSet labelSet;
for (int32_t psIndex=0; psIndex<preferenceSorting.size(); psIndex++) {
- UnicodeString item = *static_cast<const UnicodeString *>(preferenceSorting.elementAt(psIndex));
+ UnicodeString item = *static_cast<UnicodeString *>(preferenceSorting.elementAt(psIndex));
// TODO: Since preferenceSorting was originally populated from the contents of a UnicodeSet,
// is it even possible for duplicates to show up in this check?
if (labelSet.contains(item)) {
@@ -240,7 +240,7 @@
int32_t count = 0;
int32_t old = -1;
for (int32_t srcIndex=0; srcIndex<labels_->size(); srcIndex++) {
- const UnicodeString *str = static_cast<const UnicodeString *>(labels_->elementAt(srcIndex));
+ const UnicodeString *str = static_cast<UnicodeString *>(labels_->elementAt(srcIndex));
++count;
const int32_t bump = count * maxLabelCount_ / size;
if (bump == old) {
@@ -528,7 +528,7 @@
const UnicodeString &AlphabeticIndex::getOverflowComparisonString(const UnicodeString &lowerLimit, UErrorCode &/*status*/) {
for (int32_t i=0; i<firstScriptCharacters_->size(); i++) {
const UnicodeString *s =
- static_cast<const UnicodeString *>(firstScriptCharacters_->elementAt(i));
+ const_cast<const UnicodeString *>(static_cast<UnicodeString *>(firstScriptCharacters_->elementAt(i)));
if (collator_->compare(*s, lowerLimit) > 0) {
return *s;
}
@@ -735,8 +735,10 @@
sortCollateComparator(const void *context, const void *left, const void *right) {
const UHashTok *leftTok = static_cast<const UHashTok *>(left);
const UHashTok *rightTok = static_cast<const UHashTok *>(right);
- const UnicodeString *leftString = static_cast<const UnicodeString *>(leftTok->pointer);
- const UnicodeString *rightString = static_cast<const UnicodeString *>(rightTok->pointer);
+ const UnicodeString *leftString
+ = const_cast<const UnicodeString *>(static_cast<UnicodeString *>(leftTok->pointer));
+ const UnicodeString *rightString
+ = const_cast<const UnicodeString *>(static_cast<UnicodeString *>(rightTok->pointer));
const Collator *col = static_cast<const Collator *>(context);
if (leftString == rightString) {
@@ -760,8 +762,10 @@
recordCompareFn(const void *context, const void *left, const void *right) {
const UHashTok *leftTok = static_cast<const UHashTok *>(left);
const UHashTok *rightTok = static_cast<const UHashTok *>(right);
- const AlphabeticIndex::Record *leftRec = static_cast<const AlphabeticIndex::Record *>(leftTok->pointer);
- const AlphabeticIndex::Record *rightRec = static_cast<const AlphabeticIndex::Record *>(rightTok->pointer);
+ const AlphabeticIndex::Record *leftRec
+ = const_cast<const AlphabeticIndex::Record *>(static_cast<AlphabeticIndex::Record *>(leftTok->pointer));
+ const AlphabeticIndex::Record *rightRec
+ = const_cast<const AlphabeticIndex::Record *>(static_cast<AlphabeticIndex::Record *>(rightTok->pointer));
const Collator *col = static_cast<const Collator *>(context);
Collator::EComparisonResult r = col->compare(leftRec->sortingName_, rightRec->sortingName_);
@@ -1087,8 +1091,8 @@
PreferenceComparator(const void *context, const void *left, const void *right) {
const UHashTok *leftTok = static_cast<const UHashTok *>(left);
const UHashTok *rightTok = static_cast<const UHashTok *>(right);
- const UnicodeString *s1 = static_cast<const UnicodeString *>(leftTok->pointer);
- const UnicodeString *s2 = static_cast<const UnicodeString *>(rightTok->pointer);
+ const UnicodeString *s1 = const_cast<const UnicodeString *>(static_cast<UnicodeString *>(leftTok->pointer));
+ const UnicodeString *s2 = const_cast<const UnicodeString *>(static_cast<UnicodeString *>(rightTok->pointer));
UErrorCode &status = *(UErrorCode *)(context); // Cast off both static and const.
if (s1 == s2) {
return 0;
diff -ruN icu/source/i18n/currfmt.h icu-haiku/source/i18n/currfmt.h
--- icu/source/i18n/currfmt.h 2011-07-19 23:16:00.058720256 +0200
+++ icu-haiku/source/i18n/currfmt.h 2011-08-19 15:46:55.293339136 +0200
@@ -63,7 +63,9 @@
virtual Format* clone() const;
+#if (__GNUC__ > 2)
using MeasureFormat::format;
+#endif
/**
* Override Format API.
diff -ruN icu/source/i18n/digitlst.cpp icu-haiku/source/i18n/digitlst.cpp
--- icu/source/i18n/digitlst.cpp 2011-07-19 23:16:00.050593792 +0200
+++ icu-haiku/source/i18n/digitlst.cpp 2011-08-19 15:46:55.295698432 +0200
@@ -37,7 +37,9 @@
#include <limits.h>
#include <string.h>
#include <stdio.h>
+#if (__GNUC__ > 2)
#include <limits>
+#endif
// ***************************************************************************
// class DigitList
@@ -423,11 +425,15 @@
nonConstThis->fDouble /= -1;
}
} else if (isInfinite()) {
+#if (__GNUC__ > 2)
if (std::numeric_limits<double>::has_infinity) {
nonConstThis->fDouble = std::numeric_limits<double>::infinity();
} else {
nonConstThis->fDouble = std::numeric_limits<double>::max();
}
+#else
+ nonConstThis->fDouble = DBL_MAX;
+#endif
if (!isPositive()) {
nonConstThis->fDouble = -fDouble;
}
diff -ruN icu/source/i18n/reldtfmt.h icu-haiku/source/i18n/reldtfmt.h
--- icu/source/i18n/reldtfmt.h 2011-07-19 23:16:06.034078720 +0200
+++ icu-haiku/source/i18n/reldtfmt.h 2011-08-19 15:46:55.297533440 +0200
@@ -79,7 +79,9 @@
virtual UBool operator==(const Format& other) const;
+#if (__GNUC__ > 2)
using DateFormat::format;
+#endif
/**
* Format a date or time, which is the standard millis since 24:00 GMT, Jan
diff -ruN icu/source/i18n/unicode/alphaindex.h icu-haiku/source/i18n/unicode/alphaindex.h
--- icu/source/i18n/unicode/alphaindex.h 2011-07-19 23:15:52.042467328 +0200
+++ icu-haiku/source/i18n/unicode/alphaindex.h 2011-08-19 15:46:55.344719360 +0200
@@ -588,6 +588,9 @@
Record(AlphabeticIndex *alphaIndex, const UnicodeString &name, const void *data);
~Record();
};
+#if (__GNUC__ == 2)
+ friend struct Record;
+#endif
/**
* Holds all user records before they are distributed into buckets.
diff -ruN icu/source/i18n/unicode/choicfmt.h icu-haiku/source/i18n/unicode/choicfmt.h
--- icu/source/i18n/unicode/choicfmt.h 2011-07-19 23:15:52.038797312 +0200
+++ icu-haiku/source/i18n/unicode/choicfmt.h 2011-08-19 15:46:55.300154880 +0200
@@ -352,7 +352,9 @@
virtual const UnicodeString* getFormats(int32_t& count) const;
+#if (__GNUC__ > 2)
using NumberFormat::format;
+#endif
/**
* Formats a double number using this object's choices.
diff -ruN icu/source/i18n/unicode/datefmt.h icu-haiku/source/i18n/unicode/datefmt.h
--- icu/source/i18n/unicode/datefmt.h 2011-07-19 23:15:52.035389440 +0200
+++ icu-haiku/source/i18n/unicode/datefmt.h 2011-08-19 15:46:55.302514176 +0200
@@ -212,7 +212,9 @@
virtual UBool operator==(const Format&) const;
+#if (__GNUC__ > 2)
using Format::format;
+#endif
/**
* Format an object to produce a string. This method handles Formattable
diff -ruN icu/source/i18n/unicode/decimfmt.h icu-haiku/source/i18n/unicode/decimfmt.h
--- icu/source/i18n/unicode/decimfmt.h 2011-07-19 23:15:54.040370176 +0200
+++ icu-haiku/source/i18n/unicode/decimfmt.h 2011-08-19 15:46:55.305397760 +0200
@@ -834,7 +834,16 @@
virtual UBool operator==(const Format& other) const;
+#if (__GNUC__ > 2)
using NumberFormat::format;
+#else
+ virtual UnicodeString& format(const Formattable& obj,
+ UnicodeString& appendTo,
+ FieldPositionIterator* posIter,
+ UErrorCode& status) const {
+ return NumberFormat::format(obj, appendTo, posIter, status);
+ }
+#endif
/**
* Format a double or long number using base-10 representation.
diff -ruN icu/source/i18n/unicode/dtitvfmt.h icu-haiku/source/i18n/unicode/dtitvfmt.h
--- icu/source/i18n/unicode/dtitvfmt.h 2011-07-19 23:15:54.042467328 +0200
+++ icu-haiku/source/i18n/unicode/dtitvfmt.h 2011-08-19 15:46:55.307757056 +0200
@@ -363,7 +363,9 @@
UBool operator!=(const Format& other) const;
+#if (__GNUC__ > 2)
using Format::format;
+#endif
/**
* Format an object to produce a string. This method handles Formattable
diff -ruN icu/source/i18n/unicode/msgfmt.h icu-haiku/source/i18n/unicode/msgfmt.h
--- icu/source/i18n/unicode/msgfmt.h 2011-07-19 23:15:54.041156608 +0200
+++ icu-haiku/source/i18n/unicode/msgfmt.h 2011-08-19 15:46:55.310116352 +0200
@@ -615,7 +615,9 @@
virtual const Format** getFormats(int32_t& count) const;
+#if (__GNUC__ > 2)
using Format::format;
+#endif
/**
* Formats the given array of arguments into a user-readable string.
diff -ruN icu/source/i18n/unicode/numfmt.h icu-haiku/source/i18n/unicode/numfmt.h
--- icu/source/i18n/unicode/numfmt.h 2011-07-19 23:15:54.039059456 +0200
+++ icu-haiku/source/i18n/unicode/numfmt.h 2011-08-19 15:46:55.312213504 +0200
@@ -212,8 +212,9 @@
*/
virtual UBool operator==(const Format& other) const;
-
+#if (__GNUC__ > 2)
using Format::format;
+#endif
/**
* Format an object to produce a string. This method handles
diff -ruN icu/source/i18n/unicode/plurfmt.h icu-haiku/source/i18n/unicode/plurfmt.h
--- icu/source/i18n/unicode/plurfmt.h 2011-07-19 23:15:52.044040192 +0200
+++ icu-haiku/source/i18n/unicode/plurfmt.h 2011-08-19 15:46:55.314310656 +0200
@@ -281,7 +281,9 @@
void applyPattern(const UnicodeString& pattern, UErrorCode& status);
+#if (__GNUC__ > 2)
using Format::format;
+#endif
/**
* Formats a plural message for a given number.
diff -ruN icu/source/i18n/unicode/rbnf.h icu-haiku/source/i18n/unicode/rbnf.h
--- icu/source/i18n/unicode/rbnf.h 2011-07-19 23:15:54.034340864 +0200
+++ icu-haiku/source/i18n/unicode/rbnf.h 2011-08-19 15:46:55.316932096 +0200
@@ -722,7 +722,9 @@
const Locale& locale = Locale::getDefault());
+#if (__GNUC__ > 2)
using NumberFormat::format;
+#endif
/**
* Formats the specified 32-bit number using the default ruleset.
diff -ruN icu/source/i18n/unicode/selfmt.h icu-haiku/source/i18n/unicode/selfmt.h
--- icu/source/i18n/unicode/selfmt.h 2011-07-19 23:15:52.042991616 +0200
+++ icu-haiku/source/i18n/unicode/selfmt.h 2011-08-19 15:46:55.318767104 +0200
@@ -219,7 +219,9 @@
void applyPattern(const UnicodeString& pattern, UErrorCode& status);
+#if (__GNUC__ > 2)
using Format::format;
+#endif
/**
* Selects the phrase for the given keyword
diff -ruN icu/source/i18n/unicode/smpdtfmt.h icu-haiku/source/i18n/unicode/smpdtfmt.h
--- icu/source/i18n/unicode/smpdtfmt.h 2011-07-19 23:15:52.035127296 +0200
+++ icu-haiku/source/i18n/unicode/smpdtfmt.h 2011-08-19 15:46:55.321126400 +0200
@@ -369,7 +369,9 @@
virtual UBool operator==(const Format& other) const;
+#if (__GNUC__ > 2)
using DateFormat::format;
+#endif
/**
* Format a date or time, which is the standard millis since 24:00 GMT, Jan
diff -ruN icu/source/i18n/unicode/tmutfmt.h icu-haiku/source/i18n/unicode/tmutfmt.h
--- icu/source/i18n/unicode/tmutfmt.h 2011-07-19 23:15:54.039583744 +0200
+++ icu-haiku/source/i18n/unicode/tmutfmt.h 2011-08-19 15:46:55.322961408 +0200
@@ -162,7 +162,16 @@
void setNumberFormat(const NumberFormat& format, UErrorCode& status);
+#if (__GNUC__ > 2)
using MeasureFormat::format;
+#else
+ virtual UnicodeString& format(const Formattable& obj,
+ UnicodeString& appendTo,
+ FieldPositionIterator* posIter,
+ UErrorCode& status) const {
+ return MeasureFormat::format(obj, appendTo, posIter, status);
+ }
+#endif
/**
* Format a TimeUnitAmount.
diff -ruN icu/source/tools/pkgdata/pkgdata.cpp icu-haiku/source/tools/pkgdata/pkgdata.cpp
--- icu/source/tools/pkgdata/pkgdata.cpp 2011-07-19 23:16:36.003670016 +0200
+++ icu-haiku/source/tools/pkgdata/pkgdata.cpp 2011-08-19 15:46:55.326107136 +0200
@@ -476,7 +476,7 @@
static int runCommand(const char* command, UBool specialHandling) {
char *cmd = NULL;
- char cmdBuffer[SMALL_BUFFER_MAX_SIZE];
+ char cmdBuffer[64000];
int32_t len = strlen(command);
if (len == 0) {

9
dev-libs/jansson/jansson-2.4.bep → dev-libs/jansson/jansson-2.4.recipe
View File

@@ -5,18 +5,21 @@ CHECKSUM_MD5="c4629b89bf0432f3158c461e88fe0113"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd jansson-2.4
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
INSTALL()
{
cd jansson-2.4
make install
}
TEST {
TEST()
{
cd jansson-2.4/test
run-suites
}

6
dev-libs/json-c/json-c-0.9.bep → dev-libs/json_c/json_c-0.9.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="3a13d264528dcbaf3931b0cede24abae"
BUILD {
BUILD()
{
cd json-c-0.9
libtoolize --force --install --copy
aclocal
@@ -15,7 +16,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd json-c-0.9
make install DESTDIR=${DESTDIR}
}

0
dev-libs/json-c/patches/json-c-0.9.patch → dev-libs/json_c/patches/json-c-0.9.patch
View File

6
dev-libs/libattica/libattica-0.4.1.bep → dev-libs/libattica/libattica-0.4.1.recipe
View File

@@ -5,13 +5,15 @@ CHECKSUM_MD5="b90983ec5d79e5ddcbc9146fa23cab72"
REVISION="1"
STATUS_HAIKU="untested"
DEPEND=""
BUILD {
BUILD()
{
cd attica-0.4.1
cmake CMakeLists.txt
make
}
INSTALL {
INSTALL()
{
cd attica-0.4.1
make install
}

6
dev-libs/libcdio/libcdio-0.82.bep → dev-libs/libcdio/libcdio-0.82.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/libiconv >= 1.12"
CHECKSUM_MD5="1c29b18e01ab2b966162bc727bf3c360"
BUILD {
BUILD()
{
cd libcdio-0.82
libtoolize --force --copy --install
aclocal
@@ -15,7 +16,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd libcdio-0.82
make install
}

6
dev-libs/libcdio/libcdio-0.83.bep → dev-libs/libcdio/libcdio-0.83.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/libiconv >= 1.12"
CHECKSUM_MD5="b9e0f1bccb142e697cd834fe56b6e6fb"
BUILD {
BUILD()
{
cd libcdio-0.83
libtoolize --force --copy --install
aclocal -I m4
@@ -15,7 +16,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd libcdio-0.83
make install
}

6
dev-libs/libcdio/libcdio-0.90.bep → dev-libs/libcdio/libcdio-0.90.recipe
View File

@@ -6,7 +6,8 @@ STATUS_HAIKU="stable"
DEPEND="dev-libs/libiconv >= 1.12
dev-util/pkgconfig"
CHECKSUM_MD5="1b245b023fb03a58d030fd2800db3247"
BUILD {
BUILD()
{
cd libcdio-0.90
libtoolize --force --copy --install
aclocal -I m4
@@ -16,7 +17,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd libcdio-0.90
make install
}

6
dev-libs/libcss/libcss-0.1.2.bep → dev-libs/libcss/libcss-0.1.2.recipe
View File

@@ -5,12 +5,14 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/libparserutils >= 0.1.1"
BUILD {
BUILD()
{
cd libcss-0.1.2
make
}
INSTALL {
INSTALL()
{
cd libcss-0.1.2
make install
}

0
dev-libs/libcss/libcss-0.2.0-HEAD.bep → dev-libs/libcss/libcss-0.2.0_HEAD.recipe
View File

6
dev-libs/libdwarf/libdwarf-20120410.bep → dev-libs/libdwarf/libdwarf-20120410.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="77c8b351f11738bc9fa50474a69d5b36"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/libelf >= 0.8.13"
BUILD {
BUILD()
{
cd dwarf-20120410/libdwarf
./configure --enable-shared --prefix=$(finddir B_COMMON_DIRECTORY)
make
@@ -14,7 +15,8 @@ BUILD {
LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make
}
INSTALL {
INSTALL()
{
cd dwarf-20120410/libdwarf
make install
cd ../dwarfdump

6
dev-libs/libebml/libebml-1.0.0.bep → dev-libs/libebml/libebml-1.0.0.recipe
View File

@@ -5,12 +5,14 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03"
BUILD {
BUILD()
{
cd libebml-1.0.0/make/linux
make
}
INSTALL {
INSTALL()
{
cd libebml-1.0.0/make/linux
if [ -n ${DESTDIR} ];then
make install DESTDIR="${DESTDIR}"

19
dev-libs/libedit/libedit-20090923.bep
View File

@@ -1,19 +0,0 @@
DESCRIPTION="libedit - A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20090923-3.0.tar.gz"
CHECKSUM_MD5="1e6dad38e8499d71b9c78045e5536734"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd libedit-20090923-3.0
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
cd libedit-20090923-3.0
make install
}
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."

22
dev-libs/libedit/libedit-20100424.bep
View File

@@ -1,22 +0,0 @@
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://ports-space.haiku-files.org/dev-libs/source/libedit-20100424-3.0.tar.gz"
CHECKSUM_MD5="eb4482139525beff12c8ef59f1a84aae"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."
BUILD {
cd libedit-20100424-3.0
autoreconf --force --install
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd libedit-20100424-3.0
make install
}

22
dev-libs/libedit/libedit-20110802-3.0.bep
View File

@@ -1,22 +0,0 @@
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20110802-3.0.tar.gz"
CHECKSUM_MD5="0ea42e2c794da8ed32f6307b427f6590"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2011 The NetBSD Foundation, Inc."
BUILD {
cd libedit-20110802-3.0
autoreconf --force --install
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd libedit-20110802-3.0
make install
}

22
dev-libs/libedit/libedit-20120601-3.0.bep
View File

@@ -1,22 +0,0 @@
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
BUILD {
cd libedit-20120601-3.0
autoreconf --force --install
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd libedit-20120601-3.0
make install
}

66
dev-libs/libedit/libedit-2012_06_01_3.0.recipe Normal file
View File

@@ -0,0 +1,66 @@
SUMMARY="A BSD licensed replacement for the GNU readline library"
DESCRIPTION="This is an autotool- and libtoolized port of the NetBSD Editline library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline."
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="libedit-2012_06_01_3.0.patch"
PROVIDES="
libedit = $portVersion
lib:libedit = 0.0.41 compat >= 0
"
REQUIRES="
haiku >= $haikuVersion
lib:libncurses
"
BUILD_REQUIRES="
devel:libncurses
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoreconf
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
cmd:sed
"
SOURCE_DIR="libedit-20120601-3.0"
BUILD()
{
autoreconf --force --install
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libedit
fixPkgconfig
# devel package
packageEntries devel \
$developDir \
$manDir/man3
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libedit_devel = $portVersion
devel:libedit = 0.0.41 compat >= 0
"
REQUIRES_devel="
libedit == $portVersion base
"

66
dev-libs/libedit/patches/libedit-20090923.patch
View File

@@ -1,66 +0,0 @@
diff -ur libedit-20090923-3.0/examples/fileman.c libedit-20090923-3.0-haiku/examples/fileman.c
--- libedit-20090923-3.0/examples/fileman.c 2008-07-12 02:41:43.000000000 -0600
+++ libedit-20090923-3.0-haiku/examples/fileman.c 2009-10-29 15:35:57.000000000 -0600
@@ -11,7 +11,11 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#if defined(__HAIKU__)
+#include <errno.h>
+#else
#include <sys/errno.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff -ur libedit-20090923-3.0/src/editline/readline.h libedit-20090923-3.0-haiku/src/editline/readline.h
--- libedit-20090923-3.0/src/editline/readline.h 2009-09-23 15:04:26.000000000 -0600
+++ libedit-20090923-3.0-haiku/src/editline/readline.h 2009-10-29 15:35:17.000000000 -0600
@@ -75,7 +75,7 @@
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
diff -ur libedit-20090923-3.0/src/el.c libedit-20090923-3.0-haiku/src/el.c
--- libedit-20090923-3.0/src/el.c 2009-09-23 15:04:26.000000000 -0600
+++ libedit-20090923-3.0-haiku/src/el.c 2009-10-29 15:30:46.000000000 -0600
@@ -41,10 +41,6 @@
#endif
#endif /* not lint && not SCCSID */
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 4096
-#endif
-
/*
* el.c: EditLine interface functions
*/
@@ -56,6 +52,10 @@
#include <ctype.h>
#include "el.h"
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
/* el_init():
* Initialize editline and set default parameters.
*/
diff -ur libedit-20090923-3.0/src/vis.c libedit-20090923-3.0-haiku/src/vis.c
--- libedit-20090923-3.0/src/vis.c 2009-09-23 15:04:26.000000000 -0600
+++ libedit-20090923-3.0-haiku/src/vis.c 2009-10-29 15:34:45.000000000 -0600
@@ -65,6 +65,10 @@
#include <vis.h>
#include <stdlib.h>
+#if defined(__HAIKU__)
+#include <stdint.h>
+#endif
+
#ifdef __weak_alias
__weak_alias(strsvis,_strsvis)
__weak_alias(strsvisx,_strsvisx)

66
dev-libs/libedit/patches/libedit-20100424.patch
View File

@@ -1,66 +0,0 @@
diff -up libedit-20100424-3.0/configure.ac.orig libedit-20100424-3.0/configure.ac
--- libedit-20100424-3.0/configure.ac.orig 2010-04-29 17:13:51.201588736 -0600
+++ libedit-20100424-3.0/configure.ac 2010-04-29 17:13:56.768344064 -0600
@@ -46,7 +46,7 @@ AC_FUNC_ALLOCA
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h])
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h])
AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[])
diff -up libedit-20100424-3.0/examples/fileman.c.orig libedit-20100424-3.0/examples/fileman.c
--- libedit-20100424-3.0/examples/fileman.c.orig 2010-04-29 17:11:46.768868352 -0600
+++ libedit-20100424-3.0/examples/fileman.c 2010-04-29 17:11:53.987496448 -0600
@@ -11,7 +11,11 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+#elif HAVE_ERRNO_H
+#include <errno.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff -up libedit-20100424-3.0/src/el.c.orig libedit-20100424-3.0/src/el.c
--- libedit-20100424-3.0/src/el.c.orig 2010-04-29 17:13:07.215482368 -0600
+++ libedit-20100424-3.0/src/el.c 2010-04-29 17:13:27.866385920 -0600
@@ -55,7 +55,9 @@ __RCSID("$NetBSD: el.c,v 1.59 2010/04/15
#include <stdarg.h>
#include <ctype.h>
#include <locale.h>
+#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
+#endif
#include "el.h"
/* el_init():
diff -up libedit-20100424-3.0/src/vis.c.orig libedit-20100424-3.0/src/vis.c
--- libedit-20100424-3.0/src/vis.c.orig 2010-04-29 17:12:31.912261120 -0600
+++ libedit-20100424-3.0/src/vis.c 2010-04-29 17:12:56.681574400 -0600
@@ -67,6 +67,10 @@ __RCSID("$NetBSD: vis.c,v 1.41 2009/11/2
#include <vis.h>
#include <stdlib.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
#ifdef __weak_alias
__weak_alias(strsvis,_strsvis)
__weak_alias(strsvisx,_strsvisx)
diff -up libedit-20100424-3.0/src/editline/readline.h.orig libedit-20100424-3.0/src/editline/readline.h
--- libedit-20100424-3.0/src/editline/readline.h.orig 2010-04-29 17:12:05.235143168 -0600
+++ libedit-20100424-3.0/src/editline/readline.h 2010-04-29 17:12:16.735313920 -0600
@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL

53
dev-libs/libedit/patches/libedit-2012_06_01_3.0.patch Normal file
View File

@@ -0,0 +1,53 @@
diff -urN libedit-20120601-3.0/configure.ac libedit-20120601-3.0-haiku/configure.ac
--- libedit-20120601-3.0/configure.ac 2012-06-01 12:04:56.000000000 -0700
+++ libedit-20120601-3.0-haiku/configure.ac 2012-06-16 15:01:10.749207552 -0700
@@ -65,7 +65,7 @@
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h])
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h])
AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[])
diff -urN libedit-20120601-3.0/examples/fileman.c libedit-20120601-3.0-haiku/examples/fileman.c
--- libedit-20120601-3.0/examples/fileman.c 2010-04-22 12:13:17.000000000 -0700
+++ libedit-20120601-3.0-haiku/examples/fileman.c 2012-06-16 15:01:10.911212544 -0700
@@ -11,7 +11,11 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+#elif HAVE_ERRNO_H
+#include <errno.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff -urN libedit-20120601-3.0/src/editline/readline.h libedit-20120601-3.0-haiku/src/editline/readline.h
--- libedit-20120601-3.0/src/editline/readline.h 2012-05-22 10:43:49.000000000 -0700
+++ libedit-20120601-3.0-haiku/src/editline/readline.h 2012-06-16 15:01:10.947388416 -0700
@@ -75,7 +75,7 @@
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
diff -urN libedit-20120601-3.0/src/vis.c libedit-20120601-3.0-haiku/src/vis.c
--- libedit-20120601-3.0/src/vis.c 2011-07-08 23:39:42.000000000 -0700
+++ libedit-20120601-3.0-haiku/src/vis.c 2012-06-16 15:01:11.063176704 -0700
@@ -68,6 +68,10 @@
#include <errno.h>
#include <stdlib.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
#ifdef __weak_alias
__weak_alias(strvisx,_strvisx)
#endif

6
dev-libs/libelf/libelf-0.8.13.bep → dev-libs/libelf/libelf-0.8.13.recipe
View File

@@ -5,7 +5,8 @@ CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
BUILD()
{
cd libelf-0.8.13
libtoolize -fci
autoreconf
@@ -13,7 +14,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd libelf-0.8.13
make install instroot=$DESTDIR
make install-compat instroot=$DESTDIR

21
dev-libs/libevent/libevent-1.4.11.bep
View File

@@ -1,21 +0,0 @@
DESCRIPTION="Libevent"
HOMEPAGE="http://monkey.org/~provos/libevent/"
SRC_URI="http://monkey.org/~provos/libevent-1.4.11-stable.tar.gz"
CHECKSUM_MD5="3d2dfe659a84441dd27e4587b5ffe0fe"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd libevent-1.4.11-stable
autoreconf -vfi
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
cd libevent-1.4.11-stable
make install
}
LICENSE="BSD (3-clause)"
COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."

21
dev-libs/libevent/libevent-1.4.13.bep
View File

@@ -1,21 +0,0 @@
DESCRIPTION="Libevent"
HOMEPAGE="http://monkey.org/~provos/libevent/"
SRC_URI="http://monkey.org/~provos/libevent-1.4.13-stable.tar.gz"
CHECKSUM_MD5="0b3ea18c634072d12b3c1ee734263664"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd libevent-1.4.13-stable
autoreconf -vfi
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
cd libevent-1.4.13-stable
make install
}
LICENSE="BSD (3-clause)"
COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."

25
dev-libs/libevent/libevent-1.4.14b.bep
View File

@@ -1,25 +0,0 @@
DESCRIPTION="Libevent"
HOMEPAGE="http://monkey.org/~provos/libevent/"
SRC_URI="http://monkey.org/~provos/libevent-1.4.14b-stable.tar.gz"
CHECKSUM_MD5="a00e037e4d3f9e4fe9893e8a2d27918c"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd libevent-1.4.14b-stable
autoreconf -vfi
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \
--mandir=$COMMON_DOCS
make
}
INSTALL {
cd libevent-1.4.14b-stable
make install
}
LICENSE="BSD (3-clause)"
COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."

103
dev-libs/libevent/libevent-1.4.14b.recipe Normal file
View File

@@ -0,0 +1,103 @@
SUMMARY="Libevent - an event notification library"
DESCRIPTION="The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. Furthermore, libevent also support callbacks due to signals or regular timeouts.
libevent is meant to replace the event loop found in event driven network servers. An application just needs to call event_dispatch() and then add or remove events dynamically without having to change the event loop."
HOMEPAGE="http://www.libevent.org/"
SRC_URI="http://monkey.org/~provos/libevent-1.4.14b-stable.tar.gz"
CHECKSUM_MD5="a00e037e4d3f9e4fe9893e8a2d27918c"
LICENSE="BSD (3-clause)"
COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
REVISION="1"
ARCHITECTURES="x86_gcc2 x86"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
cmd:event_rpcgen.py
lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
SOURCE_DIR="$portVersionedName-stable"
PATCHES="libevent-1.4.14b.patch"
BUILD()
{
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in
sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
# TODO: replace /packages/libevent-1.4.14b-1/.self/ with an alias
mv /packages/libevent-1.4.14b-1/.self/lib/libevent.a \
/packages/libevent-1.4.14b-1/.self/lib/libevent.la \
/packages/libevent-1.4.14b-1/.self/lib/libevent_core.a \
/packages/libevent-1.4.14b-1/.self/lib/libevent_core.la \
/packages/libevent-1.4.14b-1/.self/lib/libevent_extra.a \
/packages/libevent-1.4.14b-1/.self/lib/libevent_extra.la \
$developDir
prepareInstalledDevelLibs \
libevent-1.4 \
libevent_core-1.4 \
libevent_extra-1.4
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
cmd:event_rpcgen.py
lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
"
REQUIRES_devel="
libevent$secondaryArchSuffix == $portVersion base
"

25
dev-libs/libevent/libevent-2.0.10.bep
View File

@@ -1,25 +0,0 @@
DESCRIPTION="Libevent"
HOMEPAGE="http://monkey.org/~provos/libevent/"
SRC_URI="http://monkey.org/~provos/libevent-2.0.10-stable.tar.gz"
CHECKSUM_MD5="a37401d26cbbf28185211d582741a3d4"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd libevent-2.0.10-stable
autoreconf -vfi
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--libdir=$LIBDIR \
--mandir=$COMMON_DOCS
make
}
INSTALL {
cd libevent-2.0.10-stable
make install
}
LICENSE="BSD (3-clause)"
COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."

118
dev-libs/libevent/libevent-2.0.21.recipe Normal file
View File

@@ -0,0 +1,118 @@
SUMMARY="Libevent - an event notification library"
DESCRIPTION="The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. Furthermore, libevent also support callbacks due to signals or regular timeouts.
libevent is meant to replace the event loop found in event driven network servers. An application just needs to call event_dispatch() and then add or remove events dynamically without having to change the event loop."
HOMEPAGE="http://www.libevent.org/"
SRC_URI="https://github.com/downloads/libevent/libevent/libevent-2.0.21-stable.tar.gz"
CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2"
LICENSE="BSD (3-clause)"
COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
REVISION="1"
ARCHITECTURES="x86_gcc2 x86"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
cmd:event_rpcgen.py
lib:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5
lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_openssl_2.0$secondaryArchSuffix= 5.1.9 compat >= 5
lib:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_openssl$secondaryArchSuffix= 5.1.9 compat >= 5
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libnetwork$secondaryArchSuffix >= $haikuVersion
lib:libssl$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libnetwork >= $haikuVersion
"
BUILD_REQUIRES="
devel:libssl$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libz
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
SOURCE_DIR="$portVersionedName-stable"
PATCHES="libevent-2.0.21.patch"
BUILD()
{
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in
sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs \
libevent \
libevent_core \
libevent_extra \
libevent_pthreads \
libevent_openssl
mv .libs/libevent_core.* \
.libs/libevent_extra.* \
.libs/libevent_pthreads.* \
.libs/libevent_openssl.* \
$developLibDir
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
cmd:event_rpcgen.py
lib:libevent$secondaryArchSuffix = $portVersion
lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent$secondaryArchSuffix = 2.0_5.1.9 compat >= 2.0_5
devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
"
REQUIRES_devel="
libevent$secondaryArchSuffix == $portVersion base
devel:libssl
devel:libcrypto
"

12
dev-libs/libevent/patches/libevent-1.4.11.patch
View File

@@ -1,12 +0,0 @@
diff -Naur libevent-1.4.11-stable/configure.in libevent-1.4.11-stable-haiku/configure.in
--- libevent-1.4.11-stable/configure.in 2009-05-24 13:37:49.000000000 +0000
+++ libevent-1.4.11-stable-haiku/configure.in 2009-05-28 16:55:17.000000000 +0000
@@ -33,7 +33,7 @@
AC_SUBST(LIBTOOL_DEPS)
dnl Checks for libraries.
-AC_CHECK_LIB(socket, socket)
+AC_SEARCH_LIBS(socket, socket network)
AC_CHECK_LIB(resolv, inet_aton)
AC_CHECK_LIB(rt, clock_gettime)
AC_CHECK_LIB(nsl, inet_ntoa)

12
dev-libs/libevent/patches/libevent-1.4.13.patch
View File

@@ -1,12 +0,0 @@
diff -Naur libevent-1.4.13-stable/configure.in libevent-1.4.13-stable-haiku/configure.in
--- libevent-1.4.13-stable/configure.in 2009-05-24 13:37:49.000000000 +0000
+++ libevent-1.4.13-stable-haiku/configure.in 2009-05-28 16:55:17.000000000 +0000
@@ -33,7 +33,7 @@
AC_SUBST(LIBTOOL_DEPS)
dnl Checks for libraries.
-AC_CHECK_LIB(socket, socket)
+AC_SEARCH_LIBS(socket, socket network)
AC_CHECK_LIB(resolv, inet_aton)
AC_CHECK_LIB(rt, clock_gettime)
AC_CHECK_LIB(nsl, inet_ntoa)

26
dev-libs/libevent/patches/libevent-2.0.10.patch
View File

@@ -1,26 +0,0 @@
diff -Naur libevent-2.0.10-stable/configure.in libevent-2.0.10-stable-haiku/configure.in
--- libevent-2.0.10-stable/configure.in 2010-12-16 18:38:34.018350080 +0100
+++ libevent-2.0.10-stable-haiku/configure.in 2011-02-21 23:55:55.070254592 +0100
@@ -54,8 +54,8 @@
AC_SUBST(LIBTOOL_DEPS)
dnl Checks for libraries.
-AC_SEARCH_LIBS([inet_ntoa], [nsl])
-AC_SEARCH_LIBS([socket], [socket])
+AC_SEARCH_LIBS([inet_ntoa], [nsl network])
+AC_SEARCH_LIBS([socket], [socket network])
AC_SEARCH_LIBS([inet_aton], [resolv])
AC_SEARCH_LIBS([clock_gettime], [rt])
AC_SEARCH_LIBS([sendfile], [sendfile])
diff -Naur libevent-2.0.10-stable/util-internal.h libevent-2.0.10-stable-haiku/util-internal.h
--- libevent-2.0.10-stable/util-internal.h 2010-12-14 20:07:56.021233664 +0100
+++ libevent-2.0.10-stable-haiku/util-internal.h 2011-02-22 00:00:14.000000000 +0100
@@ -173,7 +173,7 @@
/* Evaluates to the same boolean value as 'p', and hints to the compiler that
* we expect this value to be false. */
-#ifdef __GNUC__
+#if __GNUC__ >= 3
#define EVUTIL_UNLIKELY(p) __builtin_expect(!!(p),0)
#else
#define EVUTIL_UNLIKELY(p) (p)

13
dev-libs/libevent/patches/libevent-2.0.21.patch Normal file
View File

@@ -0,0 +1,13 @@
--- configure.in 2012-11-17 22:34:13.040894464 -0800
+++ haiku/configure.in 2013-08-28 15:07:32.000000000 -0700
@@ -104,8 +104,8 @@
AM_CONDITIONAL([BUILD_REGRESS], [test "$enable_libevent_regress" = "yes"])
dnl Checks for libraries.
-AC_SEARCH_LIBS([inet_ntoa], [nsl])
-AC_SEARCH_LIBS([socket], [socket])
+AC_SEARCH_LIBS([inet_ntoa], [nsl network])
+AC_SEARCH_LIBS([socket], [socket network])
AC_SEARCH_LIBS([inet_aton], [resolv])
AC_SEARCH_LIBS([clock_gettime], [rt])
AC_SEARCH_LIBS([sendfile], [sendfile])

6
dev-libs/libffi/libffi-3.0.11.bep → dev-libs/libffi/libffi-3.0.11.recipe
View File

@@ -5,14 +5,16 @@ REVISION="1"
STATUS_HAIKU="stable"
CHECKSUM_MD5="f69b9693227d976835b4857b1ba7d0e3"
DEPEND=""
BUILD {
BUILD()
{
cd libffi-3.0.11
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
make
}
INSTALL {
INSTALL()
{
cd libffi-3.0.11
make install
}

6
dev-libs/libffi/libffi-3.0.9.bep → dev-libs/libffi/libffi-3.0.9.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
CHECKSUM_MD5="1f300a7a7f975d4046f51c3022fa5ff1"
DEPEND=""
BUILD {
BUILD()
{
cd libffi-3.0.9
cp /boot/common/share/libtool/config/config.* .
libtoolize --force --copy
@@ -16,7 +17,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd libffi-3.0.9
make install
}

6
dev-libs/libgcrypt/libgcrypt-1.4.5.bep → dev-libs/libgcrypt/libgcrypt-1.4.5.recipe
View File

@@ -4,7 +4,8 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.5.tar.gz"
REVISION="1"
STATUS_HAIKU="untested"
DEPEND="dev-libs/libgpg-error"
BUILD {
BUILD()
{
cd libgcrypt-1.4.5
libtoolize --force --copy --install
autogen.sh
@@ -12,7 +13,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd libgcrypt-1.4.5
make install
}

6
dev-libs/libgcrypt/libgcrypt-1.5.0.bep → dev-libs/libgcrypt/libgcrypt-1.5.0.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-libs/libgpg-error > 1.8"
CHECKSUM_MD5="693f9c64d50c908bc4d6e01da3ff76d8"
BUILD {
BUILD()
{
cd libgcrypt-1.5.0
libtoolize --force --copy --install
autogen.sh
@@ -16,7 +17,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd libgcrypt-1.5.0
make install
}

6
dev-libs/libgpg-error/libgpg-error-1.10.bep → dev-libs/libgpg_error/libgpg_error-1.10.recipe
View File

@@ -5,7 +5,8 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND="gettext = 0.18.1.1-dev"
CHECKSUM_MD5="736a03daa9dc5873047d4eb4a9c22a16"
BUILD {
BUILD()
{
cd libgpg-error-1.10
cd po
touch t-cs.gmo t-de.gmo t-fr.gmo t-it.gmo t-nl.gmo \
@@ -17,7 +18,8 @@ BUILD {
make
}
INSTALL {
INSTALL()
{
cd libgpg-error-1.10
make install
}

6
dev-libs/libgpg-error/libgpg-error-1.7.bep → dev-libs/libgpg_error/libgpg_error-1.7.recipe
View File

@@ -5,14 +5,16 @@ REVISION="1"
STATUS_HAIKU="untested"
DEPEND=""
CHECKSUM_MD5="62c0d09d1e76c5b6da8fff92314c4665"
BUILD {
BUILD()
{
cd libgpg-error-1.7
autoreconf -vfi -Im4
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
INSTALL()
{
cd libgpg-error-1.7
make install
}

11
dev-libs/libgpg_error/patches/libgpg_error-1.10.patch Normal file
View File

@@ -0,0 +1,11 @@
--- libgpg-error-1.10/src/mkerrcodes2.awk 2008-08-26 12:45:58.010747904 +0000
+++ libgpg-error-1.10-haiku/src/mkerrcodes2.awk 2012-04-09 16:59:18.363855872 +0000
@@ -81,7 +81,7 @@
/^#/ { next; }
header {
- if ($1 ~ /^[0123456789]+$/)
+ if ($1 ~ /^-?[0123456789]+$/)
{
print "static const int err_code_from_index[] = {";
header = 0;

0
dev-libs/libgpg-error/patches/libgpg-error-1.7.patch → dev-libs/libgpg_error/patches/libgpg_error-1.7.patch
View File

47
dev-libs/libiconv/libiconv-1.12.bep
View File

@@ -1,47 +0,0 @@
DESCRIPTION="libiconv"
HOMEPAGE="http://www.gnu.org/software/libiconv/"
SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz"
CHECKSUM_MD5="c2be282595751535a618ae0edeb8f648"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd libiconv-1.12
rm -rf aclocal.m4
echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
libtoolize -fci
aclocal --install -I m4 -I srcm4
autoconf
autoheader
cd libcharset
echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
libtoolize -fci
aclocal --install -I m4
autoconf
autoheader
cd ..
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \
--docdir=$COMMON_DOCS/doc/iconv \
--mandir=$COMMON_DOCS/man \
--enable-relocatable \
--enable-shared \
--enable-static \
--disable-nls
make
}
INSTALL {
cd libiconv-1.12
ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir`
mkdir -p ${ACLOCALDIR}
cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4
make install
}
TEST{
cd libiconv-1.12
make check
}

48
dev-libs/libiconv/libiconv-1.13.1.bep
View File

@@ -1,48 +0,0 @@
DESCRIPTION="libiconv"
HOMEPAGE="http://www.gnu.org/software/libiconv/"
SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz"
CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd libiconv-1.13.1
rm -rf aclocal.m4
echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
libtoolize -fci
aclocal --install -I m4 -I srcm4
autoconf
autoheader
cd libcharset
echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac"
libtoolize -fci
aclocal --install -I m4
autoconf
autoheader
cd ..
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \
--docdir=$COMMON_DOCS/doc/iconv \
--mandir=$COMMON_DOCS/man \
--enable-relocatable \
--enable-shared \
--enable-static \
--disable-nls
make
}
INSTALL {
cd libiconv-1.13.1
ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir`
mkdir -p ${ACLOCALDIR}
cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4
make install
}
TEST{
cd libiconv-1.13.1
make check
}

Some files were not shown because too many files have changed in this diff Show More