From b7a4d7a3b0d46ab6e2f781e3fda2ddd52a26370b Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 17 Sep 2016 21:52:14 +0000
Subject: [PATCH] fossil: reorder sections, drop unneeded SOURCE_DIR, drop
 1.34.

---
 dev-vcs/fossil/fossil-1.34.recipe | 54 -------------------------------
 dev-vcs/fossil/fossil-1.35.recipe | 11 +++----
 2 files changed, 5 insertions(+), 60 deletions(-)
 delete mode 100644 dev-vcs/fossil/fossil-1.34.recipe

diff --git a/dev-vcs/fossil/fossil-1.34.recipe b/dev-vcs/fossil/fossil-1.34.recipe
deleted file mode 100644
index d929059b8..000000000
--- a/dev-vcs/fossil/fossil-1.34.recipe
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY="A tool for distributed software configuration management"
-DESCRIPTION="Fossil is a simple, high-reliability, 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/"
-SOURCE_URI="https://www.fossil-scm.org/download/fossil-src-$portVersion.tar.gz"
-CHECKSUM_SHA256="53a6b83e878feced9ac7705f87e5b6ea82727314e3e19202ae1c46c7e4dba49f"
-REVISION="2"
-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
-	lib:libssl
-	"
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libz
-	devel:libssl
-	"
-# tests require cmd:tclsh
-BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc
-	"
-
-SOURCE_DIR="fossil-src-$portVersion"
-
-BUILD()
-{
-	./configure --prefix=$prefix
-	make
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
diff --git a/dev-vcs/fossil/fossil-1.35.recipe b/dev-vcs/fossil/fossil-1.35.recipe
index 5b17cc0c1..cb32b955b 100644
--- a/dev-vcs/fossil/fossil-1.35.recipe
+++ b/dev-vcs/fossil/fossil-1.35.recipe
@@ -6,12 +6,12 @@ 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/"
+HOMEPAGE="https://www.fossil-scm.org/"
+COPYRIGHT="2007-2016 D. Richard Hipp"
+LICENSE="BSD (2-clause)"
+REVISION="2"
 SOURCE_URI="https://www.fossil-scm.org/download/fossil-src-$portVersion.tar.gz"
 CHECKSUM_SHA256="c1f92f925a87c9872cb40d166f56ba08b90edbab01a8546ff37025836136ba1d"
-REVISION="1"
-LICENSE="BSD (2-clause)"
-COPYRIGHT="2007 D. Richard Hipp"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -24,6 +24,7 @@ REQUIRES="
 	lib:libz
 	lib:libssl
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libz
@@ -35,8 +36,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-SOURCE_DIR="fossil-$portVersion"
-
 BUILD()
 {
 	./configure --prefix=$prefix