Index: head/games/jfsw/files/patch-Makefile =================================================================== --- head/games/jfsw/files/patch-Makefile (revision 547522) +++ head/games/jfsw/files/patch-Makefile (revision 547523) @@ -1,46 +1,46 @@ Rename PREFIX to DATADIR as its purpose is only to find data files (avoids conflicts with our PREFIX, which has another meaning). Do not enforce compilers. ---- Makefile.orig 2014-01-07 08:52:28.000000000 +0100 -+++ Makefile 2014-11-17 19:05:21.738720856 +0100 +--- Makefile.orig 2020-09-03 06:19:21 UTC ++++ Makefile @@ -14,7 +14,7 @@ RELEASE ?= 1 # Base path of app installation -PREFIX ?= /usr/local/share/games/jfsw +DATADIR ?= /usr/local/share/games/jfsw # DirectX SDK location DXROOT ?= $(USERPROFILE)/sdks/directx/dx81 -@@ -61,8 +61,8 @@ +@@ -61,8 +61,8 @@ endif include $(AUDIOLIBROOT)/Makefile.shared -CC=gcc -CXX=g++ +CC?=gcc +CXX?=g++ OURCFLAGS=$(debug) -W -Wall -Wimplicit -Wno-unused \ -fno-pic -fno-strict-aliasing -DNO_GCC_BUILTINS \ -I$(INC) -I$(EINC) -I$(MACTROOT) -I$(AUDIOLIBROOT)/include -@@ -165,6 +165,10 @@ +@@ -165,6 +165,10 @@ ifeq ($(PLATFORM),LINUX) NASMFLAGS+= -f elf GAMELIBS+= $(JFAUDIOLIB_LDFLAGS) endif +ifeq ($(PLATFORM),BSD) + NASMFLAGS+= -f elf + GAMELIBS+= $(JFAUDIOLIB_LDFLAGS) +endif ifeq ($(PLATFORM),WINDOWS) OURCFLAGS+= -I$(DXROOT)/include NASMFLAGS+= -f win32 --prefix _ -@@ -192,7 +196,7 @@ +@@ -192,7 +196,7 @@ endif OURCFLAGS+= $(BUILDCFLAGS) ifneq ($(PLATFORM),WINDOWS) - OURCFLAGS+= -DPREFIX=\"$(PREFIX)\" + OURCFLAGS+= -DDATADIR=\"$(DATADIR)\" endif .PHONY: clean all engine $(ELIB)/$(ENGINELIB) $(ELIB)/$(EDITORLIB) $(AUDIOLIBROOT)/$(JFAUDIOLIB) Index: head/games/jfsw/files/patch-jfaudiolib-Makefile =================================================================== --- head/games/jfsw/files/patch-jfaudiolib-Makefile (revision 547522) +++ head/games/jfsw/files/patch-jfaudiolib-Makefile (revision 547523) @@ -1,17 +1,17 @@ Do not enforce compilers / flags ---- jfaudiolib/Makefile.orig 2014-11-13 09:26:16.821946185 +0100 -+++ jfaudiolib/Makefile 2014-11-13 09:42:05.999047069 +0100 -@@ -8,9 +8,9 @@ +--- jfaudiolib/Makefile.orig 2020-09-03 06:19:21 UTC ++++ jfaudiolib/Makefile +@@ -8,9 +8,9 @@ else OPTLEVEL=-O2 endif -CC=gcc -CFLAGS=-g $(OPTLEVEL) -Wall -CPPFLAGS=-Iinclude -Isrc +CC?=gcc +CFLAGS+=-Wall +CPPFLAGS+=-Iinclude -Isrc SOURCES=src/drivers.c \ src/fx_man.c \ Index: head/games/jfsw/files/patch-jfaudiolib-Makefile.shared =================================================================== --- head/games/jfsw/files/patch-jfaudiolib-Makefile.shared (revision 547522) +++ head/games/jfsw/files/patch-jfaudiolib-Makefile.shared (revision 547523) @@ -1,26 +1,26 @@ Disable ALSA and FluidSynth (MIDI) support : use SDL for PCM/CD/Music support. See jfaudiolib/src/drivers.c for the exact role of each driver. ---- jfaudiolib/Makefile.shared.orig 2013-06-01 02:16:56.000000000 +0200 -+++ jfaudiolib/Makefile.shared 2014-11-25 06:23:00.693738002 +0100 -@@ -18,12 +18,12 @@ +--- jfaudiolib/Makefile.shared.orig 2013-06-01 00:16:56 UTC ++++ jfaudiolib/Makefile.shared +@@ -18,12 +18,12 @@ else JFAUDIOLIB_HAVE_SDL=1 JFAUDIOLIB_LDFLAGS+= $(shell pkg-config --libs sdl) endif - ifeq (yes,$(shell pkg-config --exists alsa && echo yes)) - JFAUDIOLIB_HAVE_ALSA=1 - JFAUDIOLIB_LDFLAGS+= $(shell pkg-config --libs alsa) - endif - ifeq (yes,$(shell pkg-config --exists fluidsynth && echo yes)) - JFAUDIOLIB_HAVE_FLUIDSYNTH=1 - JFAUDIOLIB_LDFLAGS+= $(shell pkg-config --libs fluidsynth) - endif +# ifeq (yes,$(shell pkg-config --exists alsa && echo yes)) +# JFAUDIOLIB_HAVE_ALSA=1 +# JFAUDIOLIB_LDFLAGS+= $(shell pkg-config --libs alsa) +# endif +# ifeq (yes,$(shell pkg-config --exists fluidsynth && echo yes)) +# JFAUDIOLIB_HAVE_FLUIDSYNTH=1 +# JFAUDIOLIB_LDFLAGS+= $(shell pkg-config --libs fluidsynth) +# endif endif Index: head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c =================================================================== --- head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c (revision 547522) +++ head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c (revision 547523) @@ -1,15 +1,15 @@ Allow definition of clockid_t from within time.h, included by pthread.h ---- jfaudiolib/src/driver_fluidsynth.c.orig 2014-11-17 09:33:38.377936840 +0100 -+++ jfaudiolib/src/driver_fluidsynth.c 2014-11-17 18:56:05.694804967 +0100 +--- jfaudiolib/src/driver_fluidsynth.c.orig 2020-09-03 06:19:21 UTC ++++ jfaudiolib/src/driver_fluidsynth.c @@ -29,7 +29,10 @@ #include #include #include + +#define __POSIX_VISIBLE 199309 #include + #include #include #include Index: head/games/jfsw/files/patch-jfbuild-Makefile =================================================================== --- head/games/jfsw/files/patch-jfbuild-Makefile (revision 547522) +++ head/games/jfsw/files/patch-jfbuild-Makefile (revision 547523) @@ -1,15 +1,15 @@ Do not enforce compilers ---- jfbuild/Makefile.orig 2014-11-13 08:43:00.382215199 +0100 -+++ jfbuild/Makefile 2014-11-13 08:43:23.230777638 +0100 -@@ -55,8 +55,8 @@ +--- jfbuild/Makefile.orig 2020-09-03 06:19:21 UTC ++++ jfbuild/Makefile +@@ -55,8 +55,8 @@ else debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE endif -CC=gcc -CXX=g++ +CC?=gcc +CXX?=g++ AS=nasm RC=windres AR=ar Index: head/games/jfsw/files/patch-jfbuild-src-kplib.c =================================================================== --- head/games/jfsw/files/patch-jfbuild-src-kplib.c (revision 547522) +++ head/games/jfsw/files/patch-jfbuild-src-kplib.c (revision 547523) @@ -1,13 +1,13 @@ Make return-free function void ---- jfbuild/src/kplib.c.orig 2014-11-13 08:27:09.882066653 +0100 -+++ jfbuild/src/kplib.c 2014-11-13 08:27:25.864964483 +0100 -@@ -2495,7 +2495,7 @@ +--- jfbuild/src/kplib.c.orig 2020-09-03 06:19:21 UTC ++++ jfbuild/src/kplib.c +@@ -2495,7 +2495,7 @@ static int kddsrend (const char *buf, int leng, //=============================== DDS ends ================================== //=================== External picture interface begins ====================== -int kpgetdim (const char *buf, int leng, int *xsiz, int *ysiz) +void kpgetdim (const char *buf, int leng, int *xsiz, int *ysiz) { int *lptr; const unsigned char *cptr; Index: head/games/jfsw/files/patch-jfbuild-src-sdlayer.c =================================================================== --- head/games/jfsw/files/patch-jfbuild-src-sdlayer.c (revision 547522) +++ head/games/jfsw/files/patch-jfbuild-src-sdlayer.c (revision 547523) @@ -1,21 +1,21 @@ Ensure jfsw and build files get created within $HOME/.jfsw ---- jfbuild/src/sdlayer.c.orig 2014-11-19 11:24:19.905905262 +0100 -+++ jfbuild/src/sdlayer.c 2014-11-19 11:36:43.045765953 +0100 -@@ -152,6 +152,16 @@ +--- jfbuild/src/sdlayer.c.orig 2020-09-03 06:19:21 UTC ++++ jfbuild/src/sdlayer.c +@@ -152,6 +152,16 @@ int main(int argc, char *argv[]) { int r; +#ifdef __FreeBSD__ + /* XXX Ensure every jfsw file gets created within $HOME/.jfsw */ + if (chdir(getenv("HOME")) != 0) + err(1, "cannot cd to $HOME"); + if (mkdir(".jfsw", 0755) != 0 && errno != EEXIST) + err(1, "cannot mkdir $HOME/.jfsw"); + if (chdir(".jfsw") != 0) + err(1, "cannot cd to $HOME/.jfsw"); +#endif + buildkeytranslationtable(); #ifdef HAVE_GTK2 Index: head/games/jfsw/files/patch-src-game.c =================================================================== --- head/games/jfsw/files/patch-src-game.c (revision 547522) +++ head/games/jfsw/files/patch-src-game.c (revision 547523) @@ -1,16 +1,16 @@ Rename PREFIX to DATADIR as its purpose is only to find data files. ---- src/game.c.orig 2014-11-17 19:06:17.227366945 +0100 -+++ src/game.c 2014-11-17 19:06:27.493911819 +0100 -@@ -3470,9 +3470,9 @@ +--- src/game.c.orig 2020-09-03 06:19:21 UTC ++++ src/game.c +@@ -3470,9 +3470,9 @@ int app_main(int argc, char const * const argv[]) } #endif -#if defined(PREFIX) +#if defined(DATADIR) { - const char *prefixdir = PREFIX; + const char *prefixdir = DATADIR; if (prefixdir && prefixdir[0]) { addsearchpath(prefixdir); } Index: head/games/jfsw/files/patch-src-gamedefs.h =================================================================== --- head/games/jfsw/files/patch-src-gamedefs.h (revision 547522) +++ head/games/jfsw/files/patch-src-gamedefs.h (revision 547523) @@ -1,14 +1,14 @@ Avoid buffer overflow @src/config.c:255 where JoystickDigitalAxes[6] overrides RTSName. ---- src/gamedefs.h.orig 2014-11-19 08:03:04.589718681 +0100 -+++ src/gamedefs.h 2014-11-19 08:03:37.128424065 +0100 -@@ -125,7 +125,7 @@ +--- src/gamedefs.h.orig 2020-09-03 06:19:21 UTC ++++ src/gamedefs.h +@@ -125,7 +125,7 @@ extern "C" { // Number of JOY axes -#define MAXJOYAXES 6 +#define MAXJOYAXES 12 // Number of GAMEPAD axes Index: head/games/jfsw/files/patch-src-grpscan.h =================================================================== --- head/games/jfsw/files/patch-src-grpscan.h (nonexistent) +++ head/games/jfsw/files/patch-src-grpscan.h (revision 547523) @@ -0,0 +1,13 @@ +--- src/grpscan.h.orig 2020-09-03 06:19:21 UTC ++++ src/grpscan.h +@@ -31,7 +31,9 @@ struct grpfile { + int crcval; + int size; + struct grpfile *next; +-} grpfiles[numgrpfiles], *foundgrps; ++}; ++ ++extern struct grpfile grpfiles[numgrpfiles], *foundgrps; + + int ScanGroups(void); + void FreeGroups(void); Property changes on: head/games/jfsw/files/patch-src-grpscan.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/jfsw/files/patch-src-jnstub.c =================================================================== --- head/games/jfsw/files/patch-src-jnstub.c (revision 547522) +++ head/games/jfsw/files/patch-src-jnstub.c (revision 547523) @@ -1,15 +1,15 @@ Do not hardcode data directory (available as DATADIR) ---- src/jnstub.c.orig 2014-11-17 19:10:37.306944907 +0100 -+++ src/jnstub.c 2014-11-17 19:12:27.694272007 +0100 -@@ -699,7 +699,9 @@ +--- src/jnstub.c.orig 2020-09-03 06:19:21 UTC ++++ src/jnstub.c +@@ -699,7 +699,9 @@ ExtInit(void) #if defined(__linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) addsearchpath("/usr/share/games/jfsw"); - addsearchpath("/usr/local/share/games/jfsw"); +#if defined(DATADIR) + addsearchpath(DATADIR); +#endif #elif defined(__APPLE__) addsearchpath("/Library/Application Support/JFShadowWarrior"); #endif