CVS commit: pkgsrc/games/love010

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jun 24 11:24:46 UTC 2020

Modified Files:
        pkgsrc/games/love010: Makefile
Added Files:
        pkgsrc/games/love010: options.mk

Log Message:
love010: Allow building without luajit. Should help aarch64 builds.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/love010/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/games/love010/options.mk

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

Modified files:

Index: pkgsrc/games/love010/Makefile
diff -u pkgsrc/games/love010/Makefile:1.3 pkgsrc/games/love010/Makefile:1.4
--- pkgsrc/games/love010/Makefile:1.3   Fri Jun  5 12:49:05 2020
+++ pkgsrc/games/love010/Makefile       Wed Jun 24 11:24:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/06/05 12:49:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/24 11:24:45 nia Exp $
 
 DISTNAME=      love-0.10.2-linux-src
 PKGNAME=       ${DISTNAME:S/-linux-src//:S/love/love010/}
@@ -18,16 +18,12 @@ USE_LANGUAGES=      c c++
 USE_TOOLS+=    pkg-config
 USE_LIBTOOL=   yes
 
-LUA_VERSIONS_INCOMPATIBLE=     52
-
-# JIT needs WX mappings
-NOT_PAX_MPROTECT_SAFE+=                love0.10/bin/love
-
 GNU_CONFIGURE_PREFIX=          ${PREFIX}/love0.10
 GNU_CONFIGURE_MANDIR=          ${PREFIX}/love0.10/${PKGMANDIR}/
 BUILDLINK_PASSTHRU_DIRS+=      ${PREFIX}/love0.10/lib
 BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/love0.10/lib
 
+.include "options.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
@@ -35,8 +31,6 @@ BUILDLINK_API_DEPENDS.physfs+=        physfs>=2
 .include "../../devel/physfs/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../devel/devIL/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../audio/libmodplug/buildlink3.mk"

Added files:

Index: pkgsrc/games/love010/options.mk
diff -u /dev/null pkgsrc/games/love010/options.mk:1.1
--- /dev/null   Wed Jun 24 11:24:46 2020
+++ pkgsrc/games/love010/options.mk     Wed Jun 24 11:24:45 2020
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2020/06/24 11:24:45 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.love
+PKG_SUPPORTED_OPTIONS= luajit
+
+.include "../../lang/LuaJIT2/platform.mk"
+.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss])
+PKG_SUGGESTED_OPTIONS= luajit
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mluajit)
+# JIT needs WX mappings
+NOT_PAX_MPROTECT_SAFE+=                love0.10/bin/love
+.  include "../../lang/LuaJIT2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=               --with-lua=lua
+CONFIGURE_ARGS+=               --with-luaversion=-5.1
+.  include "../../lang/lua51/buildlink3.mk"
+.endif