diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-04-21 21:56:54 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-04-21 21:56:54 +0000 |
| commit | fcc4bbdec11e57d5879b8ffe07b0e2a37d7a9e65 (patch) | |
| tree | a81ea99f5e6df4fb555bdd2974bc9ce05e8da58a /dns | |
| parent | Switch to lua 5.2 (diff) | |
Switch to use lua 5.2
Notes
Notes:
svn path=/head/; revision=351724
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/dnsmasq-devel/Makefile | 4 | ||||
| -rw-r--r-- | dns/dnsmasq/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index 35d647a00e58..3242f4361a5c 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -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: @: diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index 46988a70c3cb..a9e896718981 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -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 |