From owner-svn-ports-head@freebsd.org  Wed Jun 13 11:32:17 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BFBFD10000AB;
 Wed, 13 Jun 2018 11:32:17 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6FF827C85D;
 Wed, 13 Jun 2018 11:32:17 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52A4418DD8;
 Wed, 13 Jun 2018 11:32:17 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5DBWHBA076430;
 Wed, 13 Jun 2018 11:32:17 GMT (envelope-from martymac@FreeBSD.org)
Received: (from martymac@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5DBWHhi076429;
 Wed, 13 Jun 2018 11:32:17 GMT (envelope-from martymac@FreeBSD.org)
Message-Id: <201806131132.w5DBWHhi076429@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: martymac set sender to
 martymac@FreeBSD.org using -f
From: Ganael LAPLANCHE <martymac@FreeBSD.org>
Date: Wed, 13 Jun 2018 11:32:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r472303 - head/ftp/lftp
X-SVN-Group: ports-head
X-SVN-Commit-Author: martymac
X-SVN-Commit-Paths: head/ftp/lftp
X-SVN-Commit-Revision: 472303
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2018 11:32:17 -0000

Author: martymac
Date: Wed Jun 13 11:32:16 2018
New Revision: 472303
URL: https://svnweb.freebsd.org/changeset/ports/472303

Log:
  Fix readline detection on 10.x
  
  (previous commit broke readline detection on 10.x where base readline resides
  in /usr)

Modified:
  head/ftp/lftp/Makefile

Modified: head/ftp/lftp/Makefile
==============================================================================
--- head/ftp/lftp/Makefile	Wed Jun 13 11:14:11 2018	(r472302)
+++ head/ftp/lftp/Makefile	Wed Jun 13 11:32:16 2018	(r472303)
@@ -27,7 +27,11 @@ GNU_CONFIGURE=	yes
 
 # XXX Fix readline detection with a non-standard LOCALBASE
 # To remove when m4/lftp_lib_readline.m4 is fixed upstream
+.if !exists(/usr/lib/libreadline.so)
 CONFIGURE_ARGS+=	--with-readline=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--with-readline=/usr
+.endif
 
 PORTDOCS=	AUTHORS BUGS ChangeLog FAQ FEATURES INSTALL \
 		MIRRORS NEWS README README.debug-levels README.modules \