CVS commit: pkgsrc/games

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Mon, 4 May 2026 12:28:52 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May  4 12:28:52 UTC 2026

Modified Files:
        pkgsrc/games: Makefile
Added Files:
        pkgsrc/games/jfsw: DESCR Makefile PLIST distinfo options.mk
        pkgsrc/games/jfsw/files: jfsw.desktop
        pkgsrc/games/jfsw/patches: patch-jfaudiolib_Makefile
            patch-jfaudiolib_src_midi.c patch-jfbuild_include_compat.h
            patch-jfbuild_src_mmulti.c

Log Message:
jfsw: Initial import.

JFShadowWarrior is 3D Realms' 1997 shooter Shadow Warrior updated
for modern computers. An OpenGL 2 implementation is required.

Game data is required from a copy of Shadow Warrior (e.g. from
GOG.com, Humble Store, or the shareware version). If using
the shareware version, extract SWSW12.SHR to $HOME/.jfsw.

Verified to build on FreeBSD, NetBSD, macOS, Linux (retro & modern).


To generate a diff of this commit:
cvs rdiff -u -r1.563 -r1.564 pkgsrc/games/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/games/jfsw/DESCR pkgsrc/games/jfsw/Makefile \
    pkgsrc/games/jfsw/PLIST pkgsrc/games/jfsw/distinfo \
    pkgsrc/games/jfsw/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/games/jfsw/files/jfsw.desktop
cvs rdiff -u -r0 -r1.1 pkgsrc/games/jfsw/patches/patch-jfaudiolib_Makefile \
    pkgsrc/games/jfsw/patches/patch-jfaudiolib_src_midi.c \
    pkgsrc/games/jfsw/patches/patch-jfbuild_include_compat.h \
    pkgsrc/games/jfsw/patches/patch-jfbuild_src_mmulti.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/Makefile
diff -u pkgsrc/games/Makefile:1.563 pkgsrc/games/Makefile:1.564
--- pkgsrc/games/Makefile:1.563 Wed Apr 29 19:14:22 2026
+++ pkgsrc/games/Makefile       Mon May  4 12:28:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.563 2026/04/29 19:14:22 wiz Exp $
+# $NetBSD: Makefile,v 1.564 2026/05/04 12:28:51 nia Exp $
 #
 
 COMMENT=       Games
@@ -203,6 +203,7 @@ SUBDIR+=    iortcw
 SUBDIR+=       ironwail
 SUBDIR+=       ivan
 SUBDIR+=       jetpack
+SUBDIR+=       jfsw
 SUBDIR+=       jin
 SUBDIR+=       jools
 SUBDIR+=       julius

Added files:

