From de97a382ddc4d785f894646b49fa49224d79b948 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 24 Mar 2017 21:28:41 +0100
Subject: [PATCH] libfreehand: bump version, enable x86_64.

---
 ...-0.1.0.recipe => libfreehand-0.1.1.recipe} | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)
 rename media-libs/libfreehand/{libfreehand-0.1.0.recipe => libfreehand-0.1.1.recipe} (78%)

diff --git a/media-libs/libfreehand/libfreehand-0.1.0.recipe b/media-libs/libfreehand/libfreehand-0.1.1.recipe
similarity index 78%
rename from media-libs/libfreehand/libfreehand-0.1.0.recipe
rename to media-libs/libfreehand/libfreehand-0.1.1.recipe
index 9e8580ea5..31adfdb16 100644
--- a/media-libs/libfreehand/libfreehand-0.1.0.recipe
+++ b/media-libs/libfreehand/libfreehand-0.1.1.recipe
@@ -4,22 +4,23 @@ Aldus/Macromedia/Adobe FreeHand documents of all versions."
 HOMEPAGE="http://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 COPYRIGHT="Fridrich Strba, David Tardon"
 LICENSE="MPL v2.0"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://dev-www.libreoffice.org/src/libfreehand/libfreehand-$portVersion.tar.bz2"
-CHECKSUM_SHA256="c69962d5947561afeefeee71bc78ba7419e9d9b0fea8bcef2f625be867afe307"
+CHECKSUM_SHA256="45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"
 
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libfreehand$secondaryArchSuffix = $portVersion
 	cmd:fh2svg$secondaryArchSuffix
 	cmd:fh2raw$secondaryArchSuffix
-	lib:libfreehand_0.1$secondaryArchSuffix = 1.0.0 compat >= 1
+	cmd:fh2text$secondaryArchSuffix
+	lib:libfreehand_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libboost_system$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_generators_0.0$secondaryArchSuffix
 	lib:librevenge_stream_0.0$secondaryArchSuffix
@@ -28,7 +29,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libfreehand${secondaryArchSuffix}_devel = $portVersion
-	devel:libfreehand_0.1$secondaryArchSuffix = 1.0.0 compat >= 1
+	devel:libfreehand_0.1$secondaryArchSuffix = 1.0.1 compat >= 1
 	"
 REQUIRES_devel="
 	libfreehand$secondaryArchSuffix == $portVersion base
@@ -37,6 +38,8 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_system$secondaryArchSuffix
+	devel:liblcms2$secondaryArchSuffix
+	devel:libicuuc$secondaryArchSuffix
 	devel:librevenge_0.0$secondaryArchSuffix
 	devel:librevenge_generators_0.0$secondaryArchSuffix
 	devel:librevenge_stream_0.0$secondaryArchSuffix
@@ -44,24 +47,20 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:autoconf
 	cmd:automake
 	cmd:autoheader
 	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:gperf
 	"
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal
-	autoheader
-	automake -a -c --foreign
-	autoconf
+	autoreconf -fi
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -70,6 +69,8 @@ INSTALL()
 {
 	make install
 
+	rm $libDir/libfreehand-0.1.la
+
 	prepareInstalledDevelLibs libfreehand-0.1
 	fixPkgconfig