From owner-dev-commits-ports-all@freebsd.org Mon Jul 26 10:41:08 2021 Return-Path: Delivered-To: dev-commits-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 4054866A6AA; Mon, 26 Jul 2021 10:41:08 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GYGg8100pz3Ccw; Mon, 26 Jul 2021 10:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A67815B32; Mon, 26 Jul 2021 10:41:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16QAf7SZ058335; Mon, 26 Jul 2021 10:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16QAf7qQ058334; Mon, 26 Jul 2021 10:41:07 GMT (envelope-from git) Date: Mon, 26 Jul 2021 10:41:07 GMT Message-Id: <202107261041.16QAf7qQ058334@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: cd806799d15b - main - games/tome4: go back to using luajit MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd806799d15b3e32b061a5794e736b1091c8470a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jul 2021 10:41:08 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd806799d15b3e32b061a5794e736b1091c8470a commit cd806799d15b3e32b061a5794e736b1091c8470a Author: Piotr Kubaj AuthorDate: 2021-07-26 10:40:53 +0000 Commit: Piotr Kubaj CommitDate: 2021-07-26 10:40:53 +0000 games/tome4: go back to using luajit Turns out the luajit issues were caused by my setup. While here, remove empty whitespaces from pkg-plist. --- games/tome4/Makefile | 18 ++++++++++++++++-- games/tome4/pkg-plist | 14 +++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/games/tome4/Makefile b/games/tome4/Makefile index fef0c7761f29..1af83ef68259 100644 --- a/games/tome4/Makefile +++ b/games/tome4/Makefile @@ -1,6 +1,6 @@ PORTNAME= tome4 DISTVERSION?= 1.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= https://te4.org/dl/t-engine/ \ SF/lifanov-ports-distfiles/${PORTNAME}/:icons @@ -18,7 +18,7 @@ BUILD_DEPENDS= premake4:devel/premake4 LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libpng.so:graphics/png -USES= compiler:c++11-lang gl gmake openal:al sdl tar:bzip2 xorg +USES= gl gmake openal:al sdl tar:bzip2 xorg USE_SDL= image2 sdl2 ttf2 USE_GL= gl glu SUB_FILES= tome4 @@ -33,9 +33,23 @@ WRKSRC= ${WRKDIR}/t-engine4-src-${DISTVERSION} MAKE_ARGS+= config=release verbose=yes ARCH="" CC=${CC} CXX=${CXX} LDFLAGS_i386= -Wl,-znotext +.include + +.if ${ARCH} == powerpc +USES+= compiler:gcc-c++11-lib +.else +USES+= compiler:c++11-lang +.endif + pre-build: @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/premake4.lua +.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*} || ${ARCH} == riscv64 (cd ${WRKSRC} && premake4 --lua=default gmake) +.else + (cd ${WRKSRC} && premake4 gmake) + @${ECHO} '.NOTPARALLEL:' >> ${WRKSRC}/build/buildvm.make + @${ECHO} '.NOTPARALLEL:' >> ${WRKSRC}/build/luajit2.make +.endif @${REINPLACE_CMD} 's|-lpthread|-pthread|' ${WRKSRC}/build/TEngine.make do-install: diff --git a/games/tome4/pkg-plist b/games/tome4/pkg-plist index 1f2d8454edfe..be11a4b451f7 100644 --- a/games/tome4/pkg-plist +++ b/games/tome4/pkg-plist @@ -20,9 +20,9 @@ share/pixmaps/tome4.png %%DATADIR%%/game/modules/example_realtime/data/general/grids/basic.lua %%DATADIR%%/game/modules/example_realtime/data/general/npcs/kobold.lua %%DATADIR%%/game/modules/example_realtime/data/gfx/particles/acid.lua -%%DATADIR%%/game/modules/example_realtime/data/locales/ja_JP.lua -%%DATADIR%%/game/modules/example_realtime/data/locales/ko_KR.lua -%%DATADIR%%/game/modules/example_realtime/data/locales/zh_hans.lua +%%DATADIR%%/game/modules/example_realtime/data/locales/ja_JP.lua +%%DATADIR%%/game/modules/example_realtime/data/locales/ko_KR.lua +%%DATADIR%%/game/modules/example_realtime/data/locales/zh_hans.lua %%DATADIR%%/game/modules/example_realtime/data/locales/zh_hant.lua %%DATADIR%%/game/modules/example_realtime/data/rooms/pilar.lua %%DATADIR%%/game/modules/example_realtime/data/rooms/simple.lua @@ -48,10 +48,10 @@ share/pixmaps/tome4.png %%DATADIR%%/game/modules/example/data/general/grids/basic.lua %%DATADIR%%/game/modules/example/data/general/npcs/kobold.lua %%DATADIR%%/game/modules/example/data/gfx/particles/acid.lua -%%DATADIR%%/game/modules/example/data/locales/ja_JP.lua -%%DATADIR%%/game/modules/example/data/locales/ko_KR.lua -%%DATADIR%%/game/modules/example/data/locales/zh_hans.lua -%%DATADIR%%/game/modules/example/data/locales/zh_hant.lua +%%DATADIR%%/game/modules/example/data/locales/ja_JP.lua +%%DATADIR%%/game/modules/example/data/locales/ko_KR.lua +%%DATADIR%%/game/modules/example/data/locales/zh_hans.lua +%%DATADIR%%/game/modules/example/data/locales/zh_hant.lua %%DATADIR%%/game/modules/example/data/rooms/pilar.lua %%DATADIR%%/game/modules/example/data/rooms/simple.lua %%DATADIR%%/game/modules/example/data/talents.lua