Index: pkgsrc/games/jfsw/DESCR
diff -u /dev/null pkgsrc/games/jfsw/DESCR:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/DESCR     Mon May  4 12:28:52 2026
@@ -0,0 +1,6 @@
+JFShadowWarrior is 3D Realms' 1997 shooter Shadow Warrior updated
+for modern computers. An OpenGL 2 implementation is required.
+
+Game data is required from a copy of Shadow Warrior (e.g. from
+GOG.com, Humble Store, or the shareware version). If using
+the shareware version, extract SWSW12.SHR to $HOME/.jfsw.
Index: pkgsrc/games/jfsw/Makefile
diff -u /dev/null pkgsrc/games/jfsw/Makefile:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/Makefile  Mon May  4 12:28:52 2026
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile,v 1.1 2026/05/04 12:28:52 nia Exp $
+
+DISTNAME=      jfsw-20260105
+CATEGORIES=    games
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=jonof/}
+GITHUB_PROJECT=        jfsw
+GITHUB_TAG=    ${PKGVERSION_NOREV}
+
+GITHUB_SUBMODULES+= \
+       jonof jfaudiolib 68be97f6d33d7be2421a6bea437f21c60d70f8bb jfaudiolib
+
+GITHUB_SUBMODULES+= \
+       jonof jfbuild 40a98be571e359a70fc60476899e4650e285dbca jfbuild
+
+GITHUB_SUBMODULES+= \
+       jonof jfmact 731c0cc4aabd3cc0f510c9322825f1b61b2e47b3 jfmact
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.jonof.id.au/jfsw/
+COMMENT=       Shadow Warrior port for modern systems
+LICENSE=       gnu-gpl-v2
+
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
+
+USE_TOOLS+=    gmake pkg-config
+USE_LANGUAGES= c c++
+
+FORCE_C_STD=   gnu99 # alloca
+
+MAKE_FLAGS+=   USE_ASM=0
+MAKE_FLAGS+=   HAVE_GTK=0
+MAKE_FLAGS+=   RENDERTYPE=SDL
+MAKE_FLAGS+=   DATADIR=${PREFIX}/share/${PKGBASE}
+
+MAKE_FLAGS.NetBSD+=    PLATFORM=BSD
+
+INSTALLATION_DIRS+=    bin
+INSTALLATION_DIRS+=    share/${PKGBASE}
+INSTALLATION_DIRS+=    share/applications
+INSTALLATION_DIRS+=    share/pixmaps
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/sw \
+               ${DESTDIR}${PREFIX}/bin/${PKGBASE}
+       ${INSTALL_PROGRAM} ${WRKSRC}/build \
+               ${DESTDIR}${PREFIX}/bin/${PKGBASE}-build
+       ${INSTALL_DATA} ${WRKSRC}/rsrc/game.png \
+               ${DESTDIR}${PREFIX}/share/pixmaps/${PKGBASE}.png
+       ${INSTALL_DATA} ${FILESDIR}/jfsw.desktop \
+               ${DESTDIR}${PREFIX}/share/applications/${PKGBASE}.desktop
+
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.endif
+.include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/jfsw/PLIST
diff -u /dev/null pkgsrc/games/jfsw/PLIST:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/PLIST     Mon May  4 12:28:52 2026
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2026/05/04 12:28:52 nia Exp $
+bin/jfsw
+bin/jfsw-build
+share/applications/jfsw.desktop
+share/pixmaps/jfsw.png
+@pkgdir share/jfsw
Index: pkgsrc/games/jfsw/distinfo
diff -u /dev/null pkgsrc/games/jfsw/distinfo:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/distinfo  Mon May  4 12:28:52 2026
@@ -0,0 +1,18 @@
+$NetBSD: distinfo,v 1.1 2026/05/04 12:28:52 nia Exp $
+
+BLAKE2s (jfsw-20260105-20260105.tar.gz) = 96e6ebd1f9beeed58b1f209de8da3efb01ff15d2f931e603a439dc745a998c56
+SHA512 (jfsw-20260105-20260105.tar.gz) = 8eb259c540bcc40169264c16f8d1a2f3d9da40eee41547d877d27e04637725e3591d3fd7441c2de7611e848f689e52987532c3b4a79983ba9790159e804a123b
+Size (jfsw-20260105-20260105.tar.gz) = 1096673 bytes
+BLAKE2s (jonof-jfaudiolib-68be97f6d33d7be2421a6bea437f21c60d70f8bb.tar.gz) = 534803263888e51ad8d7bca53a2cce810ac53ecad652512bc83959c6f96a0b30
+SHA512 (jonof-jfaudiolib-68be97f6d33d7be2421a6bea437f21c60d70f8bb.tar.gz) = 
7a4d6f4de62c915f789316700da070ec04e82db9af5c4c1b59547fa8e62f56a732c5b6b525ee5a4d75785b27e4a415c2503a87608b88c84f177b4ae156575b78
+Size (jonof-jfaudiolib-68be97f6d33d7be2421a6bea437f21c60d70f8bb.tar.gz) = 1785315 bytes
+BLAKE2s (jonof-jfbuild-40a98be571e359a70fc60476899e4650e285dbca.tar.gz) = 49e0f1c1653d71a961909453297e1668a25377731c3fa78b4eef87a17ebcd533
+SHA512 (jonof-jfbuild-40a98be571e359a70fc60476899e4650e285dbca.tar.gz) = 
03b89bfcf60015d2d217aeee8b8b3be0168792d5a6864a11177559a4af43289619643080c3f957c4babadaafd6d4a24add8d4f75df54e10827b34e8f3d4a3cc0
+Size (jonof-jfbuild-40a98be571e359a70fc60476899e4650e285dbca.tar.gz) = 1516057 bytes
+BLAKE2s (jonof-jfmact-731c0cc4aabd3cc0f510c9322825f1b61b2e47b3.tar.gz) = ec752c0c7944a743471335dba38779c7947d9d26d9f633ed5ab4ee5fe812b229
+SHA512 (jonof-jfmact-731c0cc4aabd3cc0f510c9322825f1b61b2e47b3.tar.gz) = 
5d25ffae8c71d357f4e401b0177b748ab3783bd3542fd70b1a026f53171734ab4bd629e435be65ac43a80319d3ab47ea3303108dfa17ac47fd582aaa9c2225d3
+Size (jonof-jfmact-731c0cc4aabd3cc0f510c9322825f1b61b2e47b3.tar.gz) = 25469 bytes
+SHA1 (patch-jfaudiolib_Makefile) = 8dba9f73b4f4cceec795c361a584e63d231b264c
+SHA1 (patch-jfaudiolib_src_midi.c) = 5688ef851101feb0a66b59563b68e61d5bbf6af7
+SHA1 (patch-jfbuild_include_compat.h) = 983d257dee9788ef4981a9b30f548c8852eaf44c
+SHA1 (patch-jfbuild_src_mmulti.c) = 225f094d9079c15e3c1c962ab64b36089b572121
Index: pkgsrc/games/jfsw/options.mk
diff -u /dev/null pkgsrc/games/jfsw/options.mk:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/options.mk        Mon May  4 12:28:52 2026
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2026/05/04 12:28:52 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.jfsw
+PKG_SUPPORTED_OPTIONS= opengl
+PKG_SUGGESTED_OPTIONS= opengl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mopengl)
+MAKE_FLAGS+=   USE_OPENGL=2
+.else
+MAKE_FLAGS+=   USE_OPENGL=0
+.endif

