Attachment #245751 for bug #274601

View | Details | Raw Unified | Return to bug 274601
Collapse All | Expand All




PORTNAME=	ja2
DISTVERSIONPREFIX=	v
DISTVERSION=	0.20.0
PORTREVISION=	6
CATEGORIES=	games

MAINTAINER=	timp87@gmail.com

		miniaudio>=0.11.9:audio/miniaudio
LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk

USES=		cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53+
USE_GITHUB=	yes
GH_ACCOUNT=	ja2-stracciatella
GH_PROJECT=	ja2-stracciatella


.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 1400000 && ${ARCH} == "i386"
CXXFLAGS+=	-Wno-error=enum-constexpr-conversion
# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236344
# Copy-pasted gcc-c++11-lib from Mk/Uses/compiler.mk
USE_GCC=	yes
CHOSEN_COMPILER_TYPE=	gcc
CXXFLAGS+=	-nostdinc++ -isystem /usr/include/c++/v1
LDFLAGS+=	-L${WRKDIR}
_USES_configure+=	200:gcc-libc++-configure
gcc-libc++-configure:
	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
.endif

.include <bsd.port.post.mk>




--- dependencies/lib-lua/CMakeLists.txt.orig	2023-01-25 17:13:43 UTC
+++ dependencies/lib-lua/CMakeLists.txt
@@ -3,7 +3,7 @@
 option(LOCAL_LUA_LIB "Download and build Lua instead of searching the system" ON)
 if (NOT LOCAL_LUA_LIB)
     message(STATUS "Using system Lua")
-    find_package(Lua "5.3" REQUIRED)
+    find_package(Lua "5.3" REQUIRED EXACT)
     if (NOT LUA_FOUND)
         message(FATAL_ERROR "Lua 5.3 not found")
     endif()
- 

Return to bug 274601

Lines 1-7 Link Here

(-)b/games/jaggedalliance2/Makefile (-13 / +4 lines)
1	PORTNAME= ja2	1	PORTNAME= ja2
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.20.0	3	DISTVERSION= 0.20.0
4	PORTREVISION= 5	4	PORTREVISION= 6
5	CATEGORIES= games	5	CATEGORIES= games
6		6
7	MAINTAINER= timp87@gmail.com	7	MAINTAINER= timp87@gmail.com
Lines 25-31 BUILD_DEPENDS= string_theory>=3.1:devel/string_theory \ Link Here
25	miniaudio>=0.11.9:audio/miniaudio	25	miniaudio>=0.11.9:audio/miniaudio
26	LIB_DEPENDS= libfltk.so:x11-toolkits/fltk	26	LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
27		27
28	USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53	28	USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53+
29	USE_GITHUB= yes	29	USE_GITHUB= yes
30	GH_ACCOUNT= ja2-stracciatella	30	GH_ACCOUNT= ja2-stracciatella
31	GH_PROJECT= ja2-stracciatella	31	GH_PROJECT= ja2-stracciatella
Lines 176-192 post-install: Link Here
176		176
177	.include <bsd.port.pre.mk>	177	.include <bsd.port.pre.mk>
178		178
179	# Compilation with clang's broken in 14-CURRENT	179	.if ${OSVERSION} >= 1400000 && ${ARCH} == "i386"
180	.if ${OSVERSION} >= 1400000	180	CXXFLAGS+= -Wno-error=enum-constexpr-conversion
181	# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236344
182	# Copy-pasted gcc-c++11-lib from Mk/Uses/compiler.mk
183	USE_GCC= yes
184	CHOSEN_COMPILER_TYPE= gcc
185	CXXFLAGS+= -nostdinc++ -isystem /usr/include/c++/v1
186	LDFLAGS+= -L${WRKDIR}
187	_USES_configure+= 200:gcc-libc++-configure
188	gcc-libc++-configure:
189	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
190	.endif	181	.endif
191		182
192	.include <bsd.port.post.mk>	183	.include <bsd.port.post.mk>

Removed Link Here

(-)a/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt (-12 lines)
1	--- dependencies/lib-lua/CMakeLists.txt.orig 2023-01-25 17:13:43 UTC
2	+++ dependencies/lib-lua/CMakeLists.txt
3	@@ -3,7 +3,7 @@
4	option(LOCAL_LUA_LIB "Download and build Lua instead of searching the system" ON)
5	if (NOT LOCAL_LUA_LIB)
6	message(STATUS "Using system Lua")
7	- find_package(Lua "5.3" REQUIRED)
8	+ find_package(Lua "5.3" REQUIRED EXACT)
9	if (NOT LUA_FOUND)
10	message(FATAL_ERROR "Lua 5.3 not found")
11	endif()
12	-