svn commit: r373408 - in head: . games/jfsw games/jfsw/files
Ganael LAPLANCHE
martymac at FreeBSD.org
Tue Nov 25 13:37:31 UTC 2014
Author: martymac
Date: Tue Nov 25 13:37:26 2014
New Revision: 373408
URL: https://svnweb.freebsd.org/changeset/ports/373408
QAT: https://qat.redports.org/buildarchive/r373408/
Log:
Update games/jfsw to 20131019
Added:
head/games/jfsw/files/patch-Makefile (contents, props changed)
head/games/jfsw/files/patch-jfaudiolib-Makefile (contents, props changed)
head/games/jfsw/files/patch-jfaudiolib-Makefile.shared (contents, props changed)
head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c (contents, props changed)
head/games/jfsw/files/patch-jfbuild-Makefile (contents, props changed)
head/games/jfsw/files/patch-jfbuild-src-kplib.c (contents, props changed)
head/games/jfsw/files/patch-jfbuild-src-sdlayer.c (contents, props changed)
head/games/jfsw/files/patch-src-game.c (contents, props changed)
head/games/jfsw/files/patch-src-gamedefs.h (contents, props changed)
head/games/jfsw/files/patch-src-jnstub.c (contents, props changed)
Deleted:
head/games/jfsw/files/patch-jfbuild_src_20051009-Makefile
head/games/jfsw/files/patch-jfbuild_src_20051009-include-editor.h
head/games/jfsw/files/patch-jfbuild_src_20051009-src-build.c
head/games/jfsw/files/patch-jfbuild_src_20051009-src-crc32.c
head/games/jfsw/files/patch-jfbuild_src_20051009-src-sdlayer.c
head/games/jfsw/files/patch-jfsw_src_20051009-Makefile
head/games/jfsw/files/patch-jfsw_src_20051009-Makefile.deps
head/games/jfsw/files/patch-jfsw_src_20051009-source-config.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-game.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-_multivc.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-debugio.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-dma.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-dpmi.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-dsl.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-dsl.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-interrup.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-nodpmi.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-platform.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-sdlmusic.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-unixglob.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-unixpitch.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-unixvoc.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-jaudiolib-util.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-lists.h
head/games/jfsw/files/patch-jfsw_src_20051009-source-menus.c
head/games/jfsw/files/patch-jfsw_src_20051009-source-sounds.c
Modified:
head/LEGAL
head/games/jfsw/Makefile
head/games/jfsw/distinfo
head/games/jfsw/files/pkg-message.in
head/games/jfsw/pkg-descr
Modified: head/LEGAL
==============================================================================
--- head/LEGAL Tue Nov 25 13:24:33 2014 (r373407)
+++ head/LEGAL Tue Nov 25 13:37:26 2014 (r373408)
@@ -136,7 +136,7 @@ jdk-7*-apidocs.zip java/jdk7-doc This d
jdk-8*-apidocs.zip java/jdk8-doc This documentation is under license and export control
jdk-7*-i586.tar.gz java/linux-sun-jdk17 Redistribution of repackaged binaries not permitted
jdk-8*-i586.tar.gz java/linux-oracle-jdk18 Redistribution of repackaged binaries not permitted
-jfbuild_src_* games/jfsw Must be distributed only through the Internet and free of charge
+jfbuild-* games/jfsw Must be distributed only through the Internet and free of charge
jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted
jpgraph-2.* graphics/jpgraph2 The free version cannot be used in a commercial context
jre-7*-i586.tar.gz java/linux-sun-jre17 License does not allow distribution with fee
Modified: head/games/jfsw/Makefile
==============================================================================
--- head/games/jfsw/Makefile Tue Nov 25 13:24:33 2014 (r373407)
+++ head/games/jfsw/Makefile Tue Nov 25 13:37:26 2014 (r373408)
@@ -2,12 +2,16 @@
# $FreeBSD$
PORTNAME= jfsw
-PORTVERSION= 20051009
-PORTREVISION= 4
+PORTVERSION= 20131019
CATEGORIES= games
-MASTER_SITES= http://users.on.net/~jonof/buildport/
-DISTFILES= ${PORTNAME}_src_${PORTVERSION}.zip \
- jfbuild_src_${PORTVERSION}.zip
+MASTER_SITES= http://github.com/jonof/${PORTNAME}/archive/${JFSW_COMMIT}.tar.gz?dummy=/ \
+ http://github.com/jonof/jfbuild/archive/${JFBUILD_COMMIT}.tar.gz?dummy=/ \
+ http://github.com/jonof/jfaudiolib/archive/${JFAUDIO_COMMIT}.tar.gz?dummy=/ \
+ http://github.com/jonof/jfmact/archive/${JFMACT_COMMIT}.tar.gz?dummy=/
+DISTFILES= ${PORTNAME}-${JFSW_COMMIT}.tar.gz \
+ jfbuild-${JFBUILD_COMMIT}.tar.gz \
+ jfaudiolib-${JFAUDIO_COMMIT}.tar.gz \
+ jfmact-${JFMACT_COMMIT}.tar.gz
MAINTAINER= martymac at FreeBSD.org
COMMENT= Jonathon Fowler's Shadow Warrior Port
@@ -15,51 +19,55 @@ COMMENT= Jonathon Fowler's Shadow Warrio
LICENSE= GPLv2 BuildLic
LICENSE_COMB= multi
LICENSE_NAME_BuildLic= Build source code license
-LICENSE_FILE_BuildLic= ${WRKDIR}/jfbuild_src_${PORTVERSION}/buildlic.txt
+LICENSE_FILE_BuildLic= ${WRKSRC}/jfbuild/buildlic.txt
LICENSE_PERMS_BuildLic= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
-BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
+LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis
-NO_CDROM= Must be distributed only through the Internet and free of charge
-
-ONLY_FOR_ARCHS= i386
-ONLY_FOR_ARCHS_REASON= uses x86 assembly code
+JFSW_COMMIT= 5cff6a81708ff053b569ba4400fba073afe207fe
+JFBUILD_COMMIT= a73583184aca466cebde152db2ce1020591d7049
+JFAUDIO_COMMIT= a39ccf5e95961952d27754a255940be1d76ce85e
+JFMACT_COMMIT= b1071da75cd465f59257240e5dbc60a014580190
USE_GL= gl
USE_GNOME= gtk20
USE_SDL= mixer sdl
-USE_GCC= any
-USES= dos2unix gmake zip
+USES= dos2unix gmake pkgconfig:build
DOS2UNIX_REGEX= .*(\.(c|h)|Makefile)(\.deps)?
-NO_WRKSUBDIR= yes
-BUILD_WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}
+NO_CDROM= Must be distributed only through the Internet and free of charge
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${JFSW_COMMIT}
+MAKE_ENV+= DATADIR="${DATADIR}" \
+ NOASM=1 \
+ LINKED_GTK=1
SUB_FILES= pkg-message
PORTDOCS= readme.txt releasenotes.html
+post-extract:
+ @(cd ${WRKSRC} && \
+ ${RMDIR} jfbuild jfaudiolib jfmact && \
+ ${LN} -sf ${WRKDIR}/jfbuild-${JFBUILD_COMMIT} jfbuild && \
+ ${LN} -sf ${WRKDIR}/jfaudiolib-${JFAUDIO_COMMIT} jfaudiolib && \
+ ${LN} -sf ${WRKDIR}/jfmact-${JFMACT_COMMIT} jfmact)
+
post-patch:
- @${REINPLACE_CMD} -Ee \
- 's|^(EROOT=)../build/|\1../jfbuild_src_${PORTVERSION}/|; \
- s|^(CC=).*|\1${CC}|; \
- s|^(CFLAGS=).*|\1${CFLAGS}|; \
- s|^(NASMFLAGS=).*|\1 -s -f elf|; \
- s|/usr/X11R6|${LOCALBASE}|; \
- s|sdl-config|${SDL_CONFIG}|' \
- ${BUILD_WRKSRC}/Makefile \
- ${WRKDIR}/jfbuild_src_${PORTVERSION}/Makefile \
- ${WRKDIR}/jfbuild_src_${PORTVERSION}/Makefile.shared
- @${REINPLACE_CMD} -e 's|/usr/share/games/jfsw|${DATADIR}|' \
- ${BUILD_WRKSRC}/source/game.c \
- ${BUILD_WRKSRC}/source/jnstub.c
+ @${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' \
+ ${WRKSRC}/jfbuild/Makefile
+ @${REINPLACE_CMD} 's|sdl-config|${SDL_CONFIG}|' \
+ ${WRKSRC}/Makefile \
+ ${WRKSRC}/jfbuild/Makefile.shared
+ @${REINPLACE_CMD} 's|/usr|${LOCALBASE}|' \
+ ${WRKSRC}/jfaudiolib/src/driver_fluidsynth.c
do-install:
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/sw ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/build ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-build
+ ${INSTALL_PROGRAM} ${WRKSRC}/sw ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+ ${INSTALL_PROGRAM} ${WRKSRC}/build ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-build
${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${BUILD_WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
post-install:
${MKDIR} ${STAGEDIR}${DATADIR}
Modified: head/games/jfsw/distinfo
==============================================================================
--- head/games/jfsw/distinfo Tue Nov 25 13:24:33 2014 (r373407)
+++ head/games/jfsw/distinfo Tue Nov 25 13:37:26 2014 (r373408)
@@ -1,4 +1,8 @@
-SHA256 (jfsw_src_20051009.zip) = 09fd3b711775deb7e3843b30f649b486a95e0e3f22a1de9e1cb1744d954992ce
-SIZE (jfsw_src_20051009.zip) = 1091394
-SHA256 (jfbuild_src_20051009.zip) = 4bab5eb5171b6480c529f2076411f83038bd19861e3a9c8ede95c4c026bd746e
-SIZE (jfbuild_src_20051009.zip) = 610745
+SHA256 (jfsw-5cff6a81708ff053b569ba4400fba073afe207fe.tar.gz) = 605a84a06de4c5f1ea5e0603e39a55c9eaa4421f9d8138fe0fa49c2059a59b48
+SIZE (jfsw-5cff6a81708ff053b569ba4400fba073afe207fe.tar.gz) = 1393801
+SHA256 (jfbuild-a73583184aca466cebde152db2ce1020591d7049.tar.gz) = 1a9669d5fc8940c20d7169f524a6e3b99944ff0fd4c75479bbf98e4f2b1a94e2
+SIZE (jfbuild-a73583184aca466cebde152db2ce1020591d7049.tar.gz) = 1434766
+SHA256 (jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e.tar.gz) = 1469349178a6cfe8b5b46e5ebc86697d733c9c51b98453f3705095b5bc99ec3c
+SIZE (jfaudiolib-a39ccf5e95961952d27754a255940be1d76ce85e.tar.gz) = 1041164
+SHA256 (jfmact-b1071da75cd465f59257240e5dbc60a014580190.tar.gz) = 61f98c885995d5d7c1f7bb7315eed118f95b53312ad7dfbd190006ba3446ee24
+SIZE (jfmact-b1071da75cd465f59257240e5dbc60a014580190.tar.gz) = 25410
Added: head/games/jfsw/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-Makefile Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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
+@@ -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 @@
+
+ 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 @@
+ 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 @@
+ OURCFLAGS+= $(BUILDCFLAGS)
+
+ ifneq ($(PLATFORM),WINDOWS)
+- OURCFLAGS+= -DPREFIX=\"$(PREFIX)\"
++ OURCFLAGS+= -DDATADIR=\"$(DATADIR)\"
+ endif
+
+ .PHONY: clean all engine $(ELIB)/$(ENGINELIB) $(ELIB)/$(EDITORLIB) $(AUDIOLIBROOT)/$(JFAUDIOLIB)
Added: head/games/jfsw/files/patch-jfaudiolib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfaudiolib-Makefile Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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 @@
+ 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 \
Added: head/games/jfsw/files/patch-jfaudiolib-Makefile.shared
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfaudiolib-Makefile.shared Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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_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
Added: head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfaudiolib-src-driver_fluidsynth.c Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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
+@@ -29,7 +29,10 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++
++#define __POSIX_VISIBLE 199309
+ #include <pthread.h>
++
+ #include <sys/select.h>
+ #include <math.h>
+ #include <unistd.h>
Added: head/games/jfsw/files/patch-jfbuild-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfbuild-Makefile Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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 @@
+ debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE
+ endif
+
+-CC=gcc
+-CXX=g++
++CC?=gcc
++CXX?=g++
+ AS=nasm
+ RC=windres
+ AR=ar
Added: head/games/jfsw/files/patch-jfbuild-src-kplib.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfbuild-src-kplib.c Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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 @@
+ //=============================== 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;
Added: head/games/jfsw/files/patch-jfbuild-src-sdlayer.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-jfbuild-src-sdlayer.c Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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 @@
+ {
+ 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
Added: head/games/jfsw/files/patch-src-game.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-src-game.c Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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 @@
+ }
+ #endif
+
+-#if defined(PREFIX)
++#if defined(DATADIR)
+ {
+- const char *prefixdir = PREFIX;
++ const char *prefixdir = DATADIR;
+ if (prefixdir && prefixdir[0]) {
+ addsearchpath(prefixdir);
+ }
Added: head/games/jfsw/files/patch-src-gamedefs.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-src-gamedefs.h Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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 @@
+
+ // Number of JOY axes
+
+-#define MAXJOYAXES 6
++#define MAXJOYAXES 12
+
+ // Number of GAMEPAD axes
+
Added: head/games/jfsw/files/patch-src-jnstub.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/jfsw/files/patch-src-jnstub.c Tue Nov 25 13:37:26 2014 (r373408)
@@ -0,0 +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 @@
+
+ #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
Modified: head/games/jfsw/files/pkg-message.in
==============================================================================
--- head/games/jfsw/files/pkg-message.in Tue Nov 25 13:24:33 2014 (r373407)
+++ head/games/jfsw/files/pkg-message.in Tue Nov 25 13:37:26 2014 (r373408)
@@ -1,19 +1,24 @@
-=============================================================
+===============================================================================
JonoF's Shadow Warrior is now installed.
-Before playing, you need to copy the following
-files from the original (or shareware) game:
+Before playing, you need to copy the following files from the original (or
+shareware) game:
* sw.grp
* sw.rts
to %%DATADIR%%
+If you want music support as well (optional), also copy CD track files to that
+directory. They must be Ogg Vorbis files and named:
+
+ * track{02..14}.ogg
+
Launch the game by typing 'jfsw'
Enjoy!
-=============================================================
+===============================================================================
Modified: head/games/jfsw/pkg-descr
==============================================================================
--- head/games/jfsw/pkg-descr Tue Nov 25 13:24:33 2014 (r373407)
+++ head/games/jfsw/pkg-descr Tue Nov 25 13:37:26 2014 (r373408)
@@ -1,4 +1,3 @@
-This is JonoF's Shadow Warrior port with additional
-patches for FX sound support.
+This is JonoF's Shadow Warrior port.
WWW: http://www.jonof.id.au/jfsw
More information about the svn-ports-head
mailing list