Update templates for FreeBSD and OpenBSD.

Update templates for FreeBSD and OpenBSD. i386 version of game for FreeBSD and OpenBSD now using only C/C++ code without asm. Because when using only C/C++ code without using assembler, there is no relocation in read-only section (TEXTREL). And everything is fine with QA Notices. After the changes, packages will use the new 1.10.6c tag. In this case, there will be no need for new patches.
tx00100xt · Dec 3, 2023 · 8c062b9 · 8c062b9
1 parent 10de4d1
commit 8c062b9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 20 deletions.
diff --git a/man/bsd/serioussam.1 b/man/bsd/serioussam.1
@@ -185,7 +185,7 @@ located in this directory.
 \fB /usr/local/bin/"internal game name"\fB-mkfont\fR
 .PP
 The game libraries will be searched in the following directories:
-\fIusr/local/lib/"internal-game-name"/\fR
+\fI /usr/local/lib/"internal-game-name"/\fR
 The location of the libraries of modifications is also on the same principle.
 .PP
 \fB /usr/local/lib/"internal game name"/Mods/"Mod name"\fR

diff --git a/man/bsd/serioussamclassic.1 b/man/bsd/serioussamclassic.1
@@ -185,7 +185,7 @@ located in this directory.
 \fB /usr/local/bin/"internal game name"\fB-mkfont\fR
 .PP
 The game libraries will be searched in the following directories:
-\fIusr/local/lib/"internal-game-name"/\fR
+\fI /usr/local/lib/"internal-game-name"/\fR
 The location of the libraries of modifications is also on the same principle.
 .PP
 \fB /usr/local/lib/"internal game name"/Mods/"Mod name"\fR

diff --git a/man/gentoo/serioussam.1 b/man/gentoo/serioussam.1
@@ -185,7 +185,7 @@ located in this directory.
 \fB /usr/bin/"internal game name"\fB-mkfont\fR
 .PP
 The game libraries will be searched in the following directories:
-\fI/usr/lib(64)/"internal-game-name"/\fR
+\fI /usr/lib(64)/"internal-game-name"/\fR
 The location of the libraries of modifications is also on the same principle.
 .PP
 \fB /usr/lib(64)/"internal game name"/Mods/"Mod name"\fR

diff --git a/man/netbsd/serioussam.1 b/man/netbsd/serioussam.1
@@ -185,7 +185,7 @@ located in this directory.
 \fB /usr/pkg/bin/"internal game name"\fB-mkfont\fR
 .PP
 The game libraries will be searched in the following directories:
-\fIusr/local/lib/"internal-game-name"/\fR
+\fI /usr/local/lib/"internal-game-name"/\fR
 The location of the libraries of modifications is also on the same principle.
 .PP
 \fB /usr/pkg/lib/"internal game name"/Mods/"Mod name"\fR

diff --git a/man/netbsd/serioussamclassic.1 b/man/netbsd/serioussamclassic.1
@@ -185,7 +185,7 @@ located in this directory.
 \fB /usr/pkg/bin/"internal game name"\fB-mkfont\fR
 .PP
 The game libraries will be searched in the following directories:
-\fIusr/local/lib/"internal-game-name"/\fR
+\fI /usr/local/lib/"internal-game-name"/\fR
 The location of the libraries of modifications is also on the same principle.
 .PP
 \fB /usr/pkg/lib/"internal game name"/Mods/"Mod name"\fR

diff --git a/templates/freebsd/ports/games/serioussam/Makefile b/templates/freebsd/ports/games/serioussam/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	serioussam
 DISTNAME=	SeriousSamClassic
-DISTVERSION=	1.10.6b
+DISTVERSION=	1.10.6c
 PORTREVISION=	1
 CATEGORIES=	games
 
@@ -16,9 +16,7 @@ LICENSE_FILE= 	${WRKSRC}/LICENSE
 # Building code for them workd.
 # Work on real hardware has been 
 # tested for architectures: armv7 aaarch64 under Linux
-# When testing i386 on Virtualbox, image artifacts were sometimes observed.
-# Perhaps everything will be fine on real hardware.
-ONLY_FOR_ARCHS= amd64
+ONLY_FOR_ARCHS= amd64 i386
 
 BUILD_DEPENDS=	flex:textproc/flex \
 		convert:graphics/ImageMagick7
@@ -38,7 +36,7 @@ GH_ACCOUNT=	tx00100xt
 GH_PROJECT=	SeriousSamClassic
 USE_GITHUB=	yes
 
-CMAKE_ARGS=	-DRPI4:BOOL=FALSE -DUSE_ASM:BOOL=TRUE \
+CMAKE_ARGS=	-DRPI4:BOOL=FALSE -DUSE_ASM:BOOL=FALSE \
 	-DUSE_SYSTEM_INSTALL:BOOL=TRUE -DUSE_I386_NASM_ASM:BOOL=FALSE
 
 post-install:
@@ -47,15 +45,13 @@ post-install:
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == amd64
+CMAKE_ON=	USE_ASM
+.endif
+
 # Unocmment this for aarch64 and armv7 architectures
 #.if ${ARCH} == aarch64 || ${ARCH} == armv7
 #CMAKE_ON=	RPI4
 #.endif
 
-# Unocmment this for i386 architecture
-#.if ${ARCH} == i386
-#CMAKE_ON=	USE_I386_NASM_ASM
-#BUILD_DEPENDS+=	nasm:devel/nasm
-#.endif
-
 .include	<bsd.port.mk>
diff --git a/templates/openbsd/ports/games/serioussam/Makefile b/templates/openbsd/ports/games/serioussam/Makefile
@@ -8,11 +8,11 @@ ONLY_FOR_ARCHS =	amd64 i386
 
 GH_ACCOUNT =		tx00100xt
 GH_PROJECT =		SeriousSamClassic
-GH_TAGNAME =		1.10.6b
+GH_TAGNAME =		1.10.6c
 
 COMMENT =		Open source version of game Serious Sam Classic
 N=			serioussam
-V=			1.10.6b
+V=			1.10.6c
 PKGNAME =		${N}-${V}
 DISTNAME =		SeriousSamClassic-${V}
 CATEGORIES =		games
@@ -52,8 +52,8 @@ NO_TEST =		Yes
 #CONFIGURE_ARGS +=	-DRPI4=ON
 #.endif
 
-.if ${MACHINE_ARCH}== i386
-CONFIGURE_ARGS +=	-DUSE_I386_NASM_ASM=ON
+.if ${MACHINE_ARCH}== i386 || ${MACHINE_ARCH}== amd64
+CONFIGURE_ARGS +=	-DUSE_ASM=OFF
 .endif
 
 post-install: