Merged haikuports/haikuports into master

This commit is contained in:
diversys
2014-06-20 02:38:23 +04:00
164 changed files with 7372 additions and 1734 deletions

View File

@@ -6,31 +6,38 @@ or test its integrity.
"
HOMEPAGE="http://www.info-zip.org/UnZip.html"
SRC_URI="http://downloads.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"
CHECKSUM_SHA256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND=""
CHECKSUM_MD5="62b490407489521db863b523a7f86375"
ARCHITECTURES="!x86_gcc2"
PROVIDES="
unzip = $portVersion
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:gcc
cmd:make
"
SOURCE_DIR="unzip60"
BUILD()
{
cd unzip60
make -f beos/Makefile \
PREFIX=`finddir B_COMMON_DIRECTORY` \
MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
PREFIX=$prefix MANDIR=$manDir
}
INSTALL()
{
cd unzip60
make -f beos/Makefile install
}
TEST()
{
cd unzip60
# make test
make test
# make check
}
LICENSE="Info-ZIP"
#COPYRIGHT=""
COPYRIGHT="1995-2014 Greg Roelofs"

View File

@@ -14,7 +14,7 @@ COPYRIGHT="2013 Oracle"
HOMEPAGE="https://java.net/projects/libmicro"
SRC_URI="hg+https://hg.java.net/hg/libmicro~hg-repo#7dd95b416c3c"
REVISION="1"
ARCHITECTURES="!x86 !x86_gcc2"
ARCHITECTURES="!x86 x86_gcc2"
PROVIDES="
libmicro = $portVersion
@@ -29,11 +29,12 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
cmd:make
cmd:awk
cmd:gcc
cmd:make
"
PATCHES="libmicro-0.4.2.patchset"
PATCHES="libmicro-0.4.2.hg.patchset"
BUILD()
{
@@ -42,5 +43,11 @@ BUILD()
INSTALL()
{
make install
echo "This package does not install. Use haikuporter --test."
false
}
TEST()
{
./bench > output_$haikuVersion
}

View File

@@ -1,4 +1,4 @@
From 4beb46cb703e13ca5b6a055efec5f18c961b11fe Mon Sep 17 00:00:00 2001
From 8cef3c3f453df05b7e32f670afb786926583512e Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 26 Jan 2014 11:57:02 -0700
Subject: applying patch libmicro-0.4.1.patch
@@ -137,3 +137,64 @@ index 27d95d1..a6634a1 100644
--
1.8.3.4
From 459c52bd6b2394e867ec1657a2b6d83eed4f048d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 5 Jun 2014 12:50:10 +0200
Subject: Undo broken changes from libmicro 1.4.1 patchset.
* Comments inside a multiline in makefiles comment the whole thing. So
all benchmarks after getcontext were not compiled.
* Instead, use the ELIDED system that allows easy exclusion of
benchmarks in a platform specific way.
* Remove -l option from OPTS in the bench script, because the tests
don't know about it.
This gets the testsuite running, but the 3rd test deadlocks.
diff --git a/Makefile.Haiku b/Makefile.Haiku
index 5181d91..f034ce5 100644
--- a/Makefile.Haiku
+++ b/Makefile.Haiku
@@ -36,8 +36,11 @@ CPPFLAGS= -DUSE_SEMOP -D_REENTRANT
MATHLIB=
ELIDED_BENCHMARKS= \
+ atomic \
cachetocache \
- atomic
+ getcontext \
+ mmap \
+ setcontext
include ../Makefile.com
diff --git a/Makefile.benchmarks b/Makefile.benchmarks
index d1b1ff8..ed1923a 100644
--- a/Makefile.benchmarks
+++ b/Makefile.benchmarks
@@ -50,7 +50,7 @@ ALL= \
fcntl_ndelay \
file_lock \
fork \
-# getcontext \
+ getcontext \
getenv \
gettimeofday \
getpeername \
diff --git a/bench.sh b/bench.sh
index 24ca1d9..709cfe3 100644
--- a/bench.sh
+++ b/bench.sh
@@ -56,7 +56,7 @@ VDIR1=$VARROOT/0/1/2/3/4/5/6/7/8/9
VDIR2=$VARROOT/1/2/3/4/5/6/7/8/9/0
-OPTS="-l -E -C 200 -L -S -W"
+OPTS="-E -C 200 -L -S -W"
dd if=/dev/zero of=$TFILE bs=1024k count=10 2>/dev/null
dd if=/dev/zero of=$VFILE bs=1024k count=10 2>/dev/null
--
1.8.3.4

View File

@@ -0,0 +1,54 @@
SUMMARY="Testing Linux, one syscall at a time."
DESCRIPTION="
The Linux Test Project is a joint project started by SGI, developed and
maintained by IBM, Cisco, Fujitsu, SUSE, Red Hat and others, that has a goal to
deliver test suites to the open source community that validate the reliability,
robustness, and stability of Linux. The LTP testsuite contains a collection of
tools for testing the Linux kernel and related features.
"
HOMEPAGE="http://linux-test-project.github.io/"
SRC_URI="https://github.com/linux-test-project/ltp/archive/20140422.tar.gz"
CHECKSUM_SHA256="0356ba208813efb3d9be6a530a9b56688281b6ac9d80ba901920ec07cf250f2e"
REVISION="1"
ARCHITECTURES="!x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
ltp = $portVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:automake
cmd:autoconf
cmd:find
cmd:cc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
BUILD()
{
make autotools
runConfigure ./configure
make all $jobArgs CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS" CXXFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS" LDFLAGS="-lposix_error_mapper"
}
INSTALL()
{
make install
}
TEST()
{
$prefix/ltp/runltp
}
LICENSE="GNU GPL v2"
COPYRIGHT="2002-2004 Intel Corporation. All rights reserved.
2004, QUALCOMM Inc. All rights reserved.
2004-2005 Bull S.A.. All rights reserved."

View File

@@ -50,6 +50,7 @@ BUILD_PREREQUIRES="
cmd:autoconf
cmd:automake
cmd:autoheader
cmd:find
cmd:gcc
"

View File

@@ -7,13 +7,11 @@ it is significantly faster than bash (the GNU Bourne-Again Shell) for most tasks
HOMEPAGE="http://gondor.apana.org/~herbert/dash/"
SRC_URI="http://gondor.apana.org/~herbert/dash/files/dash-0.5.7.tar.gz"
CHECKSUM_SHA256="ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39"
REVISION="1"
REVISION="2"
LICENSE="GNU GPL v3"
COPYRIGHT="Copyright (c) 1989-1994 The Regents of the University of California. 1997 Christos Zoulas. 1997-2005 Herbert Xu."
ARCHITECTURES="?x86_gcc2 ?x86 !x86_64"
PATCHES="dash-0.5.7.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
dash = $portVersion

View File

@@ -1,21 +0,0 @@
From bf0f50131da4ab31343b239a7e4360ffeb82779a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 19 Apr 2014 20:07:51 +0000
Subject: string.h needs __USE_GNU
diff --git a/src/mystring.h b/src/mystring.h
index 083ea98..0381f6c 100644
--- a/src/mystring.h
+++ b/src/mystring.h
@@ -35,6 +35,7 @@
*/
#include <inttypes.h>
+#define __USE_GNU
#include <string.h>
extern const char snlfmt[];
--
1.8.3.4

View File

@@ -0,0 +1,122 @@
SUMMARY="Docbook DTD for XML."
DESCRIPTION="
DocBook is an XML vocabulary that lets you create documents in a \
presentation-neutral form that captures the logical structure of your content.
DocBook is a schema (available in several languages including RELAX NG, \
W3C XML Schemas, and XML DTDs) maintained by the DocBook Technical Committee \
of OASIS. It is particularly well suited to books and papers about computer \
hardware and software (though it is by no means limited to these applications).
"
HOMEPAGE="http://www.docbook.org/schemas/4x.html"
SRC_URI="http://www.docbook.org/xml/$portVersion/docbook-xml-$portVersion.zip"
CHECKSUM_SHA256="23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464"
REVISION="1"
ARCHITECTURES="any"
LICENSE="Docbook"
COPYRIGHT="
19996-2006 HaL Computer Systems Inc., O'Reilly & Associates Inc,
ArborText Inc, Fujitsu Software Corporation, Norman Walsh,
Sun Microsystems Inc. and the Organization for the Advancement of
Structured Information Standards (OASIS)
"
PROVIDES="
docbook_xml_dtd = $portVersion
"
BUILD_PREREQUIRES="
cmd:xmlcatalog
cmd:find
"
SOURCE_DIR=""
BUILD()
{
true
}
INSTALL()
{
mkdir -p $dataDir/xml/docbook/xml-dtd-$portVersion
cp -v -af docbook.cat *.dtd ent/ *.mod \
$dataDir/xml/docbook/xml-dtd-$portVersion
mkdir -p $settingsDir/etc/xml/catalog
CATALOG=$settingsDir/etc/xml/docbook
xmlcatalog --noout --create $CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML V$portVersion//EN" \
"http://www.oasis-open.org/docbook/xml/$portVersion/docbookx.dtd" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML CALS Table Model V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/calstblx.dtd" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/soextblx.dtd" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Information Pool V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbpoolx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbhierx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML HTML Tables V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/htmltblx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Notations V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbnotnx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Character Entities V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbcentx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Additional General Entities V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbgenent.mod" \
$CATALOG
xmlcatalog --noout --add "rewriteSystem" \
"http://www.oasis-open.org/docbook/xml/$portVersion" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion" \
$CATALOG
xmlcatalog --noout --add "rewriteURI" \
"http://www.oasis-open.org/docbook/xml/$portVersion" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion" \
$CATALOG
CATALOG=$settingsDir/etc/xml/catalog/docbook-xml-dtd
xmlcatalog --noout --create $CATALOG
xmlcatalog --noout --add "delegatePublic" \
"-//OASIS//ENTITIES DocBook XML" \
"file://$settingsDir/etc/xml/docbook" \
$CATALOG
xmlcatalog --noout --add "delegatePublic" \
"-//OASIS//DTD DocBook XML" \
"file://$settingsDir/etc/xml/docbook" \
$CATALOG
xmlcatalog --noout --add "delegateSystem" \
"http://www.oasis-open.org/docbook/" \
"file://$settingsDir/etc/xml/docbook" \
$CATALOG
xmlcatalog --noout --add "delegateURI" \
"http://www.oasis-open.org/docbook/" \
"file://$settingsDir/etc/xml/docbook" \
$CATALOG
}
GLOBAL_WRITABLE_FILES="
settings/etc/xml/catalog/docbook-xml-dtd keep-old
settings/etc/xml/docbook keep-old
"

View File

@@ -0,0 +1,122 @@
SUMMARY="Docbook DTD for XML."
DESCRIPTION="
DocBook is an XML vocabulary that lets you create documents in a \
presentation-neutral form that captures the logical structure of your content.
DocBook is a schema (available in several languages including RELAX NG, \
W3C XML Schemas, and XML DTDs) maintained by the DocBook Technical Committee \
of OASIS. It is particularly well suited to books and papers about computer \
hardware and software (though it is by no means limited to these applications).
"
HOMEPAGE="http://www.docbook.org/schemas/4x.html"
SRC_URI="http://www.docbook.org/xml/$portVersion/docbook-xml-$portVersion.zip"
CHECKSUM_SHA256="4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4"
REVISION="1"
ARCHITECTURES="any"
LICENSE="Docbook"
COPYRIGHT="
19996-2006 HaL Computer Systems Inc., O'Reilly & Associates Inc,
ArborText Inc, Fujitsu Software Corporation, Norman Walsh,
Sun Microsystems Inc. and the Organization for the Advancement of
Structured Information Standards (OASIS)
"
PROVIDES="
docbook_xml_dtd = $portVersion
"
BUILD_PREREQUIRES="
cmd:xmlcatalog
cmd:find
"
SOURCE_DIR=""
BUILD()
{
true
}
INSTALL()
{
mkdir -p $dataDir/xml/docbook/xml-dtd-$portVersion
cp -v -af docbook.cat *.dtd ent/ *.mod \
$dataDir/xml/docbook/xml-dtd-$portVersion
mkdir -p $settingsDir/etc/xml/catalog
CATALOG=$settingsDir/etc/xml/docbook
xmlcatalog --noout --create $CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML V$portVersion//EN" \
"http://www.oasis-open.org/docbook/xml/$portVersion/docbookx.dtd" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML CALS Table Model V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/calstblx.dtd" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/soextblx.dtd" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Information Pool V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbpoolx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbhierx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML HTML Tables V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/htmltblx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Notations V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbnotnx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Character Entities V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbcentx.mod" \
$CATALOG
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Additional General Entities V$portVersion//EN" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbgenent.mod" \
$CATALOG
xmlcatalog --noout --add "rewriteSystem" \
"http://www.oasis-open.org/docbook/xml/$portVersion" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion" \
$CATALOG
xmlcatalog --noout --add "rewriteURI" \
"http://www.oasis-open.org/docbook/xml/$portVersion" \
"file://$dataDir/xml/docbook/xml-dtd-$portVersion" \
$CATALOG
CATALOG=$settingsDir/etc/xml/catalog/docbook-xml-dtd
xmlcatalog --noout --create $CATALOG
xmlcatalog --noout --add "delegatePublic" \
"-//OASIS//ENTITIES DocBook XML" \
"file://$settingsDir/etc/xml/docbook" \
$CATALOG
xmlcatalog --noout --add "delegatePublic" \
"-//OASIS//DTD DocBook XML" \
"file://$settingsDir/etc/xml/docbook" \
$CATALOG
xmlcatalog --noout --add "delegateSystem" \
"http://www.oasis-open.org/docbook/" \
"file://$settingsDir/etc/xml/docbook" \
$CATALOG
xmlcatalog --noout --add "delegateURI" \
"http://www.oasis-open.org/docbook/" \
"file://$settingsDir/etc/xml/docbook" \
$CATALOG
}
GLOBAL_WRITABLE_FILES="
settings/etc/xml/catalog/docbook-xml-dtd keep-old
settings/etc/xml/docbook keep-old
"

View File

@@ -0,0 +1,26 @@
Copyright 1992-2006 HaL Computer Systems, Inc.,
O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
Corporation, Norman Walsh, Sun Microsystems, Inc., and the
Organization for the Advancement of Structured Information
Standards (OASIS).
See also http://docbook.org/specs/
$Id: docbookx.dtd 6340 2006-10-03 13:23:24Z nwalsh $
Permission to use, copy, modify and distribute the DocBook XML DTD
and its accompanying documentation for any purpose and without fee
is hereby granted in perpetuity, provided that the above copyright
notice and this paragraph appear in all copies. The copyright
holders make no representation about the suitability of the DTD for
any purpose. It is provided "as is" without expressed or implied
warranty.
If you modify the DocBook DTD in any way, except for declaring and
referencing additional sets of general entities and declaring
additional notations, label your DTD as a variant of DocBook. See
the maintenance documentation for more information.
Please direct all questions, bug reports, or suggestions for
changes to the docbook@lists.oasis-open.org mailing list. For more
information, see http://www.oasis-open.org/docbook/.

View File

@@ -24,6 +24,7 @@ PROVIDES="
"
BUILD_PREREQUIRES="
cmd:xmlcatalog
cmd:find
"
@@ -43,4 +44,31 @@ INSTALL()
xhtml xhtml-1_1 $dataDir/xml/docbook/xsl-stylesheets-1.78.1
ln -s VERSION $dataDir/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl
mkdir -p $settingsDir/etc/xml/catalog
CATALOG=$settingsDir/etc/xml/catalog/docbook-xsl
xmlcatalog --noout --create $CATALOG
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/1.78.1" \
"$dataDir/xml/docbook/xsl-stylesheets-1.78.1" \
$CATALOG
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/1.78.1" \
"$dataDir/xml/docbook/xsl-stylesheets-1.78.1" \
$CATALOG
xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \
"$dataDir/xml/docbook/xsl-stylesheets-1.78.1" \
$CATALOG
xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \
"$dataDir/xml/docbook/xsl-stylesheets-1.78.1" \
$CATALOG
}
GLOBAL_WRITABLE_FILES="settings/etc/xml/catalog/docbook-xsl keep-old"

View File

@@ -0,0 +1,82 @@
SUMMARY="An SQL Database Engine in a C Library"
DESCRIPTION="
SQLite is a software library that implements a self-contained, serverless, \
zero-configuration, transactional SQL database engine.
SQLite is the most widely deployed SQL database engine in the world. The \
source code for SQLite is in the public domain.
"
HOMEPAGE="http://www.sqlite.org/"
SRC_URI="http://www.sqlite.org/2014/sqlite-autoconf-3080403.tar.gz"
CHECKSUM_SHA256="e0e995e23a324a5d6ae95d8a836240382a4d7475d09707fc469c8cafcbd48d65"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
LICENSE="SQLite"
COPYRIGHT="Public Domain"
PROVIDES="
sqlite$secondaryArchSuffix = $portVersion compat >= 3
lib:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:sqlite3 = $portVersion compat >= 3
"
fi
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
SOURCE_DIR="sqlite-autoconf-3080403"
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
automake
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLib libsqlite3
fixPkgconfig
# devel package
packageEntries devel \
$developDir
# Remove stuff we don't need in the secondary architecture base package.
if [ -n "$secondaryArchSuffix" ]; then
rm -rf $binDir
rm -rf $documentationDir
fi
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
sqlite${secondaryArchSuffix}_devel = $portVersion
devel:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0
"
REQUIRES_devel="
sqlite$secondaryArchSuffix == $portVersion base
"

View File

@@ -1,26 +0,0 @@
DESCRIPTION="orc - The Oil Runtime Compiler"
HOMEPAGE="http://code.entropywave.com/orc/"
SRC_URI="http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="e482932e544c847761449b106ecbc483"
BUILD()
{
cd orc-0.4.16
autoconf
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--mandir=$COMMON_DOCS/man
make
}
INSTALL()
{
cd orc-0.4.16
make install
}
LICENSE="BSD (2-clause)"
COPYRIGHT="2002 - 2009 David A. Schleef"

View File

@@ -0,0 +1,78 @@
SUMMARY="The Oil Runtime Compiler"
DESCRIPTION="
Orc is a library and set of tools for compiling and executing \
very simple programs that operate on arrays of data. The \"language\" \
is a generic assembly language that represents many of the features \
available in SIMD architectures, including saturated addition and \
subtraction, and many arithmetic operations.
"
HOMEPAGE="http://code.entropywave.com/orc/"
COPYRIGHT="
2002-2009 David A. Schleef
"
LICENSE="BSD (2-clause)"
SRC_URI="http://gstreamer.freedesktop.org/src/orc/orc-$portVersion.tar.gz"
CHECKSUM_SHA256="e21f50321a21c33178bbe41ea8bd27c49ae60aeb8c22902a215f7141297fb59e"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
PATCHES="orc-$portVersion.patchset"
PROVIDES="
orc$secondaryArchSuffix = $portVersion compat >= 0
lib:liborc_0.4$secondaryArchSuffix = 0.19.0 compat >= 0
lib:liborc_test_0.4$secondaryArchSuffix = 0.19.0 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
BUILD()
{
autoreconf -f -i -I m4
runConfigure ./configure --disable-gtk-doc
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs liborc-0.4 \
liborc-test-0.4
fixPkgconfig
# fix include path in pkgconfig
sed -i -e 's#^includedir=\(.*\)#includedir=\1/orc-0.4#g' \
$developLibDir/pkgconfig/orc-0.4.pc
# devel package
packageEntries devel \
$binDir \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
orc${secondaryArchSuffix}_devel = $portVersion compat >= 0.4
cmd:orc_bugreport
cmd:orcc
devel:liborc_0.4$secondaryArchSuffix = 0.19.0 compat >= 0
devel:liborc_test_0.4$secondaryArchSuffix = 0.19.0 compat >= 0
"
REQUIRES_devel="
orc$secondaryArchSuffix == $portVersion base
"

View File

@@ -1,11 +0,0 @@
--- orc-0.4.16/configure.ac 2011-10-03 03:34:22.054788096 +0000
+++ orc-0.4.16-haiku/configure.ac 2012-04-08 21:58:47.729808896 +0000
@@ -97,7 +97,7 @@
mingw*|pw32*|cygwin*)
AC_DEFINE(HAVE_CODEMEM_VIRTUALALLOC, 1, [Use VirtualAlloc to allocate code for execution])
;;
- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*)
+ linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*|haiku*)
AC_DEFINE(HAVE_CODEMEM_MMAP, 1, [Use mmap to allocate code for execution])
;;
*)

View File

@@ -0,0 +1,43 @@
From 65ca1ed4bdcb05d3ad5a27ebae881b7fc7b92ab3 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 13 Jun 2014 18:20:13 +0000
Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index a396b05..ddfdede 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(1.6)
ORC_MAJORMINOR=0.4
AC_SUBST(ORC_MAJORMINOR)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
dnl CURRENT, REVISION, AGE
dnl - library source changed -> increment REVISION
@@ -97,7 +97,7 @@ case "${host_os}" in
mingw*|pw32*|cygwin*)
AC_DEFINE(HAVE_CODEMEM_VIRTUALALLOC, 1, [Use VirtualAlloc to allocate code for execution])
;;
- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*)
+ linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*|haiku*)
AC_DEFINE(HAVE_CODEMEM_MMAP, 1, [Use mmap to allocate code for execution])
;;
*)
@@ -114,6 +114,11 @@ case "${host_os}" in
PTHREAD_CFLAGS=
PTHREAD_LIBS=
;;
+ haiku*)
+ AC_DEFINE(HAVE_THREAD_PTHREAD, 1, [Use pthread thread code])
+ PTHREAD_CFLAGS=
+ PTHREAD_LIBS=
+ ;;
*)
AC_DEFINE(HAVE_THREAD_PTHREAD, 1, [Use pthread thread code])
PTHREAD_CFLAGS=
--
1.8.3.4

View File

