Merge all changes from trunk

This commit is contained in:
Oliver Tappe
2013-03-29 14:04:07 +00:00
parent 888e133171
commit 94cc6aaf85
1052 changed files with 65053 additions and 2541 deletions

View File

@@ -0,0 +1,34 @@
DESCRIPTION="tool for checking backward binary and source-level compatibility of a C/C++ library."
HOMEPAGE="ispras.linuxbase.org/index.php/ABI_compliance_checker"
SRC_URI="https://github.com/downloads/lvc/abi-compliance-checker/abi-compliance-checker-1.98.3.tar.gz"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND=""
CHECKSUM_MD5="e2ca96bf71b014eefa11fe10a6f7d1f6"
BUILD {
cd abi-compliance-checker-1.98.3
sed -i 's/linux|freebsd|openbsd|netbsd/linux|freebsd|openbsd|netbsd|haiku/' Makefile.pl
sed -i 's/$PREFIX\/share\/$TOOL_SNAME/$PREFIX\/data\/$TOOL_SNAME/' Makefile.pl
sed -i 's/..\/share\/$TOOL_SNAME/..\/data\/$TOOL_SNAME/' Makefile.pl
}
INSTALL {
cd abi-compliance-checker-1.98.3
mkdir -p $DESTDIR/`finddir B_COMMON_DIRECTORY`/example-descriptors
perl Makefile.pl -install --prefix=`finddir B_COMMON_DIRECTORY` \
--destdir=$DESTDIR
cp -r `haikuporter -t`/dev-util/abi-compliance-checker/example-descriptors \
$DESTDIR/`finddir B_COMMON_DIRECTORY`/data/abi-compliance-checker
}
TEST {
cd abi-compliance-checker-1.98.3
# make test
# make check
}
LICENSE="GNU GPL v2"
COPYRIGHT="2009-2010 The Linux Foundation
2009-2011 Institute for System Programming, RAS
2011-2012 Nokia Corporation and/or its subsidiary(-ies)
2011-2012 ROSA Laboratory"

View File

@@ -0,0 +1,29 @@
This tool can be used to compare the ABIs of different versions of a shared
library. As part of the checking process, it invokes gcc in order to generate
a compiled header, which is not supported by gcc2.
So: only execute this tool if you have gcc4 installed and set as your current
compiler!
Enclosed are a couple of example descriptors (*.desc), which have been used
to analyze the ABI compatibility of zlib, libpng and libjpeg.
If you want to do your own checks, you are expected to unpack the sources of
all libraries that you'd like to compare in a folder (such that there is a
subfolder for each library, as usually is the case with xxx.tar.gz
distributions) and build each versions of library.
Before you can invoke the checker, you need to give it some info about each
library version, by means of a descriptor file. You can ask the checker to
generate a generic descriptor template, or you can use one of the enclosed
descriptor examples as a starting point.
abi-compliance-checker.pl -l <libname> -d1 <older>.desc -d2 <newer>.desc
More info can be found on the tool's homepage:
http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
Please send your haiku-specific questions my way:
Oliver Tappe <zooey@hirschkaefer.de>
Have fun.

View File

@@ -0,0 +1,44 @@
<?xml version="1.0"?>
<version>
6.2
</version>
<headers>
jconfig.h
jerror.h
jmorecfg.h
jpeglib.h
</headers>
<libs>
jpeg-6b/.libs/libjpeg.so
</libs>
<include_paths>
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
/* This section is not necessary */
jpeg-6b
</include_paths>
<gcc_options>
/* Addition gcc options, one per line */
/* This section is not necessary */
</gcc_options>
<opaque_types>
/* The list of types that should be skipped while checking, one per line */
/* This section is not necessary */
</opaque_types>
<skip_interfaces>
/* The list of interfaces that should be skipped while checking, one mangled name per line */
/* This section is not necessary */
</skip_interfaces>
<include_preamble>
/* The list of header files that should be included before other headers, one per line */
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
/* This section is not necessary */
stdio.h
</include_preamble>

View File

@@ -0,0 +1,44 @@
<?xml version="1.0"?>
<version>
7
</version>
<headers>
jconfig.h
jerror.h
jmorecfg.h
jpeglib.h
</headers>
<libs>
jpeg-7/.libs/libjpeg.so
</libs>
<include_paths>
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
/* This section is not necessary */
jpeg-7
</include_paths>
<gcc_options>
/* Addition gcc options, one per line */
/* This section is not necessary */
</gcc_options>
<opaque_types>
/* The list of types that should be skipped while checking, one per line */
/* This section is not necessary */
</opaque_types>
<skip_interfaces>
/* The list of interfaces that should be skipped while checking, one mangled name per line */
/* This section is not necessary */
</skip_interfaces>
<include_preamble>
/* The list of header files that should be included before other headers, one per line */
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
/* This section is not necessary */
stdio.h
</include_preamble>

View File

@@ -0,0 +1,44 @@
<?xml version="1.0"?>
<version>
8
</version>
<headers>
jconfig.h
jerror.h
jmorecfg.h
jpeglib.h
</headers>
<libs>
jpeg-8/.libs/libjpeg.so
</libs>
<include_paths>
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
/* This section is not necessary */
jpeg-8
</include_paths>
<gcc_options>
/* Addition gcc options, one per line */
/* This section is not necessary */
</gcc_options>
<opaque_types>
/* The list of types that should be skipped while checking, one per line */
/* This section is not necessary */
</opaque_types>
<skip_interfaces>
/* The list of interfaces that should be skipped while checking, one mangled name per line */
/* This section is not necessary */
</skip_interfaces>
<include_preamble>
/* The list of header files that should be included before other headers, one per line */
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
/* This section is not necessary */
stdio.h
</include_preamble>

View File

@@ -0,0 +1,41 @@
<?xml version="1.0"?>
<version>
1.2.42
</version>
<headers>
pngconf.h
png.h
</headers>
<libs>
libpng-1.2.42/.libs/libpng12.so
</libs>
<include_paths>
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
/* This section is not necessary */
libpng-1.2.42
</include_paths>
<gcc_options>
/* Addition gcc options, one per line */
/* This section is not necessary */
</gcc_options>
<opaque_types>
/* The list of types that should be skipped while checking, one per line */
/* This section is not necessary */
</opaque_types>
<skip_interfaces>
/* The list of interfaces that should be skipped while checking, one mangled name per line */
/* This section is not necessary */
</skip_interfaces>
<include_preamble>
/* The list of header files that should be included before other headers, one per line */
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
/* This section is not necessary */
</include_preamble>

View File

@@ -0,0 +1,41 @@
<?xml version="1.0"?>
<version>
1.4.0
</version>
<headers>
pngconf.h
png.h
</headers>
<libs>
libpng-1.4.0/.libs/libpng14.so
</libs>
<include_paths>
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
/* This section is not necessary */
libpng-1.4.0
</include_paths>
<gcc_options>
/* Addition gcc options, one per line */
/* This section is not necessary */
</gcc_options>
<opaque_types>
/* The list of types that should be skipped while checking, one per line */
/* This section is not necessary */
</opaque_types>
<skip_interfaces>
/* The list of interfaces that should be skipped while checking, one mangled name per line */
/* This section is not necessary */
</skip_interfaces>
<include_preamble>
/* The list of header files that should be included before other headers, one per line */
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
/* This section is not necessary */
</include_preamble>

View File

@@ -0,0 +1,42 @@
<?xml version="1.0"?>
<version>
1.1.4
</version>
<headers>
zconf.h
zlib.h
zutil.h
</headers>
<libs>
zlib-1.1.4/libz.so
</libs>
<include_paths>
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
/* This section is not necessary */
zlib-1.1.4
</include_paths>
<gcc_options>
/* Addition gcc options, one per line */
/* This section is not necessary */
</gcc_options>
<opaque_types>
/* The list of types that should be skipped while checking, one per line */
/* This section is not necessary */
</opaque_types>
<skip_interfaces>
/* The list of interfaces that should be skipped while checking, one mangled name per line */
/* This section is not necessary */
</skip_interfaces>
<include_preamble>
/* The list of header files that should be included before other headers, one per line */
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
/* This section is not necessary */
</include_preamble>

