diff --git a/app-arch/unzip/unzip-6.0.recipe b/app-arch/unzip/unzip-6.0.recipe index 90d29b697..fdfede7af 100644 --- a/app-arch/unzip/unzip-6.0.recipe +++ b/app-arch/unzip/unzip-6.0.recipe @@ -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" diff --git a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe index 7ae2a054f..84822cf58 100644 --- a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe +++ b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe @@ -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 } diff --git a/app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset b/app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset index 69ba097c3..d2aaf5a0d 100644 --- a/app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset +++ b/app-benchmarks/libmicro/patches/libmicro-0.4.2.hg.patchset @@ -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 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 +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 + diff --git a/app-benchmarks/ltp/ltp-20140422.recipe b/app-benchmarks/ltp/ltp-20140422.recipe new file mode 100644 index 000000000..f57f45422 --- /dev/null +++ b/app-benchmarks/ltp/ltp-20140422.recipe @@ -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." diff --git a/app-misc/mc/mc-4.8.11.recipe b/app-misc/mc/mc-4.8.11.recipe index 58d11712e..23c7f1294 100644 --- a/app-misc/mc/mc-4.8.11.recipe +++ b/app-misc/mc/mc-4.8.11.recipe @@ -50,6 +50,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:autoheader + cmd:find cmd:gcc " diff --git a/app-shells/dash/dash-0.5.7.recipe b/app-shells/dash/dash-0.5.7.recipe index 94fc8675f..b07f21bce 100644 --- a/app-shells/dash/dash-0.5.7.recipe +++ b/app-shells/dash/dash-0.5.7.recipe @@ -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 diff --git a/app-shells/dash/patches/dash-0.5.7.patchset b/app-shells/dash/patches/dash-0.5.7.patchset deleted file mode 100644 index fc88d2dc2..000000000 --- a/app-shells/dash/patches/dash-0.5.7.patchset +++ /dev/null @@ -1,21 +0,0 @@ -From bf0f50131da4ab31343b239a7e4360ffeb82779a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -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 -+#define __USE_GNU - #include - - extern const char snlfmt[]; --- -1.8.3.4 - diff --git a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe new file mode 100644 index 000000000..96ce90472 --- /dev/null +++ b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe @@ -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 +" diff --git a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe new file mode 100644 index 000000000..0d891ee12 --- /dev/null +++ b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe @@ -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 +" diff --git a/app-text/docbook_xml_dtd/licenses/Docbook b/app-text/docbook_xml_dtd/licenses/Docbook new file mode 100644 index 000000000..a77b8d3e8 --- /dev/null +++ b/app-text/docbook_xml_dtd/licenses/Docbook @@ -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/. diff --git a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe index d76ef5487..645406032 100644 --- a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe +++ b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe @@ -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" diff --git a/dev-db/sqlite/sqlite-3.8.4.3.recipe b/dev-db/sqlite/sqlite-3.8.4.3.recipe new file mode 100644 index 000000000..a3b5c7d5d --- /dev/null +++ b/dev-db/sqlite/sqlite-3.8.4.3.recipe @@ -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 + " diff --git a/dev-lang/orc/orc-0.4.16.recipe b/dev-lang/orc/orc-0.4.16.recipe deleted file mode 100644 index e7fa5a9b5..000000000 --- a/dev-lang/orc/orc-0.4.16.recipe +++ /dev/null @@ -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" \ No newline at end of file diff --git a/dev-lang/orc/orc-0.4.19.recipe b/dev-lang/orc/orc-0.4.19.recipe new file mode 100644 index 000000000..009d5cbad --- /dev/null +++ b/dev-lang/orc/orc-0.4.19.recipe @@ -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 + " diff --git a/dev-lang/orc/patches/orc-0.4.16.patch b/dev-lang/orc/patches/orc-0.4.16.patch deleted file mode 100644 index 68a87ff5a..000000000 --- a/dev-lang/orc/patches/orc-0.4.16.patch +++ /dev/null @@ -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]) - ;; - *) diff --git a/dev-lang/orc/patches/orc-0.4.19.patchset b/dev-lang/orc/patches/orc-0.4.19.patchset new file mode 100644 index 000000000..5ba1e7aec --- /dev/null +++ b/dev-lang/orc/patches/orc-0.4.19.patchset @@ -0,0 +1,43 @@ +From 65ca1ed4bdcb05d3ad5a27ebae881b7fc7b92ab3 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 + diff --git a/dev-lang/perl/patches/perl-5.18.2.patchset b/dev-lang/perl/patches/perl-5.18.2.patchset new file mode 100644 index 000000000..6db252c67 --- /dev/null +++ b/dev-lang/perl/patches/perl-5.18.2.patchset @@ -0,0 +1,546 @@ +From 4bef2ada1d8a38b4dff88f0659a3b9e181bf1950 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 + diff --git a/dev-lang/perl/perl-5.18.2.recipe b/dev-lang/perl/perl-5.18.2.recipe index 19c28d011..e819a8c0a 100644 --- a/dev-lang/perl/perl-5.18.2.recipe +++ b/dev-lang/perl/perl-5.18.2.recipe @@ -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. diff --git a/dev-lang/python/patches/python-2.7.6.patchset b/dev-lang/python/patches/python-2.7.6.patchset index 22d516fe1..d518a0001 100644 --- a/dev-lang/python/patches/python-2.7.6.patchset +++ b/dev-lang/python/patches/python-2.7.6.patchset @@ -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 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 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 +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 + diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index ada901e8a..58437c961 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -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" diff --git a/dev-lang/ruby/patches/ruby-1.9.3.patchset b/dev-lang/ruby/patches/ruby-1.9.3.patchset new file mode 100644 index 000000000..d382648d4 --- /dev/null +++ b/dev-lang/ruby/patches/ruby-1.9.3.patchset @@ -0,0 +1,545 @@ +From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001 +From: Chris Roberts +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= 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 + * 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", §ion, &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; iname), 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 +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 +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 +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 + diff --git a/dev-lang/ruby/patches/ruby-2.1.2.patchset b/dev-lang/ruby/patches/ruby-2.1.2.patchset new file mode 100644 index 000000000..c08b3be70 --- /dev/null +++ b/dev-lang/ruby/patches/ruby-2.1.2.patchset @@ -0,0 +1,33 @@ +From 0293a01f710c55445042a570cc3fb9755e20ed71 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 + diff --git a/dev-lang/ruby/ruby-1.9.3.recipe b/dev-lang/ruby/ruby-1.9.3.recipe index b676700a0..8c9fd8a13 100644 --- a/dev-lang/ruby/ruby-1.9.3.recipe +++ b/dev-lang/ruby/ruby-1.9.3.recipe @@ -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() { diff --git a/dev-lang/ruby/ruby-2.1.1.recipe b/dev-lang/ruby/ruby-2.1.2.recipe similarity index 59% rename from dev-lang/ruby/ruby-2.1.1.recipe rename to dev-lang/ruby/ruby-2.1.2.recipe index 589540b52..8901a4fc7 100644 --- a/dev-lang/ruby/ruby-2.1.1.recipe +++ b/dev-lang/ruby/ruby-2.1.2.recipe @@ -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 } diff --git a/dev-lang/spidermonkey/licenses/NPL v1.1 b/dev-lang/spidermonkey/licenses/NPL v1.1 new file mode 100644 index 000000000..0abd10966 --- /dev/null +++ b/dev-lang/spidermonkey/licenses/NPL v1.1 @@ -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Ā  ļæ½[___] 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." + + 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." diff --git a/dev-lang/spidermonkey/patches/spidermonkey-1.8.5.patchset b/dev-lang/spidermonkey/patches/spidermonkey-1.8.5.patchset new file mode 100644 index 000000000..c3c289f82 --- /dev/null +++ b/dev-lang/spidermonkey/patches/spidermonkey-1.8.5.patchset @@ -0,0 +1,68 @@ +From 6810ba3a550c5559ccbdbdda846ea7cbfa04bcca Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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(st.ss_sp) + st.ss_size; + } + ++#elif defined(__HAIKU__) ++ ++#include ++ ++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 +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 + diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe new file mode 100644 index 000000000..0ba14dbba --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe @@ -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 + " diff --git a/dev-libs/check/check-0.9.13.recipe b/dev-libs/check/check-0.9.13.recipe new file mode 100644 index 000000000..0341698a9 --- /dev/null +++ b/dev-libs/check/check-0.9.13.recipe @@ -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 +" diff --git a/dev-libs/expat/expat-2.1.0.recipe b/dev-libs/expat/expat-2.1.0.recipe new file mode 100644 index 000000000..7d9aa0431 --- /dev/null +++ b/dev-libs/expat/expat-2.1.0.recipe @@ -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 + " diff --git a/dev-libs/glib/glib2-2.38.1.recipe b/dev-libs/glib/glib2-2.38.1.recipe index f914b0dcd..84f4a0cf2 100644 --- a/dev-libs/glib/glib2-2.38.1.recipe +++ b/dev-libs/glib/glib2-2.38.1.recipe @@ -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 } diff --git a/dev-libs/gmp/gmp-4.3.1.recipe b/dev-libs/gmp/gmp-4.3.1.recipe deleted file mode 100644 index 811275dc9..000000000 --- a/dev-libs/gmp/gmp-4.3.1.recipe +++ /dev/null @@ -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." diff --git a/dev-libs/gmp/gmp-5.0.1.recipe b/dev-libs/gmp/gmp-5.0.1.recipe deleted file mode 100644 index 5b7af9fa7..000000000 --- a/dev-libs/gmp/gmp-5.0.1.recipe +++ /dev/null @@ -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." diff --git a/dev-libs/gmp/gmp-5.0.5.recipe b/dev-libs/gmp/gmp-5.0.5.recipe deleted file mode 100644 index b9daccb9c..000000000 --- a/dev-libs/gmp/gmp-5.0.5.recipe +++ /dev/null @@ -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." diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe deleted file mode 100644 index 8f9f53dd8..000000000 --- a/dev-libs/gmp/gmp-5.1.1.recipe +++ /dev/null @@ -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 - " - diff --git a/dev-libs/json_c/json_c-0.12.recipe b/dev-libs/json_c/json_c-0.12.recipe new file mode 100644 index 000000000..2f722d98b --- /dev/null +++ b/dev-libs/json_c/json_c-0.12.recipe @@ -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" diff --git a/dev-libs/json_c/json_c-0.9.recipe b/dev-libs/json_c/json_c-0.9.recipe deleted file mode 100644 index bc916a517..000000000 --- a/dev-libs/json_c/json_c-0.9.recipe +++ /dev/null @@ -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" \ No newline at end of file diff --git a/dev-libs/json_c/patches/json_c-0.12.patchset b/dev-libs/json_c/patches/json_c-0.12.patchset new file mode 100644 index 000000000..a1ebb4eda --- /dev/null +++ b/dev-libs/json_c/patches/json_c-0.12.patchset @@ -0,0 +1,45 @@ +From 42928f5769cc98b8cd791dfa2c58f7dc0634dba5 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 +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 + diff --git a/dev-libs/libcdio/libcdio-0.92.recipe b/dev-libs/libcdio/libcdio-0.92.recipe index 468c53575..16469b4c5 100644 --- a/dev-libs/libcdio/libcdio-0.92.recipe +++ b/dev-libs/libcdio/libcdio-0.92.recipe @@ -67,6 +67,7 @@ INSTALL() # set up the develop directory correctly prepareInstalledDevelLibs libcdio + fixPkgconfig libcdio # devel package packageEntries devel \ diff --git a/dev-libs/libcss/libcss-0.2.0_git.recipe b/dev-libs/libcss/libcss-0.3.0.recipe similarity index 66% rename from dev-libs/libcss/libcss-0.2.0_git.recipe rename to dev-libs/libcss/libcss-0.3.0.recipe index 649095dae..be443e749 100644 --- a/dev-libs/libcss/libcss-0.2.0_git.recipe +++ b/dev-libs/libcss/libcss-0.3.0.recipe @@ -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 +" diff --git a/dev-libs/libcss/patches/libcss-0.3.0.patchset b/dev-libs/libcss/patches/libcss-0.3.0.patchset new file mode 100644 index 000000000..6232c4d62 --- /dev/null +++ b/dev-libs/libcss/patches/libcss-0.3.0.patchset @@ -0,0 +1,78 @@ +From 53ba61ff1f71c50a26a03909a9b35e12b79d939d Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 +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 + diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.2.0.recipe similarity index 51% rename from dev-libs/libparserutils/libparserutils-0.1.2_git.recipe rename to dev-libs/libparserutils/libparserutils-0.2.0.recipe index 0ee101344..9ecaa06cf 100644 --- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe +++ b/dev-libs/libparserutils/libparserutils-0.2.0.recipe @@ -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 +" diff --git a/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset b/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset new file mode 100644 index 000000000..2761f5236 --- /dev/null +++ b/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset @@ -0,0 +1,50 @@ +From 40b2c1f916c450195884c7db57bbea9155e297fc Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 + diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe deleted file mode 100644 index 42356bef8..000000000 --- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe +++ /dev/null @@ -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" diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe similarity index 55% rename from dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe rename to dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe index dfc4b2a7d..f5b4cc7c0 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe +++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe @@ -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 +" diff --git a/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset b/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset new file mode 100644 index 000000000..8dab7c82f --- /dev/null +++ b/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset @@ -0,0 +1,35 @@ +From 32b0d42e141a2bab66d7420e1f7159282f5beb69 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 + diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index 7f87250bd..0e3e28ff3 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -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" diff --git a/dev-libs/libxml2/patches/libxml2-2.8.0.patchset b/dev-libs/libxml2/patches/libxml2-2.8.0.patchset index 04aea95d4..19e7c5d8c 100644 --- a/dev-libs/libxml2/patches/libxml2-2.8.0.patchset +++ b/dev-libs/libxml2/patches/libxml2-2.8.0.patchset @@ -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 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 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 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 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 +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 + diff --git a/dev-libs/openssl/openssl-1.0.0m.recipe b/dev-libs/openssl/openssl-1.0.0m.recipe new file mode 100644 index 000000000..38538f991 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0m.recipe @@ -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 + " diff --git a/dev-libs/openssl/patches/openssl-1.0.0m.patchset b/dev-libs/openssl/patches/openssl-1.0.0m.patchset new file mode 100644 index 000000000..cea5b3100 --- /dev/null +++ b/dev-libs/openssl/patches/openssl-1.0.0m.patchset @@ -0,0 +1,72 @@ +From df00735cecc9c5ec0cdb9a9706e52b15f14057ec Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 + diff --git a/dev-libs/popt/patches/popt-1.16.patchset b/dev-libs/popt/patches/popt-1.16.patchset new file mode 100644 index 000000000..ebefa4c9a --- /dev/null +++ b/dev-libs/popt/patches/popt-1.16.patchset @@ -0,0 +1,43 @@ +From 4db73bb22181c9c029fecdd52eb0e73b0e638ef6 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 + diff --git a/dev-libs/popt/popt-1.16.recipe b/dev-libs/popt/popt-1.16.recipe index c7b6f8b3f..c3a30e42b 100644 --- a/dev-libs/popt/popt-1.16.recipe +++ b/dev-libs/popt/popt-1.16.recipe @@ -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." \ No newline at end of file + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + popt${secondaryArchSuffix}_devel = $portVersion + devel:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + popt$secondaryArchSuffix == $portVersion base + " diff --git a/dev-perl/html_parser/html_parser-3.71.recipe b/dev-perl/html_parser/html_parser-3.71.recipe new file mode 100644 index 000000000..1f89a4f01 --- /dev/null +++ b/dev-perl/html_parser/html_parser-3.71.recipe @@ -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. +" diff --git a/dev-python/buildbot_slave/buildbot_slave-0.8.8.recipe b/dev-python/buildbot_slave/buildbot_slave-0.8.8.recipe new file mode 100644 index 000000000..f1211fc9a --- /dev/null +++ b/dev-python/buildbot_slave/buildbot_slave-0.8.8.recipe @@ -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 +} diff --git a/dev-python/mock/python_mock-1.0.1.recipe b/dev-python/mock/python_mock-1.0.1.recipe new file mode 100644 index 000000000..ba2d9764c --- /dev/null +++ b/dev-python/mock/python_mock-1.0.1.recipe @@ -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 +} diff --git a/dev-python/twisted/python_twisted-13.2.0.recipe b/dev-python/twisted/python_twisted-13.2.0.recipe new file mode 100644 index 000000000..64dc3b0e3 --- /dev/null +++ b/dev-python/twisted/python_twisted-13.2.0.recipe @@ -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 +} diff --git a/dev-python/zope.interface/licenses/ZPL 2.1 b/dev-python/zope.interface/licenses/ZPL 2.1 new file mode 100644 index 000000000..e1f9ad7b3 --- /dev/null +++ b/dev-python/zope.interface/licenses/ZPL 2.1 @@ -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. diff --git a/dev-python/zope.interface/python_zope.interface-4.1.1.recipe b/dev-python/zope.interface/python_zope.interface-4.1.1.recipe new file mode 100644 index 000000000..b5c078533 --- /dev/null +++ b/dev-python/zope.interface/python_zope.interface-4.1.1.recipe @@ -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 +} diff --git a/dev-util/byacc/byacc-20140422.recipe b/dev-util/byacc/byacc-20140422.recipe new file mode 100644 index 000000000..c216c2c50 --- /dev/null +++ b/dev-util/byacc/byacc-20140422.recipe @@ -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 +} diff --git a/dev-util/cmake/cmake-2.8.10.2.recipe b/dev-util/cmake/cmake-2.8.10.2.recipe deleted file mode 100644 index 3ab461703..000000000 --- a/dev-util/cmake/cmake-2.8.10.2.recipe +++ /dev/null @@ -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." diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe deleted file mode 100644 index 3f8de3c12..000000000 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ /dev/null @@ -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 -} diff --git a/dev-util/cmake/cmake-3.0.0_rc1.recipe b/dev-util/cmake/cmake-3.0.0_rc1.recipe deleted file mode 100644 index 718b4e4c2..000000000 --- a/dev-util/cmake/cmake-3.0.0_rc1.recipe +++ /dev/null @@ -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 -} - diff --git a/dev-util/cmake/cmake-3.0.0_rc3.recipe b/dev-util/cmake/cmake-3.0.0_rc3.recipe deleted file mode 100644 index c0f868f39..000000000 --- a/dev-util/cmake/cmake-3.0.0_rc3.recipe +++ /dev/null @@ -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 -} - diff --git a/dev-util/cmake/cmake-3.0.0_rc5.recipe b/dev-util/cmake/cmake-3.0.0_rc6.recipe similarity index 81% rename from dev-util/cmake/cmake-3.0.0_rc5.recipe rename to dev-util/cmake/cmake-3.0.0_rc6.recipe index eeb2d72e7..a7acc8d41 100644 --- a/dev-util/cmake/cmake-3.0.0_rc5.recipe +++ b/dev-util/cmake/cmake-3.0.0_rc6.recipe @@ -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 \ diff --git a/dev-util/cmake/patches/cmake-2.8.10.2.patch b/dev-util/cmake/patches/cmake-2.8.10.2.patch deleted file mode 100644 index da4732325..000000000 --- a/dev-util/cmake/patches/cmake-2.8.10.2.patch +++ /dev/null @@ -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 - #include - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - #include /* 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 -+#include -+#include - #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 -+#include -+#include -+#include - #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 - - #if defined(__HAIKU__) --#include -+#include -+#include - #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 - - #if defined(__HAIKU__) --#include -+#include -+#include - #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 /* DIR, dirent */ - #include /* 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 - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) -+#if defined(__BEOS__) && !defined(__ZETA__) - #include - #include - -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 /* 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 - 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 - #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 diff --git a/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset b/dev-util/cmake/patches/cmake-3.0.0_rc6.patchset similarity index 97% rename from dev-util/cmake/patches/cmake-3.0.0_rc1.patchset rename to dev-util/cmake/patches/cmake-3.0.0_rc6.patchset index 09491fcba..9a8f7f09b 100644 --- a/dev-util/cmake/patches/cmake-3.0.0_rc1.patchset +++ b/dev-util/cmake/patches/cmake-3.0.0_rc6.patchset @@ -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 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 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 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 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 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 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 +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 + diff --git a/dev-util/gtk_doc/gtk_doc-1.15.recipe b/dev-util/gtk_doc/gtk_doc-1.15.recipe deleted file mode 100644 index 87f6e85b7..000000000 --- a/dev-util/gtk_doc/gtk_doc-1.15.recipe +++ /dev/null @@ -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" diff --git a/dev-util/gtk_doc/gtk_doc-1.20.recipe b/dev-util/gtk_doc/gtk_doc-1.20.recipe new file mode 100644 index 000000000..a0eca295e --- /dev/null +++ b/dev-util/gtk_doc/gtk_doc-1.20.recipe @@ -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" diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe similarity index 67% rename from dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe rename to dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe index 00f6e381a..cf3ccaa98 100644 --- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe +++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe @@ -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() diff --git a/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset b/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset new file mode 100644 index 000000000..71289b99f --- /dev/null +++ b/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset @@ -0,0 +1,44 @@ +From 4a0ea106ab2a23af3798b7a3114c969f7339c05a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 + diff --git a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe index dbd5694e5..e28258ed7 100644 --- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe +++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe @@ -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 } diff --git a/dev-util/scons/patches/scons-2.2.0.patch b/dev-util/scons/patches/scons-2.3.1.patchset similarity index 54% rename from dev-util/scons/patches/scons-2.2.0.patch rename to dev-util/scons/patches/scons-2.3.1.patchset index 15d06891d..1ecca99d2 100644 --- a/dev-util/scons/patches/scons-2.2.0.patch +++ b/dev-util/scons/patches/scons-2.3.1.patchset @@ -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 +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 + diff --git a/dev-util/scons/scons-2.3.1.recipe b/dev-util/scons/scons-2.3.1.recipe index 34c143f5a..636281c94 100644 --- a/dev-util/scons/scons-2.3.1.recipe +++ b/dev-util/scons/scons-2.3.1.recipe @@ -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 diff --git a/dev-vcs/mercurial/mercurial-2.9.1.recipe b/dev-vcs/mercurial/mercurial-2.9.1.recipe index 09d14f259..0edd1c388 100644 --- a/dev-vcs/mercurial/mercurial-2.9.1.recipe +++ b/dev-vcs/mercurial/mercurial-2.9.1.recipe @@ -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 diff --git a/dev-vcs/mercurial/mercurial-2.9.2.recipe b/dev-vcs/mercurial/mercurial-2.9.2.recipe index 540756cd4..af343a973 100644 --- a/dev-vcs/mercurial/mercurial-2.9.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.9.2.recipe @@ -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 diff --git a/dev-vcs/mercurial/patches/mercurial-2.9.1.patch b/dev-vcs/mercurial/patches/mercurial-2.9.1.patch new file mode 100644 index 000000000..edfe44133 --- /dev/null +++ b/dev-vcs/mercurial/patches/mercurial-2.9.1.patch @@ -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 diff --git a/dev-vcs/mercurial/patches/mercurial-2.9.2.patch b/dev-vcs/mercurial/patches/mercurial-2.9.2.patch new file mode 100644 index 000000000..edfe44133 --- /dev/null +++ b/dev-vcs/mercurial/patches/mercurial-2.9.2.patch @@ -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 diff --git a/games-arcade/xrick/patches/xrick-021212.patchset b/games-arcade/xrick/patches/xrick-021212.patchset index 3f130c1d8..15733c081 100644 --- a/games-arcade/xrick/patches/xrick-021212.patchset +++ b/games-arcade/xrick/patches/xrick-021212.patchset @@ -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 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 +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 +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 @@ ++ ++ ++ ++ ++ ++ ++ ++ XRick ++ ++ ++ ++
++XRick icon ++