@@ -0,0 +1,546 @@
From 4bef2ada1d8a38b4dff88f0659a3b9e181bf1950 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:52:03 +0200
Subject: Tell perl that BFS has a link count of 1
diff --git a/cpan/File-Temp/lib/File/Temp.pm b/cpan/File-Temp/lib/File/Temp.pm
index ac57c26..759690c 100644
--- a/cpan/File-Temp/lib/File/Temp.pm
+++ b/cpan/File-Temp/lib/File/Temp.pm
@@ -2051,7 +2051,8 @@ sub unlink0 {
# On NFS the link count may still be 1 but we can't know that
# we are on NFS. Since we can't be sure, we'll defer it
- return 1 if $fh[3] == 0 || $^O eq 'cygwin';
+ # On haiku, the link count seems to be always 1 (at least for BFS)
+ return 1 if $fh[3] == 0 || $^O eq 'cygwin' || $^O eq 'haiku';
}
# fall-through if we can't unlink now
_deferred_unlink($fh, $path, 0);
--
1.8.3.4
From e54a8f98abfea2be3eec53b4bbe2cbaaf9f39139 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:52:53 +0200
Subject: Haiku defines, but does not implement O_EXLOCK
diff --git a/cpan/File-Temp/t/lock.t b/cpan/File-Temp/t/lock.t
index ff8c7f9..4364bf6 100644
--- a/cpan/File-Temp/t/lock.t
+++ b/cpan/File-Temp/t/lock.t
@@ -8,7 +8,8 @@ use Fcntl;
BEGIN {
# see if we have O_EXLOCK
eval { &Fcntl::O_EXLOCK; };
- if ($@) {
+ if ($@ || $^O eq 'haiku') {
+ # haiku doesn't implement O_EXLOCK yet (but it defines the value)
plan skip_all => 'Do not seem to have O_EXLOCK';
} else {
plan tests => 4;
--
1.8.3.4
From 30f81dcecdfb9c49ad8824314348cd23ef43ec0f Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:53:40 +0200
Subject: haiku sets all its specifics via Configure
diff --git a/hints/haiku.sh b/hints/haiku.sh
index fa8ebe5..0f09f53 100644
--- a/hints/haiku.sh
+++ b/hints/haiku.sh
@@ -1,44 +1 @@
-# Haiku hints file
-# $Id$
-
-case "$prefix" in
-'') prefix="/boot/common" ;;
-*) ;; # pass the user supplied value through
-esac
-
-libpth='/boot/home/config/lib /boot/common/lib /system/lib'
-usrinc='/boot/develop/headers/posix'
-locinc='/boot/home/config/include /boot/common/include /boot/develop/headers'
-
-libc='/system/lib/libroot.so'
-libs='-lnetwork'
-
-# Use Haiku's malloc() by default.
-case "$usemymalloc" in
-'') usemymalloc='n' ;;
-esac
-
-# Haiku generally supports hard links, but the default file system (BFS)
-# doesn't. So better avoid using hard links.
-d_link='undef'
-dont_use_nlink='define'
-
-# The array syserrlst[] is useless for the most part.
-# Large negative numbers really kind of suck in arrays.
-d_syserrlst='undef'
-
-# Haiku uses gcc.
-cc="gcc"
-ld='gcc'
-
-# The runtime loader library path variable is LIBRARY_PATH.
-case "$ldlibpthname" in
-'') ldlibpthname=LIBRARY_PATH ;;
-esac
-
-# as of alpha 4.1 (at the latest) some symbols are versioned,
-# confusing the nm lookup
-case "$usenm" in
-'') usenm='undef' ;;
-esac
-
+# haiku sets all its specifics via Configure
--
1.8.3.4
From 187343906d2ed78aa5e5b4b3a6cfb7ad199c726f Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:54:15 +0200
Subject: Tell perl that Haiku needs haikuish.h installed as well
diff --git a/installperl b/installperl
index e64b1c3..8ae20cc 100755
--- a/installperl
+++ b/installperl
@@ -379,6 +379,11 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy
# AIX needs perl.exp installed as well.
push(@corefiles,'perl.exp') if $^O eq 'aix';
+ if ($^O eq 'haiku') {
+ # Haiku needs haikuish.h installed as well.
+ mkpath("$installarchlib/CORE/haiku", $opts{verbose}, 0777);
+ push(@corefiles,'haiku/haikuish.h');
+ }
}
foreach my $file (@corefiles) {
# HP-UX (at least) needs to maintain execute permissions
--
1.8.3.4
From 936c1f0486788b814578ea469f4441d1755dac71 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 14:55:13 +0200
Subject: Fix handling of exit codes on Haiku
diff --git a/t/run/exit.t b/t/run/exit.t
index 02e57c6..e836410 100644
--- a/t/run/exit.t
+++ b/t/run/exit.t
@@ -55,18 +55,18 @@ is( ${^CHILD_ERROR_NATIVE}, $native_success, 'Normal exit ${^CHILD_ERROR_NATIVE
if (!$vms_exit_mode) {
my $posix_ok = eval { require POSIX; };
my $wait_macros_ok = defined &POSIX::WIFEXITED;
- eval { POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}) };
+ eval { POSIX::WIFEXITED($?) };
$wait_macros_ok = 0 if $@;
$exit = run('exit 42');
is( $exit >> 8, 42, 'Non-zero exit' );
is( $exit, $?, 'Non-zero exit $?' );
- isnt( !${^CHILD_ERROR_NATIVE}, 0, 'Non-zero exit ${^CHILD_ERROR_NATIVE}' );
+ isnt( ${^CHILD_ERROR_NATIVE}, 0, 'Non-zero exit ${^CHILD_ERROR_NATIVE}' );
SKIP: {
skip("No POSIX", 3) unless $posix_ok;
skip("No POSIX wait macros", 3) unless $wait_macros_ok;
- ok(POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}), "WIFEXITED");
- ok(!POSIX::WIFSIGNALED(${^CHILD_ERROR_NATIVE}), "WIFSIGNALED");
- is(POSIX::WEXITSTATUS(${^CHILD_ERROR_NATIVE}), 42, "WEXITSTATUS");
+ ok(POSIX::WIFEXITED($?), "WIFEXITED");
+ ok(!POSIX::WIFSIGNALED($?), "WIFSIGNALED");
+ is(POSIX::WEXITSTATUS($?), 42, "WEXITSTATUS");
}
SKIP: {
@@ -85,9 +85,9 @@ if (!$vms_exit_mode) {
SKIP: {
skip("No POSIX", 3) unless $posix_ok;
skip("No POSIX wait macros", 3) unless $wait_macros_ok;
- ok(!POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}), "WIFEXITED");
- ok(POSIX::WIFSIGNALED(${^CHILD_ERROR_NATIVE}), "WIFSIGNALED");
- is(POSIX::WTERMSIG(${^CHILD_ERROR_NATIVE}), 15, "WTERMSIG");
+ ok(!POSIX::WIFEXITED($?), "WIFEXITED");
+ ok(POSIX::WIFSIGNALED($?), "WIFSIGNALED");
+ is(POSIX::WTERMSIG($?), 15, "WTERMSIG");
}
}
--
1.8.3.4
From c8c19c0e4b6493dd5122749ba0f0d7d8b1b89117 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 22 Sep 2013 15:00:44 +0200
Subject: Fix include path of errno.h
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
index b707911..7999ae4 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
@@ -143,7 +143,7 @@ sub get_files {
$file{$linux_errno_h} = 1;
} elsif ($^O eq 'haiku') {
# hidden in a special place
- $file{'/boot/develop/headers/posix/errno.h'} = 1;
+ $file{'/boot/system/develop/headers/posix/errno.h'} = 1;
} elsif ($^O eq 'vos') {
# avoid problem where cpp returns non-POSIX pathnames
--
1.8.3.4
From 46ed1ae1bc678bda0d0fe3efb589847798afab58 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sat, 28 Sep 2013 13:46:42 +0200
Subject: Adjust ExtUtils::MakeMaker for PM-Haiku.
* MakeMaker-projects trying to install into 'site-perl' while specifying
PREFIX would end up using a wrong 'site-perl' prefix.
* Split MM_Haiku.pm off MM_BeOS.pm, implementing Haiku-specific overrides
for MakeMaker.
diff --git a/cpan/ExtUtils-MakeMaker/MANIFEST b/cpan/ExtUtils-MakeMaker/MANIFEST
index 72feb7d..8eb81f3 100644
--- a/cpan/ExtUtils-MakeMaker/MANIFEST
+++ b/cpan/ExtUtils-MakeMaker/MANIFEST
@@ -48,6 +48,7 @@ lib/ExtUtils/MM_BeOS.pm
lib/ExtUtils/MM_Cygwin.pm
lib/ExtUtils/MM_Darwin.pm
lib/ExtUtils/MM_DOS.pm
+lib/ExtUtils/MM_Haiku.pm
lib/ExtUtils/MM_MacOS.pm
lib/ExtUtils/MM_NW5.pm
lib/ExtUtils/MM_OS2.pm
diff --git a/cpan/ExtUtils-MakeMaker/NOTES b/cpan/ExtUtils-MakeMaker/NOTES
index cb29aec..bfa628c 100644
--- a/cpan/ExtUtils-MakeMaker/NOTES
+++ b/cpan/ExtUtils-MakeMaker/NOTES
@@ -80,9 +80,9 @@ The MM_* hierarchy
MM_Win95 MM_NW5
\ /
-MM_BeOS MM_Cygwin MM_OS2 MM_VMS MM_Win32 MM_DOS MM_UWIN
- \ | | | / / /
- ------------------------------------------------
+MM_BeOS MM_Cygwin MM_OS2 MM_VMS MM_Win32 MM_DOS MM_UWIN MM_Haiku
+ \ | | | / / / /
+ --------------------------------------------------------
| |
MM_Unix |
| |
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
index 26ed594..dfeea45 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
@@ -59,7 +59,8 @@ if( $^O eq 'MSWin32' ) {
$Is{UWIN} = $^O =~ /^uwin(-nt)?$/;
$Is{Cygwin} = $^O eq 'cygwin';
$Is{NW5} = $Config{osname} eq 'NetWare'; # intentional
-$Is{BeOS} = ($^O =~ /beos/i or $^O eq 'haiku');
+$Is{BeOS} = $^O =~ /beos/i;
+$Is{Haiku} = $^O eq 'haiku';
$Is{DOS} = $^O eq 'dos';
if( $Is{NW5} ) {
$^O = 'NetWare';
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
new file mode 100644
index 0000000..81e5f99
--- /dev/null
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
@@ -0,0 +1,70 @@
+package ExtUtils::MM_Haiku;
+
+use strict;
+
+=head1 NAME
+
+ExtUtils::MM_Haiku - methods to override UN*X behaviour in ExtUtils::MakeMaker
+
+=head1 SYNOPSIS
+
+ use ExtUtils::MM_Haiku; # Done internally by ExtUtils::MakeMaker if needed
+
+=head1 DESCRIPTION
+
+See ExtUtils::MM_Unix for a documentation of the methods provided
+there. This package overrides the implementation of these methods, not
+the semantics.
+
+=over 4
+
+=cut
+
+use ExtUtils::MakeMaker::Config;
+use File::Spec;
+require ExtUtils::MM_Any;
+require ExtUtils::MM_Unix;
+
+our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
+our $VERSION = '6.66';
+
+
+=item os_flavor
+
+Haiku is Haiku.
+
+=cut
+
+sub os_flavor {
+ return('Haiku');
+}
+
+=head3 init_INSTALL_from_PREFIX
+
+ $mm->init_INSTALL_from_PREFIX;
+
+=cut
+
+sub init_INSTALL_from_PREFIX {
+ my $self = shift;
+
+ # If a prefix has been given from outside, the default implementation
+ # will set PERLPREFIX, SITEPREFIX and VENDORPREFIX to identical values,
+ # but due to the way how Haiku's package management works, PERLPREFIX
+ # and VENDORPREFIX are not writable at all (as they're being populated
+ # from installed packages via package-fs). SITEPREFIX, however needs to
+ # be set to a path which can be written to (since site packages are
+ # expected to be installed "manually") - so we make sure it points
+ # to a 'non-packaged'-folder:
+ my $prefixGiven = $self->{PREFIX};
+ $self->SUPER::init_INSTALL_from_PREFIX();
+ if ($prefixGiven) {
+ $self->{SITEPREFIX} = '$(PREFIX)/non-packaged';
+ }
+}
+
+=back
+
+1;
+__END__
+
--
1.8.3.4
From f9458e30c41213d315721183c9f10c3605812f57 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Tue, 8 Oct 2013 22:16:37 +0200
Subject: Avoid using -rpath for dynamic modules.
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
index 81e5f99..25ace13 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
@@ -65,6 +65,33 @@ sub init_INSTALL_from_PREFIX {
=back
+=head3 init_others
+
+ $MM->init_others();
+
+Initializes the macro definitions having to do with compiling and
+linking used by tools_other() and places them in the $MM object.
+
+If there is no description, its the same as the parameter to
+WriteMakefile() documented in ExtUtils::MakeMaker.
+
+=cut
+
+sub init_others {
+ my $self = shift;
+
+ $self->SUPER::init_others();
+
+ # Don't use run-time paths for libraries required by dynamic
+ # modules on Haiku, as that wouldn't work should a library be moved
+ # (for instance because the package has been activated somewhere else).
+ $self->{LD_RUN_PATH} = "";
+
+ return;
+}
+
+=back
+
1;
__END__
--
1.8.3.4
From 5d6dde9cb0022bdeee490b383ff1991eacc3b9cc Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Tue, 8 Oct 2013 22:17:26 +0200
Subject: Add script sitecustomize.pl for setting up @INC as we need it.
diff --git a/sitecustomize.pl b/sitecustomize.pl
new file mode 100644
index 0000000..a321e51
--- /dev/null
+++ b/sitecustomize.pl
@@ -0,0 +1,36 @@
+#! perl
+
+use Config;
+
+# Remove all compiled-in paths referring to Perl's installation dir
+# and replace them with a static set of paths that implement the intended
+# searching order:
+my @ourINC = (
+ "/boot/home/config/lib/perl5/$Config{version}/$Config{archname}",
+ "/boot/home/config/lib/perl5/$Config{version}",
+ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}",
+ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}",
+ "/boot/home/config/lib/perl5/vendor_perl/$Config{version}/$Config{archname}",
+ "/boot/home/config/lib/perl5/vendor_perl/$Config{version}",
+ "/boot/home/config/lib/perl5/vendor_perl",
+ "/boot/system/lib/perl5/$Config{version}/$Config{archname}",
+ "/boot/system/lib/perl5/$Config{version}",
+ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}",
+ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}",
+ "/boot/system/lib/perl5/vendor_perl/$Config{version}/$Config{archname}",
+ "/boot/system/lib/perl5/vendor_perl/$Config{version}",
+ "/boot/system/lib/perl5/vendor_perl",
+);
+my @newINC;
+my $removedPerlPaths;
+foreach my $inc (@INC) {
+ if ($inc =~ m[^/packages/perl-$Config{version}-\d+/.self/]o) {
+ if (! $removedPerlPaths) {
+ push @newINC, @ourINC;
+ $removedPerlPaths = 1;
+ }
+ next;
+ }
+ push @newINC, $inc;
+}
+@INC = @newINC;
--
1.8.3.4
From f33151a4535dd22acaae24d4b16da3115b6cef64 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Wed, 9 Oct 2013 20:29:38 +0200
Subject: Fix initialization check for CPAN.
* On Haiku, only the site-lib directories will ever be writable,
as the others read-only. This avoids CPAN asking for a way to
circumvent unwritable lib dirs.
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
index b099b04..55bf194 100644
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
@@ -2010,6 +2010,12 @@ sub _print_urllist {
}
sub _can_write_to_libdirs {
+ if ($^O eq 'haiku') {
+ # on Haiku, the other dirs are never writable, as they are
+ # being populated by packagefs
+ return -w $Config{installsitelib}
+ && -w $Config{installsitearch}
+ }
return -w $Config{installprivlib}
&& -w $Config{installarchlib}
&& -w $Config{installsitelib}
--
1.8.3.4
From 6fbbb6e99558e992f373cddd6ae02a3656ad7ce0 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 13 Oct 2013 17:32:50 +0200
Subject: Add support for HAIKU_USE_VENDOR_DIRECTORIES.
* Adjust MakeMaker to automatically switch to vendor directories if
requested via HAIKU_USE_VENDOR_DIRECTORIES.
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
index 25ace13..0be8c3d 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm
@@ -29,21 +29,20 @@ our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
our $VERSION = '6.66';
-=item os_flavor
-
-Haiku is Haiku.
-
-=cut
-
sub os_flavor {
return('Haiku');
}
-=head3 init_INSTALL_from_PREFIX
+sub init_main {
+ my $self = shift;
- $mm->init_INSTALL_from_PREFIX;
+ # switch to vendor directories if requested.
+ if ($ENV{'HAIKU_USE_VENDOR_DIRECTORIES'}) {
+ $self->{INSTALLDIRS} ||= 'vendor';
+ }
-=cut
+ $self->SUPER::init_main();
+}
sub init_INSTALL_from_PREFIX {
my $self = shift;
@@ -63,20 +62,6 @@ sub init_INSTALL_from_PREFIX {
}
}
-=back
-
-=head3 init_others
-
- $MM->init_others();
-
-Initializes the macro definitions having to do with compiling and
-linking used by tools_other() and places them in the $MM object.
-
-If there is no description, its the same as the parameter to
-WriteMakefile() documented in ExtUtils::MakeMaker.
-
-=cut
-
sub init_others {
my $self = shift;
@@ -90,8 +75,6 @@ sub init_others {
return;
}
-=back
-
1;
__END__
--
1.8.3.4

View File

@@ -23,7 +23,7 @@ CHECKSUM_SHA256="7cbed5ef11900e8f68041215eea0de5e443d53393f84c41d5c9c69c150a4982
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
PATCHES="perl-5.18.1.patchset"
PATCHES="perl-5.18.2.patchset"
PROVIDES="
# assume that any perl commands are backwards compatible to version 5.

View File

@@ -1,4 +1,4 @@
From faaf6967e31a129b062c3a3a9b6752944aee865f Mon Sep 17 00:00:00 2001
From 2e6d0a2e4c715dd9a3ef2ce19ae6389a6dd4e0c7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 Mar 2014 21:17:06 +0000
Subject: initial Haiku patch
@@ -759,7 +759,7 @@ index 40ad843..24621ef 100644
1.8.3.4
From 6e1205e2b0b90002f678ed93a8a27ab567e8bd86 Mon Sep 17 00:00:00 2001
From 077cde20cfcd287454dcc131e10c00a0c7bb6e2e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 5 Apr 2014 21:16:40 +0000
Subject: fix pyconfig.h path
@@ -781,3 +781,35 @@ index cf75650..bb54b6f 100644
--
1.8.3.4
From 6123b9d003eb7c5dd8f7cb468b8937061dc8f0dd Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 18 Jun 2014 12:19:13 +0000
Subject: Import missed change from the 2.6.9 patches
This makes our site- and vendor- packages work properly again.
It's sill missing the changes to addusersitepackages. This method was apparently refactored, and I don't have enough Python knowledge to redo our changes in the new code. User packages will not workas
expected with
this version of Python.
diff --git a/Lib/site.py b/Lib/site.py
index f1b0ae8..c18a7dd 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -287,6 +287,13 @@ def getsitepackages():
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
+ elif sys.platform.startswith('haiku'):
+ sitepackages.append(os.path.join(prefix, "non-packaged", "lib",
+ "python" + sys.version[:3],
+ "site-packages"))
+ sitepackages.append(os.path.join(prefix, "lib",
+ "python" + sys.version[:3],
+ "vendor-packages"))
elif os.sep == '/':
sitepackages.append(os.path.join(prefix, "lib",
"python" + sys.version[:3],
--
1.8.3.4

View File

@@ -13,7 +13,7 @@ LICENSE="Python"
COPYRIGHT="1990-2012, Python Software Foundation"
SRC_URI="https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tar.xz"
CHECKSUM_SHA256="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1"
REVISION="2"
REVISION="3"
ARCHITECTURES="!x86_gcc2 !x86 x86_64"
PATCHES="python-2.7.6.patchset"

View File

@@ -0,0 +1,545 @@
From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 11 Nov 2013 19:00:01 -0700
Subject: applying patch ruby-1.9.1.patch
diff --git a/configure.in b/configure.in
index c98a024..113d4e5 100644
--- a/configure.in
+++ b/configure.in
@@ -1462,11 +1462,11 @@ if test "$with_dln_a_out" != yes; then
haiku*) case "$target_cpu" in
powerpc*)
: ${LDSHARED="ld -xms"}
- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+ DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
;;
i586*)
: ${LDSHARED="ld -shared"}
- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
+ DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib"
;;
esac
: ${LIBPATHENV=LIBRARY_PATH}
diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h
index 0998837..814ceef 100644
--- a/ext/nkf/nkf-utf8/nkf.h
+++ b/ext/nkf/nkf-utf8/nkf.h
@@ -164,6 +164,11 @@ void setbinmode(FILE *fp)
# ifndef HAVE_LOCALE_H
# define HAVE_LOCALE_H
# endif
+#elif defined(__HAIKU__)
+# undef HAVE_LANGINFO_H
+# ifndef HAVE_LOCALE_H
+# define HAVE_LOCALE_H
+# endif
#else
# ifndef HAVE_LANGINFO_H
# define HAVE_LANGINFO_H
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index a3b612b..d900ef3 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary)
#define OSSL_IMPL_SK2ARY(name, type) \
VALUE \
-ossl_##name##_sk2ary(STACK *sk) \
+ossl_##name##_sk2ary(STACK_OF(type) *sk) \
{ \
type *t; \
int i, num; \
@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk) \
OSSL_Debug("empty sk!"); \
return Qnil; \
} \
- num = sk_num(sk); \
+ num = sk_##type##_num(sk); \
if (num < 0) { \
OSSL_Debug("items in sk < -1???"); \
return rb_ary_new(); \
@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk) \
ary = rb_ary_new2(num); \
\
for (i=0; i<num; i++) { \
- t = (type *)sk_value(sk, i); \
+ t = sk_##type##_value(sk, i); \
rb_ary_push(ary, ossl_##name##_new(t)); \
} \
return ary; \
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index ecddb80..fe24280 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -104,6 +104,13 @@ extern VALUE eOSSLError;
} while (0)
/*
+ * Compatibility
+ */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
+
+/*
* String to HEXString conversion
*/
int string2hex(const unsigned char *, int, char **, int *);
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index bc5067f..5ec5b06 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -1,5 +1,5 @@
/*
- * $Id: ossl_config.c 18971 2008-08-31 03:36:09Z nobu $
+ * $Id: ossl_config.c 27460 2010-04-23 14:28:56Z akr $
* 'OpenSSL for Ruby' project
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
* All rights reserved.
@@ -33,8 +33,8 @@
VALUE cConfig;
VALUE eConfigError;
-/*
- * Public
+/*
+ * Public
*/
static CONF *parse_config(VALUE, CONF*);
@@ -154,7 +154,7 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self)
_CONF_new_data(conf);
}
#endif
-
+
return self;
}
@@ -187,11 +187,30 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
OPENSSL_free(cv);
ossl_raise(eConfigError, "_CONF_add_string failure");
}
-
+
return value;
#endif
}
+static void
+rb_ossl_config_modify_check(VALUE config)
+{
+ if (OBJ_FROZEN(config)) rb_error_frozen("OpenSSL::Config");
+ if (!OBJ_UNTRUSTED(config) && rb_safe_level() >= 4)
+ rb_raise(rb_eSecurityError, "Insecure: can't modify OpenSSL config");
+}
+
+#if !defined(OSSL_NO_CONF_API)
+static VALUE
+ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value)
+{
+ rb_ossl_config_modify_check(self);
+ return ossl_config_add_value(self, section, name, value);
+}
+#else
+#define ossl_config_add_value_m rb_f_notimplement
+#endif
+
static VALUE
ossl_config_get_value(VALUE self, VALUE section, VALUE name)
{
@@ -214,7 +233,7 @@ static VALUE
ossl_config_get_value_old(int argc, VALUE *argv, VALUE self)
{
VALUE section, name;
-
+
rb_scan_args(argc, argv, "11", &section, &name);
/* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */
@@ -247,6 +266,7 @@ ossl_config_set_section(VALUE self, VALUE section, VALUE hash)
{
VALUE arg[2];
+ rb_ossl_config_modify_check(self);
arg[0] = self;
arg[1] = section;
rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg);
@@ -278,7 +298,7 @@ ossl_config_get_section(VALUE self, VALUE section)
return hash;
}
for (i=0; i<entries; i++) {
- entry = sk_CONF_VALUE_value(sk, i);
+ entry = sk_CONF_VALUE_value(sk, i);
rb_hash_aset(hash, rb_str_new2(entry->name), rb_str_new2(entry->value));
}
@@ -292,15 +312,16 @@ ossl_config_get_section_old(VALUE self, VALUE section)
return ossl_config_get_section(self, section);
}
-#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN
+#if defined(IMPLEMENT_LHASH_DOALL_ARG_FN) && defined(LHASH_OF)
static void
-get_conf_section(CONF_VALUE *cv, VALUE ary)
+get_conf_section_doall_arg(CONF_VALUE *cv, void *tmp)
{
+ VALUE ary = (VALUE)tmp;
if(cv->name) return;
rb_ary_push(ary, rb_str_new2(cv->section));
}
-static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE);
+static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE, void)
static VALUE
ossl_config_get_sections(VALUE self)
@@ -310,14 +331,16 @@ ossl_config_get_sections(VALUE self)
GetConfig(self, conf);
ary = rb_ary_new();
- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary);
+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(get_conf_section),
+ (void*)ary);
return ary;
}
static void
-dump_conf_value(CONF_VALUE *cv, VALUE str)
+dump_conf_value_doall_arg(CONF_VALUE *cv, void *tmp)
{
+ VALUE str = (VALUE)tmp;
STACK_OF(CONF_VALUE) *sk;
CONF_VALUE *v;
int i, num;
@@ -338,7 +361,7 @@ dump_conf_value(CONF_VALUE *cv, VALUE str)
rb_str_cat2(str, "\n");
}
-static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE);
+static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE, void)
static VALUE
dump_conf(CONF *conf)
@@ -346,7 +369,8 @@ dump_conf(CONF *conf)
VALUE str;
str = rb_str_new(0, 0);
- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str);
+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(dump_conf_value),
+ (void*)str);
return str;
}
@@ -362,7 +386,7 @@ ossl_config_to_s(VALUE self)
}
static void
-each_conf_value(CONF_VALUE *cv, void* dummy)
+each_conf_value_doall_arg(CONF_VALUE *cv, void *dummy)
{
STACK_OF(CONF_VALUE) *sk;
CONF_VALUE *v;
@@ -382,7 +406,7 @@ each_conf_value(CONF_VALUE *cv, void* dummy)
}
}
-static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*);
+static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE, void *)
static VALUE
ossl_config_each(VALUE self)
@@ -392,7 +416,8 @@ ossl_config_each(VALUE self)
RETURN_ENUMERATOR(self, 0, 0);
GetConfig(self, conf);
- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL);
+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(each_conf_value),
+ (void*)NULL);
return self;
}
@@ -456,7 +481,7 @@ Init_ossl_config()
rb_define_method(cConfig, "initialize", ossl_config_initialize, -1);
rb_define_method(cConfig, "get_value", ossl_config_get_value, 2);
rb_define_method(cConfig, "value", ossl_config_get_value_old, -1);
- rb_define_method(cConfig, "add_value", ossl_config_add_value, 3);
+ rb_define_method(cConfig, "add_value", ossl_config_add_value_m, 3);
rb_define_method(cConfig, "[]", ossl_config_get_section, 1);
rb_define_method(cConfig, "section", ossl_config_get_section_old, 1);
rb_define_method(cConfig, "[]=", ossl_config_set_section, 2);
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index f7cd156..644e91a 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, VALUE cert)
return self;
}
-static STACK *
-pkcs7_get_certs_or_crls(VALUE self, int want_certs)
+static STACK_OF(X509) *
+pkcs7_get_certs(VALUE self)
{
PKCS7 *pkcs7;
STACK_OF(X509) *certs;
- STACK_OF(X509_CRL) *crls;
int i;
GetPKCS7(self, pkcs7);
@@ -585,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int want_certs)
switch(i){
case NID_pkcs7_signed:
certs = pkcs7->d.sign->cert;
- crls = pkcs7->d.sign->crl;
break;
case NID_pkcs7_signedAndEnveloped:
certs = pkcs7->d.signed_and_enveloped->cert;
+ break;
+ default:
+ certs = NULL;
+ }
+
+ return certs;
+}
+
+static STACK_OF(X509_CRL) *
+pkcs7_get_crls(VALUE self)
+{
+ PKCS7 *pkcs7;
+ STACK_OF(X509_CRL) *crls;
+ int i;
+
+ GetPKCS7(self, pkcs7);
+ i = OBJ_obj2nid(pkcs7->type);
+ switch(i){
+ case NID_pkcs7_signed:
+ crls = pkcs7->d.sign->crl;
+ break;
+ case NID_pkcs7_signedAndEnveloped:
crls = pkcs7->d.signed_and_enveloped->crl;
break;
default:
- certs = crls = NULL;
+ crls = NULL;
}
- return want_certs ? certs : crls;
+ return crls;
}
static VALUE
@@ -610,7 +630,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
STACK_OF(X509) *certs;
X509 *cert;
- certs = pkcs7_get_certs_or_crls(self, 1);
+ certs = pkcs7_get_certs(self);
while((cert = sk_X509_pop(certs))) X509_free(cert);
rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self);
@@ -620,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary)
static VALUE
ossl_pkcs7_get_certificates(VALUE self)
{
- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1));
+ return ossl_x509_sk2ary(pkcs7_get_certs(self));
}
static VALUE
@@ -650,7 +670,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
STACK_OF(X509_CRL) *crls;
X509_CRL *crl;
- crls = pkcs7_get_certs_or_crls(self, 0);
+ crls = pkcs7_get_crls(self);
while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl);
rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self);
@@ -660,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary)
static VALUE
ossl_pkcs7_get_crls(VALUE self)
{
- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0));
+ return ossl_x509crl_sk2ary(pkcs7_get_crls(self));
}
static VALUE
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index c278edc..1167627 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -1195,10 +1195,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
}
chain = SSL_get_peer_cert_chain(ssl);
if(!chain) return Qnil;
- num = sk_num(chain);
+ num = sk_X509_num(chain);
ary = rb_ary_new2(num);
for (i = 0; i < num; i++){
- cert = (X509*)sk_value(chain, i);
+ cert = sk_X509_value(chain, i);
rb_ary_push(ary, ossl_x509_new(cert));
}
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
index b236e4d..4d0848f 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -72,6 +72,16 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
return self;
}
+#if HAVE_SSL_SESSION_CMP == 0
+int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b)
+{
+ if (a->ssl_version != b->ssl_version ||
+ a->session_id_length != b->session_id_length)
+ return 1;
+ return memcmp(a->session_id,b-> session_id, a->session_id_length);
+}
+#endif
+
/*
* call-seq:
* session1 == session2 -> boolean
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index 248e02a..2634cd9 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -218,8 +218,9 @@ ossl_x509attr_get_value(VALUE self)
ossl_str_adjust(str, p);
}
else{
- length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL,
- i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
+ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set,
+ (unsigned char **) NULL, i2d_ASN1_TYPE,
+ V_ASN1_SET, V_ASN1_UNIVERSAL, 0);
str = rb_str_new(0, length);
p = (unsigned char *)RSTRING_PTR(str);
i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p,
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index 3896b6e..c5123ae 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self)
VALUE ary, revoked;
GetX509CRL(self, crl);
- num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl));
+ num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
if (num < 0) {
OSSL_Debug("num < 0???");
return rb_ary_new();
@@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self)
ary = rb_ary_new2(num);
for(i=0; i<num; i++) {
/* NO DUP - don't free! */
- rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i);
+ rev = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
revoked = ossl_x509revoked_new(rev);
rb_ary_push(ary, revoked);
}
diff --git a/signal.c b/signal.c
index 5da1769..74072d2 100644
--- a/signal.c
+++ b/signal.c
@@ -34,7 +34,7 @@ typedef int rb_atomic_t;
# define ATOMIC_DEC(var) (--(var))
#endif
-#ifdef __BEOS__
+#if defined __BEOS__ || defined __HAIKU__
#undef SIGBUS
#endif
@@ -586,7 +586,7 @@ static int segv_received = 0;
static RETSIGTYPE
sigsegv(int sig SIGINFO_ARG)
{
-#ifdef USE_SIGALTSTACK
+#if defined USE_SIGALTSTACK && defined SA_SIGINFO
int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
rb_thread_t *th = GET_THREAD();
--
1.8.3.4
From b5cf064c70f3212fb0a44dd4eaa4298e881b333f Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 11 Nov 2013 20:00:13 -0700
Subject: Use gcc for linking modules
diff --git a/configure.in b/configure.in
index 113d4e5..9bfbfb3 100644
--- a/configure.in
+++ b/configure.in
@@ -1465,7 +1465,10 @@ if test "$with_dln_a_out" != yes; then
DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
;;
i586*)
- : ${LDSHARED="ld -shared"}
+ : ${LDSHARED="${CC} -shared"}
+ if test "$rb_cv_binary_elf" = yes; then
+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ fi
DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib"
;;
esac
--
1.8.3.4
From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 11 Nov 2013 23:13:59 -0700
Subject: Add soname flags for libruby.so
diff --git a/configure.in b/configure.in
index 9bfbfb3..611b586 100644
--- a/configure.in
+++ b/configure.in
@@ -1777,6 +1777,10 @@ if test "$enable_shared" = 'yes'; then
;;
esac
;;
+ haiku*)
+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+ ;;
darwin*)
LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
--
1.8.3.4
From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Wed, 18 Dec 2013 21:52:24 -0500
Subject: Add case for x86_64.
diff --git a/configure.in b/configure.in
index 611b586..01f0bb0 100644
--- a/configure.in
+++ b/configure.in
@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then
: ${LDSHARED="ld -xms"}
DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
;;
- i586*)
+ i586*|x86_64*)
: ${LDSHARED="${CC} -shared"}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
--
1.8.3.4

