Date: Mon, 21 Apr 2014 21:56:55 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> 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 Message-ID: <201404212156.s3LLutLl053102@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404212156.s3LLutLl053102>