View File

@@ -0,0 +1,42 @@
<?xml version="1.0"?>
<version>
1.2.2
</version>
<headers>
zconf.h
zlib.h
zutil.h
</headers>
<libs>
zlib-1.2.2/libz.so
</libs>
<include_paths>
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
/* This section is not necessary */
zlib-1.2.2
</include_paths>
<gcc_options>
/* Addition gcc options, one per line */
/* This section is not necessary */
</gcc_options>
<opaque_types>
/* The list of types that should be skipped while checking, one per line */
/* This section is not necessary */
</opaque_types>
<skip_interfaces>
/* The list of interfaces that should be skipped while checking, one mangled name per line */
/* This section is not necessary */
</skip_interfaces>
<include_preamble>
/* The list of header files that should be included before other headers, one per line */
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
/* This section is not necessary */
</include_preamble>

View File

@@ -0,0 +1,42 @@
<?xml version="1.0"?>
<version>
1.2.3
</version>
<headers>
zconf.h
zlib.h
zutil.h
</headers>
<libs>
zlib-1.2.3/libz.so
</libs>
<include_paths>
/* The list of paths to be searched for header files needed for compiling of library headers, one per line */
/* This section is not necessary */
zlib-1.2.3
</include_paths>
<gcc_options>
/* Addition gcc options, one per line */
/* This section is not necessary */
</gcc_options>
<opaque_types>
/* The list of types that should be skipped while checking, one per line */
/* This section is not necessary */
</opaque_types>
<skip_interfaces>
/* The list of interfaces that should be skipped while checking, one mangled name per line */
/* This section is not necessary */
</skip_interfaces>
<include_preamble>
/* The list of header files that should be included before other headers, one per line */
/* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */
/* This section is not necessary */
</include_preamble>

View File

@@ -0,0 +1,22 @@
DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code."
HOMEPAGE="http://astyle.sourceforge.net"
SRC_URI="svn+https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyle#339"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
BUILD {
cd astyle-r339/build/gcc
make prefix=$(finddir B_COMMON_DIRECTORY)
}
INSTALL {
cd astyle-r339/build/gcc
make install \
prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \
SYSCONF_PATH="${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/astyle" \
INSTALL=install
}
LICENSE="GNU LGPL v3"
COPYRIGHT="1998-2002 by Tal Davidson
2006-2012 Jim Pattee"

View File

@@ -0,0 +1,22 @@
DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code."
HOMEPAGE="http://astyle.sourceforge.net"
SRC_URI="svn+https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyle#361"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
BUILD {
cd astyle-r361/build/gcc
make prefix=$(finddir B_COMMON_DIRECTORY)
}
INSTALL {
cd astyle-r361/build/gcc
make install \
prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \
SYSCONF_PATH="${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/astyle" \
INSTALL=install
}
LICENSE="GNU LGPL v3"
COPYRIGHT="1998-2002 by Tal Davidson
2006-2012 Jim Pattee"

View File

@@ -0,0 +1,20 @@
DESCRIPTION="KDE Meta Object Compiler"
HOMEPAGE="http://techbase.kde.org/Development/Tools/Automoc4"
SRC_URI="git://anongit.kde.org/automoc"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="qt4,
cmake"
BUILD {
cd automoc-4-git
cmake CMakeLists.txt
make
}
INSTALL {
cd automoc-4-git
make install
}
LICENSE="BSD (2-clause)"
COPYRIGHT="The KDE Project"

View File

@@ -10,7 +10,7 @@ BUILD {
touch ./ChangeLog
libtoolize --force --copy --install
autoreconf -i
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -0,0 +1,39 @@
DESCRIPTION="a simple, self-contained and portable build system"
HOMEPAGE="http://hypertriton.com/bsdbuild/"
SRC_URI="http://stable.hypertriton.com/bsdbuild/bsdbuild-2.9.tar.gz"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND="dev-lang/perl >= 5.10
dev-lang/lua >= 5.1"
CHECKSUM_MD5="fd0d4a754024a39d9cf1f5e42f8075b5"
BUILD {
cd bsdbuild-2.9
cp mkconfigure.pl mkconfigure
# cp gen-dotdepend.pl gen-dotdepend-tmp.pl
sed -i 's#/usr/bin/perl#/boot/common/bin/perl#' mkconfigure
sed -i 's#$INSTALLDIR/gen-dotdepend.pl#./gen-dotdepend.pl#' mkconfigure
cat configure.in | mkconfigure > configure
rm mkconfigure
./configure --prefix=/boot/common \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \
--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
--sharedir=`finddir B_COMMON_DATA_DIRECTORY`
make
}
INSTALL {
cd bsdbuild-2.9
make install
}
TEST {
cd bsdbuild-2.9
# make test
# make check
}
LICENSE="BSD (2-clause)"
COPYRIGHT="2002-2011 Hypertrition, Inc."

View File

@@ -0,0 +1,27 @@
diff -urN bsdbuild-2.9/configure.in bsdbuild-2.9-haiku/configure.in
--- bsdbuild-2.9/configure.in 2011-06-20 12:46:10.031719424 +0000
+++ bsdbuild-2.9-haiku/configure.in 2011-08-11 21:05:19.596377600 +0000
@@ -4,7 +4,7 @@
VERSION("2.9")
RELEASE("Blast of Ancient Atmospheres")
-MDEFINE(SHAREDIR, "$PREFIX/share/bsdbuild")
+MDEFINE(SHAREDIR, "$SHAREDIR/bsdbuild")
echo "*"
echo "* Configuration successful."
diff -urN bsdbuild-2.9/mkconfigure.pl bsdbuild-2.9-haiku/mkconfigure.pl
--- bsdbuild-2.9/mkconfigure.pl 2011-05-17 08:06:19.033554432 +0000
+++ bsdbuild-2.9-haiku/mkconfigure.pl 2011-08-11 22:05:40.015728640 +0000
@@ -865,7 +865,10 @@
datadir=$optarg
;;
--sharedir=*)
- datadir=$optarg
+ sharedir=$optarg
+ ;;
+ --sbindir=*)
+ sbindir=$optarg
;;
--localedir=*)
localedir=$optarg

View File

@@ -0,0 +1,19 @@
DESCRIPTION="NetSurf build framework for compiling some of their libraries"
HOMEPAGE="http://www.netsurf-browser.org/"
SRC_URI="git://git.netsurf-browser.org/buildsystem"
REVISION="1"
STATUS_HAIKU="stable"
BUILD {
cd buildsystem-0
make
}
INSTALL {
cd buildsystem-0
make install PREFIX=/boot/common/
}
LICENSE="MIT
GNU GPL v2"
COPYRIGHT="2003 - 2012 The NetSurf Developers"

View File