View File

@@ -0,0 +1,33 @@
From 0293a01f710c55445042a570cc3fb9755e20ed71 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 18 Jun 2014 16:03:04 +0000
Subject: Fix configuration for Haiku.
* Use something for linking dynamic libraries
* Set a soname on libruby.
diff --git a/configure.in b/configure.in
index 17ed3ed..8efd25d 100644
--- a/configure.in
+++ b/configure.in
@@ -2654,7 +2654,7 @@ if test "$with_dln_a_out" != yes; then
[bsdi3*], [ AS_CASE(["$CC"],
[*shlicc*], [ : ${LDSHARED='$(CC) -r'}
rb_cv_dlopen=yes])],
- [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [
+ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
: ${LDSHARED='$(CC) -shared'}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
@@ -3124,7 +3124,7 @@ AS_CASE("$enable_shared", [yes], [
[sunos4*], [
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
],
- [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [
+ [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [
LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
if test "$load_relative" = yes; then
--
1.8.3.4

View File

@@ -78,7 +78,7 @@ REQUIRES_devel="
SOURCE_DIR="ruby-1.9.3-p545"
PATCHES="ruby-1.9.1.patchset"
PATCHES="ruby-1.9.3.patchset"
BUILD()
{

View File

@@ -11,28 +11,33 @@ imperative. It also has a dynamic type system and automatic memory
management. Therefore, it is similar in varying degrees to, Smalltalk,
Python, Perl, Lisp, Dylan, and CLU."
HOMEPAGE="http://www.ruby-lang.org"
SRC_URI="http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.1.tar.gz"
CHECKSUM_SHA256="c843df31ae88ed49f5393142b02b9a9f5a6557453805fd489a76fbafeae88941"
SRC_URI="http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.2.tar.gz"
CHECKSUM_SHA256="f22a6447811a81f3c808d1c2a5ce3b5f5f0955c68c9a749182feb425589e6635"
LICENSE="Ruby
BSD (3-clause)"
COPYRIGHT="1993-2014 Yukihiro Matsumoto"
REVISION="1"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="!x86"
ARCHITECTURES="?x86 !x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
ruby$secondaryArchSuffix = $portVersion compat >= 1.9
cmd:ruby = $portVersion compat >= 1.9
cmd:erb = $portVersion compat >= 1.9
cmd:gem = $portVersion compat >= 1.9
cmd:irb = $portVersion compat >= 1.9
cmd:rake = $portVersion compat >= 1.9
cmd:rdoc = $portVersion compat >= 1.9
cmd:ri = $portVersion compat >= 1.9
cmd:testrb = $portVersion compat >= 1.9
lib:libruby$secondaryArchSuffix = $portVersion compat >= 1.9
ruby$secondaryArchSuffix = $portVersion compat >= 2.1
cmd:ruby$secondaryArchSuffix = $portVersion compat >= 2.1
cmd:erb$secondaryArchSuffix = $portVersion compat >= 2.1
cmd:gem$secondaryArchSuffix = $portVersion compat >= 2.1
cmd:irb$secondaryArchSuffix = $portVersion compat >= 2.1
cmd:rake$secondaryArchSuffix = $portVersion compat >= 2.1
cmd:rdoc$secondaryArchSuffix = $portVersion compat >= 2.1
cmd:ri$secondaryArchSuffix = $portVersion compat >= 2.1
cmd:testrb$secondaryArchSuffix = $portVersion compat >= 2.1
lib:libruby$secondaryArchSuffix = $portVersion compat >= 2.1
"
REQUIRES="
@@ -46,41 +51,48 @@ REQUIRES="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libedit$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libncursesw$secondaryArchSuffix
devel:libffi$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:g++$secondaryArchSuffix
cmd:autoconf
cmd:make
cmd:bison
cmd:git
cmd:libtoolize
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
PROVIDES_devel="
ruby_devel$secondaryArchSuffix = $portVersion
devel:libruby_static$secondaryArchSuffix = $portVersion compat >= 1.9
lib:libruby_static$secondaryArchSuffix = $portVersion compat >= 1.9
devel:libruby$secondaryArchSuffix = $portVersion compat >= 1.9
devel:libruby_static$secondaryArchSuffix = $portVersion compat >= 2.1
lib:libruby_static$secondaryArchSuffix = $portVersion compat >= 2.1
devel:libruby$secondaryArchSuffix = $portVersion compat >= 2.1
"
REQUIRES_devel="
ruby$secondaryArchSuffix == $portVersion base
"
PATCHES="ruby-2.1.2.patchset"
BUILD()
{
runConfigure ./configure --enable-shared
libtoolize --force --copy --install
autoconf
runConfigure ./configure --enable-shared --disable-silent-rules
# The build process needs to run ruby, and without this it fails to find
# libruby.so.
export LIBRARY_PATH=$LIBRARY_PATH:%A
make $jobArgs
make $jobArgs Q=''
}
INSTALL()
@@ -93,5 +105,6 @@ INSTALL()
TEST()
{
export LIBRARY_PATH=$LIBRARY_PATH:%A
make check
}

View File

@@ -0,0 +1,611 @@
AMENDMENTS
The Netscape Public License Version 1.1 ("NPL") consists of the Mozilla Public License Version 1.1 with the following Amendments, including Exhibit A-Netscape Public License.  Files identified with "Exhibit A-Netscape Public License" are governed by the Netscape Public License Version 1.1.
Additional Terms applicable to the Netscape Public License.
I. Effect.
These additional terms described in this Netscape Public License -- Amendments shall apply to the Mozilla Communicator client code and to all Covered Code under this License.
II. ''Netscape's Branded Code'' means Covered Code that Netscape distributes and/or permits others to distribute under one or more trademark(s) which are controlled by Netscape but which are not licensed for use under this License.
III. Netscape and logo.
This License does not grant any rights to use the trademarks "Netscape'', the "Netscape N and horizon'' logo or the "Netscape lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", "Smart Browsing" even if such marks are included in the Original Code or Modifications.
IV. Inability to Comply Due to Contractual Obligation.
Prior to licensing the Original Code under this License, Netscape has licensed third party code for use in Netscape's Branded Code. To the extent that Netscape is limited contractually from making such third party code available under this License, Netscape may choose to reintegrate such code into Covered Code without being required to distribute such code in Source Code form, even if such code would otherwise be considered ''Modifications'' under this License.
V. Use of Modifications and Covered Code by Initial Developer.
V.1. In General.
The obligations of Section 3 apply to Netscape, except to the extent specified in this Amendment, Section V.2 and V.3.
V.2. Other Products.
Netscape may include Covered Code in products other than the Netscape's Branded Code which are released by Netscape during the two (2) years following the release date of the Original Code, without such additional products becoming subject to the terms of this License, and may license such additional products on different terms from those contained in this License.
V.3. Alternative Licensing.
Netscape may license the Source Code of Netscape's Branded Code, including Modifications incorporated therein, without such Netscape Branded Code becoming subject to the terms of this License, and may license such Netscape Branded Code on different terms from those contained in this License.
VI. Litigation.
Notwithstanding the limitations of Section 11 above, the provisions regarding litigation in Section 11(a), (b) and (c) of the License shall apply to all disputes relating to this License.
EXHIBIT A-Netscape Public License.
 
''The contents of this file are subject to the Netscape Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/NPL/
Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
The Original Code is Mozilla Communicator client code, released March 31, 1998.
The Initial Developer of the Original Code is Netscape Communications Corporation. Portions created by Netscape are Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights Reserved.
Contributor(s): ______________________________________.
 
Alternatively, the contents of this file may be used under the terms of the _____ license (the  <20>[___] License<73>), in which case the provisions of [______] License are applicable  instead of those above.  If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the NPL, indicate your decision by deleting  the provisions above and replace  them with the notice and other provisions required by the [___] License.  If you do not delete the provisions above, a recipient may use your version of this file under either the NPL or the [___] License."
MOZILLA PUBLIC LICENSE
Version 1.1
---------------
1. Definitions.
1.0.1. "Commercial Use" means distribution or otherwise making the
Covered Code available to a third party.
1.1. "Contributor" means each entity that creates or contributes to
the creation of Modifications.
1.2. "Contributor Version" means the combination of the Original
Code, prior Modifications used by a Contributor, and the Modifications
made by that particular Contributor.
1.3. "Covered Code" means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including portions thereof.
1.4. "Electronic Distribution Mechanism" means a mechanism generally
accepted in the software development community for the electronic
transfer of data.
1.5. "Executable" means Covered Code in any form other than Source
Code.
1.6. "Initial Developer" means the individual or entity identified
as the Initial Developer in the Source Code notice required by Exhibit
A.
1.7. "Larger Work" means a work which combines Covered Code or
portions thereof with code not governed by the terms of this License.
1.8. "License" means this document.
1.8.1. "Licensable" means having the right to grant, to the maximum
extent possible, whether at the time of the initial grant or
subsequently acquired, any and all of the rights conveyed herein.
1.9. "Modifications" means any addition to or deletion from the
substance or structure of either the Original Code or any previous
Modifications. When Covered Code is released as a series of files, a
Modification is:
A. Any addition to or deletion from the contents of a file
containing Original Code or previous Modifications.
B. Any new file that contains any part of the Original Code or
previous Modifications.
1.10. "Original Code" means Source Code of computer software code
which is described in the Source Code notice required by Exhibit A as
Original Code, and which, at the time of its release under this
License is not already Covered Code governed by this License.
1.10.1. "Patent Claims" means any patent claim(s), now owned or
hereafter acquired, including without limitation, method, process,
and apparatus claims, in any patent Licensable by grantor.
1.11. "Source Code" means the preferred form of the Covered Code for
making modifications to it, including all modules it contains, plus
any associated interface definition files, scripts used to control
compilation and installation of an Executable, or source code
differential comparisons against either the Original Code or another
well known, available Covered Code of the Contributor's choice. The
Source Code can be in a compressed or archival form, provided the
appropriate decompression or de-archiving software is widely available
for no charge.
1.12. "You" (or "Your") means an individual or a legal entity
exercising rights under, and complying with all of the terms of, this
License or a future version of this License issued under Section 6.1.
For legal entities, "You" includes any entity which controls, is
controlled by, or is under common control with You. For purposes of
this definition, "control" means (a) the power, direct or indirect,
to cause the direction or management of such entity, whether by
contract or otherwise, or (b) ownership of more than fifty percent
(50%) of the outstanding shares or beneficial ownership of such
entity.
2. Source Code License.
2.1. The Initial Developer Grant.
The Initial Developer hereby grants You a world-wide, royalty-free,
non-exclusive license, subject to third party intellectual property
claims:
(a) under intellectual property rights (other than patent or
trademark) Licensable by Initial Developer to use, reproduce,
modify, display, perform, sublicense and distribute the Original
Code (or portions thereof) with or without Modifications, and/or
as part of a Larger Work; and
(b) under Patents Claims infringed by the making, using or
selling of Original Code, to make, have made, use, practice,
sell, and offer for sale, and/or otherwise dispose of the
Original Code (or portions thereof).
(c) the licenses granted in this Section 2.1(a) and (b) are
effective on the date Initial Developer first distributes
Original Code under the terms of this License.
(d) Notwithstanding Section 2.1(b) above, no patent license is
granted: 1) for code that You delete from the Original Code; 2)
separate from the Original Code; or 3) for infringements caused
by: i) the modification of the Original Code or ii) the
combination of the Original Code with other software or devices.
2.2. Contributor Grant.
Subject to third party intellectual property claims, each Contributor
hereby grants You a world-wide, royalty-free, non-exclusive license
(a) under intellectual property rights (other than patent or
trademark) Licensable by Contributor, to use, reproduce, modify,
display, perform, sublicense and distribute the Modifications
created by such Contributor (or portions thereof) either on an
unmodified basis, with other Modifications, as Covered Code
and/or as part of a Larger Work; and
(b) under Patent Claims infringed by the making, using, or
selling of Modifications made by that Contributor either alone
and/or in combination with its Contributor Version (or portions
of such combination), to make, use, sell, offer for sale, have
made, and/or otherwise dispose of: 1) Modifications made by that
Contributor (or portions thereof); and 2) the combination of
Modifications made by that Contributor with its Contributor
Version (or portions of such combination).
(c) the licenses granted in Sections 2.2(a) and 2.2(b) are
effective on the date Contributor first makes Commercial Use of
the Covered Code.
(d) Notwithstanding Section 2.2(b) above, no patent license is
granted: 1) for any code that Contributor has deleted from the
Contributor Version; 2) separate from the Contributor Version;
3) for infringements caused by: i) third party modifications of
Contributor Version or ii) the combination of Modifications made
by that Contributor with other software (except as part of the
Contributor Version) or other devices; or 4) under Patent Claims
infringed by Covered Code in the absence of Modifications made by
that Contributor.
3. Distribution Obligations.
3.1. Application of License.
The Modifications which You create or to which You contribute are
governed by the terms of this License, including without limitation
Section 2.2. The Source Code version of Covered Code may be
distributed only under the terms of this License or a future version
of this License released under Section 6.1, and You must include a
copy of this License with every copy of the Source Code You
distribute. You may not offer or impose any terms on any Source Code
version that alters or restricts the applicable version of this
License or the recipients' rights hereunder. However, You may include
an additional document offering the additional rights described in
Section 3.5.
3.2. Availability of Source Code.
Any Modification which You create or to which You contribute must be
made available in Source Code form under the terms of this License
either on the same media as an Executable version or via an accepted
Electronic Distribution Mechanism to anyone to whom you made an
Executable version available; and if made available via Electronic
Distribution Mechanism, must remain available for at least twelve (12)
months after the date it initially became available, or at least six
(6) months after a subsequent version of that particular Modification
has been made available to such recipients. You are responsible for
ensuring that the Source Code version remains available even if the
Electronic Distribution Mechanism is maintained by a third party.
3.3. Description of Modifications.
You must cause all Covered Code to which You contribute to contain a
file documenting the changes You made to create that Covered Code and
the date of any change. You must include a prominent statement that
the Modification is derived, directly or indirectly, from Original
Code provided by the Initial Developer and including the name of the
Initial Developer in (a) the Source Code, and (b) in any notice in an
Executable version or related documentation in which You describe the
origin or ownership of the Covered Code.
3.4. Intellectual Property Matters
(a) Third Party Claims.
If Contributor has knowledge that a license under a third party's
intellectual property rights is required to exercise the rights
granted by such Contributor under Sections 2.1 or 2.2,
Contributor must include a text file with the Source Code
distribution titled "LEGAL" which describes the claim and the
party making the claim in sufficient detail that a recipient will
know whom to contact. If Contributor obtains such knowledge after
the Modification is made available as described in Section 3.2,
Contributor shall promptly modify the LEGAL file in all copies
Contributor makes available thereafter and shall take other steps
(such as notifying appropriate mailing lists or newsgroups)
reasonably calculated to inform those who received the Covered
Code that new knowledge has been obtained.
(b) Contributor APIs.
If Contributor's Modifications include an application programming
interface and Contributor has knowledge of patent licenses which
are reasonably necessary to implement that API, Contributor must
also include this information in the LEGAL file.
(c) Representations.
Contributor represents that, except as disclosed pursuant to
Section 3.4(a) above, Contributor believes that Contributor's
Modifications are Contributor's original creation(s) and/or
Contributor has sufficient rights to grant the rights conveyed by
this License.
3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source
Code. If it is not possible to put such notice in a particular Source
Code file due to its structure, then You must include such notice in a
location (such as a relevant directory) where a user would be likely
to look for such a notice. If You created one or more Modification(s)
You may add your name as a Contributor to the notice described in
Exhibit A. You must also duplicate this License in any documentation
for the Source Code where You describe recipients' rights or ownership
rights relating to Covered Code. You may choose to offer, and to
charge a fee for, warranty, support, indemnity or liability
obligations to one or more recipients of Covered Code. However, You
may do so only on Your own behalf, and not on behalf of the Initial
Developer or any Contributor. You must make it absolutely clear than
any such warranty, support, indemnity or liability obligation is
offered by You alone, and You hereby agree to indemnify the Initial
Developer and every Contributor for any liability incurred by the
Initial Developer or such Contributor as a result of warranty,
support, indemnity or liability terms You offer.
3.6. Distribution of Executable Versions.
You may distribute Covered Code in Executable form only if the
requirements of Section 3.1-3.5 have been met for that Covered Code,
and if You include a notice stating that the Source Code version of
the Covered Code is available under the terms of this License,
including a description of how and where You have fulfilled the
obligations of Section 3.2. The notice must be conspicuously included
in any notice in an Executable version, related documentation or
collateral in which You describe recipients' rights relating to the
Covered Code. You may distribute the Executable version of Covered
Code or ownership rights under a license of Your choice, which may
contain terms different from this License, provided that You are in
compliance with the terms of this License and that the license for the
Executable version does not attempt to limit or alter the recipient's
rights in the Source Code version from the rights set forth in this
License. If You distribute the Executable version under a different
license You must make it absolutely clear that any terms which differ
from this License are offered by You alone, not by the Initial
Developer or any Contributor. You hereby agree to indemnify the
Initial Developer and every Contributor for any liability incurred by
the Initial Developer or such Contributor as a result of any such
terms You offer.
3.7. Larger Works.
You may create a Larger Work by combining Covered Code with other code
not governed by the terms of this License and distribute the Larger
Work as a single product. In such a case, You must make sure the
requirements of this License are fulfilled for the Covered Code.
4. Inability to Comply Due to Statute or Regulation.
If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Code due to
statute, judicial order, or regulation then You must: (a) comply with
the terms of this License to the maximum extent possible; and (b)
describe the limitations and the code they affect. Such description
must be included in the LEGAL file described in Section 3.4 and must
be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently detailed for a recipient of ordinary skill to be able to
understand it.
5. Application of this License.
This License applies to code to which the Initial Developer has
attached the notice in Exhibit A and to related Covered Code.
6. Versions of the License.
6.1. New Versions.
Netscape Communications Corporation ("Netscape") may publish revised
and/or new versions of the License from time to time. Each version
will be given a distinguishing version number.
6.2. Effect of New Versions.
Once Covered Code has been published under a particular version of the
License, You may always continue to use it under the terms of that
version. You may also choose to use such Covered Code under the terms
of any subsequent version of the License published by Netscape. No one
other than Netscape has the right to modify the terms applicable to
Covered Code created under this License.
6.3. Derivative Works.
If You create or use a modified version of this License (which you may
only do in order to apply it to code which is not already Covered Code
governed by this License), You must (a) rename Your license so that
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
"MPL", "NPL" or any confusingly similar phrase do not appear in your
license (except to note that your license differs from this License)
and (b) otherwise make it clear that Your version of the license
contains terms which differ from the Mozilla Public License and
Netscape Public License. (Filling in the name of the Initial
Developer, Original Code or Contributor in the notice described in
Exhibit A shall not of themselves be deemed to be modifications of
this License.)
7. DISCLAIMER OF WARRANTY.
COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
8. TERMINATION.
8.1. This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure
such breach within 30 days of becoming aware of the breach. All
sublicenses to the Covered Code which are properly granted shall
survive any termination of this License. Provisions which, by their
nature, must remain in effect beyond the termination of this License
shall survive.
8.2. If You initiate litigation by asserting a patent infringement
claim (excluding declatory judgment actions) against Initial Developer
or a Contributor (the Initial Developer or Contributor against whom
You file such action is referred to as "Participant") alleging that:
(a) such Participant's Contributor Version directly or indirectly
infringes any patent, then any and all rights granted by such
Participant to You under Sections 2.1 and/or 2.2 of this License
shall, upon 60 days notice from Participant terminate prospectively,
unless if within 60 days after receipt of notice You either: (i)
agree in writing to pay Participant a mutually agreeable reasonable
royalty for Your past and future use of Modifications made by such
Participant, or (ii) withdraw Your litigation claim with respect to
the Contributor Version against such Participant. If within 60 days
of notice, a reasonable royalty and payment arrangement are not
mutually agreed upon in writing by the parties or the litigation claim
is not withdrawn, the rights granted by Participant to You under
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
the 60 day notice period specified above.
(b) any software, hardware, or device, other than such Participant's
Contributor Version, directly or indirectly infringes any patent, then
any rights granted to You by such Participant under Sections 2.1(b)
and 2.2(b) are revoked effective as of the date You first made, used,
sold, distributed, or had made, Modifications made by that
Participant.
8.3. If You assert a patent infringement claim against Participant
alleging that such Participant's Contributor Version directly or
indirectly infringes any patent where such claim is resolved (such as
by license or settlement) prior to the initiation of patent
infringement litigation, then the reasonable value of the licenses
granted by such Participant under Sections 2.1 or 2.2 shall be taken
into account in determining the amount or value of any payment or
license.
8.4. In the event of termination under Sections 8.1 or 8.2 above,
all end user license agreements (excluding distributors and resellers)
which have been validly granted by You or any distributor hereunder
prior to termination shall survive termination.
9. LIMITATION OF LIABILITY.
UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
10. U.S. GOVERNMENT END USERS.
The Covered Code is a "commercial item," as that term is defined in
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
software" and "commercial computer software documentation," as such
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
all U.S. Government End Users acquire Covered Code with only those
rights set forth herein.
11. MISCELLANEOUS.
This License represents the complete agreement concerning subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. This License shall be governed by
California law provisions (except to the extent applicable law, if
any, provides otherwise), excluding its conflict-of-law provisions.
With respect to disputes in which at least one party is a citizen of,
or an entity chartered or registered to do business in the United
States of America, any litigation relating to this License shall be
subject to the jurisdiction of the Federal Courts of the Northern
District of California, with venue lying in Santa Clara County,
California, with the losing party responsible for costs, including
without limitation, court costs and reasonable attorneys' fees and
expenses. The application of the United Nations Convention on
Contracts for the International Sale of Goods is expressly excluded.
Any law or regulation which provides that the language of a contract
shall be construed against the drafter shall not apply to this
License.
12. RESPONSIBILITY FOR CLAIMS.
As between Initial Developer and the Contributors, each party is
responsible for claims and damages arising, directly or indirectly,
out of its utilization of rights under this License and You agree to
work with Initial Developer and Contributors to distribute such
responsibility on an equitable basis. Nothing herein is intended or
shall be deemed to constitute any admission of liability.
13. MULTIPLE-LICENSED CODE.
Initial Developer may designate portions of the Covered Code as
"Multiple-Licensed". "Multiple-Licensed" means that the Initial
Developer permits you to utilize portions of the Covered Code under
Your choice of the NPL or the alternative licenses, if any, specified
by the Initial Developer in the file described in Exhibit A.
EXHIBIT A -Mozilla Public License.
``The contents of this file are subject to the Mozilla Public License
Version 1.1 (the "License"); you may not use this file except in
compliance with the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS"
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
License for the specific language governing rights and limitations
under the License.
The Original Code is ______________________________________.
The Initial Developer of the Original Code is ________________________.
Portions created by ______________________ are Copyright (C) ______
_______________________. All Rights Reserved.
Contributor(s): ______________________________________.
Alternatively, the contents of this file may be used under the terms
of the _____ license (the "[___] License"), in which case the
provisions of [______] License are applicable instead of those
above. If you wish to allow use of your version of this file only
under the terms of the [____] License and not to allow others to use
your version of this file under the MPL, indicate your decision by
deleting the provisions above and replace them with the notice and
other provisions required by the [___] License. If you do not delete
the provisions above, a recipient may use your version of this file
under either the MPL or the [___] License."
[NOTE: The text of this Exhibit A may differ slightly from the text of
the notices in the Source Code files of the Original Code. You should
use the text of this Exhibit A rather than the text found in the
Original Code Source Code for Your Modifications.]
----------------------------------------------------------------------
AMENDMENTS
The Netscape Public License Version 1.1 ("NPL") consists of the
Mozilla Public License Version 1.1 with the following Amendments,
including Exhibit A-Netscape Public License. Files identified with
"Exhibit A-Netscape Public License" are governed by the Netscape
Public License Version 1.1.
Additional Terms applicable to the Netscape Public License.
I. Effect.
These additional terms described in this Netscape Public
License -- Amendments shall apply to the Mozilla Communicator
client code and to all Covered Code under this License.
II. "Netscape's Branded Code" means Covered Code that Netscape
distributes and/or permits others to distribute under one or more
trademark(s) which are controlled by Netscape but which are not
licensed for use under this License.
III. Netscape and logo.
This License does not grant any rights to use the trademarks
"Netscape", the "Netscape N and horizon" logo or the "Netscape
lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
"Smart Browsing" even if such marks are included in the Original
Code or Modifications.
IV. Inability to Comply Due to Contractual Obligation.
Prior to licensing the Original Code under this License, Netscape
has licensed third party code for use in Netscape's Branded Code.
To the extent that Netscape is limited contractually from making
such third party code available under this License, Netscape may
choose to reintegrate such code into Covered Code without being
required to distribute such code in Source Code form, even if
such code would otherwise be considered "Modifications" under
this License.
V. Use of Modifications and Covered Code by Initial Developer.
V.1. In General.
The obligations of Section 3 apply to Netscape, except to
the extent specified in this Amendment, Section V.2 and V.3.
V.2. Other Products.
Netscape may include Covered Code in products other than the
Netscape's Branded Code which are released by Netscape
during the two (2) years following the release date of the
Original Code, without such additional products becoming
subject to the terms of this License, and may license such
additional products on different terms from those contained
in this License.
V.3. Alternative Licensing.
Netscape may license the Source Code of Netscape's Branded
Code, including Modifications incorporated therein, without
such Netscape Branded Code becoming subject to the terms of
this License, and may license such Netscape Branded Code on
different terms from those contained in this License.
VI. Litigation.
Notwithstanding the limitations of Section 11 above, the
provisions regarding litigation in Section 11(a), (b) and (c) of
the License shall apply to all disputes relating to this License.
EXHIBIT A-Netscape Public License.
"The contents of this file are subject to the Netscape Public
License Version 1.1 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at http://www.mozilla.org/NPL/
Software distributed under the License is distributed on an "AS
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
implied. See the License for the specific language governing
rights and limitations under the License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 1998-1999 Netscape Communications Corporation. All
Rights Reserved.
Contributor(s): ______________________________________.
Alternatively, the contents of this file may be used under the
terms of the _____ license (the "[___] License"), in which case
the provisions of [______] License are applicable instead of
those above. If you wish to allow use of your version of this
file only under the terms of the [____] License and not to allow
others to use your version of this file under the NPL, indicate
your decision by deleting the provisions above and replace them
with the notice and other provisions required by the [___]
License. If you do not delete the provisions above, a recipient
may use your version of this file under either the NPL or the
[___] License."

