From b5419621f4625db76698c089fda8e2f6486d03bf Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 30 Jun 2018 02:13:52 +0200
Subject: [PATCH] popt, fix build (#2747)

---
 dev-libs/popt/patches/popt-1.16.patchset | 30 ++++++++++++++++++++++--
 dev-libs/popt/popt-1.16.recipe           | 15 ++++++------
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/dev-libs/popt/patches/popt-1.16.patchset b/dev-libs/popt/patches/popt-1.16.patchset
index ebefa4c9a..fe0ecc514 100644
--- a/dev-libs/popt/patches/popt-1.16.patchset
+++ b/dev-libs/popt/patches/popt-1.16.patchset
@@ -1,4 +1,4 @@
-From 4db73bb22181c9c029fecdd52eb0e73b0e638ef6 Mon Sep 17 00:00:00 2001
+From 0dbaa1578f72a56178aa5b94abda6f8d28ad19da Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 11 Jun 2014 16:57:20 +0000
 Subject: haiku patch
@@ -39,5 +39,31 @@ index 2a7b4aa..2779f7c 100755
                                    description. After all, we have to test
                                    argument help wrapping somehow, right?
 -- 
-1.8.3.4
+2.16.4
+
+
+From 1933ebbba7ee932e11e6c97aadca1ae156d69b98 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 29 Jun 2018 16:54:37 +0200
+Subject: test fails, could use a fix ...
+
+
+diff --git a/Makefile.am b/Makefile.am
+index d7aec9e..9a15720 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,9 +35,9 @@ tdict_LDADD = $(usrlib_LTLIBRARIES)
+ noinst_SCRIPTS = testit.sh
+ 
+ TESTS_ENVIRONMENT = \
+-test1="$(top_builddir)/test1"
++test1="./test1"
+ 
+-TESTS = $(top_srcdir)/testit.sh
++#TESTS = testit.sh
+ 
+ include_HEADERS = popt.h
+ 
+-- 
+2.16.4
 
diff --git a/dev-libs/popt/popt-1.16.recipe b/dev-libs/popt/popt-1.16.recipe
index 5955d94d1..b20c0e348 100644
--- a/dev-libs/popt/popt-1.16.recipe
+++ b/dev-libs/popt/popt-1.16.recipe
@@ -9,9 +9,9 @@ quite difficult
 arrays"
 LICENSE="MIT"
 COPYRIGHT="1998-2010 Red Hat, Inc."
-HOMEPAGE="http://rpm5.org/files/popt/"
-REVISION="4"
-SOURCE_URI="http://rpm5.org/files/popt/popt-1.16.tar.gz"
+HOMEPAGE="http://www.linuxfromscratch.org/blfs/view/8.1/general/popt.html"
+REVISION="5"
+SOURCE_URI="ftp://anduin.linuxfromscratch.org/BLFS/popt/popt-1.16.tar.gz"
 CHECKSUM_SHA256="e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8"
 PATCHES="popt-1.16.patchset"
 
@@ -24,6 +24,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -36,11 +38,12 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:sed
@@ -48,8 +51,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	libtoolize -fci
-	autoconf
+	autoreconf -vfi
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -73,4 +75,3 @@ TEST()
 {
 	make check
 }
-