jfsw-git: update patches and Makefile for latest git version

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Jul 17 23:05:45 2022 +0200
Changeset:	3d9e5434381d025e3b2a85b64a14eda09298bdc4

Modified Files:
	jfsw-git/Makefile
	jfsw-git/distinfo
	jfsw-git/patches/patch-Makefile

Log Message:
jfsw-git: update patches and Makefile for latest git version

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3d9e5434381d025e3b2a85b64a14eda09298bdc4

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

diffstat:
 jfsw-git/Makefile               |  2 +-
 jfsw-git/distinfo               |  2 +-
 jfsw-git/patches/patch-Makefile | 19 ++++---------------
 3 files changed, 6 insertions(+), 17 deletions(-)

diffs:
diff --git a/jfsw-git/Makefile b/jfsw-git/Makefile
index e48d1ff409..f829ba1954 100644
--- a/jfsw-git/Makefile
+++ b/jfsw-git/Makefile
@@ -13,7 +13,7 @@ WRKSRC=		${WRKDIR}/jfsw
 USE_TOOLS+=	gmake perl pkg-config
 USE_LANGUAGES=	c c++
 
-BUILD_MAKE_FLAGS+=	LDFLAGS="${X11_LDFLAGS}"
+BUILD_MAKE_FLAGS+=	PKGSRCLDFLAGS="${LDFLAGS} ${X11_LDFLAGS}"
 GIT_REPOSITORIES=	jfsw
 GIT_REPO.jfsw=		https://github.com/jonof/jfsw.git
 INSTALLATION_DIRS+=	bin share/doc/jfsw
diff --git a/jfsw-git/distinfo b/jfsw-git/distinfo
index e639924b1e..3e131f404c 100644
--- a/jfsw-git/distinfo
+++ b/jfsw-git/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (patch-Makefile) = db3fd5a59a90857800818217d823baa440459cc8
+SHA1 (patch-Makefile) = 3d6a5b855df58dd46c3e1f111ad7d649de30c763
 SHA1 (patch-jfbuild_Makefile.shared) = b7f15a87d4a391678f38cb623376e89d1d3d5a18
 SHA1 (patch-jfbuild_include_compat.h) = 8d398f00aebb8724d50bc0f818b429ef235989db
 SHA1 (patch-jfbuild_src_mmulti.c) = eccf5b7c753a88a1a38c8aacf1689a182c6f1e7e
diff --git a/jfsw-git/patches/patch-Makefile b/jfsw-git/patches/patch-Makefile
index 5d596a1923..8e24118393 100644
--- a/jfsw-git/patches/patch-Makefile
+++ b/jfsw-git/patches/patch-Makefile
@@ -3,29 +3,18 @@ $NetBSD$
 Set LIBS for BSD.
 Add LDFLAGS so that the X11 library paths can be used.
 
---- Makefile.orig	2018-12-18 11:54:38.000000000 +0000
+--- Makefile.orig	2021-12-26 20:11:15.000000000 +0000
 +++ Makefile
-@@ -163,6 +163,10 @@ EDITOROBJS=$(SRC)/jnstub.$o \
- 
- include $(EROOT)/Makefile.shared
- 
-+ifeq ($(PLATFORM),BSD)
-+	NASMFLAGS+= -f elf
-+	GAMELIBS+= $(JFAUDIOLIB_LDFLAGS)
-+endif
- ifeq ($(PLATFORM),LINUX)
- 	NASMFLAGS+= -f elf
- 	GAMELIBS+= $(JFAUDIOLIB_LDFLAGS)
-@@ -227,10 +231,10 @@ endif
+@@ -233,10 +233,10 @@ endif
  all: sw$(EXESUFFIX) build$(EXESUFFIX)
  
  sw$(EXESUFFIX): $(GAMEOBJS) $(ELIB)/$(ENGINELIB) $(AUDIOLIBROOT)/$(JFAUDIOLIB)
 -	$(CXX) $(CXXFLAGS) $(OURCXXFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(GAMELIBS) -Wl,-Map=$@.map
-+	$(CXX) $(CXXFLAGS) $(OURCXXFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(GAMELIBS) $(LDFLAGS) -Wl,-Map=$@.map
++	$(CXX) $(CXXFLAGS) $(OURCXXFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(GAMELIBS) $(PKGSRCLDFLAGS) -Wl,-Map=$@.map
  
  build$(EXESUFFIX): $(EDITOROBJS) $(ELIB)/$(EDITORLIB) $(ELIB)/$(ENGINELIB)
 -	$(CXX) $(CXXFLAGS) $(OURCXXFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) -Wl,-Map=$@.map
-+	$(CXX) $(CXXFLAGS) $(OURCXXFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) -Wl,-Map=$@.map
++	$(CXX) $(CXXFLAGS) $(OURCXXFLAGS) $(OURCFLAGS) -o $@ $^ $(LIBS) $(PKGSRCLDFLAGS) -Wl,-Map=$@.map
  
  include Makefile.deps