XRick
++by Bigorno

++
++

Instructions — Usage — Controls — Misc Commands — Keycodes — Acknowledgements

++
++
++


++

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.

++

XRick is a clone of Rick Dangerous, known to run on Linux, Windows, BeOs, Haiku, Amiga, QNX, and all sorts of gaming consoles...

++

If you want to read more about Rick Dangerous, you may want to visit Rick Dangerous Resurrected (english) or Rick Dangerous Forever (french).

++ ++

++index ++Instructions

++

Walk through the maps, avoid traps, kill the Bad Guys... and try to stay alive long enough to accomplish your mission!

++

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:

++
++screenshot ++
++

++index ++Usage

++

When started from Terminal XRick accepts several parameters:

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
-fullscreenRun in fullscreen mode. The default is to run in a window.
-speed <speed>Run at speed <speed>. <speed> must be an integer between 1 (fast) and 100 (slow). The default is 75.
-zoom <zoom>Display with zoom factor <zoom>. <zoom> must be an integer between 1 (320x200) and 4 (4 times bigger). The default is 2.
-map <map>Start at map number <map>. <map> must be an integer between 1 and 4. The default is to start at map number 1.
-submap <submap>Start at submap number <submap>. <submap> 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.
-keys <keys>Override the default key bindings (see below).
-nosoundDisable sound.
-vol <vol>Play sounds at volume <vol>. <vol> must be an integer between 0 (silence) and 10 (max). The default is to play sound at maximal volume (10).
-data <data>Set data archive to <data>. <data> must be a zipped file (i.e. data.zip) or a directory. The default is to look for data.zip in the directory where XRick is run from.
++ ++

++index ++Controls

++

You control Rick either by joystick or keyboard. These are the default keys:

++ ++ ++ ++ ++ ++ ++
leftā† or S
rightā†’ or D
upā†‘ or O
downā†“ or K
fireSpace
++

By itself, the fire 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:

++ ++ ++ ++ ++ ++
fire + leftLashes out with his stick to the left
fire + rightLashes out with his stick to the right
fire + upFires a bullet
fire + downLights a stick of dynamite (run for cover!)
++

You can redefine the control keys if you start XRick from Terminal by using the -keys option.
++It's a fixed sequence of the five control keys: <left>-<right>-<up>-<down>-<fire>.
++For example, XRick -keys f-g-u-h-space will set F / G for left/right, U / H for up/down and Space for "fire".
++The Keycodes table at the bottom of this page contains a complete list of all valid keycodes.

++ ++

++index ++Misc Commands

++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
PPause
ESCEnd (game over)
Alt QExit
F1Toggle fullscreen mode
F2, F3Zoom in or out (only when not running fullscreen)
F4Mute
F5, F6Increase or decrease sound volume
F7Toggle Trainer cheat mode (always six bullets, six sticks, six Ricks). A T shows in the corner of the screen.
F8Toggle Never Die cheat mode (nothing can kill Rick).A N shows in the corner of the screen.
F9Toggle Expose cheat mode (see all entities). A V shows in the corner of the screen.
++

Use the Never Die 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...

++ ++

++index ++Keycodes

++

These are all the valid keycodes to be used to configure the controls with the -keys parameter:

++ ++ ++
++ ++BACKSPACE
++TAB
++CLEAR
++RETURN
++PAUSE
++ESCAPE
++SPACE
++EXCLAIM
++QUOTEDBL
++HASH
++DOLLAR
++AMPERSAND
++QUOTE
++LEFTPAREN
++RIGHTPAREN
++ASTERISK
++PLUS
++COMMA
++MINUS
++PERIOD
++SLASH
++0 ... 9
++COLON
++SEMICOLON
++LESS ++EQUALS
++GREATER ++ ++		 ++ ++QUESTION
++AT
++LEFTBRACKET
++BACKSLASH
++RIGHTBRACKET
++CARET
++UNDERSCORE
++BACKQUOTE
++a ... z
++DELETE
++WORLD_0 ... WODLD_95
++KP0 ... KP9
++KP_PERIOD
++KP_DIVIDE
++KP_MULTIPLY
++KP_MINUS
++KP_PLUS
++KP_ENTER
++KP_EQUALS
++UP
++DOWN
++RIGHT
++LEFT ++INSERT
++HOME
++END ++ ++		 ++ ++PAGEUP
++PAGEDOWN
++F1 ... F15
++NUMLOCK
++CAPSLOCK
++SCROLLOCK
++RSHIFT
++LSHIFT
++RCTRL
++LCTRL
++RALT
++LALT
++RMETA
++LMETA
++LSUPER
++RSUPER
++MODE
++COMPOSE
++HELP
++PRINT
++SYSREQ
++BREAK
++MENU
++POWER
++EURO
++
++ ++
++ ++

++index ++Acknowlegdements

++

XRick was developed and is maintained by Bigorno.net. Big chunks of this ReadMe were lifted from their website with permission. Thanks for the nice game, guys!

++ ++