View File

@@ -0,0 +1,68 @@
From 6810ba3a550c5559ccbdbdda846ea7cbfa04bcca Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 6 Jun 2014 08:40:44 +0000
Subject: Haiku patch
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index a85e055..a994d00 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -659,7 +659,7 @@ LIBS += C:/Program\ Files/Intel/VTune/Analyzer/Lib/VtuneApi.lib
endif
# BeOS and HP-UX do not require the extra linking of "-lm"
-ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS OS2,$(OS_ARCH)))
+ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS OS2 Haiku,$(OS_ARCH)))
EXTRA_LIBS += -lm
endif
diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
index 0366d25..590e5d0 100644
--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
@@ -184,6 +184,18 @@ GetNativeStackBaseImpl()
return static_cast<char*>(st.ss_sp) + st.ss_size;
}
+#elif defined(__HAIKU__)
+
+#include <OS.h>
+
+void *
+GetNativeStackBaseImpl()
+{
+ thread_info info;
+ get_thread_info(find_thread(NULL), &info);
+ return info.stack_base;
+}
+
#else /* XP_UNIX */
void *
--
1.8.3.4
From 97379beb600f8eca868e0c9e605085e1264097a2 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 6 Jun 2014 11:48:10 +0000
Subject: nsinstall patch
diff --git a/js/src/config/nsinstall.c b/js/src/config/nsinstall.c
index 355a092..008b0f1 100644
--- a/js/src/config/nsinstall.c
+++ b/js/src/config/nsinstall.c
@@ -114,7 +114,7 @@ mkdirs(char *path, mode_t mode)
for (cp = strrchr(path, '/'); cp && cp != path && *(cp - 1) == '/'; cp--);
if (cp && cp != path) {
*cp = '\0';
- if ((lstat(path, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
+ if ((stat(path, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
mkdirs(path, mode) < 0) {
return -1;
}
--
1.8.3.4

View File

@@ -0,0 +1,72 @@
SUMMARY="A Javascript engine written in C/C++."
DESCRIPTION="
Spidermonkey is a Javascript engine written in C/C++ used in various products \
from Mozilla.
"
HOMEPAGE="http://www.mozilla.org/js/spidermonkey"
SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz"
CHECKSUM_SHA256="5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"
LICENSE="NPL v1.1"
COPYRIGHT="1998-1999 Netscape Communications Corporation."
REVISION="1"
ARCHITECTURES="?x86_gcc2 x86 ?x86_64"
PATCHES="spidermonkey-${portVersion}.patchset"
PROVIDES="
spidermonkey$secondaryArchSuffix = $portVersion compat >= 1.8
lib:libmozjs185$secondaryArchSuffix = 1.0.0 compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES=""
BUILD_PREREQUIRES="
haiku_devel$secondaryArchSuffix >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
cmd:awk
cmd:python
cmd:xargs
cmd:pkg_config$secondaryArchSuffix
cmd:sed
"
SOURCE_DIR="js-$portVersion/"
BUILD()
{
cd js/src
runConfigure --omit-dirs "libDir docDir dataRootDir" ./configure \
--disable-tracejit
make $jobArgs
}
INSTALL()
{
cd js/src
make install
mv $libDir/libmozjs185-1.0.a $libDir/libmozjs185.a
prepareInstalledDevelLibs libmozjs185
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
PROVIDES_devel="
spidermonkey${secondaryArchSuffix}_devel = $portVersion
devel:libmozjs185$secondaryArchSuffix = 1.0.0 compat >= 1
"
REQUIRES_devel="
spidermonkey$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,59 @@
SUMMARY="Unit Testing Framework for C"
DESCRIPTION="
Check is a unit testing framework for C. It features a simple interface for \
defining unit tests, putting little in the way of the developer. Tests are \
run in a separate address space, so both assertion failures and code errors \
that cause segmentation faults or other signals can be caught. Test results \
are reportable in the following: Subunit, TAP, XML, and a generic logging \
format.
"
HOMEPAGE="http://check.sourceforge.net/"
LICENSE="GNU LGPL v2.1"
REVISION="1"
ARCHITECTURES="x86_gcc2"
SRC_URI="http://sourceforge.net/projects/check/files/check/0.9.13/check-0.9.13.tar.gz"
CHECKSUM_SHA256="ca6589c34f9c60ffd4c3e198ce581e944a9f040ca9352ed54068dd61bebb5cb7"
COPYRIGHT="xxx"
PROVIDES="
check = $portVersion
cmd:checkmk
lib:libcheck = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:awk
cmd:gcc
cmd:make
"
BUILD()
{
runConfigure ./configure
make
}
INSTALL()
{
make install
prepareInstalledDevelLib libcheck
fixPkgconfig libcheck
packageEntries devel $developDir
}
TEST()
{
make check
}
PROVIDES_devel="
check_devel = $portVersion
devel:libcheck = $portVersion
"

View File

@@ -0,0 +1,86 @@
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://sourceforge.net/projects/expat/files/expat/$portVersion/expat-$portVersion.tar.gz"
CHECKSUM_SHA256="823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
expat$secondaryArchSuffix = $portVersion compat >= 2.1
lib:libexpat$secondaryArchSuffix = 1.6.0 compat >= 1
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:xmlwf = $portVersion compat >= 2.1
"
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
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
expat${secondaryArchSuffix}_devel = $portVersion
devel:libexpat${secondaryArchSuffix} = 1.6.0 compat >= 1
"
REQUIRES_devel="
expat${secondaryArchSuffix} == $portVersion base
"

View File

@@ -92,7 +92,9 @@ BUILD()
# There seem to be a problem with libtool, and without this some libraries
# would not be found during the build.
ln -s ../../glib/.libs gobject/.libs/lib
mkdir -p gobject/.libs
ln -sf ../../glib/.libs gobject/.libs/lib
make $jobArgs
}

View File

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

View File

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

View File

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

View File

@@ -1,74 +0,0 @@
SUMMARY="GMP - GNU Multiple Precision Arithmetic Library"
DESCRIPTION="
The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \
arbitrary-precision arithmetic, operating on signed integers, rational numbers, \
and floating point numbers. There are no practical limits to the precision \
except the ones implied by the available memory in the machine GMP runs on \
(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \
64-bit machines). GMP has a rich set of functions, and the functions have a \
regular interface. The basic interface is for C but wrappers exist for other \
languages including Ada, C++, C#, OCaml, Perl, PHP, and Python.
"
HOMEPAGE="http://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz"
CHECKSUM_SHA256="4bd64d782fdeb61aeed45b434fca5246d66baa9de76f87cba30c38460d8834c2"
LICENSE="GNU GPL v3
GNU LGPL v3"
COPYRIGHT="1991-2013 Free Software Foundation, Inc."
REVISION="1"
ARCHITECTURES="x86 x86_gcc2"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1
lib:libgmp$secondaryArchSuffix = 10.1.1 compat >= 10
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:libtool
cmd:autoconf
cmd:automake
cmd:make
"
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
automake --add-missing
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install includedir=$includeDir includeexecdir=$includeDir
# prepare devel/lib
prepareInstalledDevelLibs libgmp
# devel package
packageEntries devel \
$developDir
}
TEST()
{
make check
}
# ----- devel package
PROVIDES_devel="
gmp${secondaryArchSuffix}_devel = $portVersion
devel:libgmp$secondaryArchSuffix = 10.1.1 compat >= 0
"
REQUIRES_devel="
gmp$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,64 @@
SUMMARY="A JSON implementation in C"
DESCRIPTION="
JSON-C implements a reference counting object model that allows you to easily \
construct JSON objects in C, output them as JSON formatted strings and parse \
JSON formatted strings back into the C representation of JSON objects.
"
SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12-nodoc.tar.gz"
CHECKSUM_SHA256="6fd6d2311d610b279e1bcdd5c6d4f699700159d3e0786de8306af7b4bc94fb35"
HOMEPAGE="https://github.com/json-c/json-c/wiki"
ARCHITECTURES="x86_gcc2"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="
2009-2012 Eric Haszlakiewicz
2004, 2005 Metaparadigm Pte Ltd
"
PROVIDES="
json_c = $portVersion
lib:libjson_c = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoreconf
cmd:gcc
cmd:libtool
cmd:make
"
SOURCE_DIR="json-c-$portVersion"
PATCHES="json_c-$portVersion.patchset"
BUILD()
{
sh autogen.sh
runConfigure ./configure
make
}
INSTALL()
{
make install
prepareInstalledDevelLib libjson-c
fixPkgconfig libjson-c
packageEntries devel $developDir
}
TEST()
{
make check
}
PROVIDES_devel="
json_c_devel = $portVersion
devel:libjson_c = $portVersion
"
REQUIRES_devel="json_c == $portVersion base"

View File

@@ -1,26 +0,0 @@
DESCRIPTION="A JSON implementation in C"
HOMEPAGE="http://oss.metaparadigm.com/json-c/"
SRC_URI="http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="3a13d264528dcbaf3931b0cede24abae"
BUILD()
{
cd json-c-0.9
libtoolize --force --install --copy
aclocal
autoconf
automake
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL()
{
cd json-c-0.9
make install DESTDIR=${DESTDIR}
}
LICENSE="MIT"
COPYRIGHT="2004-2005 Metaparadigm Pte Ltd"

View File

@@ -0,0 +1,45 @@
From 42928f5769cc98b8cd791dfa2c58f7dc0634dba5 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 8 Jun 2014 19:35:53 +0200
Subject: Remove compiler options unknown to gcc2.
diff --git a/Makefile.am.inc b/Makefile.am.inc
index fec591b..21aec1f 100644
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -1,2 +1,2 @@
-AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+AM_CFLAGS = -Wall -Wwrite-strings -std=gnu9x -D_GNU_SOURCE -D_REENTRANT
--
1.8.3.4
From d75281fd4c7e7b91913d25f3a2052221af50116e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 8 Jun 2014 21:08:43 +0200
Subject: Avoid c99ism to make gcc2 happy.
diff --git a/json_tokener.c b/json_tokener.c
index 19de8ef..80841f1 100644
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -355,11 +355,12 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
int size;
int size_inf;
int is_negative = 0;
+ char* infbuf;
printbuf_memappend_fast(tok->pb, &c, 1);
size = json_min(tok->st_pos+1, json_null_str_len);
size_inf = json_min(tok->st_pos+1, json_inf_str_len);
- char *infbuf = tok->pb->buf;
+ infbuf = tok->pb->buf;
if (*infbuf == '-')
{
infbuf++;
--
1.8.3.4

View File

@@ -67,6 +67,7 @@ INSTALL()
# set up the develop directory correctly
prepareInstalledDevelLibs libcdio
fixPkgconfig libcdio
# devel package
packageEntries devel \

View File

@@ -1,13 +1,13 @@
#TODO:split out _devel
SUMMARY="A CSS parser and selection engine"
DESCRIPTION="
LibCSS is a CSS (Cascading Style Sheet) parser and selection engine.
"
HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
SRC_URI="git://git.netsurf-browser.org/libcss.git"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-0.3.0-src.tar.gz"
CHECKSUM_SHA256="4065dbfdfc9926e14a2f0f2c600fc72abac97bd20769ac6a908ac50226e95e1a"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="2007 - 2013 J-M Bell"
COPYRIGHT="2007-2014 J-M Bell"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -15,7 +15,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libcss$secondaryArchSuffix = $portVersion
lib:libcss$secondaryArchSuffix = $portVersion
devel:libcss$secondaryArchSuffix = $portVersion
"
REQUIRES="
@@ -29,6 +28,8 @@ BUILD_REQUIRES="
devel:libparserutils${secondaryArchSuffix} >= 0.1.1
devel:libwapcaplet${secondaryArchSuffix} >= 0.1.1
netsurf_buildsystem >= 0
devel:libiconv
"
BUILD_PREREQUIRES="
@@ -39,7 +40,7 @@ BUILD_PREREQUIRES="
cmd:pkg_config
"
PATCHES="libcss-0.3.0.patchset"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -47,9 +48,21 @@ BUILD()
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
I=/develop/headers/libcss
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
mkdir -p $prefix/develop/lib
mv -f $prefix/lib/*.a $prefix/develop/lib/
mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
prepareInstalledDevelLib libcss
fixPkgconfig libcss
packageEntries devel $developDir
}
TEST()
{
make test PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
LDFLAGS="-liconv -lwapcaplet -lparserutils"
}
PROVIDES_devel="
libcss${secondaryArchSuffix}_devel = $portVersion
devel:libcss$secondaryArchSuffix = $portVersion
"

View File

@@ -0,0 +1,78 @@
From 53ba61ff1f71c50a26a03909a9b35e12b79d939d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 18:01:21 +0200
Subject: Fix build with gcc2.
diff --git a/test/dump.h b/test/dump.h
index 941117c..97a6cfd 100644
--- a/test/dump.h
+++ b/test/dump.h
@@ -733,13 +733,14 @@ void dump_bytecode(css_style *style, char **ptr, uint32_t depth)
opcode_t op;
uint32_t value;
uint32_t opv = *((uint32_t *) bytecode);
+ uint32_t i;
ADVANCE(sizeof(opv));
op = getOpcode(opv);
*((*ptr)++) = '|';
- for (uint32_t i = 0; i < depth; i++)
+ for (i = 0; i < depth; i++)
*((*ptr)++) = ' ';
*ptr += sprintf(*ptr, "%s: ", opcode_names[op]);
@@ -2657,10 +2658,10 @@ void dump_font_face(css_font_face *font_face, char **ptr)
uint32_t i;
css_font_face_src *srcs = font_face->srcs;
for (i = 0; i < font_face->n_srcs; ++i) {
+ css_font_face_format format;
*ptr += sprintf(*ptr, "\n| src: ");
- css_font_face_format format =
- css_font_face_src_format(&srcs[i]);
+ format = css_font_face_src_format(&srcs[i]);
*ptr += sprintf(*ptr, "\n| format: ");
--
1.8.3.4
From 7bb3452686257d7732b6c6cbcf5c8ace35280a09 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 18:01:32 +0200
Subject: Fix include paths for Haiku.
diff --git a/Makefile b/Makefile
index d80178c..321eb5c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ endif
include $(NSBUILD)/Makefile.top
# Extra installation rules
-I := /include/libcss
+I := /$(INCLUDEDIR)/libcss
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/computed.h
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/errors.h
diff --git a/libcss.pc.in b/libcss.pc.in
index 695aa76..8df11b4 100644
--- a/libcss.pc.in
+++ b/libcss.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libcss
Description: CSS parsing and selection library
--
1.8.3.4

View File

@@ -1,13 +1,13 @@
#TODO:split out _devel
SUMMARY="A library for building efficient parsers"
DESCRIPTION="
LibParserUtils is a library for building efficient parsers.
"
HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
SRC_URI="git://git.netsurf-browser.org/libparserutils.git"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.0-src.tar.gz"
CHECKSUM_SHA256="55c50abbffaaebe17acba43008ee2c4085401ce618e505fafa7c75baaa813da7"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="2007 - 2013 J-M Bell"
COPYRIGHT="2007-2014 J-M Bell"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -15,7 +15,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libparserutils$secondaryArchSuffix = $portVersion
lib:libparserutils$secondaryArchSuffix = $portVersion
devel:libparserutils$secondaryArchSuffix = $portVersion
"
REQUIRES="
@@ -26,7 +25,9 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libiconv${secondaryArchSuffix}
netsurf_buildsystem >= 0
netsurf_buildsystem >= 1.1
lib:libiconv${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
@@ -36,17 +37,39 @@ BUILD_PREREQUIRES="
cmd:perl
"
PATCHES="libparserutils-0.2.0.patchset"
BUILD()
{
# Build the static lib
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
# Build the shared lib
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
COMPONENT_TYPE=lib-shared
}
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
I=/develop/headers/libparserutils
INCLUDEDIR=$relativeIncludeDir
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
INCLUDEDIR=$relativeIncludeDir COMPONENT_TYPE=lib-shared
mkdir -p $prefix/develop/lib
mv -f $prefix/lib/*.a $prefix/develop/lib/
mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
prepareInstalledDevelLib libparserutils
fixPkgconfig libparserutils
packageEntries devel $developDir
}
TEST()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
LDFLAGS=-liconv test
}
PROVIDES_devel="
libparserutils${secondaryArchSuffix}_devel = $portVersion
devel:libparserutils$secondaryArchSuffix = $portVersion
"

View File

@@ -0,0 +1,50 @@
From 40b2c1f916c450195884c7db57bbea9155e297fc Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 8 Jun 2014 18:39:53 +0200
Subject: Fix include directories for Haiku.
diff --git a/Makefile b/Makefile
index 5acdc36..14b8325 100644
--- a/Makefile
+++ b/Makefile
@@ -33,19 +33,19 @@ include $(NSBUILD)/Makefile.top
# Extra installation rules
Is := include/parserutils
-I := /include/parserutils
+I := /$(INCLUDEDIR)/parserutils
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/errors.h;$(Is)/functypes.h;$(Is)/parserutils.h;$(Is)/types.h
Is := include/parserutils/charset
-I := /include/parserutils/charset
+I := /$(INCLUDEDIR)/parserutils/charset
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/codec.h;$(Is)/mibenum.h;$(Is)/utf16.h;$(Is)/utf8.h
Is := include/parserutils/input
-I := /include/parserutils/input
+I := /$(INCLUDEDIR)/parserutils/input
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/inputstream.h
Is := include/parserutils/utils
-I := /include/parserutils/utils
+I := /$(INCLUDEDIR)/parserutils/utils
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/buffer.h;$(Is)/stack.h;$(Is)/vector.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
diff --git a/libparserutils.pc.in b/libparserutils.pc.in
index 307e909..1a46cf8 100644
--- a/libparserutils.pc.in
+++ b/libparserutils.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libparserutils
Description: Utility library for facilitating parser development
--
1.8.3.4

View File

@@ -1,22 +0,0 @@
DESCRIPTION="LibWapcaplet is a string internment library"
HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
SRC_URI="git://git.netsurf-browser.org/libwapcaplet.git"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="dev-util/buildsystem >= 0"
BUILD()
{
cd libwapcaplet-0.1.1-HEAD
make PREFIX=/boot/common
}
INSTALL()
{
cd libwapcaplet-0.1.1-HEAD
make install PREFIX=/boot/common
}
LICENSE="MIT
GNU GPL v2"
COPYRIGHT="2003 - 2012 The NetSurf Developers"

View File

@@ -1,13 +1,15 @@
#TODO:split out _devel
SUMMARY="LibWapcaplet is a string internment library"
DESCRIPTION="
LibWapcaplet is a string internment library.
It provides reference counted string interment and rapid string comparison \
functionality.
"
HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
SRC_URI="git://git.netsurf-browser.org/libwapcaplet.git"
SRC_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.2.1-src.tar.gz"
CHECKSUM_SHA256="9e4a8df3dfe6d7e1bcc4a3ccce18c3d02230545f4726b05b09b9e504946c8ec8"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="2009 - 2012 The NetSurf Browser project"
COPYRIGHT="2009-2014 The NetSurf Browser project"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -15,7 +17,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libwapcaplet$secondaryArchSuffix = $portVersion
lib:libwapcaplet$secondaryArchSuffix = $portVersion
devel:libwapcaplet$secondaryArchSuffix = $portVersion
"
REQUIRES="
@@ -25,15 +26,19 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
netsurf_buildsystem >= 0
lib:libcheck
devel:libcheck
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config
"
PATCHES="libwapcaplet-0.2.1.patchset"
BUILD()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -42,8 +47,20 @@ BUILD()
INSTALL()
{
make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
I=/develop/headers/libwapcaplet
INCLUDEDIR=$relativeIncludeDir
mkdir -p $prefix/develop/lib
mv -f $prefix/lib/*.a $prefix/develop/lib/
mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
prepareInstalledDevelLib libwapcaplet
fixPkgconfig libwapcaplet
packageEntries devel $developDir
}
TEST()
{
make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
}
PROVIDES_devel="
libwapcaplet${secondaryArchSuffix}_devel = $portVersion
devel:libwapcaplet$secondaryArchSuffix = $portVersion
"

View File

@@ -0,0 +1,35 @@
From 32b0d42e141a2bab66d7420e1f7159282f5beb69 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 8 Jun 2014 22:42:45 +0200
Subject: Fix include dirs for Haiku.
diff --git a/Makefile b/Makefile
index f40842d..db191ee 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ ifeq ($(WANT_TEST),yes)
endif
# Extra installation rules
-I := /include/libwapcaplet
+I := /$(INCLUDEDIR)/libwapcaplet
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libwapcaplet/libwapcaplet.h
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
diff --git a/libwapcaplet.pc.in b/libwapcaplet.pc.in
index 9bdfdf5..9c05e37 100644
--- a/libwapcaplet.pc.in
+++ b/libwapcaplet.pc.in
@@ -1,7 +1,7 @@
prefix=PREFIX
exec_prefix=${prefix}
libdir=${exec_prefix}/LIBDIR
-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
Name: libwapcaplet
Description: String internalisation dictionary
--
1.8.3.4

View File

@@ -4,7 +4,7 @@ LICENSE="MIT"
COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved."
SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz"
CHECKSUM_SHA256="f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a"
REVISION="7"
REVISION="8"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"

View File

@@ -1,4 +1,4 @@
From 5f1f102b9ca68a60598e75acd2dfcc03eedf48f0 Mon Sep 17 00:00:00 2001
From 6db1eb950d7c25695085ceba0688c0fda21aec99 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 9 Aug 2013 03:04:24 +0200
Subject: applying patch libxml2-2.8.0.patch
@@ -60,7 +60,7 @@ index 2989325..162d348 100644
1.8.3.4
From af85142e9157eec3acd0b5f6d171eeb63a5dd6c5 Mon Sep 17 00:00:00 2001
From d06473f826da81a99d33142030378e2301ca358a Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 9 Aug 2013 20:15:20 +0200
Subject: configure.in: hack to find python directories on Haiku
@@ -91,7 +91,7 @@ index a5f86ca..ade0cf8 100644
1.8.3.4
From 077d229d4c92bbb11d5ce2dfa6ce9334b77c30db Mon Sep 17 00:00:00 2001
From 0c143c7013080fdf83a863cf3bfbd730dbec1b6e Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 9 Aug 2013 23:00:24 +0200
Subject: python[/tests]/Makefile.am: $(datadir)/doc -> $(docdir)
@@ -124,7 +124,7 @@ index 52c89fc..7549db9 100644
1.8.3.4
From 020e1f1fb2f2234d0a7222e03c6077e9df06e8fb Mon Sep 17 00:00:00 2001
From 3751469e256a007663bebb0b2206b1700d73d5c7 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Fri, 18 Oct 2013 23:51:10 +0200
Subject: Adjust libxml2 to use vendor-packages directory.
@@ -150,3 +150,54 @@ index ade0cf8..522a2c0 100644
--
1.8.3.4
From a7785e3256cfd57da9e21c11937cd6a4ab5b66a6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 16 Jun 2014 22:26:17 +0200
Subject: Allow XML_CATALOG_FILES to point to directories.
These are then recursively explored. Makes it much easier for packages
to add stuff to the default catalogs
diff --git a/catalog.c b/catalog.c
index fb586c1..cb74df0 100644
--- a/catalog.c
+++ b/catalog.c
@@ -3149,6 +3149,7 @@ xmlInitializeCatalog(void) {
if (catal != NULL) {
/* the XML_CATALOG_FILES envvar is allowed to contain a
space-separated list of entries. */
+
cur = catalogs;
nextent = &catal->xml;
while (*cur != '\0') {
@@ -3160,10 +3161,26 @@ xmlInitializeCatalog(void) {
cur++;
path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths);
if (path != NULL) {
+#if defined(HAIKU)
+ /* On Haiku, we allow directories in that list, as well as files. */
+ int addCatalog(const char* path, const struct stat* sb, int typeflag)
+ {
+ if (typeflag == FTW_F) {
+ *nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
+ NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL);
+ if (*nextent != NULL)
+ nextent = &((*nextent)->next);
+ }
+
+ return 0;
+ }
+ ftw(path, addCatalog, 3);
+#else
*nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL,
NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL);
if (*nextent != NULL)
nextent = &((*nextent)->next);
+#endif
xmlFree(path);
}
}
--
1.8.3.4

View File

@@ -0,0 +1,121 @@
SUMMARY="Full-strength general purpose cryptography library (with SSL/TLS)"
DESCRIPTION="
The OpenSSL Project is a collaborative effort to develop a robust, \
commercial-grade, full-featured, and Open Source toolkit implementing the \
Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \
protocols as well as a full-strength general purpose cryptography library. The \
project is managed by a worldwide community of volunteers that use the \
Internet to communicate, plan, and develop the OpenSSL toolkit and its related \
documentation.
OpenSSL is based on the excellent SSLeay library developed by Eric A. Young \
and Tim J. Hudson. The OpenSSL toolkit is licensed under an Apache-style \
licence, which basically means that you are free to get and use it for \
commercial and non-commercial purposes subject to some simple license \
conditions.
"
HOMEPAGE="http://www.openssl.org/"
SRC_URI="http://www.openssl.org/source/openssl-$portVersion.tar.gz"
CHECKSUM_SHA256="224dbbfaee3ad7337665e24eab516c67446d5081379a40b2f623cf7801e672de"
LICENSE="OpenSSL"
COPYRIGHT="
1995-1998 Eric Young
1998-2012 The OpenSSL Project.
"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="openssl-$portVersion.patchset"
PROVIDES="
openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0
lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0
"
if [ -z "$secondaryArchSuffix" ]; then
PROVIDES="$PROVIDES
cmd:c_rehash = $portVersion compat >= 1
cmd:openssl = $portVersion compat >= 1
"
fi
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix >= 1.2.3
"
if [ -n "$secondaryArchSuffix" ]; then
REQUIRES="$REQUIRES
openssl == $portVersion base
"
fi
BUILD_REQUIRES="
devel:libz$secondaryArchSuffix >= 1.2.3
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:gcc${secondaryArchSuffix}
cmd:ld${secondaryArchSuffix}
cmd:make
cmd:perl >= 5
cmd:sed
"
PATCH()
{
# fix hard-coded perl path
sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget
}
BUILD()
{
PERL="/bin/env perl" \
./config --prefix=$prefix --libdir=$relativeLibDir \
--openssldir=$dataRootDir/ssl \
zlib shared
make
# multi-job builds don't work correctly
}
INSTALL()
{
make MANDIR=$manDir install
# move include dir to correct location
mkdir -p $(dirname $includeDir)
mv $prefix/include $includeDir
# prepare develop/lib
prepareInstalledDevelLibs libcrypto libssl
fixPkgconfig
# devel package
packageEntries devel \
$developDir \
$manDir/man3
# Remove stuff we don't need in the secondary architecture base package,
# since we make it depend on the primary package.
if [ -n "$secondaryArchSuffix" ]; then
rm -rf $prefix/bin
rm -rf $dataRootDir/ssl
rm -rf $documentationDir
fi
}
TEST()
{
cd openssl-1.0.0j
make test
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
openssl${secondaryArchSuffix}_devel = $portVersion
devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.0
devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.0
"
REQUIRES_devel="
openssl${secondaryArchSuffix} == $portVersion base
"

View File

@@ -0,0 +1,72 @@
From df00735cecc9c5ec0cdb9a9706e52b15f14057ec Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 5 Jun 2014 15:47:46 +0000
Subject: import patch from 1.0.0l
diff --git a/Configure b/Configure
index cd849e3..0ff7727 100755
--- a/Configure
+++ b/Configure
@@ -583,6 +583,10 @@ my %table=(
"uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
"uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+##### Haiku
+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+
);
my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
diff --git a/Makefile.shared b/Makefile.shared
index e753f44..cce510f 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -594,10 +594,10 @@ symlink.hpux:
symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
# Compatibility targets
-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu
+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu
+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu
+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu
link_o.bsd-shared: link_o.bsd
link_a.bsd-shared: link_a.bsd
link_app.bsd-shared: link_app.bsd
diff --git a/config b/config
index 30e9a37..c2894cc 100755
--- a/config
+++ b/config
@@ -134,6 +134,14 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "${MACHINE}-dg-dgux"; exit 0
;;
+ Haiku:*:BePC)
+ echo "i586-pc-haiku"; exit 0
+ ;;
+
+ Haiku:*:*)
+ echo "${MACHINE}-unknown-haiku"; exit 0
+ ;;
+
HI-UX:*)
echo "${MACHINE}-hi-hiux"; exit 0
;;
@@ -799,6 +807,9 @@ case "$GUESSOS" in
options="$options no-asm"
fi
;;
+ i586-*-haiku) OUT="haiku-x86" ;;
+ x86_64-*-haiku) OUT="haiku-x86_64" ;;
+
# these are all covered by the catchall below
# *-dgux) OUT="dgux" ;;
mips-sony-newsos4) OUT="newsos4-gcc" ;;
--
1.8.3.4

