Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Jul 2021 10:12:25 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: a8deebcf79ed - main - games/tome4: switch to standard lua
Message-ID:  <202107021012.162ACPrQ065659@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=a8deebcf79ed9ba3d427c1f9ad49f45a10b5c073

commit a8deebcf79ed9ba3d427c1f9ad49f45a10b5c073
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-07-02 10:10:59 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-07-02 10:10:59 +0000

    games/tome4: switch to standard lua
    
    There seem to be some issues when running with luajit on the newest version.
---
 games/tome4/Makefile | 17 ++---------------
 games/tome4/distinfo |  2 +-
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/games/tome4/Makefile b/games/tome4/Makefile
index 47d98a3e3c47..fef0c7761f29 100644
--- a/games/tome4/Makefile
+++ b/games/tome4/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tome4
 DISTVERSION?=	1.7.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://te4.org/dl/t-engine/ \
 		SF/lifanov-ports-distfiles/${PORTNAME}/:icons
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	premake4:devel/premake4
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 		libpng.so:graphics/png
 
-USES=		gl gmake openal:al sdl tar:bzip2 xorg
+USES=		compiler:c++11-lang gl gmake openal:al sdl tar:bzip2 xorg
 USE_SDL=	image2 sdl2 ttf2
 USE_GL=		gl glu
 SUB_FILES=	tome4
@@ -32,23 +33,9 @@ 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/distinfo b/games/tome4/distinfo
index 6bf14bf5e7a8..67d8d327e16e 100644
--- a/games/tome4/distinfo
+++ b/games/tome4/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1624824084
+TIMESTAMP = 1625219385
 SHA256 (t-engine4-src-1.7.4.tar.bz2) = c3534f33f48c9cf027025eb3f44e97b23de612a66d5f315ed4830f9a52abf2a4
 SIZE (t-engine4-src-1.7.4.tar.bz2) = 486263402
 SHA256 (tome4.png) = b5223208ca6f0a51f8bbe3b96055f38f94336dbeca6704db6684fec00fad1a36



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107021012.162ACPrQ065659>