From ee95c3c88eaca41e1d4dceee0e74b26b61641abd Mon Sep 17 00:00:00 2001
From: "Joseph R. Prostko" <joe.prostko@gmail.com>
Date: Sat, 14 Mar 2015 21:21:45 -0400
Subject: [PATCH] =?UTF-8?q?Correct=20/=20simplify=20Fossil=20recipe=20per?=
 =?UTF-8?q?=20J=C3=A9r=C3=B4me's=20suggestion=20*=20Also=20removed=20previ?=
 =?UTF-8?q?ous=20recipes=20due=20to=20a=20regression=20introduced=20after?=
 =?UTF-8?q?=20v1.27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev-vcs/fossil/fossil-1.28.recipe        | 50 ---------------------
 dev-vcs/fossil/fossil-1.29.recipe        | 52 ----------------------
 dev-vcs/fossil/fossil-1.30.recipe        | 55 ------------------------
 dev-vcs/fossil/fossil-1.31.recipe        | 55 ------------------------
 dev-vcs/fossil/fossil-1.32.recipe        |  8 ++--
 dev-vcs/fossil/patches/fossil-1.29.patch | 26 -----------
 6 files changed, 4 insertions(+), 242 deletions(-)
 delete mode 100644 dev-vcs/fossil/fossil-1.28.recipe
 delete mode 100644 dev-vcs/fossil/fossil-1.29.recipe
 delete mode 100644 dev-vcs/fossil/fossil-1.30.recipe
 delete mode 100644 dev-vcs/fossil/fossil-1.31.recipe
 delete mode 100644 dev-vcs/fossil/patches/fossil-1.29.patch

diff --git a/dev-vcs/fossil/fossil-1.28.recipe b/dev-vcs/fossil/fossil-1.28.recipe
deleted file mode 100644
index c17375f54..000000000
--- a/dev-vcs/fossil/fossil-1.28.recipe
+++ /dev/null
@@ -1,50 +0,0 @@
-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-20140127173344.tar.gz"
-CHECKSUM_SHA256="aca7c5a7c39ae2880712020e089c9c12543ba656c71d8cf8ac50e3c8871baa80"
-REVISION="1"
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2007 D. Richard Hipp"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-
-PROVIDES="
-	fossil = $portVersion
-	cmd:fossil = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libz
-	openssl >= 1.0.0
-	"
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libz >= 1.2.3
-	openssl_devel >= 1.0.0
-	"
-# tests require cmd:tclsh
-BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc
-	"
-
-SOURCE_DIR="fossil-src-20140127173344"
-
-BUILD()
-{
-	./configure --prefix=$prefix
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
diff --git a/dev-vcs/fossil/fossil-1.29.recipe b/dev-vcs/fossil/fossil-1.29.recipe
deleted file mode 100644
index bc0561548..000000000
--- a/dev-vcs/fossil/fossil-1.29.recipe
+++ /dev/null
@@ -1,52 +0,0 @@
-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
-	lib:libz
-	openssl >= 1.0.0
-	"
-BUILD_REQUIRES="
-	haiku_devel
-	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/fossil-1.30.recipe b/dev-vcs/fossil/fossil-1.30.recipe
deleted file mode 100644
index e0250e32a..000000000
--- a/dev-vcs/fossil/fossil-1.30.recipe
+++ /dev/null
@@ -1,55 +0,0 @@
-SUMMARY="Simple, high-reliability, distributed software configuration management"
-DESCRIPTION="Fossil is a distributed version control system like Git and \
-Mercurial, but Fossil also supports distributed bug tracking, \
-distributed wiki, and a distributed blog mechanism all in a single \
-integrated package.
-
-Additionally, Fossil also has a built-in and easy-to-use web \
-interface that simplifies project tracking and promotes situational \
-awareness."
-HOMEPAGE="http://www.fossil-scm.org/" 
-SRC_URI="http://www.fossil-scm.org/download/fossil-src-20150119112900.tar.gz"
-CHECKSUM_SHA256="37969e5a09c1611199921e3518a4ed736fd637a02f2d5810cd45897a4ceb92dc"
-REVISION="1"
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2007 D. Richard Hipp"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PROVIDES="
-	fossil = $portVersion
-	cmd:fossil = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libz
-	openssl >= 1.0.0
-	"
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libz >= 1.2.3
-	openssl_devel >= 1.0.0
-	"
-# tests require cmd:tclsh
-BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc
-	"
-
-SOURCE_DIR="fossil-src-20150119112900"
-
-BUILD()
-{
-	./configure --prefix=$prefix
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
diff --git a/dev-vcs/fossil/fossil-1.31.recipe b/dev-vcs/fossil/fossil-1.31.recipe
deleted file mode 100644
index bb5ef5057..000000000
--- a/dev-vcs/fossil/fossil-1.31.recipe
+++ /dev/null
@@ -1,55 +0,0 @@
-SUMMARY="Simple, high-reliability, distributed software configuration management"
-DESCRIPTION="Fossil is a distributed version control system like Git and \
-Mercurial, but Fossil also supports distributed bug tracking, \
-distributed wiki, and a distributed blog mechanism all in a single \
-integrated package.
-
-Additionally, Fossil also has a built-in and easy-to-use web \
-interface that simplifies project tracking and promotes situational \
-awareness."
-HOMEPAGE="http://www.fossil-scm.org/" 
-SRC_URI="https://www.fossil-scm.org/download/fossil-src-20150223162734.tar.gz"
-CHECKSUM_SHA256="c00f9e1487530adb921df730baf57e1aa23767a0afb60b865e5842bb50782942"
-REVISION="1"
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2007 D. Richard Hipp"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PROVIDES="
-	fossil = $portVersion
-	cmd:fossil = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libz
-	openssl >= 1.0.0
-	"
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libz >= 1.2.3
-	openssl_devel >= 1.0.0
-	"
-# tests require cmd:tclsh
-BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc
-	"
-
-SOURCE_DIR="fossil-src-201502231627"
-
-BUILD()
-{
-	./configure --prefix=$prefix
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
diff --git a/dev-vcs/fossil/fossil-1.32.recipe b/dev-vcs/fossil/fossil-1.32.recipe
index e811c6edf..3bbe27d03 100644
--- a/dev-vcs/fossil/fossil-1.32.recipe
+++ b/dev-vcs/fossil/fossil-1.32.recipe
@@ -10,7 +10,7 @@ awareness."
 HOMEPAGE="http://www.fossil-scm.org/" 
 SRC_URI="https://www.fossil-scm.org/download/fossil-src-1.32.tar.gz"
 CHECKSUM_SHA256="cd79c333eb9e86fbb8c17bf5cdf31c387e4ab768eede623aed21adfdbcad686e"
-REVISION="1"
+REVISION="2"
 LICENSE="BSD (2-clause)"
 COPYRIGHT="2007 D. Richard Hipp"
 
@@ -23,12 +23,12 @@ PROVIDES="
 REQUIRES="
 	haiku
 	lib:libz
-	openssl >= 1.0.0
+	lib:libssl
 	"
 BUILD_REQUIRES="
 	haiku_devel
-	devel:libz >= 1.2.3
-	openssl_devel >= 1.0.0
+	devel:libz
+	devel:libssl
 	"
 # tests require cmd:tclsh
 BUILD_PREREQUIRES="
diff --git a/dev-vcs/fossil/patches/fossil-1.29.patch b/dev-vcs/fossil/patches/fossil-1.29.patch
deleted file mode 100644
index 4e2f23db2..000000000
--- a/dev-vcs/fossil/patches/fossil-1.29.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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.h> /* 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"