View File

@@ -0,0 +1,43 @@
From 4db73bb22181c9c029fecdd52eb0e73b0e638ef6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 11 Jun 2014 16:57:20 +0000
Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index 22f8bfc..0972545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ AC_GCC_TRADITIONAL
AC_SYS_LARGEFILE
AC_ISC_POSIX
-AM_C_PROTOTYPES
AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
diff --git a/testit.sh b/testit.sh
index 2a7b4aa..2779f7c 100755
--- a/testit.sh
+++ b/testit.sh
@@ -115,7 +115,7 @@ run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar
run test1 "test1 - 58" "\
-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
+Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
[-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
[-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG]
[-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE]
@@ -124,7 +124,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
[--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
[-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
run test1 "test1 - 59" "\
-Usage: lt-test1 [OPTION...]
+Usage: test1 [OPTION...]
--arg1 First argument with a really long
description. After all, we have to test
argument help wrapping somehow, right?
--
1.8.3.4

View File

@@ -1,27 +1,72 @@
DESCRIPTION="popt"
HOMEPAGE="http://rpm5.org/files/popt/"
SUMMARY="A command line option parsing library"
DESCRIPTION="
This is the popt(3) command line option parsing library. While it is similiar \
to getopt(3), it contains a number of enhancements, including:
1) popt is fully reentrant
2) popt can parse arbitrary argv[] style arrays while \
getopt(3) makes this quite difficult
3) popt allows users to alias command line arguments
4) popt provides convience functions for parsing strings \
into argv[] style arrays
"
LICENSE="MIT"
COPYRIGHT="1998-2002 Red Hat, Inc."
HOMEPAGE="http://rpm5.org/files/popt/"
SRC_URI="http://rpm5.org/files/popt/popt-1.16.tar.gz"
CHECKSUM_SHA256="e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="3743beefa3dd6247a73f8f7a32c14c33"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
PATCHES="popt-1.16.patchset"
PROVIDES="
popt$secondaryArchSuffix = $portVersion
lib:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:libtoolize
cmd:autoconf
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:sed
"
BUILD()
{
cd popt-1.16
libtoolize --force --copy --install
echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
aclocal -I m4
libtoolize -fci
autoconf
automake
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
cd popt-1.16
make install
prepareInstalledDevelLibs libpopt
fixPkgconfig
# devel package
packageEntries devel \
$developDir \
$manDir/man3
}
LICENSE="MIT"
COPYRIGHT="1998-2002 Red Hat, Inc."
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
popt${secondaryArchSuffix}_devel = $portVersion
devel:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0
"
REQUIRES_devel="
popt$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,44 @@
#FIXME: Appending installation info to /packages/html_parser-3.70-1/.self/lib/perl5/5.18.1/BePC-haiku/perllocal.pod
#FIXME: Warning: prerequisite HTML::Tagset 3 not found.
SUMMARY="Encode or decode strings with HTML entities"
HOMEPAGE="http://search.cpan.org/~gaas/HTML-Parser/"
SRC_URI="https://github.com/gisle/html-parser/archive/3.71.tar.gz"
CHECKSUM_SHA256="0ef2ec6ed99f80a344ce3bc93d5eff6dd8613f4a544fa4ffe44a823cfd19b851"
REVISION="1"
ARCHITECTURES="x86 x86_gcc2"
PROVIDES="
html_parser = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
perl
"
COPYRIGHT="
1995-2009 Gisle Aas. All rights reserved.
1999-2000 Michael A. Chase. All rights reserved.
"
LICENSE="
GNU GPL v1
Artistic (Perl)
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
cmd:gcc
cmd:make
cmd:perl"
SOURCE_DIR="html-parser-3.71"
BUILD() {
perl Makefile.PL PREFIX=$prefix
make
}
INSTALL() {
make install
}
DESCRIPTION="
The HTML-Parser distribution is is a collection of perl modules that parse and \
extract information from HTML documents.
"

