From 3243557fa97dbcf443471b5a45fd94e333d1a158 Mon Sep 17 00:00:00 2001 From: "Joseph R. Prostko" Date: Mon, 23 Jun 2014 05:31:08 +0000 Subject: [PATCH] Add Fossil 1.29 recipe and patch * This builds cleanly for x86_gcc2, x86, and x86_64 * The patch fixes a zlib namespace clash with OpenSSL that affects x86_gcc2, as well as an outdated config.guess which prevented Haiku x86_64 from being identified * The 1.29 release will allow `fossil ui` to work correctly, unlike the last couple of versions that had a chroot bug that affected OS's like Haiku that run as root out of the box --- dev-vcs/fossil/fossil-1.29.recipe | 52 ++++++++++++++++++++++++ dev-vcs/fossil/patches/fossil-1.29.patch | 26 ++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 dev-vcs/fossil/fossil-1.29.recipe create mode 100644 dev-vcs/fossil/patches/fossil-1.29.patch diff --git a/dev-vcs/fossil/fossil-1.29.recipe b/dev-vcs/fossil/fossil-1.29.recipe new file mode 100644 index 000000000..9950c7af6 --- /dev/null +++ b/dev-vcs/fossil/fossil-1.29.recipe @@ -0,0 +1,52 @@ +SUMMARY="Simple, high-reliability, distributed software configuration management" +DESCRIPTION=" +Simple, high-reliability, distributed software configuration management +" +HOMEPAGE="http://www.fossil-scm.org/" +SRC_URI="http://www.fossil-scm.org/download/fossil-src-20140612172556.tar.gz" +CHECKSUM_SHA256="c9882f9beb95695db7402dbd03d8fbf082e1109429175af4d57e089bcd2db387" +REVISION="1" +LICENSE="BSD (2-clause)" +COPYRIGHT="2007 D. Richard Hipp" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="fossil-$portVersion.patch" + +PROVIDES=" + fossil = $portVersion + cmd:fossil = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + lib:libz + openssl >= 1.0.0 + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libz >= 1.2.3 + openssl_devel >= 1.0.0 + " +# tests require cmd:tclsh +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + " + +SOURCE_DIR="fossil-src-20140612172556" + +BUILD() +{ + ./configure --prefix=$prefix + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make test +} diff --git a/dev-vcs/fossil/patches/fossil-1.29.patch b/dev-vcs/fossil/patches/fossil-1.29.patch new file mode 100644 index 000000000..4e2f23db2 --- /dev/null +++ b/dev-vcs/fossil/patches/fossil-1.29.patch @@ -0,0 +1,26 @@ +--- a/autosetup/config.guess ++++ b/autosetup/config.guess +@@ -1185,6 +1206,9 @@ + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +--- a/src/main.c ++++ b/src/main.c +@@ -32,10 +32,10 @@ + #else + # include /* errno global */ + #endif +-#include "zlib.h" + #ifdef FOSSIL_ENABLE_SSL + # include "openssl/crypto.h" + #endif ++#include "zlib.h" + #if INTERFACE + #ifdef FOSSIL_ENABLE_TCL + # include "tcl.h"