From owner-svn-ports-head@FreeBSD.ORG  Sat Jan 17 01:28:32 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 62EE7C4D;
 Sat, 17 Jan 2015 01:28:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 28C87D24;
 Sat, 17 Jan 2015 01:28:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0H1SWxc015906;
 Sat, 17 Jan 2015 01:28:32 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0H1SWQP015905;
 Sat, 17 Jan 2015 01:28:32 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201501170128.t0H1SWQP015905@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 17 Jan 2015 01:28:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r377207 - head/lang/lua51
X-SVN-Group: ports-head
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jan 2015 01:28:32 -0000

Author: bapt
Date: Sat Jan 17 01:28:31 2015
New Revision: 377207
URL: https://svnweb.freebsd.org/changeset/ports/377207
QAT: https://qat.redports.org/buildarchive/r377207/

Log:
  Link on port version of libedit
  Avoid overlinking on liblua

Modified:
  head/lang/lua51/Makefile

Modified: head/lang/lua51/Makefile
==============================================================================
--- head/lang/lua51/Makefile	Sat Jan 17 00:52:29 2015	(r377206)
+++ head/lang/lua51/Makefile	Sat Jan 17 01:28:31 2015	(r377207)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lua
 PORTVERSION=	5.1.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/
 PKGNAMESUFFIX=	51
@@ -14,7 +14,7 @@ COMMENT=	Small, compilable scripting lan
 LICENSE=	MIT
 
 LUA_VER=	5.1
-USES=		readline
+LIB_DEPENDS+=	libedit.so.0:${PORTSDIR}/devel/libedit
 USE_LDCONFIG=	yes
 
 # Overriding __MAKE_CONF makes sure that we don't re-parse
@@ -26,10 +26,12 @@ USE_LDCONFIG=	yes
 MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
 # liblua.so requires libm, so make sure it has an explicit dependency
 # so that applications need not second-guess lua's dependencies.
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lm -pthread
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKE_ARGS+=	MYCFLAGS="${CFLAGS} ${CPPFLAGS} -DLUA_USE_LINUX" \
-		MYLDFLAGS="${LDFLAGS} -Wl,-E -lreadline" \
+		MYLDFLAGS="${LDFLAGS}" \
+		MYLIBS="-Wl,-E -ledit" \
 		CC="${CC}" \
 		LUA_T=lua51 \
 		LUAC_T=luac51 \