View File

@@ -0,0 +1,66 @@
SUMMARY="Python-based continuous integration testing framework."
DESCRIPTION="
Buildbot is a continuous integration system designed to automate the \
build/test cycle. By automatically rebuilding and testing the tree each time \
something has changed, build problems are pinpointed quickly, before other \
developers are inconvenienced by the failure. Features
* Buildbot is easy to set up, but very extensible and customizable. It \
supports arbitrary build processes, and is not limited to common build \
processes for particular languages (e.g., autotools or ant)
* Buildbot supports building and testing on a variety of platforms. \
Developers, who do not have the facilities to test their changes everywhere \
before committing, will know shortly afterwards whether they have broken the \
build or not.
* Buildbot has minimal requirements for slaves: using virtualenv, only a \
Python installation is required.
* Slaves can be run behind a NAT firewall and communicate with the master
* Buildbot has a variety of status-reporting tools to get information about \
builds in front of developers in a timely manner.
This package contains the slave implementation, i.e. the part that is \
executing builds and/or tests.
"
HOMEPAGE="http://www.buildbot.net"
SRC_URI="https://buildbot.googlecode.com/files/buildbot-slave-0.8.8.tar.gz"
CHECKSUM_SHA256="8b7532d4d34527aea41e353d1bc3c35291ec335d3224c27800d2cc0cfc9837cc"
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2013 Bryan Warner and the Buildbot team members"
REVISION="1"
ARCHITECTURES="any"
SOURCE_DIR="buildbot-slave-$portVersion"
PROVIDES="
buildbot_slave = $portVersion
cmd:buildslave = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
cmd:python
python_twisted
"
BUILD_REQUIRES=""
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:python
"
BUILD()
{
$portPackageLinksDir/cmd~python/bin/python setup.py build
}
INSTALL()
{
$portPackageLinksDir/cmd~python/bin/python setup.py install \
--prefix=$prefix
}

View File

@@ -0,0 +1,51 @@
SUMMARY="A library for testing in Python"
DESCRIPTION="
Mock allows you to replace parts of your system under test with mock objects \
and make assertions about how they have been used.
Mock provides a core 'MagicMock' class removing the need to create a host of \
stubs throughout your test suite. After performing an action, you can make \
assertions about which methods / attributes were used and arguments they were \
called with. You can also specify return values and set needed attributes in \
the normal way.
The mock module also provides utility functions / objects to assist with \
testing, particularly monkey patching.
"
HOMEPAGE="http://pypi.python.org/pypi/mock"
SRC_URI="https://pypi.python.org/packages/source/m/mock/mock-1.0.1.tar.gz"
CHECKSUM_SHA256="b839dd2d9c117c701430c149956918a423a9863b48b09c90e30a6013e7d2f44f"
LICENSE="BSD (2-clause)"
COPYRIGHT="2003-2012, Michael Foord"
REVISION="1"
ARCHITECTURES="any"
SOURCE_DIR="mock-$portVersion"
PROVIDES="
python_mock = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
cmd:python
"
BUILD_REQUIRES=""
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:python
"
BUILD()
{
$portPackageLinksDir/cmd~python/bin/python setup.py build
}
INSTALL()
{
$portPackageLinksDir/cmd~python/bin/python setup.py install \
--prefix=$prefix
}

View File

@@ -0,0 +1,80 @@
SUMMARY="An event-driven networking engine written in Python"
DESCRIPTION="
Twisted is an event-based framework for internet applications. It includes \
modules for many different purposes, including the following:
- twisted.application
A "Service" system that allows you to organize your application in \
hierarchies with well-defined startup and dependency semantics,
- twisted.cred
A general credentials and authentication system that facilitates \
pluggable authentication backends,
- twisted.enterprise
Asynchronous database access, compatible with any Python DBAPI2.0 \
modules,
- twisted.internet
Low-level asynchronous networking APIs that allow you to define \
your own protocols that run over certain transports,
- twisted.manhole
A tool for remote debugging of your services which gives you a \
Python interactive interpreter,
- twisted.protocols
Basic protocol implementations and helpers for your own protocol \
implementations,
- twisted.python
A large set of utilities for Python tricks, reflection, text \
processing, and anything else,
- twisted.spread
A secure, fast remote object system,
- twisted.trial
A unit testing framework that integrates well with Twisted-based code.
"
HOMEPAGE="http://twistedmatrix.com"
SRC_URI="https://twistedmatrix.com/Releases/Twisted/13.2/Twisted-13.2.0.tar.bz2"
CHECKSUM_SHA256="095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3"
LICENSE="MIT"
COPYRIGHT="2001-2013 Twisted project members"
REVISION="1"
ARCHITECTURES="x86 x86_gcc2 x86_64"
SOURCE_DIR="Twisted-$portVersion"
PROVIDES="
python_twisted = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
python_zope.interface >= 3.6.0
cmd:python
"
BUILD_REQUIRES="
python_zope.interface >= 3.6.0
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:python
cmd:gcc
"
BUILD()
{
$portPackageLinksDir/cmd~python/bin/python setup.py build
}
INSTALL()
{
$portPackageLinksDir/cmd~python/bin/python setup.py install \
--prefix=$prefix
}

View File

@@ -0,0 +1,44 @@
Zope Public License (ZPL) Version 2.1
A copyright notice accompanies this license document that identifies the
copyright holders.
This license has been certified as open source. It has also been designated as
GPL compatible by the Free Software Foundation (FSF).
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions in source code must retain the accompanying copyright
notice, this list of conditions, and the following disclaimer.
2. Redistributions in binary form must reproduce the accompanying copyright
notice, this list of conditions, and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Names of the copyright holders must not be used to endorse or promote
products derived from this software without prior written permission from the
copyright holders.
4. The right to distribute this software or to use it for any purpose does not
give you the right to use Servicemarks (sm) or Trademarks (tm) of the
copyright
holders. Use of them is covered by separate agreement with the copyright
holders.
5. If any files are modified, you must cause the modified files to carry
prominent notices stating that you changed the files and the date of any
change.
Disclaimer
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@@ -0,0 +1,46 @@
SUMMARY="Interfaces for Python"
DESCRIPTION="
This package provides an implementation of 'object interfaces' for Python. \
Interfaces are a mechanism for labeling objects as conforming to a given \
API or contract. So, this package can be considered as implementation of the \
Design By Contract methodology support in Python.
For detailed documentation, please see http://docs.zope.org/zope.interface
"
HOMEPAGE="http://pypi.python.org/pypi/zope.interface"
SRC_URI="https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.1.tar.gz"
CHECKSUM_SHA256="91cba7b7cd7cb82f6f4e023fe77f94dc3df4ae5287fd55def2148dc232d0c7da"
LICENSE="ZPL 2.1"
COPYRIGHT="2004-2014 Zope Foundation and Contributors"
REVISION="1"
ARCHITECTURES="any"
SOURCE_DIR="zope.interface-$portVersion"
PROVIDES="
python_zope.interface = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
cmd:python
"
BUILD_REQUIRES=""
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:python
"
BUILD()
{
$portPackageLinksDir/cmd~python/bin/python setup.py build
}
INSTALL()
{
$portPackageLinksDir/cmd~python/bin/python setup.py install \
--prefix=$prefix
}

View File

@@ -0,0 +1,45 @@
SUMMARY="Berkeley implementation of Yacc"
DESCRIPTION="
Berkeley Yacc (byacc) is generally conceded to be the best yacc variant \
available. In contrast to bison, it is written to avoid dependencies upon a \
particular compiler.
"
REVISION="1"
LICENSE="Public Domain"
COPYRIGHT="2002-2013,2014 by Thomas E. Dickey"
HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
ARCHITECTURES="x86_gcc2"
SRC_URI="ftp://invisible-island.net/byacc/byacc.tar.gz"
CHECKSUM_SHA256="2f104c7e200dd86844d5f3521e12cb55fc48a9c3da3480a65fde2ca8c053bdcc"
PROVIDES="
byacc = $portVersion
cmd:yacc = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:awk
cmd:gcc
cmd:ld
cmd:make
"
BUILD()
{
runConfigure --omit-dirs docDir ./configure
make
}
INSTALL()
{
make install
}

View File

@@ -1,29 +0,0 @@
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

@@ -1,52 +0,0 @@
DESCRIPTION="
CMake is a cross-platform, open-source build system. It is a family of tools \
designed to build, test and package software. CMake is used to control the \
software compilation process using simple platform and compiler independent \
configuration files. CMake generates native makefiles and workspaces that can \
be used in the compiler environment of your choice.
"
HOMEPAGE="http://www.cmake.org"
LICENSE="CMake"
COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz"
CHECKSUM_SHA256="5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91"
REVISION="6"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="cmake-2.8.5.patchset"
PROVIDES="
cmake = $portVersion compat >= 2.8
cmd:cmake = $portVersion compat >= 2.8
cmd:cpack = $portVersion compat >= 2.8
cmd:ctest = $portVersion compat >= 2.8
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:gcc
cmd:grep
cmd:ld
cmd:libtool
cmd:make
cmd:sed
"
BUILD()
{
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
}

View File

