svn commit: r377209 - in head/lang: lua51 lua52

[Baptiste Daroussin]

Author: bapt
Date: Sat Jan 17 01:37:59 2015
New Revision: 377209
URL: https://svnweb.freebsd.org/changeset/ports/377209
QAT: https://qat.redports.org/buildarchive/r377209/

Log:
  Link on libedit instead of readline
  Reduce overlinking on liblua
  Enforce libedit from ports

Modified:
  head/lang/lua51/Makefile
  head/lang/lua52/Makefile

Modified: head/lang/lua51/Makefile
==============================================================================
--- head/lang/lua51/Makefile	Sat Jan 17 01:33:30 2015	(r377208)
+++ head/lang/lua51/Makefile	Sat Jan 17 01:37:59 2015	(r377209)
@@ -31,7 +31,7 @@ LDFLAGS+=	-lm -pthread
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKE_ARGS+=	MYCFLAGS="${CFLAGS} ${CPPFLAGS} -DLUA_USE_LINUX" \
 		MYLDFLAGS="${LDFLAGS}" \
-		MYLIBS="-Wl,-E -ledit" \
+		MYLIBS="-Wl,-E -L${LOCALBASE}/lib -ledit" \
 		CC="${CC}" \
 		LUA_T=lua51 \
 		LUAC_T=luac51 \

Modified: head/lang/lua52/Makefile
==============================================================================
--- head/lang/lua52/Makefile	Sat Jan 17 01:33:30 2015	(r377208)
+++ head/lang/lua52/Makefile	Sat Jan 17 01:37:59 2015	(r377209)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lua
 PORTVERSION=	5.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/
 PKGNAMESUFFIX=	52
@@ -14,7 +14,7 @@ COMMENT=	Small, compilable scripting lan
 LICENSE=	MIT
 
 LUA_VER=	5.2
-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 -L${LOCALBASE}/lib -ledit" \
 		CC="${CC}" \
 		LUA_T=lua52 \
 		LUAC_T=luac52 \
@@ -62,7 +64,9 @@ CFLAGS_powerpc=	-fPIC
 post-patch:
 	@${REINPLACE_CMD} -e 's,rand *(,random(,g' \
 		${WRKSRC}/src/lmathlib.c
-	@${REINPLACE_CMD} -e "/LUA_ROOT/s|/usr/local|${LUA_PREFIX}|" \
+	@${REINPLACE_CMD} -e "/LUA_ROOT/s|/usr/local|${LUA_PREFIX}| ; \
+		s,readline/,editline/,g ; \
+		/history\.h/d" \
 		${WRKSRC}/src/luaconf.h
 
 post-install: