Date: Mon, 26 Jul 2021 10:41:07 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cd806799d15b - main - games/tome4: go back to using luajit Message-ID: <202107261041.16QAf7qQ058334@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd806799d15b3e32b061a5794e736b1091c8470a commit cd806799d15b3e32b061a5794e736b1091c8470a Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-07-26 10:40:53 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> 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 <bsd.port.options.mk> + +.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107261041.16QAf7qQ058334>