@@ -1,72 +0,0 @@
SUMMARY="Cross platform Make"
DESCRIPTION="
CMake is a cross-platform, open-source build system. It is a family of tools \
designed to build, test and package software. CMake is used to control the \
software compilation process using simple platform and compiler independent \
configuration files. CMake generates native makefiles and workspaces that can \
be used in the compiler environment of your choice.
"
HOMEPAGE="http://www.cmake.org"
LICENSE="CMake"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc1.tar.gz"
CHECKSUM_SHA256="f13ac75c2440cb81aa1c193cf4f3898092f72a0c2d43b7b02f8476a8e5e1d1e6"
REVISION="7"
ARCHITECTURES="x86 x86_64 arm"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake = $portVersion compat >= 3.0
cmd:cmake = $portVersion compat >= 3.0
cmd:ccmake = $portVersion compat >= 3.0
cmd:cpack = $portVersion compat >= 3.0
cmd:ctest = $portVersion compat >= 3.0
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
haiku_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
PATCHES="cmake-$portVersion.patchset"
SOURCE_DIR="cmake-3.0.0-rc1"
BUILD()
{
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -1,73 +0,0 @@
SUMMARY="Cross platform Make"
DESCRIPTION="
CMake is a cross-platform, open-source build system. It is a family of tools \
designed to build, test and package software. CMake is used to control the \
software compilation process using simple platform and compiler independent \
configuration files. CMake generates native makefiles and workspaces that can \
be used in the compiler environment of your choice.
"
HOMEPAGE="http://www.cmake.org"
LICENSE="CMake"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc3.tar.gz"
CHECKSUM_SHA256="5d4fc1783825caa2a898374b7bf656652531984290f5969bf86e87222f16a2d3"
REVISION="1"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake = $portVersion compat >= 3.0
cmd:cmake = $portVersion compat >= 3.0
cmd:ccmake = $portVersion compat >= 3.0
cmd:cpack = $portVersion compat >= 3.0
cmd:ctest = $portVersion compat >= 3.0
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libstdc++$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
haiku_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:make
cmd:sed
"
PATCHES="cmake-3.0.0_rc1.patchset"
SOURCE_DIR="cmake-3.0.0-rc3"
BUILD()
{
./configure --prefix=$prefix \
--datadir=/$relativeDataDir/cmake \
--docdir=/$relativeDocDir \
--mandir=/$relativeManDir
make $jobArgs
}
INSTALL()
{
make install
# No way to tell this to configure...
mv $prefix/share/aclocal $dataDir
rmdir $prefix/share
}
TEST()
{
cp bin/ctest Bootstrap.cmk/
make test VERBOSE=1
}

View File

@@ -8,11 +8,11 @@ be used in the compiler environment of your choice.
"
HOMEPAGE="http://www.cmake.org"
LICENSE="CMake"
COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc5.tar.gz"
CHECKSUM_SHA256="fa8e76e5ed44199f4ceef24abd65a4d7df2d857edf44094d4ae7a2401af78389"
COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium, All rights reserved."
SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc6.tar.gz"
CHECKSUM_SHA256="bb34dacec33b3ac26ee05b0a66b95ed8f52a0ce212f13c3e65a923944cdd484a"
REVISION="1"
ARCHITECTURES="x86 x86_64"
ARCHITECTURES="x86 x86_64 arm"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
@@ -21,7 +21,7 @@ fi
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
cmake = $portVersion compat >= 3.0
cmake$secondaryArchSuffix = $portVersion compat >= 3.0
cmd:cmake = $portVersion compat >= 3.0
cmd:ccmake = $portVersion compat >= 3.0
cmd:cpack = $portVersion compat >= 3.0
@@ -45,8 +45,8 @@ BUILD_PREREQUIRES="
cmd:make
cmd:sed
"
PATCHES="cmake-3.0.0_rc1.patchset"
SOURCE_DIR="cmake-3.0.0-rc5"
PATCHES="cmake-3.0.0_rc6.patchset"
SOURCE_DIR="cmake-3.0.0-rc6"
BUILD()
{
./configure --prefix=$prefix \

View File

@@ -1,460 +0,0 @@
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

@@ -1,4 +1,4 @@
From cec0c89807f9215ea077b7e9c14dc9d053919bd6 Mon Sep 17 00:00:00 2001
From d0a76bec3bee73af9c9d78155f4349767c36cf3b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 15:47:08 +0100
Subject: Allow use of elf relocation on Haiku.
@@ -119,7 +119,7 @@ index 0000000..6b868bb
1.8.3.4
From a9a536582f3d035673438734cf6872871fce3605 Mon Sep 17 00:00:00 2001
From 17c717fe8893ccfd6afa625fce620e4f61d87036 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 15:51:49 +0100
Subject: Add HPKG generation support to CPack.
@@ -1065,7 +1065,7 @@ index 0000000..ffa803d
1.8.3.4
From 8637f997646e2e3af5e1cc2506a217c712dec978 Mon Sep 17 00:00:00 2001
From 7e671315610ade4309c6c1e9bc151e2ad82beeac Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 15:57:05 +0100
Subject: Haiku: Fix compiler detection when using distcc.
@@ -1146,7 +1146,7 @@ index 825f851..af6697a 100644
1.8.3.4
From a0951c88746d915cc54fb9261ca4c9e56a22898c Mon Sep 17 00:00:00 2001
From 7193c39809d8c4a17fca2a77fc4f1ec0341dc97a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 16:01:23 +0100
Subject: Adjust header search paths for some modules.
@@ -1220,7 +1220,7 @@ index 3f58ac1..c48fcbe 100644
1.8.3.4
From 963b8828af64669032a8b03363e9e25844646bfc Mon Sep 17 00:00:00 2001
From 087148b32a8ce3da98670da32848a93b106f8a60 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 3 Mar 2014 16:10:05 +0100
Subject: Update CPU frequency detection code.
@@ -1229,10 +1229,10 @@ The scheduler branch in Haiku changed the API for this.
(patch already submitted upstream)
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index 5f20853..9c26380 100644
index ec3a133..0708044 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -4698,11 +4698,28 @@ bool SystemInformationImplementation::QueryHaikuInfo()
@@ -4685,11 +4685,28 @@ bool SystemInformationImplementation::QueryHaikuInfo()
{
#if defined(__HAIKU__)
@@ -1267,7 +1267,7 @@ index 5f20853..9c26380 100644
1.8.3.4
From e8af83035ae75596f931c7e8a2b5b47d8160933a Mon Sep 17 00:00:00 2001
From 01177b87e917b3c66b13838caaa69710ff879bb3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 10 Mar 2014 14:11:01 +0100
Subject: Fix the architecture detection regexp again.
@@ -1293,3 +1293,26 @@ index af6697a..920ae8f 100644
--
1.8.3.4
From 0158e13fa60eee2b2fcb916ed0903e49d0c58f23 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 9 Jun 2014 22:30:55 +0200
Subject: Fix OpenAL search path.
diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
index 8150ff2..e0276f8 100644
--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
@@ -68,7 +68,7 @@
find_path(OPENAL_INCLUDE_DIR al.h
HINTS
ENV OPENALDIR
- PATH_SUFFIXES include/AL include/OpenAL include
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
PATHS
~/Library/Frameworks
/Library/Frameworks
--
1.8.3.4

View File

@@ -1,24 +0,0 @@
DESCRIPTION="gtk-doc"
HOMEPAGE="http://www.gtk.org/gtk-doc/"
SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2"
CHECKSUM_MD5="c022788b1fbbec30d55df4ccb34eeb90"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="pkgconfig >= 0.23
dev-libs/libxslt >= 1.1.26"
BUILD()
{
cd gtk-doc-1.15
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL()
{
cd gtk-doc-1.15
make install
}
LICENSE="GNU GPL v2
GNU FDL v1.1"
COPYRIGHT="2002-2010 Damon Chaplin and Owen Taylor"

View File

@@ -0,0 +1,43 @@
SUMMARY="Generate documentation from C sources"
DESCRIPTION="
GTK-Doc is a project which was started to generate API documentation from \
comments added to C code. It is typically used to document the public API of \
GTK+ and GNOME libraries, but it can also be used to document application code.
"
HOMEPAGE="http://www.gtk.org/gtk-doc/"
SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/$portVersion/gtk-doc-$portVersion.tar.xz"
CHECKSUM_SHA256="3e6ecf134dbf92a74c24d79848fea3a48e59ab95408a38c6405905d95a293011"
REVISION="1"
ARCHITECTURES="x86_gcc2"
PROVIDES="
gtk_doc = $portVersion
"
BUILD_REQUIRES="
docbook_xml_dtd == 4.3
docbook_xsl_stylesheets
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:awk
cmd:gcc
cmd:perl
cmd:pkg_config
cmd:xsltproc
"
SOURCE_DIR="gtk-doc-$portVersion"
BUILD()
{
runConfigure ./configure
make
}
INSTALL()
{
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="2002-2010 Damon Chaplin and Owen Taylor"

View File

@@ -2,8 +2,9 @@ SUMMARY="NetSurf build framework"
DESCRIPTION="
NetSurf build framework for compiling some of their libraries.
"
HOMEPAGE="http://www.netsurf-browser.org/"
SRC_URI="git://git.netsurf-browser.org/buildsystem.git"
HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/"
SRC_URI="http://git.netsurf-browser.org/buildsystem.git/snapshot/release/1.1.tar.gz"
CHECKSUM_SHA256="e95e40d4e4e4bea2ffb391c0df1d84f81c83b1d21af992fbda0406d4d57e7dc1"
REVISION="1"
LICENSE="MIT"
COPYRIGHT="2009 - 2013 The NetSurf Browser project"
@@ -29,12 +30,12 @@ BUILD_PREREQUIRES="
cmd:make
"
SOURCE_DIR="release/1.1"
PATCHES="netsurf_buildsystem-1.1.patchset"
BUILD()
{
# no-op
# make
:
true
}
INSTALL()

View File

@@ -0,0 +1,44 @@
From 4a0ea106ab2a23af3798b7a3114c969f7339c05a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 8 Jun 2014 18:12:27 +0200
Subject: Add support for INCLUDEDIR in pkg-config files.
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 5b76f23..2f21be0 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -21,6 +21,8 @@
# (defaults to /usr/local)
# LIBDIR Library installation directory in ${PREFIX}
# (defaults to lib)
+# INCLUDEDIR Header installation directory in ${PREFIX}
+# (defaults to include)
#
###############################################################################
@@ -373,6 +375,9 @@ PREFIX ?= /usr/local
# Default libdir
LIBDIR ?= lib
+# Default includedir
+INCLUDEDIR ?= include
+
###############################################################################
# Tool defaults
###############################################################################
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
index 6329c47..bd51ecd 100644
--- a/makefiles/Makefile.top
+++ b/makefiles/Makefile.top
@@ -291,6 +291,7 @@ define install_pkgconfig
-e 's#MAJOR#$(major-version)#' \
-e 's#MINOR#$(minor-version)#' \
-e 's#PATCH#$(patch-version)#' \
+ -e 's#INCLUDEDIR#$(INCLUDEDIR)#' \
-e 's#VERSION#$(COMPONENT_VERSION)#' \
-e 's#REQUIRED#$(__required)#' \
$1 >$(BUILDDIR)/$(1:.in=)
--
1.8.3.4

View File

@@ -1,28 +1,45 @@
SUMMARY="An open source test suite for POSIX compliance"
DESCRIPTION="
The Open POSIX Test Suite is a test suite for POSIX 2001 APIs, not tied to \
specific implementations.
"
HOMEPAGE="http://posixtest.sourceforge.net/"
SRC_URI="http://sourceforge.net/projects/posixtest/files/posixtest/posixtestsuite-1.5.2/posixtestsuite-1.5.2.tar.gz/download"
CHECKSUM_MD5="9a8e6516585c886fddc257270061b59c"
SRC_URI="http://sourceforge.net/projects/posixtest/files/posixtest/posixtestsuite-1.5.2/posixtestsuite-1.5.2.tar.gz"
CHECKSUM_SHA256="15a2185672127cba851d35ec9d538ff6148defdbb75f99c7e9c50aeba0f94757"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
ARCHITECTURES="x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
posixtestsuite = $portVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:find
cmd:cc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
SOURCE_DIR="posixtestsuite"
BUILD()
{
cd posixtestsuite
make
make $jobArgs
}
INSTALL()
{
cd posixtestsuite
make install
}
TEST()
{
cd posixtestsuite
execute.sh
}

View File

@@ -1,7 +1,14 @@
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 @@
From 8f1968371d3426d08cba8dafa44eaaa0cb59b13f Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 9 Aug 2013 17:46:35 +0200
Subject: Add support for the Haiku platform
diff --git a/engine/SCons/Platform/__init__.py b/engine/SCons/Platform/__init__.py
index 2cab3c8..373938d 100644
--- a/engine/SCons/Platform/__init__.py
+++ b/engine/SCons/Platform/__init__.py
@@ -78,6 +78,8 @@ def platform_default():
return 'aix'
elif sys.platform.find('darwin') != -1:
return 'darwin'
@@ -10,10 +17,12 @@ diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/e
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 @@
diff --git a/engine/SCons/Platform/haiku.py b/engine/SCons/Platform/haiku.py
new file mode 100644
index 0000000..5c802dd
--- /dev/null
+++ b/engine/SCons/Platform/haiku.py
@@ -0,0 +1,69 @@
+"""SCons.Platform.haiku
+
+Platform-specific initialization for Haiku systems.
@@ -48,23 +57,41 @@ diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engi
+
+__revision__ = ""
+
+import posix
+import commands
+import os
+import posix
+
+def findDir( identifier ):
+ return commands.getoutput( 'finddir %s' % identifier )
+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' )
+
+ # determine, if building for the secondary architecture
+ secondaryArch = os.environ.get('HAIKU_SECONDARY_ARCH')
+ archSubDir = '/' + secondaryArch if secondaryArch else ''
+
+ # PATH
+ pathDescriptions = [
+ ('B_USER_NONPACKAGED_BIN_DIRECTORY', None),
+ ('B_USER_CONFIG_DIRECTORY', 'bin'),
+ ('B_COMMON_NONPACKAGED_BIN_DIRECTORY', None),
+ ('B_COMMON_BIN_DIRECTORY', None),
+ ('B_SYSTEM_BIN_DIRECTORY', None)
+ ]
+
+ paths = []
+ for pathConstant, subDir in pathDescriptions:
+ path = findDir(pathConstant)
+ if subDir:
+ path += '/' + subDir
+ paths.append(path)
+
+ if secondaryArch:
+ # prepend the secondary arch subdirectories
+ paths = [path + archSubDir for path in paths] + paths
+
+ env['ENV']['PATH'] = ':'.join(paths)
--
1.7.10.2

View File

@@ -14,7 +14,7 @@ CHECKSUM_SHA256="091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba12020
REVISION="3"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="scons-2.2.0.patchset"
PATCHES="scons-2.3.1.patchset"
PROVIDES="
scons = $portVersion compat >= 2

View File

@@ -10,7 +10,7 @@ CHECKSUM_SHA256="a20fb1434ecbdb070ef955c7c292db9eb2676bfc1ac165e95ba73866623bc01
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="mercurial-2.8.1.patch"
PATCHES="mercurial-2.9.1.patch"
PROVIDES="
mercurial = $portVersion compat >= 2

View File

@@ -10,7 +10,7 @@ CHECKSUM_SHA256="86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f5
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="mercurial-2.8.1.patch"
PATCHES="mercurial-2.9.2.patch"
PROVIDES="
mercurial = $portVersion compat >= 2

View File

@@ -0,0 +1,12 @@
diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py
--- mercurial-2.8.1/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600
+++ mercurial-2.8.1/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600
@@ -693,7 +693,7 @@ class ui(object):
# avoid confusion.
editor = 'E'
else:
- editor = 'vi'
+ editor = 'nano'
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or

View File

@@ -0,0 +1,12 @@
diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py
--- mercurial-2.8.1/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600
+++ mercurial-2.8.1/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600
@@ -693,7 +693,7 @@ class ui(object):
# avoid confusion.
editor = 'E'
else:
- editor = 'vi'
+ editor = 'nano'
return (os.environ.get("HGEDITOR") or
self.config("ui", "editor") or
os.environ.get("VISUAL") or

View File

@@ -1,4 +1,4 @@
From 1989e5b49aa41dee60c76b0951fea2dd8b1b2251 Mon Sep 17 00:00:00 2001
From 4e87614d1aab89ab166509fc95e58196b3ba9b97 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 12 Jan 2014 21:32:19 +0100
Subject: Look for the datafile next to the executable.
@@ -28,3 +28,693 @@ index 38d4e26..870adc7 100644
--
1.8.3.4
From 7dc93820a6afc7a271d11c8efd0b29956b633cb9 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Mon, 26 May 2014 19:18:37 +0200
Subject: Disable quitting with ESC, just end the currently running game.
Change default control keys to avoid clashes with most keymaps.
diff --git a/src/sysevt.c b/src/sysevt.c
index 9e3830f..ea478c7 100644
--- a/src/sysevt.c
+++ b/src/sysevt.c
@@ -71,11 +71,11 @@ processEvent()
SETBIT(control_status, CONTROL_END);
control_last = CONTROL_END;
}
- else if (key == syskbd_xtra) {
+/* else if (key == syskbd_xtra) {
SETBIT(control_status, CONTROL_EXIT);
control_last = CONTROL_EXIT;
}
- else if (key == syskbd_fire) {
+*/ else if (key == syskbd_fire) {
SETBIT(control_status, CONTROL_FIRE);
control_last = CONTROL_FIRE;
}
@@ -137,11 +137,11 @@ processEvent()
CLRBIT(control_status, CONTROL_END);
control_last = CONTROL_END;
}
- else if (key == syskbd_xtra) {
+/* else if (key == syskbd_xtra) {
CLRBIT(control_status, CONTROL_EXIT);
control_last = CONTROL_EXIT;
}
- else if (key == syskbd_fire) {
+*/ else if (key == syskbd_fire) {
CLRBIT(control_status, CONTROL_FIRE);
control_last = CONTROL_FIRE;
}
diff --git a/src/syskbd.c b/src/syskbd.c
index 2394760..adde88f 100644
--- a/src/syskbd.c
+++ b/src/syskbd.c
@@ -17,11 +17,11 @@
U8 syskbd_up = SDLK_o;
U8 syskbd_down = SDLK_k;
-U8 syskbd_left = SDLK_z;
-U8 syskbd_right = SDLK_x;
+U8 syskbd_left = SDLK_a;
+U8 syskbd_right = SDLK_s;
U8 syskbd_pause = SDLK_p;
-U8 syskbd_end = SDLK_e;
-U8 syskbd_xtra = SDLK_ESCAPE;
+U8 syskbd_end = SDLK_ESCAPE;
+U8 syskbd_xtra = SDLK_F12;
U8 syskbd_fire = SDLK_SPACE;
/* eof */
--
1.8.3.4
From 5f874a7e5ea4f61f9624856657ff6ddfce458cef Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Tue, 27 May 2014 18:10:10 +0200
Subject: Added ReadMe, icon and rdef
diff --git a/ReadMe b/ReadMe
new file mode 100644
index 0000000..cc4a2b4
--- /dev/null
+++ b/ReadMe
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "../html-dtd/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta name="robots" content="all" />
+ <title>XRick</title>
+
+<style type="text/css">
+
+body {
+ font-size: 0.9em;
+ font-family: "DejaVu Sans",Arial,Helvetica,sans-serif;
+ line-height: 1.5;
+ margin: 40px;
+ min-width: 45em;
+ max-width: 70em;
+}
+hr {
+ border: dotted thin #e0e0e0;
+}
+h1 {
+ font-size: 1.3em;
+ border-bottom: dotted thin #e0e0e0;
+ margin-bottom: 45px;
+}
+h2 {
+ font-size: 1.2em;
+ border-bottom: dotted thin #e0e0e0;
+ margin-top: 40px;
+}
+h3 {
+ font-size: 1em;
+ border-bottom: none;
+ margin-bottom: 0px;
+}
+.key { /* Shortcut (separate with &#160; */
+ -webkit-border-radius: 3px;
+ -khtml-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ border-color: #c7c7c7;
+ border-style: solid;
+ border-width: 1px;
+ padding: 0px 2px 0px 2px;
+ background-color: #e8e8e8;
+ font-family: sans-serif;
+ font-variant: small-caps;
+ font-size: 1em;
+}
+tt {
+ background-color: #e2e2e2;
+ font-size: 1.0em;
+ font-family: monospace;
+}
+
+</style>
+</head><body>
+<div align = "center">
+<img width="64" height="64" src="images/xrick_icon_64.png" alt="XRick icon" />
+<p><span style="font-size: 1.5em; font-weight:bold">XRick</span><br />
+by <a href="http://www.bigorno.net/xrick/">Bigorno</a></p>
+<hr />
+<p id="index"><a href="#instructions">Instructions</a> &mdash; <a href="#usage">Usage</a> &mdash; <a href="#controls">Controls</a> &mdash; <a href="#misc-commands">Misc Commands</a> &mdash; <a href="#keycodes">Keycodes</a> &mdash; <a href="#ack">Acknowledgements</a></p>
+</div>
+<hr />
+<p><br /></p>
+<p>Way before Lara Croft, back in the 1980's and early 1990's, Rick Dangerous was the Indiana Jones of computer games, running away from rolling rocks, avoiding traps, from South America to a futuristic missile base via Egypt and the Schwarzendumpf castle.</p>
+<p><tt>XRick</tt> is a clone of Rick Dangerous, known to run on Linux, Windows, BeOs, Haiku, Amiga, QNX, and all sorts of gaming consoles...</p>
+<p>If you want to read more about Rick Dangerous, you may want to visit <a href="http://www.rickdangerous.co.uk/">Rick Dangerous Resurrected</a> (english) or <a href="http://rickdangerousforever.free.fr/">Rick Dangerous Forever</a> (french).</p>
+
+<h2>
+<a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
+<a id="instructions" name="instructions">Instructions</a></h2>
+<p>Walk through the maps, avoid traps, kill the Bad Guys... and try to stay alive long enough to accomplish your mission!</p>
+<p>Rick can fire bullets, lay sticks of dynamite, walk, crawl, climb, and also poke walls or Bad Guys with his stick. Poking walls can trigger traps, open doors, etc. although sometimes dynamite or a bullet is needed... go figure. Rick starts with six bullets in his gun, six sticks of dynamite, and six lifes, as shown by the icons at the top of the screen: </p>
+<div align="center">
+<img src="images/xrick.png" alt="screenshot" />
+</div>
+<h2>
+<a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
+<a id="usage" name="usage">Usage</a></h2>
+<p>When started from Terminal <tt>XRick</tt> accepts several parameters:</p>
+<table cellpadding="2" cellspacing="1" border="0">
+<tr>
+ <td width="150"><code>-fullscreen</code></td>
+ <td>Run in fullscreen mode. The default is to run in a window.</td> </tr>
+<tr>
+ <td style="vertical-align:top"><code>-speed &lt;speed&gt;</code></td>
+ <td>Run at speed <code>&lt;speed&gt;</code>. <code>&lt;speed&gt;</code> must be an integer between 1 (fast) and 100 (slow). The default is 75.</td> </tr>
+<tr>
+ <td style="vertical-align:top"><code>-zoom &lt;zoom&gt;</code></td>
+ <td>Display with zoom factor <code>&lt;zoom&gt;</code>. <code>&lt;zoom&gt;</code> must be an integer between 1 (320x200) and 4 (4 times bigger). The default is 2.</td> </tr>
+<tr>
+ <td style="vertical-align:top"><code>-map &lt;map&gt;</code></td>
+ <td>Start at map number <code>&lt;map&gt;</code>. <code>&lt;map&gt;</code> must be an integer between 1 and 4. The default is to start at map number 1.</td> </tr>
+<tr>
+ <td style="vertical-align:top"><code>-submap &lt;submap&gt;</code></td>
+ <td>Start at submap number <code>&lt;submap&gt;</code>. <code>&lt;submap&gt;</code> must be an integer between 1 and 47. The default is to start at submap number 1 or, if a map was specified, at the first submap of that map.</td> </tr>
+<tr>
+ <td style="vertical-align:top"><code>-keys &lt;keys&gt;</code></td>
+ <td>Override the default key bindings (see below).</td> </tr>
+<tr>
+ <td style="vertical-align:top"><code>-nosound</code></td>
+ <td>Disable sound.</td> </tr>
+<tr>
+ <td style="vertical-align:top"><code>-vol &lt;vol&gt;</code></td>
+ <td>Play sounds at volume <code>&lt;vol&gt;</code>. <code>&lt;vol&gt;</code> must be an integer between 0 (silence) and 10 (max). The default is to play sound at maximal volume (10).</td></tr>
+<tr>
+ <td style="vertical-align:top"><code>-data &lt;data&gt;</code></td>
+ <td>Set data archive to <code>&lt;data&gt;</code>. <code>&lt;data&gt;</code> must be a zipped file (i.e. <code>data.zip</code>) or a directory. The default is to look for <code>data.zip</code> in the directory where <tt>XRick</tt> is run from.</td></tr>
+</table>
+
+<h2>
+<a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
+<a id="controls" name="controls">Controls</a></h2>
+<p>You control Rick either by joystick or keyboard. These are the default keys:</p>
+<table cellpadding="2" cellspacing="1" border="0">
+<tr><td width="100"><i>left</i></td><td width="20"></td><td><span class="key">←</span> or <span class="key">S</span></td></tr>
+<tr><td><i>right</i></td><td></td><td><span class="key">→</span> or <span class="key">D</span></td></tr>
+<tr><td><i>up</i></td><td></td><td><span class="key">↑</span> or <span class="key">O</span></td></tr>
+<tr><td><i>down</i></td><td></td><td><span class="key">↓</span> or <span class="key">K</span></td></tr>
+<tr><td><i>fire</i></td><td></td><td><span class="key">Space</span></td></tr>
+</table>
+<p>By itself, the <i>fire</i> key/button doesn't do anything (besides leaving the intro to start with the game). Combined with a direction, however, it has Rick perform various actions:</p>
+<table cellpadding="2" cellspacing="1" border="0">
+<tr><td width="100"><i>fire + left</i></td><td>Lashes out with his stick to the left</td></tr>
+<tr><td><i>fire + right</i></td><td>Lashes out with his stick to the right</td></tr>
+<tr><td><i>fire + up</i></td><td>Fires a bullet</td></tr>
+<tr><td><i>fire + down</i></td><td>Lights a stick of dynamite (run for cover!)</td></tr>
+</table>
+<p>You can redefine the control keys if you start <tt>XRick</tt> from Terminal by using the <tt>-keys</tt> option.<br />
+It's a fixed sequence of the five control keys: <code>&lt;left&gt;-&lt;right&gt;-&lt;up&gt;-&lt;down&gt;-&lt;fire&gt;</code>.<br />
+For example, <tt>XRick -keys f-g-u-h-space</tt> will set <span class="key">F</span> / <span class="key">G</span> for left/right, <span class="key">U</span> / <span class="key">H</span> for up/down and <span class="key">Space</span> for "fire".<br />
+The <a href="#0.1_keycodes">Keycodes</a> table at the bottom of this page contains a complete list of all valid keycodes.</p>
+
+<h2>
+<a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
+<a id="misc-commands" name="misc-commands">Misc Commands</a></h2>
+<table cellpadding="2" cellspacing="1" border="0">
+<tr>
+ <td width="100"><span class="key">P</span></td><td>Pause</td> </tr>
+<tr>
+ <td><span class="key">ESC</span></td><td>End (game over)</td> </tr>
+<tr>
+ <td><span class="key">Alt</span>&#160;<span class="key">Q</span></td><td>Exit</td> </tr>
+<tr>
+ <td><span class="key">F1</span></td><td>Toggle fullscreen mode</td> </tr>
+<tr>
+ <td><span class="key">F2</span>, <span class="key">F3</span></td><td>Zoom in or out (only when not running fullscreen)</td> </tr>
+<tr>
+ <td><span class="key">F4</span></td><td>Mute</td> </tr>
+<tr>
+ <td><span class="key">F5</span>, <span class="key">F6</span></td><td>Increase or decrease sound volume</td> </tr>
+<tr>
+ <td><span class="key">F7</span></td><td>Toggle <i>Trainer</i> cheat mode (always six bullets, six sticks, six Ricks). A <b>T</b> shows in the corner of the screen.</td> </tr>
+<tr>
+ <td><span class="key">F8</span></td><td>Toggle <i>Never Die</i> cheat mode (nothing can kill Rick).A <b>N</b> shows in the corner of the screen.</td> </tr>
+<tr>
+ <td><span class="key">F9</span></td><td>Toggle <i>Expose</i> cheat mode (see all entities). A <b>V</b> shows in the corner of the screen.</td> </tr>
+</table>
+<p>Use the <i>Never Die</i> mode with care. Although it lets you walk through Bad Guys unharmed, it can produce strange results: some Bad Guys are meant to be killed, and if you don't, who knows what will happen? Also, if a ton of bricks falls on Rick, it won't kill him, but he will be trapped, because, well, you can't go through walls...</p>
+
+<h2>
+<a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
+<a id="keycodes" name="keycodes">Keycodes</a></h2>
+<p>These are all the valid keycodes to be used to configure the controls with the <tt>-keys</tt> parameter:</p>
+<table cellpadding="2" cellspacing="1" border="0">
+<tr><td width="150" align="top">
+<code>
+BACKSPACE<br />
+TAB<br />
+CLEAR<br />
+RETURN<br />
+PAUSE<br />
+ESCAPE<br />
+SPACE<br />
+EXCLAIM<br />
+QUOTEDBL<br />
+HASH<br />
+DOLLAR<br />
+AMPERSAND<br />
+QUOTE<br />
+LEFTPAREN<br />
+RIGHTPAREN<br />
+ASTERISK<br />
+PLUS<br />
+COMMA<br />
+MINUS<br />
+PERIOD<br />
+SLASH<br />
+0 ... 9<br />
+COLON<br />
+SEMICOLON<br />
+LESS
+EQUALS<br />
+GREATER
+</code>
+</td><td width="150" align="top">
+<code>
+QUESTION<br />
+AT<br />
+LEFTBRACKET<br />
+BACKSLASH<br />
+RIGHTBRACKET<br />
+CARET<br />
+UNDERSCORE<br />
+BACKQUOTE<br />
+a ... z<br />
+DELETE<br />
+WORLD_0 ... WODLD_95<br />
+KP0 ... KP9<br />
+KP_PERIOD<br />
+KP_DIVIDE<br />
+KP_MULTIPLY<br />
+KP_MINUS<br />
+KP_PLUS<br />
+KP_ENTER<br />
+KP_EQUALS<br />
+UP<br />
+DOWN<br />
+RIGHT<br />
+LEFT
+INSERT<br />
+HOME<br />
+END
+</code>
+</td><td width="150" align="top">
+<code>
+PAGEUP<br />
+PAGEDOWN<br />
+F1 ... F15<br />
+NUMLOCK<br />
+CAPSLOCK<br />
+SCROLLOCK<br />
+RSHIFT<br />
+LSHIFT<br />
+RCTRL<br />
+LCTRL<br />
+RALT<br />
+LALT<br />
+RMETA<br />
+LMETA<br />
+LSUPER<br />
+RSUPER<br />
+MODE<br />
+COMPOSE<br />
+HELP<br />
+PRINT<br />
+SYSREQ<br />
+BREAK<br />
+MENU<br />
+POWER<br />
+EURO<br />
+<br />
+</code>
+</td></tr>
+</table>
+
+<h2>
+<a href="#"><img src="images/up.png" style="border:none;float:right" alt="index" /></a>
+<a id="ack" name="ack">Acknowlegdements</a></h2>
+<p><tt>XRick</tt> was developed and is maintained by <a href="http://www.bigorno.net/xrick" target="_blank">Bigorno.net</a>. Big chunks of this ReadMe were lifted from their website with permission. Thanks for the nice game, guys!</p>
+
+<p><br /></p>
+
+</body>
+</html>
diff --git a/images/up.png b/images/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..70f5f21bb615cb8efbf77d0c7bd4aa70656b9260
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;O0X`wF
z42lfP&si)xYySWL|1aO3fBpXa*uA=Sm%LY>w?BTr{{EXC>n?e0yzIOBg5#S{m+!yb
zaq@oC%5&DM&pWNYVE_8#h2`hW*IaNqe!pqMCGX?+8$N%3{_4|(Rp)JAeY*7O)5R~}
zp1uBf>E*`@%wE<xKpPoLg8YIR9G=}s196hP-CY<uSY<tc9L@rd$YKTtZeb8+WSBKa
z0w~B{;_2(kev?B|P)hsh$2xzYP?4vLV~B+0+k@tOhaGra9rvA&UAt*c@t*&xx(9T<
zne$ANyX#N9EVa4owfXc(r^;I#0e925@3QaP7S0`dW=>@4Lb-zSh3A|U%I`38f2}S*
zF!!7juR_ZT9TPqw<E#AKPhU2$l+M;E@qD~$&FP<ieYXAB$)7rx*>bgY&3d5i44$rj
JF6*2Ung9Sip9uf}
literal 0
HcmV?d00001
diff --git a/images/xrick.png b/images/xrick.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f46331a0742fef54cfccb131faf973ca1afd3dd
GIT binary patch
literal 5031
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
literal 0
HcmV?d00001
diff --git a/images/xrick_icon_64.png b/images/xrick_icon_64.png
new file mode 100644
index 0000000000000000000000000000000000000000..16f6c3ddc1d9e3fba46f1392778beceb494d4db3
GIT binary patch
literal 5450
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
Aga7~l
literal 0
HcmV?d00001
diff --git a/xrick.icon b/xrick.icon
new file mode 100644
index 0000000000000000000000000000000000000000..22faa9411cbc2b33f657e4a93e49cb93b669db0f
GIT binary patch
literal 14975
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
literal 0
HcmV?d00001
diff --git a/xrick.rdef b/xrick.rdef
new file mode 100644
index 0000000..6d691eb
--- /dev/null
+++ b/xrick.rdef
@@ -0,0 +1,38 @@
+resource app_signature "application/x-vnd.bigorno-xrick";
+
+resource app_flags B_SINGLE_LAUNCH;
+
+resource app_version {
+ major = 10,
+ middle = 0,
+ minor = 0,
+
+ /* 0 = development 1 = alpha 2 = beta
+ 3 = gamma 4 = golden master 5 = final */
+ variety = 5,
+
+ internal = 0,
+
+ short_info = "XRick is a clone of Rick Dangerous",
+ long_info = "XRick is a clone of Rick Dangerous."
+};
+
+resource vector_icon {
+ $"6E63696608020006023C23A3B9D98B3A2AE23C68AA4A2815498F8A00B06868FF"
+ $"6E4A4A020006023B1CB03B4019BB40193B1CB04B146D4828CD00916969FF674B"
+ $"4B020106033F10000000000000003F50004900004A000000FFFFFF1DFFFC069D"
+ $"D233330587038B5252050102000602391C45B91E3C3CA7A83CA5FC46018C4A4C"
+ $"7300A70404FFFFAA0002000602391C45B91E3C3CA7A83CA5FC4206334631CF00"
+ $"A70404FFFFAA0009020442344833BE94BB4B4A483C3F5851595058515A4F573F"
+ $"5C47C743BCB602074234C187BACEBE94BB4B4A483C3F5851595058515A4F5841"
+ $"5E4A5A3E5C39CAE0BDAACAEFBC41503250324F33C427BB9FC470BB62C2D6BB12"
+ $"0604FA473A50335C3C5E375A41544558464C430206214D27422E48305D34483D"
+ $"43505546514B464E2C3F453E3737203B3135271F353442364704020E483A5445"
+ $"4942CCC6C31E0203593C5740563B513453374F315341573CC6C3C0D80802463A"
+ $"4F310607BA2AB83EC3CBBA90C93EBDFBC7E7BD70CAABBC23C4BABACCC14EBB23"
+ $"C3F5BA24C330BA3DC5550607AA3A2B36303B2E313835302D2B29242E26272632"
+ $"0C0A020103000A0501011001178400040A000100000A010102201F1F0A030104"
+ $"1001178322040A05010630202101178200040A050106123FEF7BBADCB63ADCB6"
+ $"3FEF7B46B5BA487E6101178200040A040105000A0601072028220A0501073028"
+ $"2201178100040A070108000A050108100117810004"
+};
--
1.8.3.4

View File

@@ -1,17 +1,16 @@
SUMMARY="xrick is a clone of Rick Dangerous."
SUMMARY="XRick is a clone of Rick Dangerous."
HOMEPAGE="http://www.bigorno.net/xrick"
LICENSE="xrick"
COPYRIGHT="2000-2006 Bigorno.net"
SRC_URI="http://www.bigorno.net/xrick/xrick-021212.tgz"
CHECKSUM_SHA256="aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b"
REVISION="1"
REVISION="2"
ARCHITECTURES="x86_gcc2"
PROVIDES="
xrick = $portVersion
app:xrick = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libsdl$secondaryArchSuffix
@@ -33,14 +32,18 @@ PATCHES="xrick-$portVersion.patchset"
BUILD()
{
make $jobArgs
rc -o xrick.rsrc xrick.rdef
xres -o xrick xrick.rsrc
}
INSTALL()
{
mkdir -p $appsDir/XRick
cp xrick $appsDir/XRick
cp xrick $appsDir/XRick/XRick
cp data.zip $appsDir/XRick
addAppDeskbarSymlink $appsDir/XRick/xrick "Rick Dangerous"
cp ReadMe $appsDir/XRick
cp -r images $appsDir/XRick
addAppDeskbarSymlink $appsDir/XRick/XRick
}
# ----- DESCRIPTION -----------------------------------------------------------

View File

@@ -10,20 +10,21 @@ LICENSE="BSD (4-clause)"
SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_11"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
keymapswitcher = $portVersion compat >= 1.2.7
keymapswitcher$secondaryArchSuffix = $portVersion compat >= 1.2.7
"
REQUIRES="
haiku >= $haikuVersion
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
haiku${secondaryArchSuffix}_devel >= $haikuVersion
makefile_engine
cmd:gcc
cmd:ld
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:mkdepend
"

View File

@@ -0,0 +1,48 @@
From cab97efc07e4a49f61d9ff9ca7864c193ad22a9e Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 2 Jun 2014 17:04:50 +0200
Subject: Fix build for atomic_add volatile changes.
diff --git a/Paladin/FindWindow.h b/Paladin/FindWindow.h
index f6aff2c..d1a8951 100644
--- a/Paladin/FindWindow.h
+++ b/Paladin/FindWindow.h
@@ -45,7 +45,7 @@ private:
thread_id fThreadID;
int8 fThreadMode;
- vint32 fThreadQuitFlag;
+ int32 fThreadQuitFlag;
BObjectList<BString> fFileList;
DPath fWorkingDir;
diff --git a/Paladin/Paladin.cpp b/Paladin/Paladin.cpp
index a09e30b..ed3c774 100644
--- a/Paladin/Paladin.cpp
+++ b/Paladin/Paladin.cpp
@@ -38,7 +38,7 @@ static int sReturnCode = 0;
static int32 sWindowCount = 0;
static BLocker sWindowLocker;
-volatile int32 gQuitOnZeroWindows = 1;
+int32 gQuitOnZeroWindows = 1;
void
RegisterWindow(void)
diff --git a/Paladin/Paladin.h b/Paladin/Paladin.h
index e3ee7a5..97bf312 100644
--- a/Paladin/Paladin.h
+++ b/Paladin/Paladin.h
@@ -45,7 +45,7 @@ void DeregisterWindow(void);
int32 CountRegisteredWindows(void);
BWindow *WindowForProject(Project *proj);
-extern volatile int32 gQuitOnZeroWindows;
+extern int32 gQuitOnZeroWindows;
#define APP_SIGNATURE "application/x-vnd.dw-Paladin"
--
1.8.3.4

View File

@@ -23,6 +23,7 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:make
cmd:gcc
cmd:mkdepend
"
BUILD()

View File

@@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86"
if [ $effectiveTargetArchitecture == x86_64 ]; then
PATCHES="haikuwebkit-1.2.5.patchset"
PATCHES="haikuwebkit-1.3.0.patchset"
fi
PROVIDES="

View File

@@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86"
if [ $effectiveTargetArchitecture == x86_64 ]; then
PATCHES="haikuwebkit-1.2.5.patchset"
PATCHES="haikuwebkit-1.3.1.patchset"
fi
PROVIDES="

View File

@@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86"
if [ $effectiveTargetArchitecture == x86_64 ]; then
PATCHES="haikuwebkit-1.2.5.patchset"
PATCHES="haikuwebkit-1.3.2.patchset"
fi
PROVIDES="

View File

@@ -0,0 +1,29 @@
From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Wed, 19 Mar 2014 00:52:39 +0100
Subject: [PATCH] Fix compilation on x86_64
---
Source/JavaScriptCore/offlineasm/asm.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
index 8fe6228..0f5849c 100644
--- a/Source/JavaScriptCore/offlineasm/asm.rb
+++ b/Source/JavaScriptCore/offlineasm/asm.rb
@@ -209,7 +209,11 @@ class Assembler
def self.labelReference(labelName)
if !$emitWinAsm
- "\" LOCAL_REFERENCE(#{labelName}) \""
+ if labelName == 'llint_throw_from_slow_path_trampoline'
+ "\" GLOBAL_REFERENCE(#{labelName}) \""
+ else
+ "\" LOCAL_REFERENCE(#{labelName}) \""
+ end
else
"#{labelName}"
end
--
Jonathan

View File

@@ -0,0 +1,29 @@
From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Wed, 19 Mar 2014 00:52:39 +0100
Subject: [PATCH] Fix compilation on x86_64
---
Source/JavaScriptCore/offlineasm/asm.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
index 8fe6228..0f5849c 100644
--- a/Source/JavaScriptCore/offlineasm/asm.rb
+++ b/Source/JavaScriptCore/offlineasm/asm.rb
@@ -209,7 +209,11 @@ class Assembler
def self.labelReference(labelName)
if !$emitWinAsm
- "\" LOCAL_REFERENCE(#{labelName}) \""
+ if labelName == 'llint_throw_from_slow_path_trampoline'
+ "\" GLOBAL_REFERENCE(#{labelName}) \""
+ else
+ "\" LOCAL_REFERENCE(#{labelName}) \""
+ end
else
"#{labelName}"
end
--
Jonathan

View File

@@ -33,7 +33,7 @@ BUILD_PREREQUIRES="
SOURCE_DIR="libprefs125"
PATCHES="libprefs.patch"
PATCHES="libprefs-1.2.5.patch"
BUILD()
{

View File

@@ -0,0 +1,16 @@
M+ FONTS Copyright (C) 2002-2012 M+ FONTS PROJECT
-
LICENSE_E
These fonts are free software.
Unlimited permission is granted to use, copy, and distribute them, with
or without modification, either commercially or noncommercially.
THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/

View File

@@ -0,0 +1,30 @@
Copyright (c) 1990-2003 Wada Laboratory, the University of Tokyo. All
rights reserved.
Copyright (c) 2003-2004 Electronic Font Open Laboratory (/efont/). All
rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the Wada Laboratory, the University of Tokyo
nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY WADA LABORATORY, THE UNIVERSITY OF TOKYO
AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE LABORATORY OR CONTRIBUTORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@@ -0,0 +1,43 @@
SUMMARY="A modern gothic font including Japanese, as well as Latin and Greek glyphs"
DESCRIPTION="This package includes the VL Gothic (monospace) and VL PGothic \
(proportional) fonts. Originally developed for the Vine Linux project, they \
include glyphs suitable for rendering Japanese text, as well as Latin and Greek \
alphabets.
The fonts are based on the M+ fonts and the Sazanami fonts."
HOMEPAGE="http://vlgothic.dicey.org/"
SRC_URI="http://sourceforge.jp/frs/redir.php?m=osdn&f=%2Fvlgothic%2F61261%2FVLGothic-20140530.tar.xz"
CHECKSUM_SHA256="bbb0abceed9052ce1249d2d4a953110c9ee6184400e4ebb2f6ea14d4cc5e70a3"
LICENSE="BSD (3-clause)
M+ Fonts Project
Sazanami Gothic Font
"
COPYRIGHT="1990-2003 Wada Laboratory, the University of Tokyo.
2003-2004 Electronic Font Open Laboratory (/efont/).
2002-2014 M+ FONTS PROJECT
2006-2014 Daisuke SUZUKI <daisuke@vinelinux.org>.
2006-2014 Project Vine <Vine@vinelinux.org>.
"
REVISION="1"
ARCHITECTURES="any"
DISABLE_SOURCE_PACKAGE=yes
PROVIDES="vl_gothic = $portVersion"
REQUIRES=""
BUILD_REQUIRES=""
BUILD_PREREQUIRES="coreutils"
SOURCE_DIR="VLGothic"
BUILD()
{
true
}
INSTALL()
{
FONTDIR=$fontsDir/VL-Gothic
mkdir -p ${FONTDIR}
cp VL-Gothic-Regular.ttf ${FONTDIR}
cp VL-PGothic-Regular.ttf ${FONTDIR}
}

View File

@@ -49,6 +49,7 @@ BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:make
cmd:gcc$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"
SOURCE_DIR="mupdf-1.1-source"

View File

@@ -0,0 +1,109 @@
SUMMARY="A library for font customization and configuration"
DESCRIPTION="
Fontconfig is a library for font customization and configuration.
"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig"
SRC_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2"
CHECKSUM_SHA256="dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99"
LICENSE="MIT"
COPYRIGHT="2000-2005, 2006-2007 Keith Packard
2005 Patrick Lam
2009 Roozbeh Pournader
2008-2009 Red Hat, Inc.
2008 Danilo Segan
2012 Google, Inc."
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
fontconfig$secondaryArchSuffix = $portVersion compat >= 2
cmd:fc_cache$secondaryArchSuffix
cmd:fc_cat$secondaryArchSuffix
cmd:fc_list$secondaryArchSuffix
cmd:fc_match$secondaryArchSuffix
cmd:fc_pattern$secondaryArchSuffix
cmd:fc_query$secondaryArchSuffix
cmd:fc_scan$secondaryArchSuffix
cmd:fc_validate$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libfreetype$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libfreetype$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:libtool
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:pkg_config
"
PATCHES="fontconfig-2.11.1.patchset"
GLOBAL_WRITABLE_FILES="
settings/fonts/conf.d directory keep-old
settings/fonts/fonts.conf auto-merge
"
BUILD()
{
export PKG_CONFIG_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib$secondaryArchSubDir/pkgconfig
mkdir -p `finddir B_USER_CACHE_DIRECTORY`
libtoolize --force --copy --install
aclocal
autoconf
automake
FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY`
FONTS_DIR2=`finddir B_BEOS_FONTS_DIRECTORY`
FONTS_DIR3=`finddir B_USER_FONTS_DIRECTORY`
CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY`
runConfigure ./configure \
--enable-libxml2 \
--with-default-fonts=${FONTS_DIR} \
--with-add-fonts=${FONTS_DIR2},${FONTS_DIR3} \
--with-cache-dir=${CACHE_DIR}
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libfontconfig
#devel package
packageEntries devel \
$developDir
}
PROVIDES_devel="
fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1
devel:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1
"
REQUIRES_devel="
fontconfig$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,22 @@
From 59eff810d3a298cddd8283f02f64ae77bc74dfb1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 10 Jun 2014 16:31:39 +0000
Subject: haiku patch
diff --git a/test/Makefile.am b/test/Makefile.am
index f270b50..ba4f0d7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -27,7 +27,7 @@ endif
noinst_PROGRAMS = $(check_PROGRAMS)
if !OS_WIN32
-check_PROGRAMS += test-migration
+check_PROGRAMS +=
test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
endif
--
1.8.3.4

View File

@@ -0,0 +1,86 @@
DESCRIPTION="
The GIFLIB project maintains the giflib service library, which has been pulling
images out of GIFs since 1989. It is deployed everywhere you can think of and
some places you probably can't - graphics applications and web browsers on
multiple operating systems, game consoles, smartphones, and likely your ATM too.
This is very mature, stable, small-footprint code with minimal dependencies
(suitable for use in embedded deployments) that needs only occasional very
minor bugfixes. Test reports from odd platforms and better regression tests are
particularly welcome. Don't try to redesign it, applications beyond counting
would break if you did.
It's \"GIFLIB\" in caps as a nod to the code's origins in the dark and backward
abysm of MS-DOS, but Unix hackers are encouraged to spell it \"giflib\" in
deference to local conventions. :-)
"
SUMMARY="giflib - A library for processing GIFs"
HOMEPAGE="http://sourceforge.net/projects/giflib/"
SRC_URI="http://sourceforge.net/projects/giflib/files/giflib-$portVersion.tar.bz2"
CHECKSUM_SHA256="5aec694f1c68132e6af499a621996b5a1fc219f4bbe19ab2ba972b3f95188d1b"
LICENSE="MIT"
COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
giflib$secondaryArchSuffix = $portVersion
lib:libgif$secondaryArchSuffix = 7.0.0 compat >= 7
cmd:gif2raw$secondaryArchSuffix
cmd:gif2rgb$secondaryArchSuffix
cmd:gifbuild$secondaryArchSuffix
cmd:gifclrmp$secondaryArchSuffix
cmd:gifecho$secondaryArchSuffix
cmd:giffix$secondaryArchSuffix
cmd:gifinto$secondaryArchSuffix
cmd:giftext$secondaryArchSuffix
cmd:giftool$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtool
cmd:aclocal
cmd:autoconf
cmd:make
"
PATCHES="giflib-5.1.0.patchset"
BUILD()
{
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libgif
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
PROVIDES_devel="
giflib${secondaryArchSuffix}_devel = $portVersion compat >= 5
devel:libgif$secondaryArchSuffix = 7.0.0 compat >= 7
"
REQUIRES_devel="
giflib$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,29 @@
From 1f7529dc2a255afb5d1ece8719761a13901751dd Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 10 Jun 2014 16:43:15 +0000
Subject: gcc2 patch
diff --git a/util/gifinto.c b/util/gifinto.c
index 1553dec..31d3548 100644
--- a/util/gifinto.c
+++ b/util/gifinto.c
@@ -70,6 +70,7 @@ mkstemp(char *tpl)
******************************************************************************/
int main(int argc, char **argv)
{
+ int FD;
int NumFiles;
bool Error, MinSizeFlag = false, HelpFlag = false;
char **FileName = NULL, FoutTmpName[STRLEN], FullPath[STRLEN], *p;
@@ -126,7 +127,6 @@ int main(int argc, char **argv)
/* then add a name for the tempfile */
if ( (strlen(FoutTmpName) + strlen(DEFAULT_TMP_NAME)) > STRLEN-1 ) GIF_EXIT("Filename too long.");
strcat(FoutTmpName, DEFAULT_TMP_NAME);
- int FD;
#ifdef _WIN32
char *tmpFN = _mktemp(FoutTmpName);
if (tmpFN)
--
1.8.3.4

View File

@@ -1,27 +1,72 @@
SUMMARY="CDDB access library"
DESCRIPTION="A library for accessing a CDDB server"
HOMEPAGE="http://libcddb.sourceforge.net"
SRC_URI="http://prdownloads.sourceforge.net/libcddb/libcddb-1.3.2.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="gettext >= 0.18.1.1-dev"
CHECKSUM_MD5="8bb4a6f542197e8e9648ae597cd6bc8a"
ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
PROVIDES="
cmd:cddb_query
bin:cddb_query
libcddb${secondaryArchSuffix} = $portVersion
lib:libcddb
"
REQUIRES="
haiku${secondaryArchSuffix} >= $haikuVersion
lib:libintl
"
BUILD_REQUIRES="
lib:libiconv
cmd:pkg_config
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:gettext
cmd:libtool
cmd:ld$secondaryArchSuffix
cmd:make
devel:libiconv
"
PATCH()
{
sed -i "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS," configure.ac
}
BUILD()
{
cd libcddb-1.3.2
libtoolize --force --copy --install
aclocal
automake
automake --add-missing
autoconf
./configure --prefix=`finddir B_COMMON_DIRECTORY`
runConfigure ./configure
make
}
INSTALL()
{
cd libcddb-1.3.2
make install
prepareInstalledDevelLibs libcddb
fixPkgconfig
packageEntries devel $developDir
}
LICENSE="GNU LGPL v2"
COPYRIGHT="2003-2005 Kris Verbeeck"
PROVIDES_devel="
libcddb${secondaryArchSuffix}_devel = $portVersion
devel:libcddb$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
libcddb$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,75 @@
SUMMARY="a GPL codec for DV video"
DESCRIPTION="
The Quasar DV codec (libdv) is a software codec for DV video, the encoding format \
used by most digital camcorders, typically those that support the IEEE 1394 \
(a.k.a FireWire or i.Link) interface. Libdv was developed according to the \
official standards for DV video: IEC 61834 and SMPTE 314M."
HOMEPAGE="http://libdv.sourceforge.net"
COPYRIGHT="
1999 Erik Walthinsen <omega@cse.ogi.edu>
1999 Charles 'Buck' Krasic <krasic@acm.org>"
LICENSE="GNU LGPL v2.1"
SRC_URI="http://sourceforge.net/projects/libdv/files/libdv/$portVersion/libdv-$portVersion.tar.gz"
CHECKSUM_SHA256="a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="libdv-$portVersion.patchset"
PROVIDES="
libdv$secondaryArchSuffix = $portVersion compat >= 1.0
lib:libdv$secondaryArchSuffix = 4.0.3 compat >= 4
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libsdl_1.2$secondaryArchSuffix
lib:libpopt$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libsdl_1.2$secondaryArchSuffix
devel:libpopt${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
"
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
automake
runConfigure ./configure --disable-gtk \
--without-debug
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libdv
fixPkgconfig
# devel package
packageEntries devel \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libdv${secondaryArchSuffix}_devel = $portVersion compat >= 1.0
devel:libdv$secondaryArchSuffix = 4.0.3 compat >= 4
"
REQUIRES_devel="
libdv$secondaryArchSuffix == $portVersion base
"

View File

@@ -0,0 +1,47 @@
From dbbb34e3759ad5e67150f959a7cc2eb1dc2d1bdf Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 11 Jun 2014 18:05:39 +0000
Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index 2b95735..20c67c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(libdv/parse.c)
dnl AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
RPM_RELEASE=1
AC_CANONICAL_HOST
@@ -161,11 +161,6 @@ AM_CONDITIONAL(HOST_X86_64, test x$arch_x86_64 = xtrue)
dnl Checks for libraries.
have_gtk="false"
-if $use_gtk; then
- REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4'
- PKG_CHECK_MODULES(GTK,$REQUIRES,have_gtk="true",have_gtk="false")
- AC_DEFINE(HAVE_GTK)
-fi
AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue)
diff --git a/encodedv/Makefile.am b/encodedv/Makefile.am
index 2887e7c..63b1c69 100644
--- a/encodedv/Makefile.am
+++ b/encodedv/Makefile.am
@@ -9,7 +9,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
CLEANFILES =
-bin_PROGRAMS= encodedv dvconnect dubdv
+bin_PROGRAMS= encodedv dubdv
noinst_PROGRAMS= fix_headers scan_packet_headers steal_header ppmqscale dvavi
--
1.8.3.4

View File

@@ -14,7 +14,7 @@ REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
PATCHES="libdvdnav-4.2.0.patch"
PATCHES="libdvdnav-4.2.1.patch"
PROVIDES="
libdvdnav${secondaryArchSuffix} = $portVersion

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