@@ -7,7 +7,8 @@ DEPEND=""
CHECKSUM_MD5="223449f7891e5d6a15b25100eca5cca4"
BUILD {
cd ccache-3.0.1
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {

View File

@@ -0,0 +1,22 @@
DESCRIPTION="ccache is a fast compiler cache."
HOMEPAGE="http://ccache.samba.org/"
SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.4.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="676fda8a9a5e02574435c32b22942abd"
BUILD {
cd ccache-3.1.4
sed -i 's/\-lm//g' Ma*
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd ccache-3.1.4
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2002-2007 Andrew Tridgell
2009-2011 Joel Rosdahl"

View File

@@ -0,0 +1,22 @@
DESCRIPTION="ccache is a fast compiler cache."
HOMEPAGE="http://ccache.samba.org/"
SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.7.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="82257745eac54826527946e9e3d046f4"
BUILD {
cd ccache-3.1.7
sed -i 's/\-lm//g' Ma*
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd ccache-3.1.7
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2002-2007 Andrew Tridgell
2009-2012 Joel Rosdahl"

View File

@@ -0,0 +1,33 @@
DESCRIPTION="cmake - Cross platform Make"
HOMEPAGE="http://www.cmake.org"
SRC_URI="git+http://cmake.org/cmake.git"
#CHECKSUM_MD5=""
REVISION="1"
STATUS_HAIKU="broken"
DEPEND=""
BUILD {
cd cmake-2.8-git
# cmake appends the prefix to mandir and datadir
# so using ../../ to back that part out but for some reason
# the doc was also picking up /boot, so had to back it out 3 times
# this seems to work but might still need some further adjusting
# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datadir=/data/cmake \
--docdir=/documentation/doc/CMake \
--mandir=/documentation/man
make
}
INSTALL {
cd cmake-2.8-git
make install
}
TEST {
cd cmake-2.8-git
make test
}
LICENSE="CMake"
COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved."

View File

@@ -0,0 +1,27 @@
DESCRIPTION="cmake - Cross platform Make"
HOMEPAGE="http://www.cmake.org"
SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz"
CHECKSUM_MD5="097278785da7182ec0aea8769d06860c"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd cmake-2.8.10.2
# cmake assumes the aclocal dir is in share/aclocal
sed -i 's/share\/aclocal/data\/aclocal/g' Source/cmakemain.cxx
sed -i 's/share\/aclocal/data\/aclocal/g' Utilities/CMakeLists.txt
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datadir=/data/cmake \
--docdir=/documentation/doc/CMake \
--mandir=/documentation/man
make
}
INSTALL {
cd cmake-2.8.10.2
make install
}
LICENSE="CMake"
COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved."

View File

@@ -0,0 +1,229 @@
diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake
--- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800
+++ cmake-2.8-git/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800
@@ -1,20 +1,25 @@
+set(HAIKU 1)
+set(UNIX 1)
+
+set(CMAKE_DL_LIBS "")
-set(BEOS 1)
-
-set(CMAKE_DL_LIBS root be)
-set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
-set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
+
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ /boot/common/non-packaged
+ /boot/common
+ /boot/system
+ )
+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ /boot/common/non-packaged/lib
+ /boot/common/lib
+ /boot/develop/lib/x86
+ )
-
-include(Platform/UnixPaths)
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common)
-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include)
-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib)
-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin)
-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib)
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
diff -urN cmake-2.8-git-orig/Source/cmExportCommand.cxx cmake-2.8-git/Source/cmExportCommand.cxx
--- cmake-2.8-git-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800
+++ cmake-2.8-git/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800
@@ -20,7 +20,8 @@
#include "cmExportBuildFileGenerator.h"
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
cmExportCommand::cmExportCommand()
@@ -305,14 +306,15 @@
const char* hash)
{
#if defined(__HAIKU__)
- BPath dir;
- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK)
+ char dir[B_PATH_NAME_LENGTH];
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) !=
+ B_OK)
{
return;
}
- dir.Append("cmake/packages");
- dir.Append(package.c_str());
- std::string fname = dir.Path();
+ std::string fname = dir;
+ fname += "/cmake/packages/";
+ fname += package;
#else
const char* home = cmSystemTools::GetEnv("HOME");
if(!home)
diff -urN cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx cmake-2.8-git/Source/cmFindPackageCommand.cxx
--- cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800
+++ cmake-2.8-git/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800
@@ -19,7 +19,9 @@
#endif
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <string.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
void cmFindPackageNeedBackwardsCompatibility(const std::string& variable,
@@ -1583,12 +1585,13 @@
#if defined(_WIN32) && !defined(__CYGWIN__)
this->LoadPackageRegistryWinUser();
#elif defined(__HAIKU__)
- BPath dir;
- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK)
+ char dir[B_PATH_NAME_LENGTH];
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) ==
+ B_OK)
{
- dir.Append("cmake/packages");
- dir.Append(this->Name.c_str());
- this->LoadPackageRegistryDir(dir.Path());
+ strlcat(dir, "/cmake/packages/", sizeof(dir));
+ strlcat(dir, this->Name.c_str(), sizeof(dir));
+ this->LoadPackageRegistryDir(dir);
}
#else
if(const char* home = cmSystemTools::GetEnv("HOME"))
diff -urN cmake-2.8-git-orig/Source/cmLocalGenerator.cxx cmake-2.8-git/Source/cmLocalGenerator.cxx
--- cmake-2.8-git-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800
+++ cmake-2.8-git/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800
@@ -37,7 +37,8 @@
#include <assert.h>
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
cmLocalGenerator::cmLocalGenerator()
@@ -354,12 +355,12 @@
prefix = prefix_win32.c_str();
}
#elif defined(__HAIKU__)
+ char dir[B_PATH_NAME_LENGTH];
if (!prefix)
{
- BPath dir;
- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK)
{
- prefix = dir.Path();
+ prefix = dir;
}
else
{
diff -urN cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx
--- cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800
+++ cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800
@@ -27,7 +27,8 @@
#include <algorithm>
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
//----------------------------------------------------------------------
@@ -1265,10 +1266,10 @@
this->InstallPath += "-";
this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION");
#elif defined(__HAIKU__)
- BPath dir;
- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
+ char dir[B_PATH_NAME_LENGTH];
+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK)
{
- this->InstallPath = dir.Path();
+ this->InstallPath = dir;
}
else
{
diff -urN cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt
--- cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800
+++ cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800
@@ -51,7 +51,7 @@
FULL_DOCS "A simple etst proerty that means nothign and is used for nothing"
)
set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR)
-if(NOT BEOS AND NOT WIN32) # No libm on BeOS.
+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS.
set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
endif()
get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
diff -urN cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c
--- cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800
+++ cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800
@@ -38,7 +38,7 @@
# define PLATFORM_AIX_V3
#endif
-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
#error "O_NONBLOCK does not work on this platform"
#endif
int socket;
diff -urN cmake-2.8-git-orig/Utilities/cmcurl/select.c cmake-2.8-git/Utilities/cmcurl/select.c
--- cmake-2.8-git-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800
+++ cmake-2.8-git/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800
@@ -39,7 +39,7 @@
#error "We can't compile without select() support!"
#endif
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__)
/* BeOS has FD_SET defined in socket.h */
#include <socket.h>
#endif
diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zconf.h cmake-2.8-git/Utilities/cmzlib/zconf.h
--- cmake-2.8-git-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800
+++ cmake-2.8-git/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800
@@ -237,7 +237,7 @@
# endif
#endif
-#if defined (__BEOS__) && !defined (__HAIKU__)
+#if defined (__BEOS__)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)
diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zutil.h cmake-2.8-git/Utilities/cmzlib/zutil.h
--- cmake-2.8-git-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800
+++ cmake-2.8-git/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800
@@ -147,12 +147,6 @@
# define OS_CODE 0x0f
#endif
-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-/* many BeOS workarounds are no longer needed in Haiku */
-#if defined(__HAIKU__) && defined(__BEOS__)
-#undef __BEOS__
-#endif
-
#if defined(_BEOS_) || defined(RISCOS)
# define fdopen(fd,mode) NULL /* No fdopen() */
#endif

View File

