From owner-svn-ports-all@freebsd.org Mon Dec 9 22:16:02 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1F851DFCA7; Mon, 9 Dec 2019 22:16:02 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47WyFZ3n0qz4731; Mon, 9 Dec 2019 22:16:02 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7866D212B3; Mon, 9 Dec 2019 22:16:02 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB9MG2Yc027395; Mon, 9 Dec 2019 22:16:02 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB9MG211027393; Mon, 9 Dec 2019 22:16:02 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201912092216.xB9MG211027393@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Mon, 9 Dec 2019 22:16:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519637 - head/games/solarus X-SVN-Group: ports-head X-SVN-Commit-Author: danilo X-SVN-Commit-Paths: head/games/solarus X-SVN-Commit-Revision: 519637 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2019 22:16:02 -0000 Author: danilo Date: Mon Dec 9 22:16:01 2019 New Revision: 519637 URL: https://svnweb.freebsd.org/changeset/ports/519637 Log: - Unbreak where luajit is unavailable by using lua instead - Add LUAJIT option and enable it by default for architecures where it's supported PR: 239538 Submitted by: pkubaj Modified: head/games/solarus/Makefile head/games/solarus/pkg-plist Modified: head/games/solarus/Makefile ============================================================================== --- head/games/solarus/Makefile Mon Dec 9 22:09:43 2019 (r519636) +++ head/games/solarus/Makefile Mon Dec 9 22:16:01 2019 (r519637) @@ -3,6 +3,7 @@ PORTNAME= solarus PORTVERSION= 1.6.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= games MAINTAINER= danilo@FreeBSD.org @@ -13,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/license.txt LIB_DEPENDS= libphysfs.so:devel/physfs \ libmodplug.so:audio/libmodplug \ - libluajit-5.1.so:lang/luajit \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg @@ -28,5 +28,21 @@ USE_QT= buildtools_build core gui linguisttools_build USE_SDL= sdl2 ttf2 image2 USE_GL= gl glu USE_LDCONFIG= yes + +OPTIONS_DEFINE= LUAJIT +OPTIONS_DEFAULT_amd64= LUAJIT +OPTIONS_DEFAULT_i386= LUAJIT +OPTIONS_DEFAULT_powerpc= LUAJIT + +LUAJIT_CMAKE_BOOL= SOLARUS_USE_LUAJIT +LUAJIT_DESC= Use LuaJIT instead of standard Lua +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_USES_OFF= lua:51 + +CMAKE_ARGS+= -DSOLARUS_MANUAL_INSTALL_DESTINATION:STRING="man" + +post-install: + ${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man6/solarus-run.6 \ + ${STAGEDIR}${PREFIX}/man/man6/solarus.6 .include Modified: head/games/solarus/pkg-plist ============================================================================== --- head/games/solarus/pkg-plist Mon Dec 9 22:09:43 2019 (r519636) +++ head/games/solarus/pkg-plist Mon Dec 9 22:16:01 2019 (r519637) @@ -522,5 +522,5 @@ share/icons/hicolor/32x32/apps/solarus.png share/icons/hicolor/48x48/apps/solarus.png share/icons/hicolor/512x512/apps/solarus.png share/icons/hicolor/64x64/apps/solarus.png -share/man/man6/solarus-run.6 -share/man/man6/solarus.6 +man/man6/solarus-run.6.gz +man/man6/solarus.6.gz