[pkgsrc/trunk]: pkgsrc/games/love07 love07: Detect Lua properly, etc.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1159cf6dffc9
branches:  trunk
changeset: 434862:1159cf6dffc9
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Jun 24 12:34:02 2020 +0000

description:
love07: Detect Lua properly, etc.

I mistakenly enabled LuaJIT support on supported platforms.
It doesn't actually work in this version of LOVE (oops).

The previous inclusion of LuaJIT's buildlink3.mk was a mistake,
instead the exact version of lua51 should be included and the library
name corrected.

Bump PKGREVISION.

diffstat:

 games/love07/Makefile   |  12 +++++++++---
 games/love07/options.mk |  22 ----------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diffs (63 lines):

diff -r 6e5dde1d0541 -r 1159cf6dffc9 games/love07/Makefile
--- a/games/love07/Makefile     Wed Jun 24 12:30:56 2020 +0000
+++ b/games/love07/Makefile     Wed Jun 24 12:34:02 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2020/06/24 11:38:26 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/24 12:34:02 nia Exp $
 
 DISTNAME=      love-0.7.2-linux-src
 PKGNAME=       ${DISTNAME:S/-linux-src//:S/love/love07/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    games
 MASTER_SITES=  https://bitbucket.org/rude/love/downloads/
 
@@ -18,15 +18,21 @@
 USE_TOOLS+=    pkg-config
 USE_LIBTOOL=   yes
 
+# Avoid detecting unversioned lua in NetBSD.
+SUBST_CLASSES+=                lua
+SUBST_STAGE.lua=       pre-configure
+SUBST_FILES.lua=       configure
+SUBST_SED.lua=         -e 's,lua lua5.1,lua5.1,g'
+
 GNU_CONFIGURE_PREFIX=          ${PREFIX}/love0.7
 
-.include "options.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 BUILDLINK_API_DEPENDS.physfs+= physfs>=2.0
 .include "../../devel/physfs/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
+.include "../../lang/lua51/buildlink3.mk"
 .include "../../devel/devIL/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../audio/libmodplug/buildlink3.mk"
diff -r 6e5dde1d0541 -r 1159cf6dffc9 games/love07/options.mk
--- a/games/love07/options.mk   Wed Jun 24 12:30:56 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2020/06/24 11:43:54 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)
-CONFIGURE_ARGS+=       --enable-luajit
-.  include "../../lang/LuaJIT2/buildlink3.mk"
-.else
-SUBST_CLASSES+=                lua
-SUBST_STAGE.lua=       pre-configure
-SUBST_FILES.lua=       configure
-SUBST_SED.lua=         -e 's,luajit-5.1,lua-5.1,g'
-.  include "../../lang/lua51/buildlink3.mk"
-.endif