++ ++ ++ + +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@4Lb-zSh3A|U%I`38f2}S* +zF!!7juR_ZT9TPqwbgY&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 +zcmbtYdpy(o|5u42Q61@!tW(J$t8|&tXkFZ;FcL#`klVzJ%q=V3B)YgW!dx~(&5XGv +z-zcn=xo$2=jE$*gR@V4_*6DkG=l|b7+vD?ky;1ZaK6lTau~b#oQkIjGQ?<4_ +z1Qcrx&}^Q@ioY2Y8c6Ku6p&dSQ_O3;;5E4kFv)asxs)iu?F +za&m(~a^F&~{HEJ`P)=@>ne{2S^ELKdUILX;wmC6)yV1MVMuRw`!I#0Un>|%%i3i2M +ztsQ?c{$a0z;4jm__U-a^&6wo6k)T^}_Cn(x3S`U=t0f}D4llFuL%j>8j5Mw)<4z9@g!2{|-o0RH8(=Vc!#f%$vN*7``Y$Y4BfG5tTgXToZ>Cqo_*^>l3 +zolMRMF_anR>wJX%Z0c*UkNWKOg8J$Z*NE8R`54#V<)guMV^gyqY2TkpiN>JX-F3@{ +za?Az7Gu#G1?W$I(i=WwYMaM6Yv%&Ef#FhzTE()#f@-+NnzKd9YNoM>SIBRlt{bwHl +zJ^?%&0tT&sf86-2_EM^V1Afhc$NwME+bznCHix#F_v+SW9t&y^C!aBdC@yt15!AJL=UZ(V$~3|DXD$8oj|-S=e> +ze@HZ=djxXS?dDs3gsRPb<{(_;NXS&sG0@a#i^gFO))F&rm)olBmAnU(Z|=WT&B{?1 +zmM89^_i;G&d>goAr7~V!ex5$INV%p%wwjL|SSO5#eUjq-1Gl*1wgLu?Vp_7ew-ghG +zB`LHlPI)le2id>e!q=6Dzm=w+&9`epP|7ass_&|cz#nx9|8W5YWt)Q{j;GeOmM#6o +zCug7TGkAk+r&6jiwzZ^lj2s7!SFgc6)!yTrujd1>HHe6*W(XfL!5$j0P4ViQvydpZ +zF3Oi{?>U>VM-Y9#&JIerKyAsyWVmVEuN7Jx^69Ah6j3C-;jJitSG$|&;FA1YB+>Wo +zcOh$8!?+NN!Ioe@i6Jb`h^9TK3uIFV)Z|4q987(uU?0&!N94jNl%0h^jIULu9)+{3SU49Bd|oK3maXFVF=_CesN}du8$Mr7=c3RqUm<*!=|=k4u6$ +zj#Nm_xcrRL5!v-lJ!{|-t2*r#2O%`K&sTn+3 +zTRL~>5(13g%1v%eIV2lTwEL^JVh~?9FfAEcbcD&S +zTYf56xp?+!Nj0oAJ*_rnI55$`^{%o4E?DWP=!&#DNkfk%4Im5;1tumQ_57wtyJ=V% +zhTR704{MoosLew|?cXI(KxsTY_#BN_%1!V#66b^-c`!s73>6yRY1nPmM_!tV0-p~& +zIFZ+col+`!%N=EYJU&9q$1CD676&McOwSUpNpqevuPXP|Q#!&NrY0X~k}_+=+7mI| +z&f?AgA631Em$rH4Pn@IlF2&?5jR>gwFt_8kh8Hzz%#E|2ZmB&>$E#tjg>Hq*N19JM +zCD8jqVNhGzD6av0-eKgC!hT+3k@lUJ?0-`?ekk8AQbNp&hWCtNN%J^w7>1Pk0R?w$ +zO{Gs@QRyK~eUb3$LOL~gZ-eT%^?rRX#OGTBO#^6344>Srg45_Ds}^L(#qTDR%$x@C +zKCEdUD;NOeP(S5L=+uq5C92~~x+3L6h~W9hFZ~2W@xNg`&3jXZ;>OH*b-DW3!<*`< +z;-&k1R2gLn0_u07^^-tDz5K1Nq!*u`zCKwJ$Il~bl>R^fW$e8c6KI;$#L#w8D-}7a +ze!A$y6}j{k{u%G^O%Yy=ql=cJ9Of~cWued}?uGD-r}Qq?^wD~!<@+j?bf7yLmbq7{ +z=HtiA`97a8ai=g3bcPv^wO>Yfh9Jn`NhZ2THk}gaRHXH&gnfK3Swn}6iu@>um`Uk% +zM|73^NZyH50}6e*+}-fSnE%PLfuuK4n+?U!4mZ60LYj+BsN|2N-7NkA`=~45%HgHI +zckSZ@nO6yKvrWA$qTBB;h4kJo+A`O(i2tI7`(TgZnXnvY +zGAk84J_XAclvFiZkcZnTQDzFUM`hjQHN6eegKokX~cLa#NT{an)BiaeGqjypNTjb1TTQRxx(Khe17k(pM;;5-pM!CoiwccP +zzM5ZL5$&+He(E11oB8Fa;4RQ=U1bjQoU$|Z`d@CAu3%}Mw?`fyGy@vohwl_R(!rB6 +zRv+i@P`WkOQf(-Z)uyvf+aML^7EFKKhUr7F|@8R|K +zH;%Oz@aH8FKIQHaB#|-X5M4_ViGf2`idoM<8}3dvRU8Nc~8HFHpaVAq0Y1mTp(|d +z;+&CrO>9x3uGl>P&y_A>)A$`aM&=1jOI~Gl>$bLOe7=E~J5?M5)3Sqh0lBE{Fnpsg +zlwq`DtQcv=Oczgtk_7mf$fq_Mgk`ENV39#(3K}ykeOMf=>_1tc*d_Tgh=@*!t+@wr +z)2IuUHNLAYQIx+d#ZKlil`&C$p3e=gN`CxYVT8zwk|UGm*%6cD3D1vs&Jdei2!*88 +zG$x?8K>+0{b6R?4U3oIcbQdY2*l(B|QFl@o~w1^0vI6GPPS7zPnJ+3%an;@ZDcJdW6TT +zmEk(&mZhfm>96ocmK3+UoMfWsxHV@dQ28O7)**dE>02>LF!u+(l#MiPMAOR<)*pbn +zz}#1VW@MpT&OwLUCVPYWb9oy0S4J{C1$f@sl!~8tkORc@65?hAts-Mu7NcvCNglpC +zkq_vv%+5j_sXZhGnk=$f0w^&+RVk9q^5Hd`BFY<8Pz9izPd}sPUKVf&)8fy&_1NQT +zue4uJwyiO4fe>V00rX=tWyd&h*fDpF5G_lA@jdIE$%E3xtmg<)nf3#^a5`w{x_8dP +zG4+alhTX2zOJa^+XHq2UJIaLjwus`>6xw|}|4^)+EI*ID-yKrxe?Xiw-;8$M*t%Bp +z9?4#IotJL2qzg)7j%8xX6Me-&3}c| +zB@o@ofZXR*7=96o)?>`QB)kprzV#1AJYWx`=MvO0N|X`y_u-I +zCvKYV-(E-?%Y~pRk8q$T6+D3q*k)m#?NT_f{0a2t=Rup9u%;(~=IvW7ZqGy!D1q>5 +z9r&Nf$~5iDgUG#qWZE-1i?@$P%)){F^aS0*5bEJi-^M+5sYh6Y=$PFmTbUd(0w-@7 +z+7BctuspDMG&3<;w&A5h20B$;vnw^n-X+dNDT#AdG}qu_)w@f&s9|ksCHy?Otc7DA +z<0!n$ksIE+@`>T~dZ@ad@TQ9e3gKojhj~)Roa-Z^-+s`jc@oe`Tu>$#rg}uHyET@>Wp*;#yBhkMKmKuDMKhV|VE< +z^0(lR3&(hZ%YFkmZ&R5|LQr*GGg0A)^{Bt)30iQ#WuWc#D+N` +z6EVa&(mlKcG!tY<0f;ga<-pjh(0Wfm(??bw5W7FAv>XXJfgL?5OoCV6lO$Vb@Y|*B +z#r)9q-TJWk)}d$M^L_{02wj+oxXXYuaCaAup(19>0#ktAK6>Sr!>{8}6PXESfyPRj +z!?T0MM-_1Ppw5}Fk-9O*8SK-#YzJoamAL&Nm#~&lAoz7-b>U6_k$UW_jf#udBU{S; +zq24U>&TmwliDEJytZmgQ%G%`^yX3&Kt-yDca3_0K$x=coGP7#6D7z%%JS@YW*;TRz +z=Z(hos#+ilJXs4HNnAaa@KgA4^&tCHdTW_-Z(z3PCDCv=7N5Bugd+nl8e0$vSbG^{ +zjvezc3xGV-`dY`r?@a^%=?Q~A#P2Q!Afx|*{Md(P%|tmK1p|9$W~PQ@ch5r5P(!&& +z$>~Acdke9^?gmF8+a1cf +z=UUofJ)Z!!z|`#+S|a4tf#HBqWiKRj>zuik9nd`N08J6c-_^IB(0HxA)+3Dc{z(H{ +zh8lBHvxI9sa~(Xm7LHy=T+&zifwlKXOVKETU*#z$Z1RE_<-p+X7)L|tl!*7M!Pz?p< +znd%z|+&6!N90=@XJTkJUT<+aZ!&ZKHp5!>EEKy^AJcY%l{=8!t#UjtZIn%eJ{PJHS +zkL*jOL(UB^m*2Q`6S&W05WqW2KveXb +z`4si*h;L7T<|E##hOt}TR(WTbN#<%m*!DfdYZC3AYuh`LV`y15?8IWMwE(&uws+~6 +z?865AXmFXaHL9jD08{y>tH~>1Zy#D#XDQZzpVoueHOF%Bmd<)Z$?50Fjfk-CVwJhX +zrR&~*z#MFV0}zlPARU>PUS{`5JK2dmZBRcfAuKvJK_C1+P0;{qV08w_-F* +yd2Vth>La)@L9N>$aob~B5rz%f)?|m-G$vG!EWG4hp2nm-Uk)R+qk!q15-q1RwKDOemR&Bj>hIVXgYcGzi +zcE)F{<2bEV3py=T#^Plvpa^0S!3!vnAOR90gxogCNlucTbKQIX*!!HEgoMk4`1Fr{ +z&$FJr&%Ug+-gkZLU2A=79~dFK0*bFz89!3_pDB|@D&zBl!FjV>!7q$d{%6WYjDS+V +zbKV5M=Wm_>Wu!75o1HZ~OQv9?@;_5HA|4O~MfGrQUbZ}OiAvE(lyRnPLlcO=R= +z6Lum3oWLy$%6an6MeM$32?v0SP9@W^qdYSuPXfu4z~v)*S%vx!XQHwrVMC1q#kbGr +z@Yp<yORot_=n1u9j3G}#X`MnOV{L)|=Yr@oZ6E;wKiqp^9z?q!)&p^ygha$5K{DX_IdIu@ST>hB;KIxd +z&Ys{}D*Iy$Oy^a&ZY)!A47b9IRJGvYva(x-n@`FH5^&`lFF0cm>mHf}BLVYD;lX8a +z^(?jkUj$e-pW>n*GZjA!OzIdW|6;lN&%>$g1LeVMe>u76qpGg1cZZWtrVSLqwz@8e +z^qktuRXdYQH^F_dv!Yl|U_UicNOB4IBl` +zeL8Cr5-Y|_;Iruw_DvzIw7U`7b;$F8EJ1EI%$*EBTB%F3&hwBv3M3auj=rN%K$5}h +zW6YAdo*N4M`o1?mWdFbl%`L-w`#g2Y56%z#bm=7j<9SY3xiA6KWK&b;_n)c_Z?zx& +zIrkO2Yu2u?fhuIIs$M7^pi{0tTB0033-x^HGBJbwzbos58?JOF?o+%rYxvAc`JBEDrUm}kF}UVt*s%+)o-u>zV~GUs*4Fj|FA0IA +zjV6jsTpTbB0~3hHV$?P_^Tw`SDHs}7_gIsOO3 +zFp-7rI)%3`(fC#cJX8%kTfyN5Y_LduqeVJ*v#(M2R>Rpd;43p`aN(3GBu$e9kW3`f +z-5?3{8U|ZiTG+O2+eyKvh#M_Q=!QXu-E~aENEhFs>-=f+<`mo>zy}!VnP81Z?8>!u +zH?Fxh*nIv}=e-4fDvSKCO4%Pp&IUQhQh#5e#>#i#<_oMbR13kFU|-)q4t(m|@@OQx +zM5oh<0E7?-(?qgG%(Thas%dQ7wvGAo=W{_t1!gETB>0ruM*yEB5eLGFL?-umv$H8v +zRq8BZOxNzX=d-GS;AOR0b6Toh{fX;0YX?u +zn}m`;fZLWXW%1(0IGs)uj|WqdEI>nmHy|xq0`N-`W1LP>ko8D}>V}3?1^<*f8EPiT +zhTZxnzMSy;Gp2gJ?8w3?Tp*l!zqx(hC>UD|Zg(b?Do_Ao5{MuO6+|wn6_G6K^z^{S +zH{raJ5`5X&mgr%%Fs6wq1YTK2DJVcF3PK1>A&7T$3<=)i#voUg)9s)DiV$=q5**ev +z>YAETmAoFyflnM2{>ihv@$_rjGDE^372^~Alh4Nhm-m7w1~DJR6?U2rVyZ<9u;^mz +z$!)c@kdd7vNqt=bFj`yFxn>s>AZ2F{2|lGC38ODmnKTTJB@!eIgMCMiq%L;>;na^I +zJs@S9KIGuMX}VNa>bXdA>FM!al5OFWGu>YWQ3jj?Vj+l15aVo8;y@$Ni>m6>*24d8 +zY2(~r5U<+}8492B0#nx!d3k9saQb}c?d_Phzzqa1fPkV{W;9!-^D@2&INctl-lKtu~Pw%Yu&?zqQE_OS#SKcwl*zN5`A7E +z0m3v%*4L+7TXDMyOqqh@bRGvDz-@bv0W`&8L=1!Wt}eFptq<-aqxInwJODt~F+Xe6 +zH+DVCT>dd~P=;1c-HalZ-_ADSf^yW0)pK<8fk!K|GP*?LB)4TN5CF#q^Dg +zz-jCZt=mFdv&PQ!g;ZzkXHlRB%tJQNMmx0v9o9YD`y>hO{x-~=1*>=L;6Q6@zade| +z&;qlyl|-L_;c&YtIQwjTrKJc-!oX_Do^VM&@i53ncgdnB0na5;91F^%0 +z(<6ou0{@sXjF~ly+|p7|6v7z-sC9O-t-6{rRZU$wADBH5(l`fQ}WN>I4o0doYu=BoeL2vh9vGc?F|j&J1{J4b+B0Od2(c9JkwYf5S*G +zj!Ypiy1PkqbRhYBNQyP3lq3na*NboLSh4~E5Q47ucHZ2(7hTu6eCAA&hJh9i1LOlQ +zoHha1EvESA_o%P<{CZF*q$4^aV`%InA=Tfyfo3dkXdxU9v2mlulqvMZ2JHAi**KU! +z6`o$Lv+uwGibszo*W$MbD=&|aYHO*ku4Zv% +zCB>>r!ZbN(b)hL(VY77X@T3I%+ihHR?@j9Z++0e8?6JdIebe7e@PbSdLRjvu0U?}D +zofY4OYnNGpR7@*eZYF^QOfG?$Q{nfo!h3af1oQGx{eG~$z_d_WoEQelt}dcYO_+v( +zP!uGm6M)*wc_0e#;W|Ww(QX +z8MlL(3HpV$(&xrtn$TyG1RLIfEpPV^kfz^Hz>)>9F2}AEA(~N@=12YCjM8(jdt`>gwgvQ#f +zP!SAr$<(Rj`~4(`h!~mnxoLA6kHwH}jYzf0>s3|MSZje8kb}Lkdt4Xz*#h;7Z_oE` +z^m^nm!jVLB07}wY3<-NtBy`K=GnyrH@1QTT(LYTpg0<`5mg~Wrok4<4fEo2*_JYp= +z3oAV2Iz6m;x0&s=wRqibRIe9VmeYEG5b04N^IVc;L`Hx`V68q|LZKAq=ddOx{R#N- +zEcLSG(*l2XxD2b8*n7!6Dqg%ny +zq0pJl;&FKtxD;O8tMTEXLnsahs@H4v@r;&FlVW>>$oM^gfTw|@VDAlH6I4sS7A$&E +zN+gwrHs1cUyXTd+nj2nzp^8HcY8rQ5$M3#>hx$M2XzeUvkd6m#cmrls!nk5EZHaYB +z@Yq98=!4Qi_~t^`yb-Rx)BG9cH44e*T1b*LY7AcKOiPEyWq|Ka9KB+HckH#tYWClJ|9fpu{G~R$qq>ET6Xo#1 +z9<&4X`kJd3s&`AKM-k|l24uV7qB(HxEErb=B;m+Wn4W-{rLb`?+_eaP{1hy`L`6zTHCx9o&2z_Pv3p`FotQO`g}O-`M^+Ku&=R^ +zHfu7}3;cjoR2bmZrqGu4O`-Q{!>6~)y1yQM=>kuAVII>lJ(x)kz8sxB>tN+e5buJ@ +zY0%sP?bWcT+#(@A2NVU`<2o_j^O}^v&0dsO!72`m)er-rj}=sYBQCdpu;@0oT;z +z=~#C+pBzr_{oD`iJ!1qMZKUa&mwWCfi7=B^srf$m_mw)=1z~(H{PIOOD*zR0dNN10 +z3!1|4@m@aDVOM<%(e)qcRlnUFe$p+JtpQo&`z7~eGYV!@!i<0!mk|jZszW%|Hib4| +zjpdtxmw|J%aJYDPeLe9+f;^80x4r3du&Ied)~awfu!4+L;jjq^=@{R+%CkZNS8D59 +zN`im1&ZqCg3_mO?fp7v!{iMG!04U6bPQjJC>UoItXB4otPCvBjqws2vByAt>%9`s+ +zN~6rEoSrzTa`rimy@_XQbUhW^XvLc2Hv@AUL!s!QHzE}`U_$z*zLFUG>E?fZ_M}I;87?tV+v+W!Hg?3wk9`zazHn7qKwLS(eL|$)F(8O1mp8zPYajsYvNHd +zVs$CgbP}&Ngx=Po#`C3F&PjgZo@6E)UGR0^Tw-Xy~y%w~O^cG~D+IUR<}Xe`zB4vRDC(Jy}`5s%u!csH%G2vrVmw +z^Bj(G!>#)n@qmAtQSh*2%8D5`*!XGJ4}SW(_KJPW+y}?TNL)6_P2V2X08enq;P*fR +zCf2m@{Hc_=JshrksjY4O$)7y24ch}21j&AYXd +zn8^)h>tInAJhi)lh5NDOURB|s240ob+ca+FBzgQz+B22qzxaQ=rU1pjd3?^IH_(PX +z3x4+xp?Q^vM0~z^EXhOMYaR2}S07*qoM6N<$g8k8I +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 +zcmeHOdyG_99X`V@3v8E1R~oRTI<1;67J&t$SRr%gb|27P3fT1|(#G-o?z!jAxx-z! +zWtWncIms_)&Uc>o_dfUTE?V5$xNvbptw0HZ@=Z4)lejkvLVl+mK4t@UoUtJr};R+V8^+r3N8a{La1ZUk{| +znHcB6zY3fWP$nupcn2`fCEmPbiM&#d9U&bzuJWX#e!Lf2{qevB!w>mt{alVzYknDB;ussfcy;U6$iHssS=I&x-@)-l}fto?~4fWW$>jBoXnx7 +zxwL`i@i#DXn5C~@2&MhDI0lS@6AWYUR1p0decWW!XHahf?E#JTh^GSxXPiS_g?a{v +zvj@@Ub_YNMSp6{SX_~lrj3R4U7z!pZdTcU^OeLdO@RQajM%i^C>>#k(MfZFhLyuSu +z;#?JW6kY>d7ns8F1RjAACw&_v*YSp(RSs?ojDeP(Z)Ggm<;shUqq$sU9;)N>7~ti% +z>?w~uY@YhlZ5ltlQADf^$ji+*R#0C0DL?r-6;!PJ3TOJH^HSk0z;)%9@`2U@_v7Wm +z4(=*HdD)#wA$+SC(gj`(fSJ@=>S;6Ta^2^&0}vo~P&L^e&|-iP-vmNcpO1P|^ygNC +z`TqNr8j}&NJ^sBh6ij2Y*f=Pc{Su{7m`{x@PLvdW2l{j_E8GCCbD214ImnO8-41SZ +znTZlYW5P@~nfq3fr|FKdoH6)?wzEtu4`GJ8I0cXLdvzmaH(d8{dfL +z-@MP9w|!T1=DvyM;oiN`YV(WcPrJ874{f~N-0_WV(G6Ae3JP7k!2g~)8C|=(H{b#k +zPVova=8i<~|Dg7=E9gSJIDx%xBss@5i`g)V!=OG8{YM9g;qo~U10eCGAdZ{Fw!tx) +z`LN?KJ3v7ecn%8;7;*t=W>>PpR&V->n}|1k&F0o8;#tv;AR6R4*oko=s6EYxg=V1_ +zbrYsz`HmBq*>7(nn&6m%?9z`d7%jL9XJeXOxHH?l*{Vw?cVZ#VOK0P~OPV>3hRg%V +z@#EZk_-=Ggad6vkIS`RXbfyxi41SCJs!XiQiX-g&3}b_w_Yh{$Q7Epca~IBAVV{@J +zaWjZTo_C_CZ#L^Vj_G9>#4+kQ_?yqS!p4Y?5p7GF8x-CPTskb=^tI=H2sj;RnV8_g +ze+W$OJH>N(-r?Y#iC8v^3%U@EiUpoVE)z>;yHlCoSdJ;_U%v9rlT&X!8F}W!ifzkZ +zIoALCec!!#^0MDXF6?^sM=kY#M4~E;XN{=Ay7i&?hUDW+>f>KLeRESH?1gK0;L6|>+1_jwHGsjocah>y&67>oM1j%?4uOE +z27P`$Y6EaTAN6D4em-iqgMUaLg<0?}=je-y%V^Q}wu8?zWT)XM6%UaApd$a;+_}19 +zox1SWf(08sBYl_4OLNeq8Ia3gYcNM#E!IOu2tfeJS`3E`Fr$5A@_$Gyg3{Eb1o5*j~>FfI{5fMm&zGL3TNSS$fvN6)1N)N|_Z@dTuCy?Njl6t$w3nSfO*) +z!ymC*KwPs7eq6sv%>>RTE5rSXpAY$@q+XC5f0KQaBF1w(Fa*BE!R`BNI1}%-1EKv^ +ziw!=88_f!7TG2%XgHQ(jau8p<2Uj2~xeBMXlHmuethLfgSh@A#Y-cPHx7X^8t@G>X +zGZx}RLF7^gA@F8N9xqzQv?m$ea*zLzUZZ2D5p~mHhY0>je5_ +zHt3btI2_7PUe!b3cRF}MUVIu?UKF=2FKRWj4}2lEKT^69i)X~67)2hg&g8P3!2SKo +zBj{5+0QIp5rcee3b`Z +z=;GBLyd5}YM;lSL!*!G`*o@+U)?6mFIxhH@INTXa0}-f +zdhj&*$);jkqO6DO{kW|p23Ku7E3_5;>#4mz=hBVqSjABEYFa&;wgBJ|RlfZEc +z*X^k<*CjiWpOB~zBb&U5YiUP=kzoX+k{uN%btOBJe(PFXf=1YmP9J@z|BVOFN6szl +zK6&KqOZ`qAQFzCb^?yBi@C(Mv@%)S9|2x+hh8xd|MN$BsMvlu-C=;YOa1 +z{BnBz%7rO_D;M6oUAd?aBDGg`5egevjAc0X(hx9zGm+<9t^7^B81>8F_+r#Af8)O- +z_~mb7hRD+<4S`R0@FDWI%gL*B6B^+RZZM+1WV6*$k8WHyV~DUB4cVM&f!n +mI*E%s+?*@(aE??^4I?8cdALhv)|Zo4$-{jTJlu#_(*FT1tD>d= + +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 + diff --git a/games-arcade/xrick/xrick-021212.recipe b/games-arcade/xrick/xrick-021212.recipe index e86a18b81..13061da70 100644 --- a/games-arcade/xrick/xrick-021212.recipe +++ b/games-arcade/xrick/xrick-021212.recipe @@ -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 ----------------------------------------------------------- diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe index 71a969d4b..2a368f91f 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe @@ -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 " diff --git a/haiku-apps/paladin/patches/paladin-git.patchset b/haiku-apps/paladin/patches/paladin-git.patchset new file mode 100644 index 000000000..565aa621b --- /dev/null +++ b/haiku-apps/paladin/patches/paladin-git.patchset @@ -0,0 +1,48 @@ +From cab97efc07e4a49f61d9ff9ca7864c193ad22a9e Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +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 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 + diff --git a/haiku-apps/slayer/slayer-0.9.recipe b/haiku-apps/slayer/slayer-0.9.recipe index dd7343a1d..e2b83b892 100644 --- a/haiku-apps/slayer/slayer-0.9.recipe +++ b/haiku-apps/slayer/slayer-0.9.recipe @@ -23,6 +23,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:make cmd:gcc + cmd:mkdepend " BUILD() diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe index cd1262412..39d1fb7ff 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe @@ -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=" diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe index 8f4f94b61..aa53e9a76 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe @@ -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=" diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe index 822a935cf..a726061eb 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe @@ -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=" diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset new file mode 100644 index 000000000..d4c97a1f8 --- /dev/null +++ b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset @@ -0,0 +1,29 @@ +From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001 +From: Jonathan Schleifer +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 + diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset new file mode 100644 index 000000000..d4c97a1f8 --- /dev/null +++ b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset @@ -0,0 +1,29 @@ +From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001 +From: Jonathan Schleifer +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 + diff --git a/haiku-libs/libprefs/libprefs-1.2.5.recipe b/haiku-libs/libprefs/libprefs-1.2.5.recipe index d6306bfb8..caca21844 100644 --- a/haiku-libs/libprefs/libprefs-1.2.5.recipe +++ b/haiku-libs/libprefs/libprefs-1.2.5.recipe @@ -33,7 +33,7 @@ BUILD_PREREQUIRES=" SOURCE_DIR="libprefs125" -PATCHES="libprefs.patch" +PATCHES="libprefs-1.2.5.patch" BUILD() { diff --git a/haiku-libs/libprefs/patches/libprefs.patch b/haiku-libs/libprefs/patches/libprefs-1.2.5.patch similarity index 100% rename from haiku-libs/libprefs/patches/libprefs.patch rename to haiku-libs/libprefs/patches/libprefs-1.2.5.patch diff --git a/media-fonts/vl_gothic/licenses/M+ Fonts Project b/media-fonts/vl_gothic/licenses/M+ Fonts Project new file mode 100644 index 000000000..de6b009cc --- /dev/null +++ b/media-fonts/vl_gothic/licenses/M+ Fonts Project @@ -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/ diff --git a/media-fonts/vl_gothic/licenses/Sazanami Gothic Font b/media-fonts/vl_gothic/licenses/Sazanami Gothic Font new file mode 100644 index 000000000..bc51733b3 --- /dev/null +++ b/media-fonts/vl_gothic/licenses/Sazanami Gothic Font @@ -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. \ No newline at end of file diff --git a/media-fonts/vl_gothic/vl_gothic-20140530.recipe b/media-fonts/vl_gothic/vl_gothic-20140530.recipe new file mode 100644 index 000000000..f63f269ac --- /dev/null +++ b/media-fonts/vl_gothic/vl_gothic-20140530.recipe @@ -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 . +2006-2014 Project Vine . +" +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} +} diff --git a/media-libs/fitz/fitz-1.1.recipe b/media-libs/fitz/fitz-1.1.recipe index 3f2988792..d4e1fcec7 100644 --- a/media-libs/fitz/fitz-1.1.recipe +++ b/media-libs/fitz/fitz-1.1.recipe @@ -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" diff --git a/media-libs/fontconfig/fontconfig-2.11.1.recipe b/media-libs/fontconfig/fontconfig-2.11.1.recipe new file mode 100644 index 000000000..22636a5c0 --- /dev/null +++ b/media-libs/fontconfig/fontconfig-2.11.1.recipe @@ -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 + " diff --git a/media-libs/fontconfig/patches/fontconfig-2.11.1.patchset b/media-libs/fontconfig/patches/fontconfig-2.11.1.patchset new file mode 100644 index 000000000..a4c77feb3 --- /dev/null +++ b/media-libs/fontconfig/patches/fontconfig-2.11.1.patchset @@ -0,0 +1,22 @@ +From 59eff810d3a298cddd8283f02f64ae77bc74dfb1 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 + diff --git a/media-libs/giflib/giflib-5.1.0.recipe b/media-libs/giflib/giflib-5.1.0.recipe new file mode 100644 index 000000000..eacfa0641 --- /dev/null +++ b/media-libs/giflib/giflib-5.1.0.recipe @@ -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 + " diff --git a/media-libs/giflib/patches/giflib-5.1.0.patchset b/media-libs/giflib/patches/giflib-5.1.0.patchset new file mode 100644 index 000000000..7bea69031 --- /dev/null +++ b/media-libs/giflib/patches/giflib-5.1.0.patchset @@ -0,0 +1,29 @@ +From 1f7529dc2a255afb5d1ece8719761a13901751dd Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 + diff --git a/media-libs/libcddb/libcddb-1.3.2.recipe b/media-libs/libcddb/libcddb-1.3.2.recipe index 4e88f2272..60632a98d 100644 --- a/media-libs/libcddb/libcddb-1.3.2.recipe +++ b/media-libs/libcddb/libcddb-1.3.2.recipe @@ -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 +" + diff --git a/media-libs/libdv/libdv-1.0.0.recipe b/media-libs/libdv/libdv-1.0.0.recipe new file mode 100644 index 000000000..6dc72151a --- /dev/null +++ b/media-libs/libdv/libdv-1.0.0.recipe @@ -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 + 1999 Charles 'Buck' Krasic " +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 + " diff --git a/media-libs/libdv/patches/libdv-1.0.0.patchset b/media-libs/libdv/patches/libdv-1.0.0.patchset new file mode 100644 index 000000000..437cfd5b9 --- /dev/null +++ b/media-libs/libdv/patches/libdv-1.0.0.patchset @@ -0,0 +1,47 @@ +From dbbb34e3759ad5e67150f959a7cc2eb1dc2d1bdf Mon Sep 17 00:00:00 2001 +From: Jerome Duval +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 + diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe index 3b139d378..83dd97331 100644 --- a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe +++ b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe @@ -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 diff --git a/media-libs/libdvdread/libdvdread-4.1.3.recipe b/media-libs/libdvdread/libdvdread-4.1.3.recipe deleted file mode 100644 index b016206fe..000000000 --- a/media-libs/libdvdread/libdvdread-4.1.3.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="libdvdread" -HOMEPAGE="http://www.mplayerhq.hu/design7/news.html" -SRC_URI="http://www3.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-4.1.3.tar.bz2" -CHECKSUM_MD5="6dc068d442c85a3cdd5ad3da75f6c6e8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libdvdread-4.1.3 - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libdvdread-4.1.3 - make install -} diff --git a/media-libs/libdvdread/libdvdread-4.2.1.recipe b/media-libs/libdvdread/libdvdread-4.2.1.recipe index be2de068d..3afdfabe6 100644 --- a/media-libs/libdvdread/libdvdread-4.2.1.recipe +++ b/media-libs/libdvdread/libdvdread-4.2.1.recipe @@ -17,7 +17,7 @@ REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" -PATCHES="libdvdread-4.2.0.patch" +PATCHES="libdvdread-4.2.1.patch" PROVIDES=" libdvdread${secondaryArchSuffix} = $portVersion diff --git a/media-libs/libdvdread/libdvdread-svn1168.recipe b/media-libs/libdvdread/libdvdread-svn1168.recipe deleted file mode 100644 index 2c9bfcf7d..000000000 --- a/media-libs/libdvdread/libdvdread-svn1168.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libdvdread is a library for DVD navigation tools" -HOMEPAGE="http://mplayerhq.hu" -SRC_URI="http://download.m0k.org/handbrake/contrib/libdvdread-svn1168.tar.gz" -CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libdvdread - libtoolize --force --copy --install - aclocal - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libdvdread - make install -} diff --git a/media-libs/libdvdread/libdvdread-svn1226.recipe b/media-libs/libdvdread/libdvdread-svn1226.recipe deleted file mode 100644 index f40b24a82..000000000 --- a/media-libs/libdvdread/libdvdread-svn1226.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libdvdread is a library for DVD navigation tools" -HOMEPAGE="http://mplayerhq.hu" -SRC_URI="http://download.m0k.org/handbrake/contrib/libdvdread-svn1168.tar.gz" -CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libdvdread - svn up -r 1226 - libtoolize --force --copy --install - aclocal - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL() -{ - cd libdvdread - make install -} diff --git a/media-libs/libdvdread/patches/libdvdread-4.1.3.patch b/media-libs/libdvdread/patches/libdvdread-4.1.3.patch deleted file mode 100644 index c7cebd27d..000000000 --- a/media-libs/libdvdread/patches/libdvdread-4.1.3.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN libdvdread-4.1.3/configure.ac libdvdread-4.1.3-haiku/configure.ac ---- libdvdread-4.1.3/configure.ac 2009-02-19 08:11:30.000000000 +0000 -+++ libdvdread-4.1.3-haiku/configure.ac 2009-02-19 08:03:55.000000000 +0000 -@@ -145,6 +145,8 @@ - *cygwin*) - LDFLAGS="-no-undefined $LDFLAGS" - ;; -+ *haiku*) -+ ;; - *) - AC_CHECK_LIB(c, dlopen, - DYNAMIC_LD_LIBS="", -diff -urN libdvdread-4.1.3/src/bswap.h libdvdread-4.1.3-haiku/src/bswap.h ---- libdvdread-4.1.3/src/bswap.h 2009-02-19 08:11:31.000000000 +0000 -+++ libdvdread-4.1.3-haiku/src/bswap.h 2009-02-19 08:09:28.000000000 +0000 -@@ -71,7 +71,7 @@ - * functionality! - */ - --#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) -+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) diff --git a/media-libs/libdvdread/patches/libdvdread-svn1226.patch b/media-libs/libdvdread/patches/libdvdread-4.2.1.patch similarity index 60% rename from media-libs/libdvdread/patches/libdvdread-svn1226.patch rename to media-libs/libdvdread/patches/libdvdread-4.2.1.patch index 345fb9cea..7ca237fcc 100644 --- a/media-libs/libdvdread/patches/libdvdread-svn1226.patch +++ b/media-libs/libdvdread/patches/libdvdread-4.2.1.patch @@ -1,26 +1,22 @@ -Index: libdvdread/src/bswap.h -=================================================================== ---- libdvdread/src/bswap.h (revision 1226) -+++ libdvdread/src/bswap.h (working copy) -@@ -73,7 +73,7 @@ - * functionality! - */ - --#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) -+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__) || defined(__OS2__) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) -Index: configure.ac -=================================================================== ---- libdvdread/configure.ac (revision 1226) -+++ libdvdread/configure.ac (working copy) +--- libdvdread-4.2.0/configure.ac 2011-10-07 20:20:59.008912896 +0000 ++++ libdvdread-4.2.0-haiku/configure.ac 2012-04-09 16:22:42.155713536 +0000 @@ -148,6 +148,8 @@ *os2*) LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" ;; + *haiku*) -+ ;; ++ ;; *) AC_CHECK_LIB(c, dlopen, DYNAMIC_LD_LIBS="", +--- libdvdread-4.2.0/src/bswap.h 2008-10-09 22:04:24.005242880 +0000 ++++ libdvdread-4.2.0-haiku/src/bswap.h 2012-04-09 16:24:41.829947904 +0000 +@@ -73,7 +73,7 @@ + * functionality! + */ + +-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) ++#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__)|| defined(__HAIKU__) + #define B2N_16(x) \ + x = ((((x) & 0xff00) >> 8) | \ + (((x) & 0x00ff) << 8)) diff --git a/media-libs/libdvdread/patches/libdvdread-svn1168.patch b/media-libs/libdvdread/patches/libdvdread-svn1168.patch deleted file mode 100644 index f92ea62f7..000000000 --- a/media-libs/libdvdread/patches/libdvdread-svn1168.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libdvdread/src/bswap.h -=================================================================== ---- libdvdread/src/bswap.h (revision 1168) -+++ libdvdread/src/bswap.h (working copy) -@@ -73,7 +73,7 @@ - * functionality! - */ - --#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) -+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__) || defined(__OS2__) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) -Index: configure.ac -=================================================================== ---- libdvdread/configure.ac (revision 1168) -+++ libdvdread/configure.ac (working copy) -@@ -148,6 +148,8 @@ - *os2*) - LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" - ;; -+ *haiku*) -+ ;; - *) - AC_CHECK_LIB(c, dlopen, - DYNAMIC_LD_LIBS="", diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.recipe b/media-libs/libid3tag/libid3tag-0.15.1b.recipe index dba9704d1..ce2c45751 100644 --- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe +++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe @@ -1,33 +1,34 @@ -SUMMARY="The MAD id3tag library" -DESCRIPTION="The MAD id3tag library" -HOMEPAGE="http://www.underbit.com/products/mad/" -SRC_URI="ftp://ftp.mars.org/pub/mpeg/$portName-$portVersion.tar.gz" +SUMMARY="The MAD id3tag library" +DESCRIPTION="The MAD id3tag library" +HOMEPAGE="http://www.underbit.com/products/mad/" +SRC_URI="ftp://ftp.mars.org/pub/mpeg/libid3tag-$portVersion.tar.gz" CHECKSUM_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151" REVISION="1" -ARCHITECTURES="x86_gcc2" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - $portName = $portVersion - lib:libid3tag = 0.3.0 compat = 0 + libid3tag$secondaryArchSuffix = $portVersion + lib:libid3tag$secondaryArchSuffix = 0.3.0 compat = 0 " REQUIRES=" - haiku >= $haikuVersion - lib:libz + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion - devel:libz + haiku${secondaryArchSuffi}_devel >= $haikuVersion + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:libtoolize cmd:autoconf cmd:make - cmd:gcc + cmd:gcc$secondaryArchSuffix " -PATCHES="$portName-$portVersion.patchset" +PATCHES="libid3tag-$portVersion.patchset" BUILD() { libtoolize --force --copy --install @@ -54,7 +55,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="2000-2004 Underbit Technologies, Inc." PROVIDES_devel=" - devel:libid3tag + devel:libid3tag$secondaryArchSuffix " REQUIRES_devel=" diff --git a/media-libs/libmetalink/libmetalink-0.1.2.recipe b/media-libs/libmetalink/libmetalink-0.1.2.recipe new file mode 100644 index 000000000..1ab81bc98 --- /dev/null +++ b/media-libs/libmetalink/libmetalink-0.1.2.recipe @@ -0,0 +1,77 @@ +SUMMARY="A library to read Metalink files." +DESCRIPTION=" +Libmetalink is a library to read Metalink XML download description \ +format. It supports Metalink version 3 and Metalink version 4 (RFC \ +5854). +" +HOMEPAGE="http://launchpad.net/libmetalink" +COPYRIGHT=" + 2008 Tatsuhiro Tsujikawa + " +LICENSE="MIT" +SRC_URI="https://launchpad.net/libmetalink/trunk/packagingfix/+download/libmetalink-$portVersion.tar.bz2" +CHECKSUM_SHA256="cbed9121bf550ef14a434d6ed3d8806ded7a339db16b698cfa2f39fdc3d48bf6" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libmetalink-$portVersion.patchset" + +PROVIDES=" + libmetalink$secondaryArchSuffix = $portVersion compat >= 0 + lib:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libexpat$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libexpat$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:find + cmd:pkg_config + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure --disable-dependency-tracking \ + --without-libxml2 + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libmetalink + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libmetalink${secondaryArchSuffix}_devel = $portVersion compat >= 0 + devel:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3 + " +REQUIRES_devel=" + libmetalink$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset b/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset new file mode 100644 index 000000000..bc946ba29 --- /dev/null +++ b/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset @@ -0,0 +1,31 @@ +From d04fd063299d5bb51ad4f1a84aa00beab5ed1170 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 14:18:29 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 1d2e686..1643fe5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,7 +78,7 @@ AC_SUBST([NUMBER_VERSION], `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSIO + # Checks for libraries. + + if test "x$with_libexpat" = "xyes"; then +- AM_PATH_LIBEXPAT ++ PKG_CHECK_MODULES([EXPAT],[expat],[have_libexpat=yes]) + fi + + if test "x$with_libxml2" = "xyes" && test "x$have_libexpat" != "xyes"; then +@@ -185,7 +185,7 @@ AC_MSG_NOTICE([summary of build options: + CPPFLAGS: ${CPPFLAGS} + C preprocessor: ${CPP} + Library types: Shared=${enable_shared}, Static=${enable_static} +- Libexpat: ${have_libexpat} ${EXPAT_CFLAGS} ${EXPAT_LIBS} ++ Libexpat: ${have_expat} ${EXPAT_CFLAGS} ${EXPAT_LIBS} + Libxml2: ${have_libxml2} ${XML_CPPFLAGS} ${XML_LIBS} + CUnit: ${have_cunit} ${CUNIT_CFLAGS} ${CUNIT_LIBS} + ]) +-- +1.8.3.4 + diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3.recipe b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe deleted file mode 100644 index 667f0b108..000000000 --- a/media-libs/libnsbmp/libnsbmp-0.0.3.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" -SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.0.3-src.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" - -BUILD() -{ - cd libnsbmp-0.0.3 - make -} - -INSTALL() -{ - cd libnsbmp-0.0.3 - make install -} - -LICENSE="MIT" -COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe b/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe deleted file mode 100644 index a0bd99208..000000000 --- a/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" -SRC_URI="git://git.netsurf-browser.org/libnsbmp.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/buildsystem >= 0.0.1" - -BUILD() -{ - cd libnsbmp-0.1.0-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libnsbmp-0.1.0-HEAD - make install PREFIX=/boot/common -} - -LICENSE="MIT" -COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox" diff --git a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe new file mode 100644 index 000000000..cf0586719 --- /dev/null +++ b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe @@ -0,0 +1,42 @@ +DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" +SUMMARY="A decoding library for BMP and ICO images" +HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.1.1-src.tar.gz" +CHECKSUM_SHA256="584046809d3213e5917cd26eafb03068ca94274229f595f0e0520b15fa454f98" +REVISION="1" +ARCHITECTURES="x86_gcc2" +PROVIDES=" + libnsbmp = $portVersion +" +BUILD_REQUIRES=" + netsurf_buildsystem +" +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make +" + +PATCHES="libnsbmp-0.1.1.patchset" +BUILD() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem +} + +INSTALL() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir install + + prepareInstalledDevelLib libnsbmp + fixPkgconfig libnsbmp + packageEntries devel $developDir +} + +LICENSE="MIT" +COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox" + +PROVIDES_devel=" + libnsbmp_devel = $portVersion + devel:libnsbmp = $portVersion +" diff --git a/media-libs/libnsbmp/patches/libnsbmp-0.1.1.patchset b/media-libs/libnsbmp/patches/libnsbmp-0.1.1.patchset new file mode 100644 index 000000000..230807a60 --- /dev/null +++ b/media-libs/libnsbmp/patches/libnsbmp-0.1.1.patchset @@ -0,0 +1,35 @@ +From 7d7f8e2d601f5d40e5f434fe07c705eb5437605a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 9 Jun 2014 21:20:45 +0200 +Subject: Fix paths for Haiku. + + +diff --git a/Makefile b/Makefile +index aad7a6e..8b0a5df 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ endif + include $(NSBUILD)/Makefile.top + + # Extra installation rules +-I := /include/ ++I := /$(INCLUDEDIR)/ + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsbmp.h + INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in + INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) +diff --git a/libnsbmp.pc.in b/libnsbmp.pc.in +index 5d6b843..5536269 100644 +--- a/libnsbmp.pc.in ++++ b/libnsbmp.pc.in +@@ -1,7 +1,7 @@ + prefix=PREFIX + exec_prefix=${prefix} + libdir=${exec_prefix}/LIBDIR +-includedir=${prefix}/include ++includedir=${prefix}/INCLUDEDIR + + Name: libnsbmp + Description: Provides bmp loading and conversion +-- +1.8.3.4 + diff --git a/media-libs/libnsgif/libnsgif-0.0.3.recipe b/media-libs/libnsgif/libnsgif-0.0.3.recipe deleted file mode 100644 index 7b5fa0c2b..000000000 --- a/media-libs/libnsgif/libnsgif-0.0.3.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Libnsgif is a decoding library for the GIF image file format" -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" -SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.0.3-src.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" - -BUILD() -{ - cd libnsgif-0.0.3 - make -} - -INSTALL() -{ - cd libnsgif-0.0.3 - make install -} - -LICENSE="MIT" -COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe b/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe deleted file mode 100644 index 391fc33b7..000000000 --- a/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Libnsgif is a decoding library for the GIF image file format" -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" -SRC_URI="git://git.netsurf-browser.org/libnsgif.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/buildsystem >= 0.0.1" - -BUILD() -{ - cd libnsgif-0.1.0-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libnsgif-0.1.0-HEAD - make install PREFIX=/boot/common -} - -LICENSE="MIT" -COPYRIGHT="2004 Richard Wilson, 2008 - 2013 Sean Fox" diff --git a/media-libs/libnsgif/libnsgif-0.1.1.recipe b/media-libs/libnsgif/libnsgif-0.1.1.recipe new file mode 100644 index 000000000..62214fd3b --- /dev/null +++ b/media-libs/libnsgif/libnsgif-0.1.1.recipe @@ -0,0 +1,42 @@ +DESCRIPTION="Libnsgif is a decoding library for GIF image file format" +SUMMARY="A decoding library for GIF images" +HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.1.1-src.tar.gz" +CHECKSUM_SHA256="d450ea0a9da234486e997248b30a86524f75f1021ca67017b5597423cf6c0a15" +REVISION="1" +ARCHITECTURES="x86_gcc2" +PROVIDES=" + libnsgif = $portVersion +" +BUILD_REQUIRES=" + netsurf_buildsystem +" +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make +" + +PATCHES="libnsgif-0.1.1.patchset" +BUILD() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem +} + +INSTALL() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir install + + prepareInstalledDevelLib libnsgif + fixPkgconfig libnsgif + packageEntries devel $developDir +} + +LICENSE="MIT" +COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox" + +PROVIDES_devel=" + libnsgif_devel = $portVersion + devel:libnsgif = $portVersion +" diff --git a/media-libs/libnsgif/patches/libnsgif-0.1.1.patchset b/media-libs/libnsgif/patches/libnsgif-0.1.1.patchset new file mode 100644 index 000000000..b6a97eca3 --- /dev/null +++ b/media-libs/libnsgif/patches/libnsgif-0.1.1.patchset @@ -0,0 +1,35 @@ +From 70d5d372e5534a2d1f58025ea8a7d92fae60ad56 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 9 Jun 2014 21:28:28 +0200 +Subject: Fix paths for Haiku port. + + +diff --git a/Makefile b/Makefile +index 099477d..ccff0e9 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ endif + include $(NSBUILD)/Makefile.top + + # Extra installation rules +-I := /include ++I := /$(INCLUDEDIR) + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsgif.h + INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in + INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) +diff --git a/libnsgif.pc.in b/libnsgif.pc.in +index 3d85e6a..0255bf9 100644 +--- a/libnsgif.pc.in ++++ b/libnsgif.pc.in +@@ -1,7 +1,7 @@ + prefix=PREFIX + exec_prefix=${prefix} + libdir=${exec_prefix}/LIBDIR +-includedir=${prefix}/include ++includedir=${prefix}/INCLUDEDIR + + Name: libnsgif + Description: Provides gif loading and conversion +-- +1.8.3.4 + diff --git a/media-libs/libquicktime/libquicktime-1.2.4.recipe b/media-libs/libquicktime/libquicktime-1.2.4.recipe new file mode 100644 index 000000000..8d2bfed39 --- /dev/null +++ b/media-libs/libquicktime/libquicktime-1.2.4.recipe @@ -0,0 +1,127 @@ +SUMMARY="A library to handle Quicktime format files." +DESCRIPTION=" +libquicktime is a library for reading and writing quicktime files. It \ +is based on the quicktime4linux library, with the following \ +extensions: + + * Sourcetree upgraded with autoconf/automake/libtool and all the \ +other stuff, people like in "standard" linux libraries. + * All 3rd party libraries (jpeg, OggVorbis) were removed to reduce \ +download size, compilation time and code duplication on users harddisks. \ +Instead, the sytemwide installed libaries are autodetected by the \ +configure script. + * All codecs have been moved into dynamically loadable modules. \ +This makes it possible to distribute closed source codecs (or codecs \ +with an incompatible license) as separate packages. + * Unlike other quicktime libraries, we are source compatible with \ +quicktime4linux. Programs like cinelerra or xmovie can be compiled with \ +libquicktime (if the build system is modified, see our web page for more \ +info). + * The codecs themselves are also source compatible with \ +quicktime4linux, so porting codecs between quicktime4linux and \ +libquicktime requires only little brain load. + * Special API extensions allow access to the codec registry. \ +Applications can get important information about the codecs, their \ +settable parameters etc. at runtime. +" +HOMEPAGE="http://libquicktime.sourceforge.net" +COPYRIGHT=" + 2002 Heroine Virtual Ltd. + 2002-2007 Members of the libquicktime project. +" +LICENSE="GNU LGPL v2.1" +SRC_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz" +CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libquicktime-$portVersion.patchset" + +PROVIDES=" + libquicktime$secondaryArchSuffix = $portVersion compat >= 1.2 + lib:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:lqt_transcode + cmd:lqtremux + cmd:qt2text + cmd:qtdechunk + cmd:qtdump + cmd:qtinfo + cmd:qtrechunk + cmd:qtstreamize + cmd:qtyuv4toyuv + " +fi +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng15$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libdv$secondaryArchSuffix + lib:libmp3lame$secondaryArchSuffix + lib:libfaad$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libpng15$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libdv$secondaryArchSuffix + devel:libmp3lame$secondaryArchSuffix + devel:libfaad$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config${secondaryArchSuffix} + cmd:gettext + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal -I m4 + autoconf + automake + runConfigure ./configure --without-doxygen \ + --with-libdv --without-cpuflags + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libquicktime + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libquicktime${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 + devel:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + libquicktime$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset b/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset new file mode 100644 index 000000000..a2dff8faa --- /dev/null +++ b/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset @@ -0,0 +1,80 @@ +From 6c572e20694fc0478baaccaef6801a314938d65e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 12 Jun 2014 17:58:08 +0000 +Subject: Haiku patch + + +diff --git a/configure.ac b/configure.ac +index da1dabc..dceea22 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,7 @@ LQT_VERSION_MICRO=`echo $VERSION | cut -d . -f 3 | cut -d p -f 1` + + USER_CFLAGS=$CFLAGS + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_CANONICAL_HOST + AM_MAINTAINER_MODE +@@ -242,9 +242,9 @@ OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + + if test x$have_vorbis = xtrue; then +-LIBS="$LIBS -lmp3lame -lvorbis -lm" ++LIBS="$LIBS -lmp3lame -lvorbis" + else +-LIBS="$LIBS -lmp3lame -lm" ++LIBS="$LIBS -lmp3lame" + fi + + dnl CFLAGS="$CFLAGS" +@@ -568,11 +568,11 @@ AVCODEC_BUILD="3412992" + + AC_ARG_WITH([ffmpeg], AS_HELP_STRING([--without-ffmpeg], [Build without ffmpeg library (default: test)])) + +-if test "x$with_ffmpeg" != "xno"; then ++dnl if test "x$with_ffmpeg" != "xno"; then + +-ACL_PATH_AVCODEC($AVCODEC_BUILD , have_libavcodec="true", have_libavcodec="false") ++dnl ACL_PATH_AVCODEC($AVCODEC_BUILD , have_libavcodec="true", have_libavcodec="false") + +-fi ++dnl fi + + AVCODEC_REQUIRED=$AVCODEC_VERSION + +@@ -664,7 +664,7 @@ if test "x$with_faac" != "xno"; then + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + +-LIBS="$LIBS -lfaac -lm" ++LIBS="$LIBS -lfaac" + CFLAGS="$CFLAGS" + + AC_MSG_CHECKING(for faac) +@@ -732,7 +732,7 @@ OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + + CFLAGS="$CFLAGS" +-LIBS="$LIBS -lfaad -lm" ++LIBS="$LIBS -lfaad" + + AC_MSG_CHECKING(for neaacdec.h usability for faad2) + +diff --git a/m4/vorbis.m4 b/m4/vorbis.m4 +index 300cc6c..5a28b34 100644 +--- a/m4/vorbis.m4 ++++ b/m4/vorbis.m4 +@@ -23,7 +23,7 @@ AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile an + VORBIS_LIBS="-L$prefix/lib" + fi + +- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" ++ VORBIS_LIBS="$VORBIS_LIBS -lvorbis" + VORBISFILE_LIBS="-lvorbisfile" + VORBISENC_LIBS="-lvorbisenc" + +-- +1.8.3.4 + diff --git a/media-libs/libsndfile/libsndfile-1.0.25.recipe b/media-libs/libsndfile/libsndfile-1.0.25.recipe index c361b6648..723895751 100644 --- a/media-libs/libsndfile/libsndfile-1.0.25.recipe +++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe @@ -8,27 +8,32 @@ COPYRIGHT=" 1999-2011 Erik de Castro Lopo " LICENSE="GNU LGPL v2.1" -SRC_URI="http://www.mega-nerd.com/libsndfile/files/$portVersionedName.tar.gz" +SRC_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-$portVersion.tar.gz" CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882" -REVISION="1" -ARCHITECTURES="!x86_gcc2 x86 x86_64" +REVISION="2" +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_gcc2 x86" -PATCHES="$portVersionedName.patchset" +PATCHES="libsndfile-$portVersion.patchset" PROVIDES=" libsndfile$secondaryArchSuffix = $portVersion compat >= 1 - cmd:sndfile_cmp - cmd:sndfile_concat - cmd:sndfile_convert - cmd:sndfile_deinterleave - cmd:sndfile_info - cmd:sndfile_interleave - cmd:sndfile_metadata_get - cmd:sndfile_metadata_set - cmd:sndfile_play - cmd:sndfile_regtest - cmd:sndfile_salvage + cmd:sndfile_cmp$secondaryArchSuffix + cmd:sndfile_concat$secondaryArchSuffix + cmd:sndfile_convert$secondaryArchSuffix + cmd:sndfile_deinterleave$secondaryArchSuffix + cmd:sndfile_info$secondaryArchSuffix + cmd:sndfile_interleave$secondaryArchSuffix + cmd:sndfile_metadata_get$secondaryArchSuffix + cmd:sndfile_metadata_set$secondaryArchSuffix + cmd:sndfile_play$secondaryArchSuffix + cmd:sndfile_regtest$secondaryArchSuffix + cmd:sndfile_salvage$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES=" @@ -51,7 +56,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " BUILD() diff --git a/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset b/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset index d1203e9d4..988ce3ea4 100644 --- a/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset +++ b/media-libs/libsndfile/patches/libsndfile-1.0.25.patchset @@ -1,4 +1,4 @@ -From c94a905e75ff6769bd4289d56f687d6c2a8f6ba4 Mon Sep 17 00:00:00 2001 +From df98cdcd4887d72c46f78e7e63f7328189427476 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 20 May 2014 16:43:24 +0000 Subject: haiku patch @@ -19,3 +19,28 @@ index 8926fc6..ef9636b 100644 -- 1.8.3.4 + +From aa846ae9c25ea6a88138edda20eec82e96639a3e Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Sun, 8 Jun 2014 17:05:44 +0200 +Subject: Fix documentation path + + +diff --git a/configure.ac b/configure.ac +index 20ba55a..9604249 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -484,6 +484,10 @@ else + htmldocdir=$prefix/share/doc/libsndfile1-dev/html + fi + ++if test $host_os = "haiku" ; then ++ htmldocdir=$prefix/documentation/packages/libsndfile ++fi ++ + if test x$enable_bow_docs = "xyes" ; then + HTML_BGCOLOUR="white" + HTML_FGCOLOUR="black" +-- +1.8.3.4 + diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe deleted file mode 100644 index b9afbdabe..000000000 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" -HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" -SRC_URI="git://git.netsurf-browser.org/libsvgtiny.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/gperf >= 3.0.4 - dev-libs/libwapcaplet >= 0.1.1-HEAD - net-libs/libdom >= 0" -#CHECKSUM_MD5="" -BUILD() -{ - cd libsvgtiny-0-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libsvgtiny-0-HEAD - make install PREFIX=/boot/common -} -LICENSE="MIT" -COPYRIGHT="2003-2012 The NetSurf Developers" diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe new file mode 100644 index 000000000..dc60d7db1 --- /dev/null +++ b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe @@ -0,0 +1,48 @@ +SUMMARY="Libsvgtiny is an implementation of SVG Tiny written in C" +DESCRIPTION=" +The overall idea of the library is to take some SVG as input, and return a \ +list of paths and texts which can be rendered easily. The library does not do \ +the actual rendering. +" +HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" +SRC_URI="http://git.netsurf-browser.org/libsvgtiny.git/snapshot/release/0.1.1.tar.gz" +CHECKSUM_SHA256="78bb67e1e93b3458c1a6414b569e3295ddbe99274a78928b33a5deea20f11d71" +REVISION="1" +ARCHITECTURES="x86_gcc2" +PROVIDES=" + libsvgtiny = $portVersion +" +BUILD_REQUIRES=" + devel:libwapcaplet + devel:libdom + netsurf_buildsystem +" +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + gperf + cmd:make +" + +SOURCE_DIR="release/0.1.1" +BUILD() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem +} + +INSTALL() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir install + + prepareInstalledDevelLib libsvgtiny + fixPkgconfig libsvgtiny + packageEntries devel $developDir +} +LICENSE="MIT" +COPYRIGHT="2003-2014 The NetSurf Developers" + +PROVIDES_devel=" + libsvgtiny_devel = $portVersion + devel:libsvgtiny = $portVersion +" diff --git a/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe b/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe deleted file mode 100644 index c6db21792..000000000 --- a/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" -HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" -SRC_URI="git://git.netsurf-browser.org/libsvgtiny.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libxml2 >= 2.7.7 - dev-util/gperf >= 3.0.4 - dev-util/buildsystem >= 0 - dev-libs/libwapcaplet >= 0.1.1-HEAD - net-libs/libdom >= 0" -#CHECKSUM_MD5="" -BUILD() -{ - cd libsvgtiny-0-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libsvgtiny-0-HEAD - make install PREFIX=/boot/common -} -LICENSE="MIT" -COPYRIGHT="2003-2012 The NetSurf Developers" diff --git a/media-libs/libsvgtiny/libsvgtiny-10856.recipe b/media-libs/libsvgtiny/libsvgtiny-10856.recipe deleted file mode 100644 index b902f7b8c..000000000 --- a/media-libs/libsvgtiny/libsvgtiny-10856.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" -HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" -SRC_URI="svn://svn.netsurf-browser.org/trunk/libsvgtiny#10856" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libxml2 >= 2.7.7 - dev-util/gperf >= 3.0.4" -#CHECKSUM_MD5="" -BUILD() -{ - cd libsvgtiny-10856 - make - make install PREFIX=/boot/common -} - -INSTALL() -{ - cd libsvgtiny-10856 - make install -} -LICENSE="MIT" -COPYRIGHT="2003-2010 The NetSurf Developers" diff --git a/media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset b/media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset new file mode 100644 index 000000000..712480847 --- /dev/null +++ b/media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset @@ -0,0 +1,35 @@ +From 9dd8bfc5652cfa089bc2381385631818cb09453f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 9 Jun 2014 20:32:12 +0200 +Subject: Fix paths for Haiku. + + +diff --git a/Makefile b/Makefile +index 392d9da..6925cab 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,7 +45,7 @@ endif + include $(NSBUILD)/Makefile.top + + # Extra installation rules +-I := /include ++I := /$(INCLUDEDIR) + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/svgtiny.h + INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in + INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) +diff --git a/libsvgtiny.pc.in b/libsvgtiny.pc.in +index a3021f6..c9ca402 100644 +--- a/libsvgtiny.pc.in ++++ b/libsvgtiny.pc.in +@@ -1,7 +1,7 @@ + prefix=PREFIX + exec_prefix=${prefix} + libdir=${exec_prefix}/LIBDIR +-includedir=${prefix}/include ++includedir=${prefix}/INCLUDEDIR + + Name: libsvgtiny + Description: SVG Tiny 1.1 rendering library +-- +1.8.3.4 + diff --git a/media-libs/schroedinger/patches/schroedinger-1.0.11.patch b/media-libs/schroedinger/patches/schroedinger-1.0.11.patch deleted file mode 100644 index c495e9017..000000000 --- a/media-libs/schroedinger/patches/schroedinger-1.0.11.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- schroedinger-1.0.11/configure.ac 2012-01-23 01:32:45.012320768 +0000 -+++ schroedinger-1.0.11-haiku/configure.ac 2012-04-09 11:35:40.101187584 +0000 -@@ -85,6 +85,10 @@ - PTHREAD_CFLAGS= - PTHREAD_LIBS=-pthread - ;; -+ haiku*) -+ PTHREAD_CFLAGS= -+ PTHREAD_LIBS= -+ ;; - *) - PTHREAD_CFLAGS= - PTHREAD_LIBS=-lpthread diff --git a/media-libs/schroedinger/patches/schroedinger-1.0.11.patchset b/media-libs/schroedinger/patches/schroedinger-1.0.11.patchset new file mode 100644 index 000000000..22b591029 --- /dev/null +++ b/media-libs/schroedinger/patches/schroedinger-1.0.11.patchset @@ -0,0 +1,33 @@ +From 0c4df55a7f402a239470bef6e9bb5bf43b30da4e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 18:42:15 +0000 +Subject: Haiku patch + + +diff --git a/configure.ac b/configure.ac +index 80b561c..448daf8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE(1.6) + SCHRO_MAJORMINOR=1.0 + AC_SUBST(SCHRO_MAJORMINOR) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + dnl CURRENT, REVISION, AGE + dnl - library source changed -> increment REVISION +@@ -85,6 +85,10 @@ if test "x${with_thread}" = "xpthread" ; then + PTHREAD_CFLAGS= + PTHREAD_LIBS=-pthread + ;; ++ haiku*) ++ PTHREAD_CFLAGS= ++ PTHREAD_LIBS= ++ ;; + *) + PTHREAD_CFLAGS= + PTHREAD_LIBS=-lpthread +-- +1.8.3.4 + diff --git a/media-libs/schroedinger/schroedinger-1.0.11.recipe b/media-libs/schroedinger/schroedinger-1.0.11.recipe index 31bdc5fbb..43303b290 100644 --- a/media-libs/schroedinger/schroedinger-1.0.11.recipe +++ b/media-libs/schroedinger/schroedinger-1.0.11.recipe @@ -1,27 +1,77 @@ -DESCRIPTION="Schroedinger Dirac Video codec" -HOMEPAGE="http://www.diracvideo.org" -SRC_URI="http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz" +SUMMARY="Schroedinger Dirac Video codec" +DESCRIPTION=" +Schroedinger (or "schro" for short) is an implementation of the \ +Dirac and SMPTE VC-2 video compression specification. Dirac was \ +developed by BBC Research & Development (http://www.bbc.co.uk/rd/) \ +as an open technology with open licensing. +Schroedinger is the C library implementing video encoding and \ +decoding. Most end users will want to use an application that \ +uses the Schroedinger library for encoding and decoding Dirac \ +streams. A few such applications are Totem, VLC, and Mplayer. \ +In addition, media frameworks such as GStreamer and decoding \ +libraries such as ffmpeg can be configured to use Schroedinger \ +either internally or via plugins. +" +HOMEPAGE="http://www.diracvideo.org" +COPYRIGHT=" + 2006 BBC and Fluendo" +LICENSE="MIT" +SRC_URI="http://diracvideo.org/download/schroedinger/schroedinger-$portVersion.tar.gz" +CHECKSUM_SHA256="1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/pkg-config >= 0.23 - dev-lang/orc >= 0.4.16" -CHECKSUM_MD5="da6af08e564ca1157348fb8d92efc891" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="schroedinger-$portVersion.patchset" + +PROVIDES=" + schroedinger$secondaryArchSuffix = $portVersion compat >= 1.0 + lib:libschroedinger_1.0$secondaryArchSuffix = 0.11.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:liborc_0.4$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:liborc_0.4$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + BUILD() { - cd schroedinger-1.0.11 - 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 + autoreconf -f -i -I m4 + runConfigure ./configure + make $jobArgs } INSTALL() { - cd schroedinger-1.0.11 make install + + prepareInstalledDevelLibs libschroedinger-1.0 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } -LICENSE="MIT" -COPYRIGHT="2006 BBC and Fluendo" +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + schroedinger${secondaryArchSuffix}_devel = $portVersion compat >= 1.0 + devel:libschroedinger_1.0$secondaryArchSuffix = 0.11.0 compat >= 0 + " +REQUIRES_devel=" + schroedinger$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index da25c21da..ec11f7ca4 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -30,6 +30,8 @@ REQUIRES=" lib:libfreetype$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libGL$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix " BUILD_REQUIRES=" @@ -37,6 +39,8 @@ BUILD_REQUIRES=" devel:libsdl$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix + devel:libpng$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/media-libs/x264/patches/x264-20120803.patch b/media-libs/x264/patches/x264-20120803.patch deleted file mode 100644 index 6e48d2cc2..000000000 --- a/media-libs/x264/patches/x264-20120803.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- x264-snapshot-20120803-2245.orig/configure 2012-08-03 20:45:03.065273856 +0000 -+++ x264-snapshot-20120803-2245/configure 2012-08-04 12:56:56.527171584 +0000 -@@ -520,6 +520,9 @@ - fi - HAVE_GETOPT_LONG=0 - ;; -+ *haiku*) -+ SYS="haiku" -+ ;; - *) - die "Unknown system $host, edit the configure" - ;; diff --git a/media-libs/x264/patches/x264-20140308.patchset b/media-libs/x264/patches/x264-20140308.patchset new file mode 100644 index 000000000..1acbed1f1 --- /dev/null +++ b/media-libs/x264/patches/x264-20140308.patchset @@ -0,0 +1,23 @@ +From a31af43d0e8d602e467570de30b816b01f30bd40 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 19:56:27 +0000 +Subject: Haiku patch + + +diff --git a/configure b/configure +index 0177cfc..d1a118f 100755 +--- a/configure ++++ b/configure +@@ -550,6 +550,9 @@ case $host_os in + HAVE_GETOPT_LONG=0 + CFLAGS="$CFLAGS -I\$(SRCPATH)/extras" + ;; ++ *haiku*) ++ SYS="haiku" ++ ;; + *) + die "Unknown system $host, edit the configure" + ;; +-- +1.8.3.4 + diff --git a/media-libs/x264/x264-20120803.recipe b/media-libs/x264/x264-20120803.recipe deleted file mode 100644 index e0881ff35..000000000 --- a/media-libs/x264/x264-20120803.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="x264 h.264/AVC encoder" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -SRC_URI="ftp://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120803-2245.tar.bz2" -CHECKSUM_MD5="0ce9048809a447b89aaecd7c8c8b2e0d" -REVISION="1" -MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd x264-snapshot-20120803-2245 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd x264-snapshot-20120803-2245 - make install-lib-static -} -LICENSE="GNU GPL v2" -COPYRIGHT="2003-2012 http://www.videolan.org/developers/x264.html" diff --git a/media-libs/x264/x264-20140308.recipe b/media-libs/x264/x264-20140308.recipe new file mode 100644 index 000000000..72e40505b --- /dev/null +++ b/media-libs/x264/x264-20140308.recipe @@ -0,0 +1,73 @@ +SUMMARY="x264 h.264/AVC encoder" +DESCRIPTION=" +x264 is a h.264/AVC encoder library. +" +HOMEPAGE="http://www.videolan.org/developers/x264.html" +COPYRIGHT=" + 2003-2012 http://www.videolan.org/developers/x264.html + " +LICENSE="GNU GPL v2" +SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20140308-2245.tar.bz2" +CHECKSUM_SHA256="b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe" +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" + +PATCHES="x264-$portVersion.patchset" + +PROVIDES=" + x264$secondaryArchSuffix = $portVersion compat >= 20140308 + lib:libx264$secondaryArchSuffix = 142 compat >= 142 + " +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 + cmd:yasm >= 1.2.0 + " + +SOURCE_DIR="x264-snapshot-20140308-2245" + +BUILD() +{ + CFLAGS="-fPIC" runConfigure --omit-dirs \ + "manDir oldIncludeDir sbinDir localStateDir sharedStateDir sysconfDir infoDir dataDir dataRootDir libExecDir docDir" \ + --omit-buildspec ./configure --enable-pic --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libx264 + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + x264${secondaryArchSuffix}_devel = $portVersion compat >= 20140308 + devel:libx264$secondaryArchSuffix = 142 compat >= 142 + " +REQUIRES_devel=" + x264$secondaryArchSuffix == $portVersion base + " diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 71bd387db..f8938b3db 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -13,20 +13,28 @@ SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar CHECKSUM_SHA256="24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff" LICENSE="GNU LGPL v2" COPYRIGHT="1998-2012 Mike Cheng et al." -REVISION="2" -ARCHITECTURES="x86 x86_gcc2" +REVISION="3" +ARCHITECTURES="x86 x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - lame = $portVersion compat >= 1 - cmd:lame = $portVersion compat >= 1 - lib:libmp3lame = $portVersion compat >= 0.0.0 + lame$secondaryArchSuffix = $portVersion compat >= 1 + lib:libmp3lame$secondaryArchSuffix = $portVersion compat >= 0.0.0 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:lame = $portVersion compat >= 1 + " +fi REQUIRES=" haiku >= $haikuVersion - lib:libiconv + lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" haiku_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + " +BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:automake @@ -36,7 +44,7 @@ BUILD_REQUIRES=" cmd:make cmd:m4 cmd:sed - devel:libiconv + cmd:find " PATCHES="lame-3.99.5.patch" @@ -87,9 +95,9 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - lame_devel = $portVersion - devel:libmp3lame = 0.0.0 compat >= 0 + lame${secondaryArchSuffix}_devel = $portVersion + devel:libmp3lame${secondaryArchSuffix} = 0.0.0 compat >= 0 " REQUIRES_devel=" - lame == $portVersion base + lame${secondaryArchSuffix} == $portVersion base " diff --git a/media-sound/mpg123/mpg123-1.12.1.recipe b/media-sound/mpg123/mpg123-1.12.1.recipe index 8049b4f75..c8a1c0cf2 100644 --- a/media-sound/mpg123/mpg123-1.12.1.recipe +++ b/media-sound/mpg123/mpg123-1.12.1.recipe @@ -27,14 +27,19 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:make cmd:awk + cmd:find + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:pkg_config$secondaryArchSuffix " PATCHES="mpg123-1.12.1.patch" BUILD() { -#libtoolize --force --copy --install -# aclocal -# autoconf + sed -i "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS," configure.ac + libtoolize --force --copy --install + autoreconf --force --install LDFLAGS="-lnetwork" runConfigure ./configure --disable-aligncheck make $jobArgs } diff --git a/media-sound/twolame/twolame-0.3.13.recipe b/media-sound/twolame/twolame-0.3.13.recipe index 2afb81b4b..16e18b842 100644 --- a/media-sound/twolame/twolame-0.3.13.recipe +++ b/media-sound/twolame/twolame-0.3.13.recipe @@ -1,26 +1,78 @@ -DESCRIPTION="TwoLAME MPEG Audio Layer 2 encoder" +SUMMARY="TwoLAME MPEG Audio Layer 2 encoder" +DESCRIPTION=" + TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME \ + by Mike Cheng, which in turn is based upon the ISO dist10 code and \ + portions of LAME. +" HOMEPAGE="http://www.twolame.org" SRC_URI="http://downloads.sourceforge.net/twolame/twolame-0.3.13.tar.gz" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2004-2006 The TwoLAME Project" +CHECKSUM_SHA256="98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="4113d8aa80194459b45b83d4dbde8ddb" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + twolame$secondaryArchSuffix = $portVersion compat >= 0 + cmd:twolame + lib:libtwolame$secondaryArchSuffix = 0.0.0 compat >= 0 +" + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsndfile$secondaryArchSuffix + lib:libFLAC$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix +" + +BUILD_REQUIRES=" + devel:libsndfile$secondaryArchSuffix + devel:libFLAC$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:automake + cmd:make +" + BUILD() { - cd twolame-0.3.13 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/twolame \ - --mandir=$COMMON_DOCS/man - make + libtoolize --force --copy --install + aclocal + autoconf + autoheader + automake --add-missing + runConfigure ./configure + make $jobArgs } INSTALL() { - cd twolame-0.3.13 make install + + prepareInstalledDevelLib libtwolame + fixPkgconfig + + packageEntries devel $developDir } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2004-2006 The TwoLAME Project" +PROVIDES_devel=" + twolame${secondaryArchSuffix}_devel = $portVersion compat >= 0 + devel:libtwolame$secondaryArchSuffix = $portVersion compat >= 0 +" + +REQUIRES_devel=" + twolame$secondaryArchSuffix == $portVersion base +" diff --git a/media-video/mjpegtools/mjpegtools-2.1.0.recipe b/media-video/mjpegtools/mjpegtools-2.1.0.recipe new file mode 100644 index 000000000..b563924ec --- /dev/null +++ b/media-video/mjpegtools/mjpegtools-2.1.0.recipe @@ -0,0 +1,171 @@ +SUMMARY="Audio and Video Tools for Motion JPEG and MPEG" +DESCRIPTION=" +Programs for MJPEG recording and playback and simple cut-and-paste \ +editting and MPEG compression of audio and video. +" +HOMEPAGE="http://mjpeg.sourceforge.net" +LICENSE=" + GNU GPL v2 + " +COPYRIGHT=" + 2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers + " +SRC_URI="http://sourceforge.net/projects/mjpeg/files/mjpegtools/$portVersion/mjpegtools-$portVersion.tar.gz" +CHECKSUM_SHA256="864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407" +REVISION="1" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + +PATCHES="mjpegtools-2.1.0.patchset" + +PROVIDES=" + mjpegtools$secondaryArchSuffix = $portVersion compat >= 2 + lib:liblavfile_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:liblavjpeg_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmjpegutils_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmpeg2encpp_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmplex2_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + " + +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:anytovcd.sh = $portVersion compat >= 2 + cmd:jpeg2yuv = $portVersion compat >= 2 + cmd:lav2avi.sh = $portVersion compat >= 2 + cmd:lav2mpeg = $portVersion compat >= 2 + cmd:lav2wav = $portVersion compat >= 2 + cmd:lav2yuv = $portVersion compat >= 2 + cmd:lavaddwav = $portVersion compat >= 2 + cmd:lavinfo = $portVersion compat >= 2 + cmd:lavpipe = $portVersion compat >= 2 + cmd:lavtc.sh = $portVersion compat >= 2 + cmd:lavtrans = $portVersion compat >= 2 + cmd:matteblend.flt = $portVersion compat >= 2 + cmd:mjpeg_simd_helper = $portVersion compat >= 2 + cmd:mp2enc = $portVersion compat >= 2 + cmd:mpeg2enc = $portVersion compat >= 2 + cmd:mpegtranscode = $portVersion compat >= 2 + cmd:mplex = $portVersion compat >= 2 + cmd:multiblend.flt = $portVersion compat >= 2 + cmd:pgmtoy4m = $portVersion compat >= 2 + cmd:png2yuv = $portVersion compat >= 2 + cmd:pnmtoy4m = $portVersion compat >= 2 + cmd:ppmtoy4m = $portVersion compat >= 2 + cmd:transist.flt = $portVersion compat >= 2 + cmd:y4mblack = $portVersion compat >= 2 + cmd:y4mcolorbars = $portVersion compat >= 2 + cmd:y4mdenoise = $portVersion compat >= 2 + cmd:y4mhist = $portVersion compat >= 2 + cmd:y4minterlace = $portVersion compat >= 2 + cmd:y4mivtc = $portVersion compat >= 2 + cmd:y4mscaler = $portVersion compat >= 2 + cmd:y4mshift = $portVersion compat >= 2 + cmd:y4mspatialfilter = $portVersion compat >= 2 + cmd:y4mstabilizer = $portVersion compat >= 2 + cmd:y4mtopnm = $portVersion compat >= 2 + cmd:y4mtoppm = $portVersion compat >= 2 + cmd:y4mtoyuv = $portVersion compat >= 2 + cmd:y4munsharp = $portVersion compat >= 2 + cmd:ypipe = $portVersion compat >= 2 + cmd:yuv2lav = $portVersion compat >= 2 + cmd:yuv4mpeg = $portVersion compat >= 2 + cmd:yuvcorrect = $portVersion compat >= 2 + cmd:yuvcorrect_tune = $portVersion compat >= 2 + cmd:yuvdeinterlace = $portVersion compat >= 2 + cmd:yuvdenoise = $portVersion compat >= 2 + cmd:yuvfps = $portVersion compat >= 2 + cmd:yuvinactive = $portVersion compat >= 2 + cmd:yuvkineco = $portVersion compat >= 2 + cmd:yuvmedianfilter = $portVersion compat >= 2 + cmd:yuvscaler = $portVersion compat >= 2 + cmd:yuvycsnoise = $portVersion compat >= 2 + cmd:yuyvtoy4m = $portVersion compat >= 2 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libjpeg$secondaryArchSuffix + lib:libpng15$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libjpeg$secondaryArchSuffix + devel:libpng15$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:awk + cmd:sed + cmd:pkg_config + cmd:nasm + cmd:libtoolize + cmd:autoconf + cmd:automake + cmd:aclocal + " + +BUILD() +{ + libtoolize -fci + aclocal + autoconf + automake + runConfigure ./configure --disable-dependency-tracking + make $jobArgs +} + +INSTALL() +{ + make install + + mv $libDir/libmjpegutils.a $libDir/libmjpegutils-2.1.a + mv $libDir/liblavfile.a $libDir/liblavfile-2.1.a + mv $libDir/liblavjpeg.a $libDir/liblavjpeg-2.1.a + mv $libDir/libmpeg2encpp.a $libDir/libmpeg2encpp-2.1.a + mv $libDir/libmplex2.a $libDir/libmplex2-2.1.a + mv $libDir/libmjpegutils.la $libDir/libmjpegutils-2.1.la + mv $libDir/liblavfile.la $libDir/liblavfile-2.1.la + mv $libDir/liblavjpeg.la $libDir/liblavjpeg-2.1.la + mv $libDir/libmpeg2encpp.la $libDir/libmpeg2encpp-2.1.la + mv $libDir/libmplex2.la $libDir/libmplex2-2.1.la + mv $libDir/libmjpegutils.so $libDir/libmjpegutils-2.1.so + mv $libDir/liblavfile.so $libDir/liblavfile-2.1.so + mv $libDir/liblavjpeg.so $libDir/liblavjpeg-2.1.so + mv $libDir/libmpeg2encpp.so $libDir/libmpeg2encpp-2.1.so + mv $libDir/libmplex2.so $libDir/libmplex2-2.1.so + + prepareInstalledDevelLibs \ + libmjpegutils-2.1 liblavfile-2.1 liblavjpeg-2.1 \ + libmpeg2encpp-2.1 libmplex2-2.1 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mjpegtools${secondaryArchSuffix}_devel = $portVersion compat >= 2 + devel:liblavfile_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:liblavjpeg_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmjpegutils_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmpeg2encpp_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmplex2_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + mjpegtools$secondaryArchSuffix == $portVersion + " diff --git a/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset b/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset new file mode 100644 index 000000000..276601339 --- /dev/null +++ b/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset @@ -0,0 +1,75 @@ +From 6bb33f02e730526ca22abe041a5f81c87bd137ce Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 11 Jun 2014 17:25:38 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 8ad5562..8c9c428 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -130,6 +130,9 @@ case $host in + [ LIBM_LIBS="-lcpml" + have_cpml=true ],,) + ;; ++ haiku*) ++ LIBM_LIBS="" ++ ;; + *) + AC_MSG_RESULT([no]) + ;; +@@ -355,7 +358,7 @@ case $host_cpu in + AC_DEFINE(HAVE_X86CPU,1, [Compiling for x86-64 architecture CPU]) + have_x86cpu=true + have_x86_64cpu=true +- PROGRAM_NOPIC="-fno-PIC" ++ PROGRAM_NOPIC="" + ;; + powerpc | powerpc64) + AC_MSG_RESULT(PowerPC) +diff --git a/lavtools/Makefile.am b/lavtools/Makefile.am +index 117dce7..417d7d2 100644 +--- a/lavtools/Makefile.am ++++ b/lavtools/Makefile.am +@@ -152,7 +152,7 @@ jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la $(JPEG_LIBS) + + png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c + png2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPNG_CFLAGS) +-png2yuv_LDADD = $(LIBMJPEGUTILS) $(LIBPNG_LIBS) -lz -lm ++png2yuv_LDADD = $(LIBMJPEGUTILS) $(LIBPNG_LIBS) -lz + + lavpipe_SOURCES = lavpipe.c pipelist.c + lavpipe_LDADD = $(LIBMJPEGUTILS) +diff --git a/y4mdenoise/newdenoise.cc b/y4mdenoise/newdenoise.cc +index d84890b..3b0a4ec 100644 +--- a/y4mdenoise/newdenoise.cc ++++ b/y4mdenoise/newdenoise.cc +@@ -1853,12 +1853,14 @@ BasicThread::Initialize (void) + mjpeg_error_exit1 ("pthread_attr_init() failed: %s", + strerror (nErr)); + ++#ifndef __HAIKU__ + // Inherit scheduling parameters from the main thread. + nErr = pthread_attr_setinheritsched (&sThreadAttributes, + PTHREAD_INHERIT_SCHED); + if (nErr != 0) + mjpeg_error_exit1 ("pthread_attr_setinheritsched() failed: %s", + strerror (nErr)); ++#endif + + // Create the thread. + nErr = pthread_create (&m_oThreadInfo, +diff --git a/yuvscaler/Makefile.am b/yuvscaler/Makefile.am +index 1fe4d75..d855a93 100644 +--- a/yuvscaler/Makefile.am ++++ b/yuvscaler/Makefile.am +@@ -18,6 +18,5 @@ noinst_HEADERS = \ + + EXTRA_DIST = yuvscaler_implementation.txt + +-yuvscaler_CFLAGS=@PROGRAM_NOPIC@ + yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c + yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) +-- +1.8.3.4 + diff --git a/net-analyzer/netperf/licenses/netperf b/net-analyzer/netperf/licenses/netperf new file mode 100644 index 000000000..e69de29bb diff --git a/net-analyzer/netperf/netperf-2.6.0.recipe b/net-analyzer/netperf/netperf-2.6.0.recipe new file mode 100644 index 000000000..5e2a2d20d --- /dev/null +++ b/net-analyzer/netperf/netperf-2.6.0.recipe @@ -0,0 +1,53 @@ +SUMMARY="Network performance benchmark including tests for TCP, UDP, and more." +DESCRIPTION=" +Netperf is a benchmark that can be used to measure the performance of many \ +different types of networking. It provides tests for both unidirectional \ +throughput, and end-to-end latency. The environments currently measureable by \ +netperf include: + * TCP and UDP via BSD Sockets for both IPv4 and IPv6 + * DLPI + * Unix Domain Sockets + * SCTP for both IPv4 and IPv6 +" +HOMEPAGE="http://netperf.org" +SRC_URI="ftp://ftp.netperf.org/${portName}/${portName}-${portVersion}.tar.bz2" +CHECKSUM_SHA256="cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a" +LICENSE="netperf" +COPYRIGHT="1993 Hewlett-Packard Company" +REVISION="1" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + netperf = $portVersion + cmd:netperf + cmd:netserver + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:awk + cmd:gcc + cmd:make + " + +PATCHES="netperf-2.6.0.patchset" +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} diff --git a/net-analyzer/netperf/patches/netperf-2.6.0.patchset b/net-analyzer/netperf/patches/netperf-2.6.0.patchset new file mode 100644 index 000000000..a456e360e --- /dev/null +++ b/net-analyzer/netperf/patches/netperf-2.6.0.patchset @@ -0,0 +1,22 @@ +From 08c3cdbadfc2679183619f71d05bae03c43cb23f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 4 Jun 2014 14:44:30 +0200 +Subject: Add missing include. + + +diff --git a/src/netserver.c b/src/netserver.c +index 379a106..55c202b 100644 +--- a/src/netserver.c ++++ b/src/netserver.c +@@ -75,6 +75,8 @@ char netserver_id[]="\ + #include + #endif + ++#include ++ + #if HAVE_SYS_SOCKET_H + #include + #endif +-- +1.8.3.4 + diff --git a/net-libs/hubbub/hubbub-0.1.2.recipe b/net-libs/hubbub/hubbub-0.1.2.recipe deleted file mode 100644 index 46bb76916..000000000 --- a/net-libs/hubbub/hubbub-0.1.2.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Hubbub is an HTML5 compliant parsing library" -HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" -SRC_URI="http://download.netsurf-browser.org/libs/releases/hubbub-0.1.2-src.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" - -BUILD() -{ - cd hubbub-0.1.2 - make -} - -INSTALL() -{ - cd hubbub-0.1.2 - make install -} - -LICENSE="MIT - GNU GPL v2" -COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe b/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe deleted file mode 100644 index 32617af60..000000000 --- a/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Hubbub is an HTML5 compliant parsing library" -HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" -SRC_URI="git://git.netsurf-browser.org/libhubbub.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/buildsystem >= 0 - dev-libs/libparserutils >= 0.1.1" - -BUILD() -{ - cd hubbub-0.1.2-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd hubbub-0.1.2-HEAD - make install PREFIX=/boot/common -} - -LICENSE="MIT" -COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe b/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe deleted file mode 100644 index 933be4ec9..000000000 --- a/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Hubbub is an HTML5 compliant parsing library" -HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" -SRC_URI="git://git.netsurf-browser.org/libhubbub.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPENDS="dev-util/buildsystem >= 0.0.1" - -BUILD() -{ - cd hubbub-0.2.0-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd hubbub-0.2.0-HEAD - make install PREFIX=/boot/common -} - -LICENSE="MIT" -COPYRIGHT="2007 - 2013 J-M Bell" diff --git a/net-libs/hubbub/libhubbub-0.3.0.recipe b/net-libs/hubbub/libhubbub-0.3.0.recipe new file mode 100644 index 000000000..fb3031512 --- /dev/null +++ b/net-libs/hubbub/libhubbub-0.3.0.recipe @@ -0,0 +1,74 @@ +SUMMARY="Hubbub is an HTML5 compliant parsing library" +DESCRIPTION=" +Hubbub is an HTML5 compliant parsing library, written in C. It was developed \ +as part of the NetSurf project and is available for use by other software \ +under the MIT licence. +The HTML5 specification defines a parsing algorithm, based on the behaviour \ +of mainstream browsers, which provides instructions for how to parse all \ +markup, both valid and invalid. As a result, Hubbub parses web content well. +If you are looking for an HTML5 parser in Python or Ruby, you may wish to \ +look at html5lib. +" +HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.0-src.tar.gz" +CHECKSUM_SHA256="dbf3b55bf2531d2a8e70f370a9b396cc78bfd5a092f87beb10b05c04fd7cdaa7" +REVISION="1" +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + libhubbub = $portVersion + lib:libhubbub = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + netsurf_buildsystem >= 0.3.0 + devel:libparserutils + + devel:libjson_c + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:perl + cmd:pkg_config + " + +PATCHES="libhubbub-0.3.0.patchset" +BUILD() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + COMPONENT_TYPE=lib-shared +} + +INSTALL() +{ + make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir + make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir COMPONENT_TYPE=lib-shared + + prepareInstalledDevelLib libhubbub + fixPkgconfig libhubbub + packageEntries devel $developDir +} + +TEST() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + LDFLAGS="-liconv -lparserutils" test +} + +LICENSE="MIT" +COPYRIGHT="2007-2014 J-M Bell" + +PROVIDES_devel=" + libhubbub_devel = $portVersion + devel:libhubbub = $portVersion +" diff --git a/net-libs/hubbub/patches/libhubbub-0.3.0.patchset b/net-libs/hubbub/patches/libhubbub-0.3.0.patchset new file mode 100644 index 000000000..367ef2575 --- /dev/null +++ b/net-libs/hubbub/patches/libhubbub-0.3.0.patchset @@ -0,0 +1,47 @@ +From 977b947e2c464a1df18bdccaef261b0c7776406a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 8 Jun 2014 21:43:33 +0200 +Subject: Fix include dirs for Haiku. + + +diff --git a/Makefile b/Makefile +index 4ec03f3..f6bfff2 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,9 +47,9 @@ ifeq ($(WANT_TEST),yes) + # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/ + ifneq ($(PKGCONFIG),) + TESTCFLAGS := $(TESTCFLAGS) \ +- $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json) ++ $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json-c) + TESTLDFLAGS := $(TESTLDFLAGS) \ +- $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json) ++ $(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json-c) + else + TESTCFLAGS := $(TESTCFLAGS) -I$(PREFIX)/include/json + TESTLDFLAGS := $(TESTLDFLAGS) -ljson +@@ -61,7 +61,7 @@ ifeq ($(WANT_TEST),yes) + endif + + # Extra installation rules +-I := /include/hubbub ++I := /$(INCLUDEDIR)/hubbub + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/errors.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/functypes.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/hubbub.h +diff --git a/libhubbub.pc.in b/libhubbub.pc.in +index 2f9565e..b20a4a0 100644 +--- a/libhubbub.pc.in ++++ b/libhubbub.pc.in +@@ -1,7 +1,7 @@ + prefix=PREFIX + exec_prefix=${prefix} + libdir=${exec_prefix}/LIBDIR +-includedir=${prefix}/include ++includedir=${prefix}/INCLUDEDIR + + Name: libhubbub + Description: HTML5 parsing library +-- +1.8.3.4 + diff --git a/net-libs/libdom/libdom-0.0.1_HEAD.recipe b/net-libs/libdom/libdom-0.0.1_HEAD.recipe deleted file mode 100644 index b67298668..000000000 --- a/net-libs/libdom/libdom-0.0.1_HEAD.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="LibDOM is an implementation of the W3C DOM" -HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" -SRC_URI="git://git.netsurf-browser.org/libdom.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-libs/hubbub >= 0.2.0-HEAD" - -BUILD() -{ - cd libdom-0.0.1-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libdom-0.0.1-HEAD - make install PREFIX=/boot/common -} - -LICENSE="MIT" -COPYRIGHT="2007 - 2013 J-M Bell" diff --git a/net-libs/libdom/libdom-0.1.0.recipe b/net-libs/libdom/libdom-0.1.0.recipe new file mode 100644 index 000000000..c2173cf5a --- /dev/null +++ b/net-libs/libdom/libdom-0.1.0.recipe @@ -0,0 +1,58 @@ +SUMMARY="LibDOM is an implementation of the W3C DOM" +DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C." +HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" +SRC_URI="http://git.netsurf-browser.org/libdom.git/snapshot/release/0.1.0.tar.gz" +CHECKSUM_SHA256="1e08a713ff564533a27699f82491f48b384c1336c392d76226356f474f07dfc0" +REVISION="1" +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + libdom = $portVersion +" + +BUILD_REQUIRES=" + devel:libexpat + devel:libhubbub + devel:libparserutils + devel:libwapcaplet + netsurf_buildsystem + xml_parser +" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:perl + cmd:pkg_config +" + +SOURCE_DIR="release/$portVersion" +PATCHES="libdom-0.1.0.recipe" +BUILD() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem +} + +INSTALL() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir install + + prepareInstalledDevelLib libdom + fixPkgconfig libdom + packageEntries devel $developDir +} + +TEST() +{ + make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test +} + +LICENSE="MIT" +COPYRIGHT="2007-2014 J-M Bell" + +PROVIDES_devel=" + libdom_devel = $portVersion + devel:libdom = $portVersion +" diff --git a/net-libs/libdom/libdom-0.recipe b/net-libs/libdom/libdom-0.recipe deleted file mode 100644 index c40feeb05..000000000 --- a/net-libs/libdom/libdom-0.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="LibDOM is an implementation of the W3C DOM" -HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" -SRC_URI="git://git.netsurf-browser.org/libdom.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lib/hubbub >= 0.1.2-HEAD" - -BUILD() -{ - cd libdom-0 - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libdom-0 - make install PREFIX=/boot/common -} - -LICENSE="MIT - GNU GPL v2" -COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/net-libs/libdom/patches/libdom-0.1.0.patchset b/net-libs/libdom/patches/libdom-0.1.0.patchset new file mode 100644 index 000000000..200c0b38b --- /dev/null +++ b/net-libs/libdom/patches/libdom-0.1.0.patchset @@ -0,0 +1,84 @@ +From ff1657dd341291967f59059f5b8dbcd1c95335e9 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 9 Jun 2014 20:13:18 +0200 +Subject: Fix include paths for Haiku. + + +diff --git a/Makefile b/Makefile +index c6bc2bd..64bc3a8 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,11 +47,11 @@ include $(NSBUILD)/Makefile.top + + # Extra installation rules + Is := include/dom +-I := /include/dom ++I := /$(INCLUDEDIR)/dom + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h + + Is := include/dom/core +-I := /include/dom/core ++I := /$(INCLUDEDIR)/dom/core + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/attr.h;$(Is)/characterdata.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/cdatasection.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/comment.h +@@ -66,7 +66,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/pi.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/text.h;$(Is)/typeinfo.h + + Is := include/dom/events +-I := /include/dom/events ++I := /$(INCLUDEDIR)/dom/events + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event.h;$(Is)/ui_event.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/custom_event.h;$(Is)/mouse_event.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/keyboard_event.h;$(Is)/text_event.h +@@ -78,7 +78,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event_listener.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/document_event.h + + Is := include/dom/html +-I := /include/dom/html ++I := /$(INCLUDEDIR)/dom/html + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_document.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_collection.h + INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_element.h +diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile +index 946219d..984ea3f 100644 +--- a/bindings/hubbub/Makefile ++++ b/bindings/hubbub/Makefile +@@ -1,7 +1,7 @@ + ifeq ($(WITH_HUBBUB_BINDING),yes) + DIR_SOURCES := parser.c + +- DIR_INSTALL_ITEMS := /include/dom/bindings/hubbub:errors.h;parser.h ++ DIR_INSTALL_ITEMS := /$(INCLUDEDIR)/dom/bindings/hubbub:errors.h;parser.h + + # Hubbub + ifneq ($(PKGCONFIG),) +diff --git a/bindings/xml/Makefile b/bindings/xml/Makefile +index ea7653c..1211c5e 100644 +--- a/bindings/xml/Makefile ++++ b/bindings/xml/Makefile +@@ -26,7 +26,7 @@ ifeq ($(WITH_EXPAT_BINDING),yes) + endif + + ifeq ($(DO_XML_INSTALL),yes) +- DIR_INSTALL_ITEMS := /include/dom/bindings/xml:xmlerror.h;xmlparser.h ++ DIR_INSTALL_ITEMS := /$(INCLUDEDIR)/dom/bindings/xml:xmlerror.h;xmlparser.h + endif + + include $(NSBUILD)/Makefile.subdir +diff --git a/libdom.pc.in b/libdom.pc.in +index b6e82cf..406ed9e 100644 +--- a/libdom.pc.in ++++ b/libdom.pc.in +@@ -1,7 +1,7 @@ + prefix=PREFIX + exec_prefix=${prefix} + libdir=${exec_prefix}/LIBDIR +-includedir=${prefix}/include ++includedir=${prefix}/INCLUDEDIR + + Name: libdom + Description: W3C DOM implementation +-- +1.8.3.4 + diff --git a/net-libs/libssh2/libssh2-1.4.3.recipe b/net-libs/libssh2/libssh2-1.4.3.recipe new file mode 100644 index 000000000..d0a9ab37b --- /dev/null +++ b/net-libs/libssh2/libssh2-1.4.3.recipe @@ -0,0 +1,79 @@ +SUMMARY="A SSH2 library." +DESCRIPTION=" +libssh2 is a library implementing the SSH2 protocol, available under \ +the revised BSD license. +" +HOMEPAGE="http://www.libssh2.org" +COPYRIGHT=" + 2004-2007 Sara Golemon + 2005,2006 Mikhail Gusarov + 2006-2007 The Written Word, Inc. + 2007 Eli Fant + 2009 Daniel Stenberg + 2008, 2009 Simon Josefsson + " +LICENSE="BSD (3-clause)" +SRC_URI="http://www.libssh2.org/download/libssh2-$portVersion.tar.gz" +CHECKSUM_SHA256="eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libssh2-$portVersion.patchset" + +PROVIDES=" + libssh2$secondaryArchSuffix = $portVersion compat >= 1.4 + lib:libssh2$secondaryArchSuffix = 1.0.1 compat >= 1 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libcrypto$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + autoreconf -I m4 -f -i + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libssh2 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libssh2${secondaryArchSuffix}_devel = $portVersion compat >= 1.4 + devel:libssh2$secondaryArchSuffix = 1.0.1 compat >= 1 + " +REQUIRES_devel=" + libssh2$secondaryArchSuffix == $portVersion base + " diff --git a/net-libs/libssh2/patches/libssh2-1.4.3.patchset b/net-libs/libssh2/patches/libssh2-1.4.3.patchset new file mode 100644 index 000000000..d1db5689c --- /dev/null +++ b/net-libs/libssh2/patches/libssh2-1.4.3.patchset @@ -0,0 +1,57 @@ +From 22c9d0908444b0d912ace76ea22f89b90b43a01c Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 17:08:13 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index dfc6988..6c2f519 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + AC_INIT(libssh2, [-], libssh2-devel@cool.haxx.se) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([src]) +-AM_CONFIG_HEADER([src/libssh2_config.h example/libssh2_config.h]) ++AC_CONFIG_HEADERS([src/libssh2_config.h example/libssh2_config.h]) + AM_MAINTAINER_MODE + + dnl SED is needed by some of the tools +-- +1.8.3.4 + + +From 25a2ec62ce50144b20d9bf3cb674ce4e9b5beece Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 17:19:49 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 6c2f519..b68cfba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,7 +60,7 @@ dnl Our configure and build reentrant settings + CURL_CONFIGURE_REENTRANT + + # Some systems (Solaris?) have socket() in -lsocket. +-AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(socket,[socket network]) + + # Solaris has inet_addr() in -lnsl. + AC_SEARCH_LIBS(inet_addr, nsl) +diff --git a/example/x11.c b/example/x11.c +index 6480dc8..a669a73 100644 +--- a/example/x11.c ++++ b/example/x11.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +1.8.3.4 + diff --git a/net-misc/openssh/openssh-6.6p1.recipe b/net-misc/openssh/openssh-6.6p1.recipe index d1e94ed76..33df17261 100644 --- a/net-misc/openssh/openssh-6.6p1.recipe +++ b/net-misc/openssh/openssh-6.6p1.recipe @@ -20,7 +20,7 @@ CHECKSUM_SHA256="48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203b SRC_URI="http://openbsd.locaweb.com.br/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz" REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="sshd_config.patch pathnames.patch" @@ -92,8 +92,6 @@ PATCH() echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac } -SOURCE_DIR="openssh" - BUILD() { mkdir -p m4 diff --git a/net-misc/wget/patches/wget-1.15.patchset b/net-misc/wget/patches/wget-1.15.patchset index 7df49d780..ec3444bdb 100644 --- a/net-misc/wget/patches/wget-1.15.patchset +++ b/net-misc/wget/patches/wget-1.15.patchset @@ -1,4 +1,4 @@ -From d44e24178a9dd9864e7ac068249444a1d95b9af1 Mon Sep 17 00:00:00 2001 +From 242dd3e8ecdcefbd023b47092cbc19ce806fdacb Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 19 May 2014 15:38:37 +0000 Subject: apply wget-1.14.patch @@ -95,7 +95,7 @@ index 3f27ea0..3cd3ed9 100644 1.8.3.4 -From d91114a406b6b16542a77b55ebe140314ce803c1 Mon Sep 17 00:00:00 2001 +From 6bc747571c02e44994578c13d5920a41f9a68a50 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 19 May 2014 15:47:24 +0000 Subject: apply and augment wget-1.14-build-fixes.patch @@ -146,18 +146,10 @@ index 1bb44b4..5285983 100644 { xfree (url_text); diff --git a/src/http.c b/src/http.c -index 5715df6..38ee4b1 100644 +index 5715df6..d6e875c 100644 --- a/src/http.c +++ b/src/http.c -@@ -29,6 +29,7 @@ Corresponding Source for a non-source form of such a combination - shall include the source code for the parts of OpenSSL used as well - as that of the covered work. */ - -+#define __USE_GNU - #include "wget.h" - - #include -@@ -1067,6 +1068,7 @@ extract_param (const char **source, param_token *name, param_token *value, +@@ -1067,6 +1067,7 @@ extract_param (const char **source, param_token *name, param_token *value, char separator) { const char *p = *source; @@ -165,7 +157,7 @@ index 5715df6..38ee4b1 100644 while (c_isspace (*p)) ++p; if (!*p) -@@ -1122,7 +1124,7 @@ extract_param (const char **source, param_token *name, param_token *value, +@@ -1122,7 +1123,7 @@ extract_param (const char **source, param_token *name, param_token *value, } *source = p; @@ -174,7 +166,7 @@ index 5715df6..38ee4b1 100644 if (NOT_RFC2231 != param_type) { modify_param_value(value, param_type); -@@ -1512,6 +1514,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, +@@ -1512,6 +1513,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, int warc_payload_offset = 0; FILE *warc_tmp = NULL; int warcerr = 0; @@ -182,7 +174,7 @@ index 5715df6..38ee4b1 100644 if (opt.warc_filename != NULL) { -@@ -1548,7 +1551,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, +@@ -1548,7 +1550,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, } /* Read the response body. */ @@ -191,7 +183,7 @@ index 5715df6..38ee4b1 100644 if (contlen != -1) /* If content-length is present, read that much; otherwise, read until EOF. The HTTP spec doesn't require the server to -@@ -1653,6 +1656,7 @@ static uerr_t +@@ -1653,6 +1655,7 @@ static uerr_t gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, struct iri *iri, int count) { @@ -199,7 +191,7 @@ index 5715df6..38ee4b1 100644 struct request *req; char *type; -@@ -2125,10 +2129,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, +@@ -2125,10 +2128,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, if (write_error >= 0 && warc_tmp != NULL) { /* Remember end of headers / start of payload. */ @@ -212,7 +204,7 @@ index 5715df6..38ee4b1 100644 if (warc_tmp_written != body_data_size) write_error = -2; } -@@ -2309,6 +2314,7 @@ read_header: +@@ -2309,6 +2313,7 @@ read_header: if (statcode == HTTP_STATUS_UNAUTHORIZED) { @@ -220,7 +212,7 @@ index 5715df6..38ee4b1 100644 /* Authorization is required. */ /* Normally we are not interested in the response body. -@@ -2347,7 +2353,7 @@ read_header: +@@ -2347,7 +2352,7 @@ read_header: } pconn.authorized = false; diff --git a/net-misc/wget/wget-1.15.recipe b/net-misc/wget/wget-1.15.recipe index 9aa469763..9206a902e 100644 --- a/net-misc/wget/wget-1.15.recipe +++ b/net-misc/wget/wget-1.15.recipe @@ -9,7 +9,7 @@ SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.15.tar.gz" CHECKSUM_SHA256="52126be8cf1bddd7536886e74c053ad7d0ed2aa89b4b630f76785bac21695fcd" LICENSE="GNU GPL v3" COPYRIGHT="1996-2013 Free Software Foundation" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86 x86_gcc2" diff --git a/sys-apps/coreutils/coreutils-8.22.recipe b/sys-apps/coreutils/coreutils-8.22.recipe index 6f4baadff..3c1c9d407 100644 --- a/sys-apps/coreutils/coreutils-8.22.recipe +++ b/sys-apps/coreutils/coreutils-8.22.recipe @@ -141,6 +141,7 @@ BUILD_PREREQUIRES=" cmd:awk cmd:sed cmd:help2man + cmd:makeinfo " defineDebugInfoPackage coreutils \ diff --git a/sys-devel/bmake/bmake-20140214.recipe b/sys-devel/bmake/bmake-20140214.recipe new file mode 100644 index 000000000..2cced260c --- /dev/null +++ b/sys-devel/bmake/bmake-20140214.recipe @@ -0,0 +1,56 @@ +SUMMARY="Portable version of NetBSD make" +DESCRIPTION=" +Bmake is derived from NetBSD's make(1), its goal is to be a portable version \ +of same, so new features are added via imports of NetBSD's make (I'm one of \ +the contributors to NetBSD). Thus bmake is kept in sync with NetBSD's make. + +This version of Make features several extensions that are not in GNU Make, and \ +does not has all of GNU Make extensions. Some projects explicitly require one \ +or the other. +" +HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm" +LICENSE="BSD (3-clause)" +COPYRIGHT="1990-2014 NetBSD and sjg@crufty.net" +SRC_URI="http://www.crufty.net/ftp/pub/sjg/bmake-20140214.tar.gz" +CHECKSUM_SHA256="2ec1771a800431c26361659ab0f96ec5c2536e85b46564eb69fa75a4b12886de" +REVISION="1" +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + bmake = $portVersion compat >= 3.82 + cmd:bmake = $portVersion compat >= 3.82 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:awk + cmd:gcc + cmd:make + " + +SOURCE_DIR="bmake" + +BUILD() +{ + runConfigure ./configure --with-default-sys-path=$dataDir/mk + make MANDIR=$manDir +} + +INSTALL() +{ + # The install process needs a root user, and there is no such thing in the + # chroot. + echo "root:x:0:" > /etc/group + useradd root || true # Don't fail if user already exists + + make install MANDIR=$manDir + + # Even when configured to look for files in dataDir, they are installed in + # share... + rm -rf $dataDir + mv $prefix/share $dataDir +} diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe index fedd4c33b..e1ddd5a1c 100644 --- a/sys-devel/llvm/llvm-3.4.1.recipe +++ b/sys-devel/llvm/llvm-3.4.1.recipe @@ -44,6 +44,107 @@ PROVIDES=" cmd:llvm_tblgen cmd:macho_dump cmd:opt + lib:BugpointPasses + lib:LLVMHello + lib:libLTO + + devel:libLLVMAArch64AsmParser + devel:libLLVMAArch64AsmPrinter + devel:libLLVMAArch64CodeGen + devel:libLLVMAArch64Desc + devel:libLLVMAArch64Disassembler + devel:libLLVMAArch64Info + devel:libLLVMAArch64Utils + devel:libLLVMARMAsmParser + devel:libLLVMARMAsmPrinter + devel:libLLVMARMCodeGen + devel:libLLVMARMDesc + devel:libLLVMARMDisassembler + devel:libLLVMARMInfo + devel:libLLVMAnalysis + devel:libLLVMAsmParser + devel:libLLVMAsmPrinter + devel:libLLVMBitReader + devel:libLLVMBitWriter + devel:libLLVMCodeGen + devel:libLLVMCore + devel:libLLVMCppBackendCodeGen + devel:libLLVMCppBackendInfo + devel:libLLVMDebugInfo + devel:libLLVMExecutionEngine + devel:libLLVMHexagonAsmPrinter + devel:libLLVMHexagonCodeGen + devel:libLLVMHexagonDesc + devel:libLLVMHexagonInfo + devel:libLLVMIRReader + devel:libLLVMInstCombine + devel:libLLVMInstrumentation + devel:libLLVMInterpreter + devel:libLLVMJIT + devel:libLLVMLTO + devel:libLLVMLinker + devel:libLLVMMC + devel:libLLVMMCDisassembler + devel:libLLVMMCJIT + devel:libLLVMMCParser + devel:libLLVMMSP430AsmPrinter + devel:libLLVMMSP430CodeGen + devel:libLLVMMSP430Desc + devel:libLLVMMSP430Info + devel:libLLVMMipsAsmParser + devel:libLLVMMipsAsmPrinter + devel:libLLVMMipsCodeGen + devel:libLLVMMipsDesc + devel:libLLVMMipsDisassembler + devel:libLLVMMipsInfo + devel:libLLVMNVPTXAsmPrinter + devel:libLLVMNVPTXCodeGen + devel:libLLVMNVPTXDesc + devel:libLLVMNVPTXInfo + devel:libLLVMObjCARCOpts + devel:libLLVMObject + devel:libLLVMOption + devel:libLLVMPowerPCAsmParser + devel:libLLVMPowerPCAsmPrinter + devel:libLLVMPowerPCCodeGen + devel:libLLVMPowerPCDesc + devel:libLLVMPowerPCInfo + devel:libLLVMR600AsmPrinter + devel:libLLVMR600CodeGen + devel:libLLVMR600Desc + devel:libLLVMR600Info + devel:libLLVMRuntimeDyld + devel:libLLVMScalarOpts + devel:libLLVMSelectionDAG + devel:libLLVMSparcCodeGen + devel:libLLVMSparcDesc + devel:libLLVMSparcInfo + devel:libLLVMSupport + devel:libLLVMSystemZAsmParser + devel:libLLVMSystemZAsmPrinter + devel:libLLVMSystemZCodeGen + devel:libLLVMSystemZDesc + devel:libLLVMSystemZDisassembler + devel:libLLVMSystemZInfo + devel:libLLVMTableGen + devel:libLLVMTarget + devel:libLLVMTransformUtils + devel:libLLVMVectorize + devel:libLLVMX86AsmParser + devel:libLLVMX86AsmPrinter + devel:libLLVMX86CodeGen + devel:libLLVMX86Desc + devel:libLLVMX86Disassembler + devel:libLLVMX86Info + devel:libLLVMX86Utils + devel:libLLVMXCoreAsmPrinter + devel:libLLVMXCoreCodeGen + devel:libLLVMXCoreDesc + devel:libLLVMXCoreDisassembler + devel:libLLVMXCoreInfo + devel:libLLVMipa + devel:libLLVMipo + devel:libLTO " REQUIRES=" @@ -70,9 +171,9 @@ BUILD_PREREQUIRES=" cmd:grep " -PATCHES="llvm-3.4.patchset" +PATCHES="llvm-3.4.1.patchset" -SOURCE_DIR="$portVersionedName.src" +SOURCE_DIR="llvm-$portVersion.src" BUILD() { @@ -80,12 +181,42 @@ BUILD() # such as Mesa export REQUIRES_RTTI=1 runConfigure ./configure --enable-optimized - make $jobArgs + make $jobArgs PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ + PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir } INSTALL() { - make install + make install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ + PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir + + prepareInstalledDevelLibs libLLVMAArch64AsmParser libLLVMAArch64Disassembler \ + libLLVMAArch64Utils + prepareInstalledDevelLibs libLLVMARMAsmParser libLLVMARMDisassembler + prepareInstalledDevelLibs libLLVMMipsAsmParser libLLVMMipsDisassembler + prepareInstalledDevelLibs libLLVMPowerPCAsmParser + prepareInstalledDevelLibs libLLVMSystemZAsmParser libLLVMSystemZDisassembler + prepareInstalledDevelLibs libLLVMX86AsmParser libLLVMX86Disassembler libLLVMX86Utils + prepareInstalledDevelLibs libLLVMXCoreDisassembler + + prepareInstalledDevelLibs libLLVMSparcCodeGen libLLVMSparcDesc libLLVMSparcInfo + + for arch in AArch64 ARM Hexagon Mips MSP430 NVPTX PowerPC R600 SystemZ X86 XCore + do + prepareInstalledDevelLibs libLLVM${arch}AsmPrinter \ + libLLVM${arch}CodeGen libLLVM${arch}Desc libLLVM${arch}Info + done + + prepareInstalledDevelLibs libLLVMAnalysis libLLVMAsmParser \ + libLLVMAsmPrinter libLLVMBitReader libLLVMBitWriter libLLVMCodeGen \ + libLLVMCore libLLVMCppBackendCodeGen libLLVMCppBackendInfo \ + libLLVMDebugInfo libLLVMExecutionEngine libLLVMIRReader \ + libLLVMInstCombine libLLVMInstrumentation libLLVMInterpreter libLLVMJIT \ + libLLVMLTO libLLVMLinker libLLVMMC libLLVMMCDisassembler libLLVMMCJIT \ + libLLVMMCParser libLLVMObjCARCOpts libLLVMObject libLLVMOption \ + libLLVMRuntimeDyld libLLVMScalarOpts libLLVMSelectionDAG libLLVMSupport \ + libLLVMTableGen libLLVMTarget libLLVMTransformUtils libLLVMVectorize \ + libLLVMipa libLLVMipo libLTO } TEST() diff --git a/sys-devel/llvm/patches/llvm-3.4.1.patchset b/sys-devel/llvm/patches/llvm-3.4.1.patchset new file mode 100644 index 000000000..58bb71623 --- /dev/null +++ b/sys-devel/llvm/patches/llvm-3.4.1.patchset @@ -0,0 +1,48 @@ +From 8bf543218812e2419f65ac444edbb2d86bad1708 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Wed, 22 Jan 2014 05:04:31 +0000 +Subject: haiku: fix Host.h for endian.h + + +diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h +index 28c4cc7..ab985a4 100644 +--- a/include/llvm/Support/Host.h ++++ b/include/llvm/Support/Host.h +@@ -16,7 +16,7 @@ + + #include "llvm/ADT/StringMap.h" + +-#if defined(__linux__) || defined(__GNU__) ++#if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__) + #include + #else + #if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32) +-- +1.8.3.4 + + +From 64d6eca1a47b91ff89fc41d8f4eb20b64a0e68d6 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 18 Jun 2014 15:32:09 +0000 +Subject: llvm: add a soname to libLTO. + +This makes PrepareInstalledDevelLib happy. + +diff --git a/tools/lto/Makefile b/tools/lto/Makefile +index cedbee1..5ce530d 100644 +--- a/tools/lto/Makefile ++++ b/tools/lto/Makefile +@@ -22,6 +22,10 @@ ifdef LLVM_VERSION_INFO + CXX.Flags += -DLLVM_VERSION_INFO='"$(LLVM_VERSION_INFO)"' + endif + ++ifeq ($(HOST_OS),Haiku) ++ LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-soname=$(SharedPrefix)LTO$(SHLIBEXT) ++endif ++ + ifeq ($(HOST_OS),Darwin) + # Special hack to allow libLTO to have an offset version number. + ifdef LLVM_LTO_VERSION_OFFSET +-- +1.8.3.4 + diff --git a/www-client/netsurf/netsurf-3.1.recipe b/www-client/netsurf/netsurf-3.1.recipe new file mode 100644 index 000000000..6d4d66c04 --- /dev/null +++ b/www-client/netsurf/netsurf-3.1.recipe @@ -0,0 +1,75 @@ +SUMMARY="NetSurf is a multi-platform web browser" +DESCRIPTION=" +Small as a mouse, fast as a cheetah and available for free. NetSurf is a \ +multi-platform web browser for RISCĀ OS, UNIX-like platforms (including Linux), \ +Mac OS X, and more. + +Whether you want to check your webmail, read the news or post to discussion \ +forums, NetSurf is your lightweight gateway to the world wide web. Actively \ +developed, NetSurf is continually evolving and improving. +" +HOMEPAGE="http://www.netsurf-browser.org/" +# Do NOT use the netsurf-all package. It contains a bunch of subprojects which +# we build as separate packages. NetSurf is statically linked to them, so the +# resulting binary is the same. +SRC_URI="http://git.netsurf-browser.org/netsurf.git/snapshot/release/3.1.tar.gz" +CHECKSUM_SHA256="e2d4f7879762008b8e0c415e927a0a07f86f2e614f5e8659aa558471843e7490" +REVISION="1" +ARCHITECTURES="x86_gcc2" +REQUIRES=" + lib:libcurl + lib:libpng + lib:libjpeg +" + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libcurl + devel:libexpat + devel:libiconv + devel:libjpeg + devel:libpng + devel:libssl + devel:libz + + devel:libcss + devel:libdom + devel:libhubbub + devel:libnsbmp + devel:libnsgif + devel:libparserutils + devel:libsvgtiny + devel:libwapcaplet + " + +BUILD_PREREQUIRES=" + html_parser >= 3.70 + cmd:bison + cmd:flex + cmd:gcc + cmd:gperf + cmd:make + cmd:pkg_config + " + +PROVIDES=" + netsurf = $portVersion + app:NetSurf = $portVersion +" + +SOURCE_DIR="release/$portVersion" +PATCHES="netsurf-3.1.patchset" + +BUILD() +{ + make TARGET=beos PREFIX=$prefix +} + +INSTALL() +{ + make TARGET=beos PREFIX=$prefix install + addAppDeskbarSymlink $appsDir/netsurf/NetSurf NetSurf +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2014 The NetSurf Browser project" diff --git a/www-client/netsurf/netsurf-3.1git.recipe b/www-client/netsurf/netsurf-3.1git.recipe deleted file mode 100644 index 45bbaa837..000000000 --- a/www-client/netsurf/netsurf-3.1git.recipe +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="NetSurf is a multi-platform web browser" -HOMEPAGE="http://www.netsurf-browser.org/" -SRC_URI="git://git.netsurf-browser.org/netsurf.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libmng > 1.0.10 - dev-libs/pkgconfig >= 0.25 - net-misc/curl >= 7.21.6 - media-libs/libpng >= 1.5.7 - media-libs/jpeg >= 8d - media-libs/libwebp >= 0.1.3 - media-libs/lcms >= 2.1 - media-libs/libsvgtiny >= 0.HEAD - media-libs/libnsbmp >= 0.0.3 - media-libs/libnsgif >= 0.0.3 - dev-libs/libcss >= 0.1.2 - dev-perl/HTML-Entities >= 3.70 - " - -BUILD() -{ - cd netsurf-3.1-HEAD - make -} - -INSTALL() -{ - cd netsurf-3.1-HEAD - make install -} - -LICENSE="MIT - GNU GPL v2" -COPYRIGHT="2003 - 2013 The NetSurf Browser project" diff --git a/www-client/netsurf/patches/netsurf-3.1.patchset b/www-client/netsurf/patches/netsurf-3.1.patchset new file mode 100644 index 000000000..a91a3ac35 --- /dev/null +++ b/www-client/netsurf/patches/netsurf-3.1.patchset @@ -0,0 +1,22 @@ +From 74431b243c18aa2e161037a7384dfcef907bb689 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 9 Jun 2014 21:44:48 +0200 +Subject: Fix include path for 3.1 release. + + +diff --git a/beos/about.cpp b/beos/about.cpp +index cd8070e..2483a22 100644 +--- a/beos/about.cpp ++++ b/beos/about.cpp +@@ -23,7 +23,7 @@ + extern "C" { + #include "desktop/netsurf.h" + #include "utils/log.h" +-#include "utils/testament.h" ++#include "testament.h" + #include "utils/useragent.h" + #include "curl/curlver.h" + } +-- +1.8.3.4 +