@@ -0,0 +1,460 @@
diff -urN cmake-2.8.10.2-orig/bootstrap cmake-2.8.10.2/bootstrap
--- cmake-2.8.10.2-orig/bootstrap 2012-11-27 05:26:34.015728640 -0800
+++ cmake-2.8.10.2/bootstrap 2012-12-03 12:02:17.615251968 -0800
@@ -146,7 +146,9 @@
cmake_default_prefix="c:/Program Files/CMake"
fi
elif ${cmake_system_haiku}; then
- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
+ cmake_man_dir="/documentation/man"
+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
else
cmake_default_prefix="/usr/local"
fi
diff -urN cmake-2.8.10.2-orig/Modules/CMakePlatformId.h.in cmake-2.8.10.2/Modules/CMakePlatformId.h.in
--- cmake-2.8.10.2-orig/Modules/CMakePlatformId.h.in 2012-11-27 05:26:32.056623104 -0800
+++ cmake-2.8.10.2/Modules/CMakePlatformId.h.in 2012-12-03 12:02:17.633864192 -0800
@@ -35,11 +35,8 @@
#elif defined(__hpux) || defined(__hpux__)
# define PLATFORM_ID "HP-UX"
-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
+#elif defined(__HAIKU__)
# define PLATFORM_ID "Haiku"
-/* Haiku also defines __BEOS__ so we must
- put it prior to the check for __BEOS__
-*/
#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
# define PLATFORM_ID "BeOS"
--- cmake-2.8.10.2-orig/Modules/FindFreetype.cmake 2012-11-27 13:26:32.037486592 +0000
+++ cmake-2.8.10.2/Modules/FindFreetype.cmake 2013-02-10 23:15:25.000000000 +0000
@@ -46,20 +46,22 @@
HINTS
ENV FREETYPE_DIR
PATHS
+ /boot/develop/headers
/usr/local/X11R6
/usr/local/X11
/usr/freeware
- PATH_SUFFIXES include/freetype2 include
+ PATH_SUFFIXES include/freetype2 include 3rdparty
)
find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
HINTS
ENV FREETYPE_DIR
PATHS
+ /boot/develop/headers
/usr/local/X11R6
/usr/local/X11
/usr/freeware
- PATH_SUFFIXES include/freetype2 include
+ PATH_SUFFIXES include/freetype2 include 3rdparty/freetype2 3rdparty
)
find_library(FREETYPE_LIBRARY
@@ -68,6 +70,7 @@
ENV FREETYPE_DIR
PATH_SUFFIXES lib
PATHS
+ /boot/system/lib
/usr/local/X11R6
/usr/local/X11
/usr/freeware
diff -urN cmake-2.8.10.2-orig/Modules/FindGLUT.cmake cmake-2.8.10.2/Modules/FindGLUT.cmake
--- cmake-2.8.10.2-orig/Modules/FindGLUT.cmake 2012-11-27 13:26:32.057147392 +0000
+++ cmake-2.8.10.2/Modules/FindGLUT.cmake 2012-12-04 09:11:43.176422912 +0000
@@ -46,19 +46,23 @@
/usr/openwin/include
/opt/graphics/OpenGL/include
/opt/graphics/OpenGL/contrib/libglut
+ /boot/develop/headers/os/opengl
)
find_library( GLUT_glut_LIBRARY glut
/usr/openwin/lib
+ /boot/develop/lib/x86/
)
- find_library( GLUT_Xi_LIBRARY Xi
- /usr/openwin/lib
- )
-
- find_library( GLUT_Xmu_LIBRARY Xmu
- /usr/openwin/lib
- )
+ if(NOT BEOS AND NOT HAIKU)
+ find_library( GLUT_Xi_LIBRARY Xi
+ /usr/openwin/lib
+ )
+
+ find_library( GLUT_Xmu_LIBRARY Xmu
+ /usr/openwin/lib
+ )
+ endif()
endif ()
@@ -70,12 +74,18 @@
if (GLUT_FOUND)
# Is -lXi and -lXmu required on all platforms that have it?
# If not, we need some way to figure out what platform we are on.
- set( GLUT_LIBRARIES
- ${GLUT_glut_LIBRARY}
- ${GLUT_Xmu_LIBRARY}
- ${GLUT_Xi_LIBRARY}
- ${GLUT_cocoa_LIBRARY}
- )
+ if(BEOS OR HAIKU)
+ set( GLUT_LIBRARIES
+ ${GLUT_glut_LIBRARY}
+ )
+ else
+ set( GLUT_LIBRARIES
+ ${GLUT_glut_LIBRARY}
+ ${GLUT_Xmu_LIBRARY}
+ ${GLUT_Xi_LIBRARY}
+ ${GLUT_cocoa_LIBRARY}
+ )
+ endif()
#The following deprecated settings are for backwards compatibility with CMake1.4
set (GLUT_LIBRARY ${GLUT_LIBRARIES})
diff -urN cmake-2.8.10.2-orig/Modules/FindLua51.cmake cmake-2.8.10.2/Modules/FindLua51.cmake
--- cmake-2.8.10.2-orig/Modules/FindLua51.cmake 2012-11-27 05:26:32.033030144 -0800
+++ cmake-2.8.10.2/Modules/FindLua51.cmake 2012-12-03 12:02:17.644612096 -0800
@@ -54,7 +54,7 @@
if(LUA_LIBRARY)
# include the math library for Unix
- if(UNIX AND NOT APPLE)
+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
find_library(LUA_MATH_LIBRARY m)
set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
# For Windows and Mac, don't need to explicitly include the math library
diff -urN cmake-2.8.10.2-orig/Modules/FindOpenGL.cmake cmake-2.8.10.2/Modules/FindOpenGL.cmake
--- cmake-2.8.10.2-orig/Modules/FindOpenGL.cmake 2012-11-27 05:26:32.034340864 -0800
+++ cmake-2.8.10.2/Modules/FindOpenGL.cmake 2012-12-03 12:02:17.651952128 -0800
@@ -80,6 +80,7 @@
/usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include /usr/X11R6/include
+ /boot/develop/headers/os/opengl
)
find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
@@ -94,6 +95,7 @@
/usr/openwin/lib
/usr/shlib /usr/X11R6/lib
${HPUX_IA_OPENGL_LIB_PATH}
+ /boot/develop/lib/x86/
)
# On Unix OpenGL most certainly always requires X11.
diff -urN cmake-2.8.10.2-orig/Modules/Platform/Haiku.cmake cmake-2.8.10.2/Modules/Platform/Haiku.cmake
--- cmake-2.8.10.2-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800
+++ cmake-2.8.10.2/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800
@@ -1,20 +1,25 @@
+set(HAIKU 1)
+set(UNIX 1)
+
+set(CMAKE_DL_LIBS "")
-set(BEOS 1)
-
-set(CMAKE_DL_LIBS root be)
-set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
-set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart")
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
+
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ /boot/common/non-packaged
+ /boot/common
+ /boot/system
+ )
+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ /boot/common/non-packaged/lib
+ /boot/common/lib
+ /boot/develop/lib/x86
+ )
-
-include(Platform/UnixPaths)
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common)
-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include)
-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib)
-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin)
-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib)
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
diff -urN cmake-2.8.10.2-orig/Source/cmCTest.cxx cmake-2.8.10.2/Source/cmCTest.cxx
--- cmake-2.8.10.2-orig/Source/cmCTest.cxx 2012-11-27 05:26:32.060030976 -0800
+++ cmake-2.8.10.2/Source/cmCTest.cxx 2012-12-03 12:02:17.659816448 -0800
@@ -53,7 +53,7 @@
#include <cm_zlib.h>
#include <cmsys/Base64.h>
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__)
#include <be/kernel/OS.h> /* disable_debugger() API. */
#endif
diff -urN cmake-2.8.10.2-orig/Source/cmExportCommand.cxx cmake-2.8.10.2/Source/cmExportCommand.cxx
--- cmake-2.8.10.2-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800
+++ cmake-2.8.10.2/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800
@@ -20,7 +20,8 @@
#include "cmExportBuildFileGenerator.h"
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
cmExportCommand::cmExportCommand()
@@ -305,14 +306,15 @@
const char* hash)
{
#if defined(__HAIKU__)
- BPath dir;
- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK)
+ char dir[B_PATH_NAME_LENGTH];
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) !=
+ B_OK)
{
return;
}
- dir.Append("cmake/packages");
- dir.Append(package.c_str());
- std::string fname = dir.Path();
+ std::string fname = dir;
+ fname += "/cmake/packages/";
+ fname += package;
#else
const char* home = cmSystemTools::GetEnv("HOME");
if(!home)
diff -urN cmake-2.8.10.2-orig/Source/cmFindPackageCommand.cxx cmake-2.8.10.2/Source/cmFindPackageCommand.cxx
--- cmake-2.8.10.2-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800
+++ cmake-2.8.10.2/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800
@@ -19,7 +19,9 @@
#endif
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <string.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
void cmFindPackageNeedBackwardsCompatibility(const std::string& variable,
@@ -1583,12 +1585,13 @@
#if defined(_WIN32) && !defined(__CYGWIN__)
this->LoadPackageRegistryWinUser();
#elif defined(__HAIKU__)
- BPath dir;
- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK)
+ char dir[B_PATH_NAME_LENGTH];
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) ==
+ B_OK)
{
- dir.Append("cmake/packages");
- dir.Append(this->Name.c_str());
- this->LoadPackageRegistryDir(dir.Path());
+ strlcat(dir, "/cmake/packages/", sizeof(dir));
+ strlcat(dir, this->Name.c_str(), sizeof(dir));
+ this->LoadPackageRegistryDir(dir);
}
#else
if(const char* home = cmSystemTools::GetEnv("HOME"))
diff -urN cmake-2.8.10.2-orig/Source/cmLocalGenerator.cxx cmake-2.8.10.2/Source/cmLocalGenerator.cxx
--- cmake-2.8.10.2-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800
+++ cmake-2.8.10.2/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800
@@ -37,7 +37,8 @@
#include <assert.h>
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
cmLocalGenerator::cmLocalGenerator()
@@ -354,12 +355,12 @@
prefix = prefix_win32.c_str();
}
#elif defined(__HAIKU__)
+ char dir[B_PATH_NAME_LENGTH];
if (!prefix)
{
- BPath dir;
- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK)
{
- prefix = dir.Path();
+ prefix = dir;
}
else
{
diff -urN cmake-2.8.10.2-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.10.2/Source/CPack/cmCPackGenerator.cxx
--- cmake-2.8.10.2-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800
+++ cmake-2.8.10.2/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800
@@ -27,7 +27,8 @@
#include <algorithm>
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
//----------------------------------------------------------------------
@@ -1265,10 +1266,10 @@
this->InstallPath += "-";
this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION");
#elif defined(__HAIKU__)
- BPath dir;
- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
+ char dir[B_PATH_NAME_LENGTH];
+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK)
{
- this->InstallPath = dir.Path();
+ this->InstallPath = dir;
}
else
{
diff -urN cmake-2.8.10.2-orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.10.2/Source/CPack/cmCPackGeneratorFactory.cxx
--- cmake-2.8.10.2-orig/Source/CPack/cmCPackGeneratorFactory.cxx 2012-12-03 12:07:50.301203456 -0800
+++ cmake-2.8.10.2/Source/CPack/cmCPackGeneratorFactory.cxx 2012-12-03 12:02:17.678428672 -0800
@@ -113,7 +113,7 @@
}
#endif
#if !defined(_WIN32) \
+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
- && !defined(__QNXNTO__) && !defined(__BEOS__)
if (cmCPackDebGenerator::CanGenerate())
{
this->RegisterGenerator("DEB", "Debian packages",
diff -urN cmake-2.8.10.2-orig/Source/kwsys/ProcessUNIX.c cmake-2.8.10.2/Source/kwsys/ProcessUNIX.c
--- cmake-2.8.10.2-orig/Source/kwsys/ProcessUNIX.c 2012-11-27 05:26:33.000524288 -0800
+++ cmake-2.8.10.2/Source/kwsys/ProcessUNIX.c 2012-12-03 12:02:17.707264512 -0800
@@ -63,10 +63,6 @@
#include <dirent.h> /* DIR, dirent */
#include <ctype.h> /* isspace */
-#ifdef __HAIKU__
-#undef __BEOS__
-#endif
-
#if defined(__VMS)
# define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK
#else
diff -urN cmake-2.8.10.2-orig/Source/kwsys/SystemTools.cxx cmake-2.8.10.2/Source/kwsys/SystemTools.cxx
--- cmake-2.8.10.2-orig/Source/kwsys/SystemTools.cxx 2012-11-27 05:26:33.005505024 -0800
+++ cmake-2.8.10.2/Source/kwsys/SystemTools.cxx 2012-12-03 12:02:17.708313088 -0800
@@ -157,7 +157,7 @@
#include <os/storage/Path.h>
#endif
-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+#if defined(__BEOS__) && !defined(__ZETA__)
#include <be/kernel/OS.h>
#include <be/storage/Path.h>
diff -urN cmake-2.8.10.2-orig/Source/kwsys/testDynamicLoader.cxx cmake-2.8.10.2/Source/kwsys/testDynamicLoader.cxx
--- cmake-2.8.10.2-orig/Source/kwsys/testDynamicLoader.cxx 2012-11-27 05:26:33.006815744 -0800
+++ cmake-2.8.10.2/Source/kwsys/testDynamicLoader.cxx 2012-12-03 12:02:17.713818112 -0800
@@ -15,7 +15,7 @@
#include KWSYS_HEADER(ios/iostream)
#include KWSYS_HEADER(stl/string)
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__)
#include <be/kernel/OS.h> /* disable_debugger() API. */
#endif
diff -urN cmake-2.8.10.2-orig/Source/kwsys/testProcess.c cmake-2.8.10.2/Source/kwsys/testProcess.c
--- cmake-2.8.10.2-orig/Source/kwsys/testProcess.c 2012-11-27 05:26:33.007602176 -0800
+++ cmake-2.8.10.2/Source/kwsys/testProcess.c 2012-12-03 12:02:17.714604544 -0800
@@ -32,7 +32,7 @@
# pragma warn -8060 /* possibly incorrect assignment */
#endif
-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__)
+#if defined(__BEOS__) && !defined(__ZETA__)
/* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */
# include <be/kernel/OS.h>
static inline void testProcess_usleep(unsigned int msec)
diff -urN cmake-2.8.10.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.10.2/Tests/ComplexOneConfig/Library/CMakeLists.txt
--- cmake-2.8.10.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800
+++ cmake-2.8.10.2/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800
@@ -51,7 +51,7 @@
FULL_DOCS "A simple etst proerty that means nothign and is used for nothing"
)
set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR)
-if(NOT BEOS AND NOT WIN32) # No libm on BeOS.
+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS.
set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
endif()
get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO)
diff -urN cmake-2.8.10.2-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.10.2/Utilities/cmcurl/CMake/CurlTests.c
--- cmake-2.8.10.2-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800
+++ cmake-2.8.10.2/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800
@@ -38,7 +38,7 @@
# define PLATFORM_AIX_V3
#endif
-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
#error "O_NONBLOCK does not work on this platform"
#endif
int socket;
diff -urN cmake-2.8.10.2-orig/Utilities/cmcurl/select.c cmake-2.8.10.2/Utilities/cmcurl/select.c
--- cmake-2.8.10.2-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800
+++ cmake-2.8.10.2/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800
@@ -39,7 +39,7 @@
#error "We can't compile without select() support!"
#endif
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__)
/* BeOS has FD_SET defined in socket.h */
#include <socket.h>
#endif
diff -urN cmake-2.8.10.2-orig/Utilities/cmzlib/zconf.h cmake-2.8.10.2/Utilities/cmzlib/zconf.h
--- cmake-2.8.10.2-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800
+++ cmake-2.8.10.2/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800
@@ -237,7 +237,7 @@
# endif
#endif
-#if defined (__BEOS__) && !defined (__HAIKU__)
+#if defined (__BEOS__)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)
diff -urN cmake-2.8.10.2-orig/Utilities/cmzlib/zutil.h cmake-2.8.10.2/Utilities/cmzlib/zutil.h
--- cmake-2.8.10.2-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800
+++ cmake-2.8.10.2/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800
@@ -147,12 +147,6 @@
# define OS_CODE 0x0f
#endif
-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
-/* many BeOS workarounds are no longer needed in Haiku */
-#if defined(__HAIKU__) && defined(__BEOS__)
-#undef __BEOS__
-#endif
-
#if defined(_BEOS_) || defined(RISCOS)
# define fdopen(fd,mode) NULL /* No fdopen() */
#endif

