From owner-svn-ports-head@FreeBSD.ORG  Mon Apr 21 21:56:55 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6E94F46F;
 Mon, 21 Apr 2014 21:56:55 +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 5AECE1C2D;
 Mon, 21 Apr 2014 21:56:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3LLut5G053108;
 Mon, 21 Apr 2014 21:56:55 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3LLutLl053102;
 Mon, 21 Apr 2014 21:56:55 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201404212156.s3LLutLl053102@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 21 Apr 2014 21:56:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351724 - in head/dns: dnsmasq dnsmasq-devel
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.17
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: Mon, 21 Apr 2014 21:56:55 -0000

Author: bapt
Date: Mon Apr 21 21:56:54 2014
New Revision: 351724
URL: http://svnweb.freebsd.org/changeset/ports/351724
QAT: https://qat.redports.org/buildarchive/r351724/

Log:
  Switch to use lua 5.2

Modified:
  head/dns/dnsmasq-devel/Makefile
  head/dns/dnsmasq/Makefile

Modified: head/dns/dnsmasq-devel/Makefile
==============================================================================
--- head/dns/dnsmasq-devel/Makefile	Mon Apr 21 21:41:24 2014	(r351723)
+++ head/dns/dnsmasq-devel/Makefile	Mon Apr 21 21:56:54 2014	(r351724)
@@ -62,7 +62,7 @@ CFLAGS+=	-DHAVE_DBUS
 
 .if ${PORT_OPTIONS:MLUA}
 CFLAGS+=	-DHAVE_LUASCRIPT
-USE_LUA=	5.1
+USES+=		lua
 .endif
 
 .if ${PORT_OPTIONS:MDNSSEC}
@@ -76,7 +76,7 @@ USE_RC_SUBR=	dnsmasq
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${REINPLACE_CMD} -e "s/lua5\.1/lua-5.1/" ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e "s/lua5\.1/lua-${LUA_VER}/" ${WRKSRC}/Makefile
 
 pre-configure:
 	@:

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Mon Apr 21 21:41:24 2014	(r351723)
+++ head/dns/dnsmasq/Makefile	Mon Apr 21 21:56:54 2014	(r351724)
@@ -72,8 +72,8 @@ LDFLAGS+=	`pkg-config --libs dbus-1`
 .if ${PORT_OPTIONS:MLUA}
 CPPFLAGS+=	-I${LUA_INCDIR}
 CFLAGS+=	-DHAVE_LUASCRIPT
-LDFLAGS+=	-L${LUA_LIBDIR} -llua
-USE_LUA=	5.1
+LDFLAGS+=	-L${LUA_LIBDIR} -llua-${LUA_VER}
+USES+=		lua
 .endif
 
 .if ${PORT_OPTIONS:MDNSSEC}
@@ -89,7 +89,7 @@ USE_RC_SUBR=	dnsmasq
 LDFLAGS+=	-L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB}
 
 post-patch:
-	${REINPLACE_CMD} -e "s/lua5\.1/lua-5.1/" ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e "s/lua5\.1/lua-${LUA_VER}/" ${WRKSRC}/Makefile
 
 pre-configure: pretty-print-config
 	@${PRINTF} "dns/libidn config: " ; ${MAKE} -C ${PORTSDIR}/dns/libidn pretty-print-config