Update to 20201010

6 files changed, 17 insertions, 102 deletions

diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index 46f824f99e9a..6d56a136dac6 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jfsw
-PORTVERSION=	20200116
+PORTVERSION=	20201010
 CATEGORIES=	games
 
 MAINTAINER=	martymac@FreeBSD.org
@@ -29,10 +29,12 @@ DOS2UNIX_REGEX=	.*(\.(c|h)|Makefile)(\.deps)?
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonof
 GH_PROJECT=	jfbuild:build jfaudiolib:audio jfmact:mact
-GH_TAGNAME=	282b31a2335b2b5cac91d30044ff6b92053d1094 \
-		31e2b842629f52227fd1291f5228a806704b0cbc:build \
-		8e28fe3bc41bf809391461697cd0ecb7027cb7f6:audio \
-		dbbf346d78334c6907ad9014958305309d4df7a0:mact
+# See GH listing to get current (tested) submodule hashes:
+# https://github.com/jonof/jfsw
+GH_TAGNAME=	ea58641 \
+		11d083e:build \
+		3ff144d:audio \
+		dbbf346:mact
 GH_SUBDIR=	jfbuild:build jfaudiolib:audio jfmact:mact
 
 NO_CDROM=	Must be distributed only through the Internet and free of charge
@@ -41,7 +43,7 @@ MAKE_ENV+=	DATADIR="${DATADIR}"
 
 SUB_FILES=	pkg-message
 
