luakit: support luajit

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Sat Jan 18 15:08:06 2020 +0000
Changeset:	c17a34ddb6c59daa498b1f6c10865db297695f23

Modified Files:
	luakit/Makefile
Added Files:
	luakit/options.mk

Log Message:
luakit: support luajit

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c17a34ddb6c59daa498b1f6c10865db297695f23

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 luakit/Makefile   | 21 +++++++++------------
 luakit/options.mk | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)

diffs:
diff --git a/luakit/Makefile b/luakit/Makefile
index 10c8411350..c3550ee0e6 100644
--- a/luakit/Makefile
+++ b/luakit/Makefile
@@ -11,15 +11,14 @@ LICENSE=	gnu-gpl-v3
 
 USE_TOOLS+=	gmake pkg-config
 
-LUAKIT_MAKE_FLAGS+=	DEVELOPMENT_PATHS=0
-LUAKIT_MAKE_FLAGS+=	APPDIR=${PREFIX}/share/applications
-LUAKIT_MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/luakit
-LUAKIT_MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
-LUAKIT_MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/pixmaps
-LUAKIT_MAKE_FLAGS+=	XDGPREFIX=${PREFIX}/etc/xdg
-LUAKIT_MAKE_FLAGS+=	USE_LUAJIT=0
-BUILD_MAKE_FLAGS+=	${LUAKIT_MAKE_FLAGS}
-INSTALL_MAKE_FLAGS+=	${LUAKIT_MAKE_FLAGS}
+MAKE_FLAGS+=	DEVELOPMENT_PATHS=0
+MAKE_FLAGS+=	APPDIR=${PREFIX}/share/applications
+MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/luakit
+MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=	PIXMAPDIR=${PREFIX}/share/pixmaps
+MAKE_FLAGS+=	XDGPREFIX=${PREFIX}/etc/xdg
+
+MAKE_ENV+=	DISPLAY=${DISPLAY:Q}
 
 LUA_VERSIONS_ACCEPTED=	51
 
@@ -40,8 +39,6 @@ DISPLAY= :2
 	@${FALSE}
 .endif  #Xvfb
 
-MAKE_ENV+=	DISPLAY=${DISPLAY:Q}
-
 teardownx:
 	${ECHO} teardownx: Xvfb-PID: `${CAT} ${WRKDIR}/.Xvfb.pid`
 	sleep 5
@@ -54,8 +51,8 @@ post-build:	teardownx
 pre-install:
 	${RM} -f ${WRKSRC}/lib/*.orig
 
+.include "options.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/luakit/options.mk b/luakit/options.mk
new file mode 100644
index 0000000000..59f5041941
--- /dev/null
+++ b/luakit/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.4 2019/10/20 11:10:48 nia Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.luakit
+PKG_SUPPORTED_OPTIONS=		luajit
+PKG_SUGGESTED_OPTIONS=		luajit
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mluajit)
+MAKE_FLAGS+=	USE_LUAJIT=1
+NOT_PAX_MPROTECT_SAFE+=	bin/luakit
+.  include "../../lang/LuaJIT2/buildlink3.mk"
+.else
+MAKE_FLAGS+=	USE_LUAJIT=0
+.  include "../../lang/lua51/buildlink3.mk"
+.endif