Received: by mail.netbsd.org (Postfix, from userid 605) id BC41F84EBF; Wed, 24 Jun 2020 11:38:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4536784EAC for ; Wed, 24 Jun 2020 11:38:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3EZQac38E9an for ; Wed, 24 Jun 2020 11:38:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BE9BF84DA1 for ; Wed, 24 Jun 2020 11:38:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B2B0EFB28; Wed, 24 Jun 2020 11:38:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1592998706275250" MIME-Version: 1.0 Date: Wed, 24 Jun 2020 11:38:26 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games/love07 To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200624113826.B2B0EFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1592998706275250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Wed Jun 24 11:38:26 UTC 2020 Modified Files: pkgsrc/games/love07: Makefile Added Files: pkgsrc/games/love07: options.mk Log Message: love07: Allow building without luajit. Should help aarch64 builds. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/love07/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/games/love07/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1592998706275250 Content-Disposition: inline Content-Length: 1973 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/love07/Makefile diff -u pkgsrc/games/love07/Makefile:1.2 pkgsrc/games/love07/Makefile:1.3 --- pkgsrc/games/love07/Makefile:1.2 Fri Jun 5 12:49:06 2020 +++ pkgsrc/games/love07/Makefile Wed Jun 24 11:38:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/06/05 12:49:06 jperkin Exp $ +# $NetBSD: Makefile,v 1.3 2020/06/24 11:38:26 nia Exp $ DISTNAME= love-0.7.2-linux-src PKGNAME= ${DISTNAME:S/-linux-src//:S/love/love07/} @@ -18,18 +18,15 @@ USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config USE_LIBTOOL= yes -LUA_VERSIONS_INCOMPATIBLE= 52 53 - 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/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/love07/options.mk diff -u /dev/null pkgsrc/games/love07/options.mk:1.1 --- /dev/null Wed Jun 24 11:38:26 2020 +++ pkgsrc/games/love07/options.mk Wed Jun 24 11:38:26 2020 @@ -0,0 +1,21 @@ +# $NetBSD: options.mk,v 1.1 2020/06/24 11:38:26 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) +. 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 --_----------=_1592998706275250--