View File

@@ -0,0 +1,21 @@
DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
HOMEPAGE="http://cppunit.sourceforge.net/"
SRC_URI="http://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/cppunit-1.12.1.tar.gz/download"
CHECKSUM_MD5 = "bd30e9cf5523cdfc019b94f5e1d7fd19"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd cppunit-1.12.1
libtoolize --force --copy --install
autoreconf -i
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL {
cd cppunit-1.12.1
make install
}
LICENSE="GNU LGPL v2.1"

View File

@@ -8,7 +8,7 @@ DEPEND=""
BUILD {
cd cscope-15.7a
autoreconf -fvi
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -7,13 +7,15 @@ DEPEND=""
CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d"
BUILD {
cd ctags-5.8
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd ctags-5.8
make install prefix=${DESTDIR}/boot/common
make install prefix=${DESTDIR}`finddir B_COMMON_DIRECTORY` \
mandir=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
}
LICENSE="GNU GPL v2"

View File

@@ -7,7 +7,7 @@ STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd diffstat-1.51
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -1,6 +1,6 @@
DESCRIPTION="fastdep is a fast dependency generator for C/C++ files."
HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/"
SRC_URI="http://www.irule.be/bvh/c++/fastdep/fastdep-0.16.tar.gz"
SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""

View File

@@ -1,20 +0,0 @@
DESCRIPTION="GNU Global is a source code tagging system."
HOMEPAGE="http://www.gnu.org/software/global/"
SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-5.8.1.tar.gz"
CHECKSUM_MD5="9c357098e42c9ba32776ccd6b549d85d"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd global-5.8.1
./configure --prefix=/boot/common --with-exuberant-ctags=/bin/ctags
make
}
INSTALL {
cd global-5.8.1
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2000-2007 Tama Communications Corporation
2007-2010 Free Software Foundation, Inc."

View File

@@ -1,21 +0,0 @@
DESCRIPTION="GNU Global is a source code tagging system."
HOMEPAGE="http://www.gnu.org/software/global/"
SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-5.8.2.tar.gz"
CHECKSUM_MD5="380a496cbe24263a80eb895f87b7c7f4"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd global-5.8.2
autoreconf -fi
./configure --prefix=/boot/common --with-exuberant-ctags=/bin/ctags
make
}
INSTALL {
cd global-5.8.2
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2000-2007 Tama Communications Corporation
2007-2010 Free Software Foundation, Inc."

View File

@@ -1,20 +0,0 @@
DESCRIPTION="GNU Global is a source code tagging system."
HOMEPAGE="http://www.gnu.org/software/global/"
SRC_URI="http://tamacom.com/global/global-5.8.tar.gz"
CHECKSUM_MD5="7ba2efb55269615b2722cca36aced2cb"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd global-5.8
./configure --prefix=/boot/common
make
}
INSTALL {
cd global-5.8
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2000-2007 Tama Communications Corporation
2007-2010 Free Software Foundation, Inc."

View File

@@ -1,21 +0,0 @@
DESCRIPTION="GNU Global is a source code tagging system."
HOMEPAGE="http://www.gnu.org/software/global/"
SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-5.9.1.tar.gz"
CHECKSUM_MD5="eaeba27e23f9a0518c4ce66f4797accf"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd global-5.9.1
autoreconf -fi
./configure --prefix=/boot/common --with-exuberant-ctags=/bin/ctags --with-posix-sort=/bin/sort
make
}
INSTALL {
cd global-5.9.1
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2000-2010 Tama Communications Corporation
2007-2010 Free Software Foundation, Inc."

View File

@@ -1,21 +0,0 @@
DESCRIPTION="GNU Global is a source code tagging system."
HOMEPAGE="http://www.gnu.org/software/global/"
SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-5.9.tar.gz"
CHECKSUM_MD5="258276ba3ba2ca1faa3c86bd6b4d8c95"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd global-5.9
autoreconf -fi
./configure --prefix=/boot/common --with-exuberant-ctags=/bin/ctags --with-posix-sort=/bin/sort
make
}
INSTALL {
cd global-5.9
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2000-2010 Tama Communications Corporation
2007-2010 Free Software Foundation, Inc."

View File

@@ -0,0 +1,27 @@
DESCRIPTION="GNU Global is a source code tagging system."
HOMEPAGE="http://www.gnu.org/software/global/"
SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-6.2.2.tar.gz"
CHECKSUM_MD5="8317d2d6914a8e18cd725f9cd7164b87"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-util/ctags >= 5.8"
BUILD {
cd global-6.2.2
autoreconf -fi
./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
--datadir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc" \
--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \
--infodir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/info" \
--with-ncurses \
--with-exuberant-ctags="$(finddir B_COMMON_BIN_DIRECTORY)/ctags" \
--with-posix-sort=/bin/sort
make
}
INSTALL {
cd global-6.2.2
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2000-2012 Tama Communications Corporation
2007-2012 Free Software Foundation, Inc."

View File

@@ -0,0 +1,27 @@
DESCRIPTION="GNU Global is a source code tagging system."
HOMEPAGE="http://www.gnu.org/software/global/"
SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-6.2.4.tar.gz"
CHECKSUM_MD5="c778d4e52a30706db7a02070cce1078c"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-util/ctags >= 5.8"
BUILD {
cd global-6.2.4
autoreconf -fi
./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
--datadir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc" \
--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \
--infodir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/info" \
--with-ncurses \
--with-exuberant-ctags="$(finddir B_COMMON_BIN_DIRECTORY)/ctags" \
--with-posix-sort=/bin/sort
make
}
INSTALL {
cd global-6.2.4
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="2000-2012 Tama Communications Corporation
2007-2012 Free Software Foundation, Inc."

View File

@@ -1,14 +0,0 @@
diff -up global-5.8.1/libdb/db.h.orig global-5.8.1/libdb/db.h
--- global-5.8.1/libdb/db.h.orig 2010-03-06 04:08:14.003145728 -0700
+++ global-5.8.1/libdb/db.h 2010-03-11 16:10:46.316145664 -0700
@@ -43,6 +43,10 @@
#include "compat.h"
+#if defined(__HAIKU__)
+#include <stdint.h>
+#endif
+
#define RET_ERROR -1 /* Return values. */
#define RET_SUCCESS 0
#define RET_SPECIAL 1

View File

@@ -1,25 +0,0 @@
diff -up global-5.8.2/configure.ac.orig global-5.8.2/configure.ac
--- global-5.8.2/configure.ac.orig 2010-05-23 01:40:56.774635520 -0600
+++ global-5.8.2/configure.ac 2010-05-23 01:41:23.901775360 -0600
@@ -57,7 +57,7 @@ LTDL_INIT([recursive])
dnl Checks for libraries.
dnl Checks for header files.
-AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h)
+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h)
AC_CHECK_HEADERS(sys/resource.h)
AC_HEADER_DIRENT
if test ${ac_header_dirent} = no; then
diff -up global-5.8.2/libdb/db.h.orig global-5.8.2/libdb/db.h
--- global-5.8.2/libdb/db.h.orig 2010-05-23 01:42:09.494665728 -0600
+++ global-5.8.2/libdb/db.h 2010-05-23 01:42:55.554434560 -0600
@@ -40,6 +40,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
#include "compat.h"

View File

@@ -1,14 +0,0 @@
diff -ur global-5.8/libdb/db.h global-5.8-haiku/libdb/db.h
--- global-5.8/libdb/db.h 2009-12-19 03:49:27.000000000 -0700
+++ global-5.8-haiku/libdb/db.h 2009-12-29 02:50:48.000000000 -0700
@@ -43,6 +43,10 @@
#include "compat.h"
+#if defined(__HAIKU__)
+#include <stdint.h>
+#endif
+
#define RET_ERROR -1 /* Return values. */
#define RET_SUCCESS 0
#define RET_SPECIAL 1

View File

@@ -1,25 +0,0 @@
diff -up global-5.9.1/configure.ac.orig global-5.9.1/configure.ac
--- global-5.9.1/configure.ac.orig 2010-07-18 23:28:56.009175040 -0600
+++ global-5.9.1/configure.ac 2010-07-18 23:59:03.300941312 -0600
@@ -57,7 +57,7 @@ LTDL_INIT([recursive])
dnl Checks for libraries.
dnl Checks for header files.
-AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h)
+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h)
AC_CHECK_HEADERS(sys/resource.h)
AC_HEADER_DIRENT
if test ${ac_header_dirent} = no; then
diff -up global-5.9.1/libdb/db.h.orig global-5.9.1/libdb/db.h
--- global-5.9.1/libdb/db.h.orig 2010-07-18 23:28:56.033292288 -0600
+++ global-5.9.1/libdb/db.h 2010-07-18 23:59:03.303824896 -0600
@@ -40,6 +40,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
#include "compat.h"

