From b8b515f485c7e408614700e12c1bb0a68e5a619f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 31 Jan 2017 21:45:43 +0100
Subject: [PATCH] foldershaper: fix build on x86_64.

* use a safe source.
---
 .../foldershaper/foldershaper-1.0.recipe      | 10 ++++++---
 .../patches/foldershaper-1.0.patchset         | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 haiku-apps/foldershaper/patches/foldershaper-1.0.patchset

diff --git a/haiku-apps/foldershaper/foldershaper-1.0.recipe b/haiku-apps/foldershaper/foldershaper-1.0.recipe
index 6bcfe74df..018762d1a 100644
--- a/haiku-apps/foldershaper/foldershaper-1.0.recipe
+++ b/haiku-apps/foldershaper/foldershaper-1.0.recipe
@@ -7,10 +7,14 @@ your folders on FolderShaper and select the template from the pop-up menu."
 HOMEPAGE="https://github.com/HaikuArchives/FolderShaper"
 COPYRIGHT="2005 Jonas Sundström"
 LICENSE="Public Domain"
-REVISION="1"
-SOURCE_URI="git://github.com/HaikuArchives/FolderShaper.git"
+REVISION="2"
+srcGitRev="afe549dc49e5fffc0dd2f65c383c6a8e0764a103"
+SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="b007d056b92f21b0cc31bea57ac939f31c3f751c06775694e1749e568257eee4"
+SOURCE_DIR="FolderShaper-$srcGitRev"
+PATCHES="foldershaper-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	foldershaper = $portVersion
diff --git a/haiku-apps/foldershaper/patches/foldershaper-1.0.patchset b/haiku-apps/foldershaper/patches/foldershaper-1.0.patchset
new file mode 100644
index 000000000..babf70eb6
--- /dev/null
+++ b/haiku-apps/foldershaper/patches/foldershaper-1.0.patchset
@@ -0,0 +1,22 @@
+From 36ae44f5ef235432cca1844705a36e98f96fd4b3 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 31 Jan 2017 21:41:40 +0100
+Subject: add STDCPPLIBS
+
+
+diff --git a/Source/Makefile b/Source/Makefile
+index 7d78645..46541c6 100644
+--- a/Source/Makefile
++++ b/Source/Makefile
+@@ -56,7 +56,7 @@ RSRCS= FolderShaper.rsrc
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS= be
++LIBS= be $(STDCPPLIBS)
+ 
+ #	specify additional paths to directories following the standard
+ #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
+-- 
+2.10.2
+