-PORTDOCS=	readme.txt releasenotes.html
+PORTDOCS=	README.md releasenotes.html
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/jfsw/distinfo b/games/jfsw/distinfo
index 88951a1d8444..3d400c7602e9 100644
--- a/games/jfsw/distinfo
+++ b/games/jfsw/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1600721184
-SHA256 (jonof-jfsw-20200116-282b31a2335b2b5cac91d30044ff6b92053d1094_GH0.tar.gz) = 77d3fb88e479b91c13dfcf6a3f9e5ba5366f1aee0da0092aff161fe7f6b5aad5
-SIZE (jonof-jfsw-20200116-282b31a2335b2b5cac91d30044ff6b92053d1094_GH0.tar.gz) = 988265
-SHA256 (jonof-jfbuild-31e2b842629f52227fd1291f5228a806704b0cbc_GH0.tar.gz) = 5f953fcb3744a6cea61186cf8bfc99ac1c3794fbc8de4f083ad6e7d593ae1225
-SIZE (jonof-jfbuild-31e2b842629f52227fd1291f5228a806704b0cbc_GH0.tar.gz) = 1535215
-SHA256 (jonof-jfaudiolib-8e28fe3bc41bf809391461697cd0ecb7027cb7f6_GH0.tar.gz) = 836efc3d49d3e32d6d8f136fa380de03f42760130b8073fe1f27a2e96e9112a5
-SIZE (jonof-jfaudiolib-8e28fe3bc41bf809391461697cd0ecb7027cb7f6_GH0.tar.gz) = 210132
-SHA256 (jonof-jfmact-dbbf346d78334c6907ad9014958305309d4df7a0_GH0.tar.gz) = 08b8ca80a76103e2ac86ee258f058dd79a4c9f6ffe43e4a1772698ea0ea518a4
-SIZE (jonof-jfmact-dbbf346d78334c6907ad9014958305309d4df7a0_GH0.tar.gz) = 25342
+TIMESTAMP = 1603053347
+SHA256 (jonof-jfsw-20201010-ea58641_GH0.tar.gz) = 3b9f76a76b26cd8b3f29cf562ed3614c233078125865c6eb830806679075941e
+SIZE (jonof-jfsw-20201010-ea58641_GH0.tar.gz) = 988016
+SHA256 (jonof-jfbuild-11d083e_GH0.tar.gz) = 8c96a138f03c1daea951547cddb798a882dec06c2705bd29e97fb428d7b44d44
+SIZE (jonof-jfbuild-11d083e_GH0.tar.gz) = 1536049
+SHA256 (jonof-jfaudiolib-3ff144d_GH0.tar.gz) = c1aa49ab4841b80ecb8b26170f10116694a82cd886f5c53f61b3843bbee8b5c6
+SIZE (jonof-jfaudiolib-3ff144d_GH0.tar.gz) = 1482329
+SHA256 (jonof-jfmact-dbbf346_GH0.tar.gz) = ba267c134de7525da6a6feffd1620b41d78c7deb00c699503bfe1e236b00e287
+SIZE (jonof-jfmact-dbbf346_GH0.tar.gz) = 25339
diff --git a/games/jfsw/files/patch-Makefile b/games/jfsw/files/patch-Makefile
deleted file mode 100644
index da2f0dce688e..000000000000
--- a/games/jfsw/files/patch-Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-Rename PREFIX to DATADIR as its only purpose is to access data files
-(and avoid conflict with FreeBSD PREFIX, which has another meaning)
-
-Tune GAMELIBS for FreeBSD platform
-
---- Makefile.orig	2020-09-22 22:08:35 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
- 
- # Engine source code path
- EROOT ?= jfbuild
-@@ -168,6 +168,10 @@ ifeq ($(PLATFORM),LINUX)
- 	NASMFLAGS+= -f elf
- 	GAMELIBS+= $(JFAUDIOLIB_LDFLAGS)
- endif
-+ifeq ($(PLATFORM),BSD)
-+	NASMFLAGS+= -f elf
-+	GAMELIBS+= $(JFAUDIOLIB_LDFLAGS) -pthread
-+endif
- ifeq ($(PLATFORM),WINDOWS)
- 	OURCFLAGS+= -I$(DXROOT)/include
- 	NASMFLAGS+= -f win32 --prefix _
-@@ -207,7 +211,7 @@ OURCFLAGS+= $(BUILDCFLAGS)
- LIBS+= $(BUILDLIBS)
- 
- ifneq ($(PLATFORM),WINDOWS)
--	OURCFLAGS+= -DPREFIX=\"$(PREFIX)\"
-+	OURCFLAGS+= -DDATADIR=\"$(DATADIR)\"
- endif
- 
- .PHONY: clean all engine $(ELIB)/$(ENGINELIB) $(ELIB)/$(EDITORLIB) $(AUDIOLIBROOT)/$(JFAUDIOLIB)
diff --git a/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c b/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c
deleted file mode 100644
index fba8d5860747..000000000000
--- a/games/jfsw/files/patch-jfbuild-kenbuild-bstub.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Rename PREFIX to DATADIR as its only purpose is to access data files
-(and avoid conflict with FreeBSD PREFIX, which has another meaning)
-
---- jfbuild/kenbuild/bstub.c.orig	2020-09-22 22:08:35 UTC
-+++ jfbuild/kenbuild/bstub.c
-@@ -73,9 +73,9 @@ int ExtInit(void)
- 	getch();
- 	*/
- 
--#if defined(PREFIX)
-+#if defined(DATADIR)
-     {
--        const char *prefixdir = PREFIX;
-+        const char *prefixdir = DATADIR;
-         if (prefixdir && prefixdir[0]) {
-             addsearchpath(prefixdir);
-         }
diff --git a/games/jfsw/files/patch-jfbuild-kenbuild-game.c b/games/jfsw/files/patch-jfbuild-kenbuild-game.c
deleted file mode 100644
index e3eb0eefe86c..000000000000
--- a/games/jfsw/files/patch-jfbuild-kenbuild-game.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Rename PREFIX to DATADIR as its only purpose is to access data files
-(and avoid conflict with FreeBSD PREFIX, which has another meaning)
-
---- jfbuild/kenbuild/game.c.orig	2020-09-22 22:08:35 UTC
-+++ jfbuild/kenbuild/game.c
-@@ -405,9 +405,9 @@ int app_main(int argc, char const * const argv[])
-     int startretval = STARTWIN_RUN;
-     struct startwin_settings settings;
- 
--#if defined(PREFIX)
-+#if defined(DATADIR)
-     {
--        const char *prefixdir = PREFIX;
-+        const char *prefixdir = DATADIR;
-         if (prefixdir && prefixdir[0]) {
-             addsearchpath(prefixdir);
-         }
diff --git a/games/jfsw/files/patch-src-game.c b/games/jfsw/files/patch-src-game.c
deleted file mode 100644
index b951654d6cd8..000000000000
--- a/games/jfsw/files/patch-src-game.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Rename PREFIX to DATADIR as its only purpose is to access data files
-(and avoid conflict with FreeBSD PREFIX, which has another meaning)
-
---- src/game.c.orig	2020-09-22 22:08:35 UTC
-+++ src/game.c
-@@ -3405,9 +3405,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);
-         }