Index: pkgsrc/games/jfsw/files/jfsw.desktop
diff -u /dev/null pkgsrc/games/jfsw/files/jfsw.desktop:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/files/jfsw.desktop        Mon May  4 12:28:52 2026
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=JFShadowWarrior
+Comment=1997 first-person shooter
+Icon=jfsw
+Exec=jfsw
+Terminal=false
+Categories=Game;Shooter;

Index: pkgsrc/games/jfsw/patches/patch-jfaudiolib_Makefile
diff -u /dev/null pkgsrc/games/jfsw/patches/patch-jfaudiolib_Makefile:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/patches/patch-jfaudiolib_Makefile Mon May  4 12:28:52 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-jfaudiolib_Makefile,v 1.1 2026/05/04 12:28:52 nia Exp $
+
+Honour CFLAGS.
+
+--- jfaudiolib/Makefile.orig   2026-05-04 11:27:22.678283084 +0000
++++ jfaudiolib/Makefile
+@@ -8,7 +8,7 @@ AR?=ar
+ 
+ CC?=gcc
+ AR?=ar
+-CFLAGS=-g $(OPTLEVEL) -W -Wall
++CFLAGS+=-g $(OPTLEVEL) -W -Wall
+ JFAUDIOLIB_CPPFLAGS=-Iinclude -Isrc
+ JFAUDIOLIB_CFLAGS=-std=c99
+ JFAUDIOLIB_LDFLAGS=
Index: pkgsrc/games/jfsw/patches/patch-jfaudiolib_src_midi.c
diff -u /dev/null pkgsrc/games/jfsw/patches/patch-jfaudiolib_src_midi.c:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/patches/patch-jfaudiolib_src_midi.c       Mon May  4 12:28:52 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-jfaudiolib_src_midi.c,v 1.1 2026/05/04 12:28:52 nia Exp $
+
+Only include <alloca.h> on systems that have it.
+
+--- jfaudiolib/src/midi.c.orig 2025-12-26 07:57:03.000000000 +0000
++++ jfaudiolib/src/midi.c
+@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ #include <stdio.h>
+ #ifdef _WIN32
+ # include <malloc.h>
+-#else
++#elif defined(__linux__) || defined(__sun)
+ # include <alloca.h>
+ #endif
+ #include "sndcards.h"
Index: pkgsrc/games/jfsw/patches/patch-jfbuild_include_compat.h
diff -u /dev/null pkgsrc/games/jfsw/patches/patch-jfbuild_include_compat.h:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/patches/patch-jfbuild_include_compat.h    Mon May  4 12:28:52 2026
@@ -0,0 +1,30 @@
+$NetBSD: patch-jfbuild_include_compat.h,v 1.1 2026/05/04 12:28:52 nia Exp $
+
+Build on NetBSD.
+
+--- jfbuild/include/compat.h.orig      2025-12-26 07:45:04.000000000 +0000
++++ jfbuild/include/compat.h
+@@ -28,6 +28,10 @@
+ #define USE_COMPAT_H_BMACROS 1
+ #endif
+ 
++#ifdef __NetBSD__
++#define _NETBSD_SOURCE # dirfd etc
++#endif
++
+ #ifndef _XOPEN_SOURCE
+ # define _XOPEN_SOURCE 700
+ #endif
+@@ -120,9 +124,9 @@ typedef unsigned __int64 uint64_t;
+ #  define B_LITTLE_ENDIAN 0
+ #  define B_BIG_ENDIAN    1
+ # endif
+-# define B_SWAP64(x) __bswap64(x)
+-# define B_SWAP32(x) __bswap32(x)
+-# define B_SWAP16(x) __bswap16(x)
++# define B_SWAP64(x) bswap64(x)
++# define B_SWAP32(x) bswap32(x)
++# define B_SWAP16(x) bswap16(x)
+ 
+ #elif defined(__APPLE__)
+ # if defined(__LITTLE_ENDIAN__)
Index: pkgsrc/games/jfsw/patches/patch-jfbuild_src_mmulti.c
diff -u /dev/null pkgsrc/games/jfsw/patches/patch-jfbuild_src_mmulti.c:1.1
--- /dev/null   Mon May  4 12:28:52 2026
+++ pkgsrc/games/jfsw/patches/patch-jfbuild_src_mmulti.c        Mon May  4 12:28:52 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-jfbuild_src_mmulti.c,v 1.1 2026/05/04 12:28:52 nia Exp $
+
+Build on NetBSD.
+
+--- jfbuild/src/mmulti.c.orig  2026-05-04 10:57:18.118628799 +0000
++++ jfbuild/src/mmulti.c
+@@ -911,9 +911,11 @@ static int lookuphost(const char *name, struct sockadd
+       memset(&hints, 0, sizeof(hints));
+       hints.ai_flags = AI_ADDRCONFIG;
+       hints.ai_family = domain;
++#ifdef AI_V4MAPPED
+       if (domain == PF_INET6) {
+               hints.ai_flags |= AI_V4MAPPED;
+       }
++#endif
+       hints.ai_socktype = SOCK_DGRAM;
+       hints.ai_protocol = IPPROTO_UDP;
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index