View File

@@ -1,25 +0,0 @@
diff -up global-5.9/configure.ac.orig global-5.9/configure.ac
--- global-5.9/configure.ac.orig 2010-06-07 22:07:47.039059456 -0600
+++ global-5.9/configure.ac 2010-07-03 16:16:00.980418560 -0600
@@ -57,7 +57,7 @@ LTDL_INIT([recursive])
dnl Checks for libraries.
dnl Checks for header files.
-AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h)
+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h)
AC_CHECK_HEADERS(sys/resource.h)
AC_HEADER_DIRENT
if test ${ac_header_dirent} = no; then
diff -up global-5.9/libdb/db.h.orig global-5.9/libdb/db.h
--- global-5.9/libdb/db.h.orig 2010-06-07 22:07:47.062914560 -0600
+++ global-5.9/libdb/db.h 2010-07-03 16:16:00.983564288 -0600
@@ -40,6 +40,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
#include "compat.h"

View File

@@ -0,0 +1,38 @@
diff -up global-6.2.2/configure.ac.orig global-6.2.2/configure.ac
--- global-6.2.2/configure.ac.orig 2012-03-14 23:23:56.037486592 -0600
+++ global-6.2.2/configure.ac 2012-05-02 21:19:08.722993152 -0600
@@ -58,7 +58,7 @@ LTDL_INIT([recursive])
dnl Checks for libraries.
dnl Checks for header files.
-AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h)
+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h)
AC_CHECK_HEADERS(sys/resource.h)
AC_HEADER_DIRENT
if test ${ac_header_dirent} = no; then
diff -up global-6.2.2/libdb/db.h.orig global-6.2.2/libdb/db.h
--- global-6.2.2/libdb/db.h.orig 2012-03-14 23:23:56.062390272 -0600
+++ global-6.2.2/libdb/db.h 2012-05-02 21:19:08.744751104 -0600
@@ -40,6 +40,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
#include "compat.h"
diff -up global-6.2.2/m4/check_curses.m4.orig global-6.2.2/m4/check_curses.m4
--- global-6.2.2/m4/check_curses.m4.orig 2012-03-14 23:23:56.037224448 -0600
+++ global-6.2.2/m4/check_curses.m4 2012-05-02 21:19:08.754188288 -0600
@@ -240,6 +240,9 @@ AC_DEFUN([AC_SEARCH_NCURSES], [
AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
+ AC_NCURSES(/boot/develop/headers/3rdparty, ncurses.h, -lncurses, -I/boot/develop/headers/3rdparty, "ncurses on /boot/develop")
+ AC_NCURSES(/boot/common/include/ncurses, ncurses.h, -lncurses, -I/boot/common/include/ncurses, "ncurses on /boot/common")
+
dnl
dnl We couldn't find ncurses, try SysV curses
dnl

View File

@@ -0,0 +1,38 @@
diff -up global-6.2.4/configure.ac.orig global-6.2.4/configure.ac
--- global-6.2.4/configure.ac.orig 2012-05-30 03:30:15.003670016 -0600
+++ global-6.2.4/configure.ac 2012-07-26 22:38:17.379060224 -0600
@@ -58,7 +58,7 @@ LTDL_INIT([recursive])
dnl Checks for libraries.
dnl Checks for header files.
-AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h)
+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h)
AC_CHECK_HEADERS(sys/resource.h)
AC_HEADER_DIRENT
if test ${ac_header_dirent} = no; then
diff -up global-6.2.4/libdb/db.h.orig global-6.2.4/libdb/db.h
--- global-6.2.4/libdb/db.h.orig 2012-05-30 03:30:15.028311552 -0600
+++ global-6.2.4/libdb/db.h 2012-07-26 22:38:17.392429568 -0600
@@ -40,6 +40,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
#include "compat.h"
diff -up global-6.2.4/m4/check_curses.m4.orig global-6.2.4/m4/check_curses.m4
--- global-6.2.4/m4/check_curses.m4.orig 2012-05-30 03:30:15.003407872 -0600
+++ global-6.2.4/m4/check_curses.m4 2012-07-26 22:38:17.409206784 -0600
@@ -240,6 +240,9 @@ AC_DEFUN([AC_SEARCH_NCURSES], [
AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
+ AC_NCURSES(/boot/develop/headers/3rdparty, ncurses.h, -lncurses, -I/boot/develop/headers/3rdparty, "ncurses on /boot/develop")
+ AC_NCURSES(/boot/common/include/ncurses, ncurses.h, -lncurses, -I/boot/common/include/ncurses, "ncurses on /boot/common")
+
dnl
dnl We couldn't find ncurses, try SysV curses
dnl

View File

@@ -1,13 +1,17 @@
DESCRIPTION="gperf"
HOMEPAGE="http://www.gnu.org/software/gperf/"
SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz"
REVISION="1"
REVISION="2"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632"
BUILD {
cd gperf-3.0.4
./configure --prefix=/boot/common
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--docdir=$COMMON_DOCS/doc/gperf \
--infodir=$COMMON_DOCS/info \
--mandir=$COMMON_DOCS/man
make
}
@@ -15,5 +19,6 @@ INSTALL {
cd gperf-3.0.4
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="1989-1998, 2000-2004, 2006-2009 Free Software Foundation, Inc."

View File

@@ -8,7 +8,7 @@ DEPEND="pkgconfig >= 0.23
dev-libs/libxslt >= 1.1.26"
BUILD {
cd gtk-doc-1.15
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -8,7 +8,7 @@ DEPEND=""
BUILD {
cd idutils-cvs
libtoolize --force --copy --install
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -8,7 +8,7 @@ DEPEND=""
BUILD {
cd idutils-4.2
libtoolize --force --copy --install
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -2,12 +2,15 @@ DESCRIPTION="intltool"
HOMEPAGE="http://www.gnome.org/"
SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz"
CHECKSUM_MD5="8e40f9d1c7308eddbfd24b22cd540631"
REVISION="1"
REVISION="2"
STATUS_HAIKU="stable"
MESSAGE="Requires XML::Parser perl module installed"
DEPEND=""
BUILD {
cd intltool-0.40.6
configure --prefix=/boot/common
./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \
--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \
make
}

View File

@@ -7,7 +7,7 @@ STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd patchutils-0.3.1
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -0,0 +1,20 @@
DESCRIPTION="A collection of tools that operate on patch files."
HOMEPAGE="http://cyberelk.net/tim/patchutils/"
SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.2.tar.bz2"
CHECKSUM_MD5="74607b4a28c9009c6aeeed0e91098917"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd patchutils-0.3.2
./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man"
make
}
INSTALL {
cd patchutils-0.3.2
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="2001-2011 Tim Waugh"

View File

@@ -8,27 +8,17 @@ DEPEND=""
BUILD {
cd pkg-config-0.23/glib-1.2.10
mkdir -p m4
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
aclocal --install -I m4
autoreconf
cd ..
mkdir -p m4
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
aclocal --install -I m4
autoreconf
automake
autoconf
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
@@ -36,5 +26,6 @@ INSTALL {
cd pkg-config-0.23
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="1998, 2001-2006 Red Hat Inc."

View File

@@ -2,33 +2,27 @@ DESCRIPTION="pkgconfig"
HOMEPAGE="http://pkg-config.freedesktop.org/wiki/"
SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz"
CHECKSUM_MD5="a3270bab3f4b69b7dc6dbdacbcae9745"
REVISION="1"
REVISION="2"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd pkg-config-0.25/glib-1.2.10
mkdir -p m4
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
aclocal --install -I m4
autoreconf
cd ..
mkdir -p m4
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
aclocal --install -I m4
autoreconf
automake
autoconf
./configure --prefix=/boot/common
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--docdir=$COMMON_DOCS/doc/pkg-config \
--mandir=$COMMON_DOCS/man
make
}

View File

@@ -0,0 +1,37 @@
diff -Naur premake-4.3/build/gmake.unix/Premake4.make premake-4.3-haiku/build/gmake.unix/Premake4.make
--- premake-4.3/build/gmake.unix/Premake4.make 2010-11-16 11:29:14.028311552 +0000
+++ premake-4.3-haiku/build/gmake.unix/Premake4.make 2012-12-27 23:50:16.043253760 +0000
@@ -28,8 +28,8 @@
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os
CXXFLAGS += $(CFLAGS)
- LDFLAGS += -s -rdynamic
- LIBS += -lm -ldl
+ LDFLAGS += -s
+ LIBS +=
RESFLAGS += $(DEFINES) $(INCLUDES)
LDDEPS +=
LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
diff -Naur premake-4.3/src/host/lua-5.1.4/src/luaconf.h premake-4.3-haiku/src/host/lua-5.1.4/src/luaconf.h
--- premake-4.3/src/host/lua-5.1.4/src/luaconf.h 2010-11-16 11:29:12.042991616 +0000
+++ premake-4.3-haiku/src/host/lua-5.1.4/src/luaconf.h 2012-12-27 23:50:16.050331648 +0000
@@ -55,7 +55,6 @@
#define LUA_USE_MKSTEMP
#define LUA_USE_ISATTY
#define LUA_USE_POPEN
-#define LUA_USE_ULONGJMP
#endif
diff -Naur premake-4.3/src/host/premake.h premake-4.3-haiku/src/host/premake.h
--- premake-4.3/src/host/premake.h 2010-11-16 11:29:12.047185920 +0000
+++ premake-4.3-haiku/src/host/premake.h 2012-12-27 23:50:16.052166656 +0000
@@ -12,7 +12,7 @@
/* Identify the current platform I'm not sure how to reliably detect
* Windows but since it is the most common I use it as the default */
-#if defined(__linux__)
+#if defined(__linux__) || defined(__HAIKU__)
#define PLATFORM_LINUX (1)
#define PLATFORM_STRING "linux"
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)

View File

@@ -0,0 +1,21 @@
DESCRIPTION="Powerfully simple build configuration"
HOMEPAGE="http://industriousone.com/premake"
SRC_URI="http://sourceforge.net/projects/premake/files/Premake/4.3/premake-4.3-src.zip/download"
CHECKSUM_MD5="8cfafee76f9665c93b2e9ad15b015eb7"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd premake-4.3/build/gmake.unix
make config=release
}
INSTALL {
cd premake-4.3/bin/release
mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`
install -m 0755 premake4 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`
}
LICENSE="BSD (2-clause)"
COPYRIGHT="2012 Industrious One, LLC"

View File

@@ -9,7 +9,7 @@ DEPEND="dev-util/diffstat >= 1.51
BUILD {
cd quilt-0.48
autoconf
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make EDITOR=nano
}

View File

@@ -0,0 +1,70 @@
diff -Naur scons-2.0.1/engine/SCons/Platform/__init__.py scons-2.0.1-haiku/engine/SCons/Platform/__init__.py
--- scons-2.0.1/engine/SCons/Platform/__init__.py 2010-08-17 06:02:51.023068672 +0000
+++ scons-2.0.1-haiku/engine/SCons/Platform/__init__.py 2011-07-26 06:05:15.824967168 +0000
@@ -78,6 +78,8 @@
return 'aix'
elif sys.platform.find('darwin') != -1:
return 'darwin'
+ elif sys.platform.find('haiku') != -1:
+ return 'haiku'
else:
return 'posix'
elif os.name == 'os2':
diff -Naur scons-2.0.1/engine/SCons/Platform/haiku.py scons-2.0.1-haiku/engine/SCons/Platform/haiku.py
--- scons-2.0.1/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000
+++ scons-2.0.1-haiku/engine/SCons/Platform/haiku.py 2011-07-26 22:13:19.692584448 +0000
@@ -0,0 +1,54 @@
+"""SCons.Platform.haiku
+
+Platform-specific initialization for Haiku systems.
+
+There normally shouldn't be any need to import this module directly. It
+will usually be imported through the generic SCons.Platform.Platform()
+selection method.
+"""
+
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = ""
+
+import posix
+import commands
+
+def findDir( identifier ):
+ return commands.getoutput( 'finddir %s' % identifier )
+
+def generate(env):
+ posix.generate(env)
+
+ # path list
+ listPath = [ '.' ]
+ listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) )
+ listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) )
+ listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) )
+ listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) )
+ listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) )
+ env['ENV']['PATH'] = ':'.join( listPath )
+
+ # help the linker find the startfiles
+ env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' )

View File

@@ -0,0 +1,70 @@
diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py
--- ./scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000
+++ ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000
@@ -78,6 +78,8 @@
return 'aix'
elif sys.platform.find('darwin') != -1:
return 'darwin'
+ elif sys.platform.find('haiku') != -1:
+ return 'haiku'
else:
return 'posix'
elif os.name == 'os2':
diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py
--- ./scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000
+++ ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000
@@ -0,0 +1,54 @@
+"""SCons.Platform.haiku
+
+Platform-specific initialization for Haiku systems.
+
+There normally shouldn't be any need to import this module directly. It
+will usually be imported through the generic SCons.Platform.Platform()
+selection method.
+"""
+
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = ""
+
+import posix
+import commands
+
+def findDir( identifier ):
+ return commands.getoutput( 'finddir %s' % identifier )
+
+def generate(env):
+ posix.generate(env)
+
+ # path list
+ listPath = [ '.' ]
+ listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) )
+ listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) )
+ listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) )
+ listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) )
+ listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) )
+ env['ENV']['PATH'] = ':'.join( listPath )
+
+ # help the linker find the startfiles
+ env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' )

View File

@@ -0,0 +1,28 @@
DESCRIPTION="Open Source next-generation build tool."
HOMEPAGE="http://www.scons.org/"
LICENSE="MIT"
COPYRIGHT="2001-2010 The SCons Foundation"
SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-2.0.1.tar.gz"
CHECKSUM_MD5="beca648b894cdbf85383fffc79516d18"
REVISION="2"
STATUS_HAIKU="stable"
DEPEND="dev-lang/python >= 2.5.4"
BUILD {
cd scons-2.0.1
for f in "script/scons script/scons-time script/sconsign"; do
sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f
done
python setup.py build
}
INSTALL {
if [ ! -z ${DESTDIR} ]; then
options="${options} --root=${DESTDIR}"
fi
options="${options} --prefix=`finddir B_COMMON_DIRECTORY`"
options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`"
options="${options} --symlink-scons"
options="${options} --standard-lib"
cd scons-2.0.1
python setup.py install $options
}

View File

@@ -0,0 +1,28 @@
DESCRIPTION="Open Source next-generation build tool."
HOMEPAGE="http://www.scons.org/"
LICENSE="MIT"
COPYRIGHT="2001-2012 The SCons Foundation"
SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz"
CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632"
REVISION="2"
STATUS_HAIKU="stable"
DEPEND="dev-lang/python >= 2.5.4"
BUILD {
cd scons-2.2.0
for f in "script/scons script/scons-time script/sconsign"; do
sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f
done
python setup.py build
}
INSTALL {
if [ ! -z ${DESTDIR} ]; then
options="${options} --root=${DESTDIR}"
fi
options="${options} --prefix=`finddir B_COMMON_DIRECTORY`"
options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`"
options="${options} --symlink-scons"
options="${options} --standard-lib"
cd scons-2.2.0
python setup.py install $options
}