From 698a9da85302df9b031e3cab6eaaa7197153e41d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 26 Mar 2017 11:00:12 +0200
Subject: [PATCH] lftp: disable modules

There is no need to have the protocols as separate libraries, and it
doesn't work because runtime_loader gets confused.

Also fix and enable secondary architecture support for availability in
gcc2 systems.

Fixes #1248.
Fixes #1148.
---
 net-ftp/lftp/lftp-4.4.16.recipe | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/net-ftp/lftp/lftp-4.4.16.recipe b/net-ftp/lftp/lftp-4.4.16.recipe
index 011647a3a..ad196f353 100644
--- a/net-ftp/lftp/lftp-4.4.16.recipe
+++ b/net-ftp/lftp/lftp-4.4.16.recipe
@@ -12,20 +12,17 @@ CHECKSUM_SHA256="441f472f9d3f13b0861fbf3e45f5d08d8cf999d2229b4ee446815d52ad673bf
 PATCHES="lftp-$portVersion.patchset"
 COPYRIGHT="1996-2012 Alexander V. Lukyanov"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	lftp = $portVersion
 	lib:liblftp_jobs$secondaryArchSuffix = 0.0.0 compat >= 0
 	lib:liblftp_tasks$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-if [ -z "$secondaryArchSuffix" ]; then
-	PROVIDES="$PROVIDES
-		cmd:lftp = $portVersion compat >= 4
-		cmd:lftpget = $portVersion compat >= 4
-		"
-fi
+	cmd:lftp = $portVersion compat >= 4
+	cmd:lftpget = $portVersion compat >= 4
+"
 
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -76,8 +73,8 @@ BUILD()
 	aclocal -I m4
 	autoconf
 	automake
-	runConfigure ./configure --with-openssl --enable-static \
-		--with-modules
+	runConfigure --omit-dirs binDir ./configure --with-openssl --enable-static \
+		--bindir=$prefix/bin
 	make $jobArgs
 }
 
@@ -92,12 +89,6 @@ INSTALL()
 	# devel package
 	packageEntries devel \
 		$developDir
-
-	# Remove stuff we don't need in the secondary architecture base package.
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $binDir
-		rm -rf $documentationDir
-	fi
 }
 
 TEST()