xscorch: Update to 0.2.1

Changes in 0.2.1
------------------

   KNOWN BUGS:
    * Leap Frogs fail to leap in Interleaved Mode, because the land
      is not cleared by one explosion before the next missile is animated.
    * Some moves/items are interpreted locally instead of sent through
      the network server like they should be.  It contributes to desync.
    * Graphics/Computers are fast - hangs and crashes have been reported.
    * The wedge code sometimes draws straight ends instead of rounded ones.
    * The man page is out of date enough to notice.


   BUG FIXES:
    * Audited for 64-bit pointers and should now run on 64-bit platforms.
    * Hans de Goede of the Fedora project fixed a stack smash in saddconf.
    * Fix from Sayu for roller infinite loop on elastic/rubbery walls bug.


   MISCELLANEOUS:
    * Updated the FSF's address in our GPL notices.
    * Upgraded various autotools cruft so it kinda works with newer versions.
    * Patch from Ilya Barygin to allow linking with the --as-needed option.
    * Added autoselection of h_addr_list[0] vs. h_addr.
    * Updated the libtoolization.


   GTK 2.0 CONVERSION
    * GTK >= 2.20 is now required.  I got tired of the GTK habit of
      constantly coming up with a new shiny thing and deprecating every
      way that used to be the right way to do stuff, so I am not going
      to even vaguely try to support GTK < 2.20.
    * Fixed segfault in some menus caused by incorrect use of GtkDialogBox.
    * Changed yet more random interfaces GTK changed for whatever reason.
    * We need to finish GTK2 support.  We are using allow deprecated some.
      1. GdkFont is deprecated, so all the font code still needs rewritten.
      2. The chat window used GtkText and still need to be rewritten.
      3. sgtk/swidgets/sconsole.c:#define  __ALLOW_DEPRECATED_GDK__
         sgtk/swidgets/sdialog.c:#define  __ALLOW_DEPRECATED_GDK__
         sgtk/swindow-gtk.c:#define  __ALLOW_DEPRECATED_GDK__

7 files changed, 60 insertions, 63 deletions

diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 411be525439..26139fad926 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.34 2020/08/31 18:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2020/11/20 15:15:24 nia Exp $
 
-DISTNAME=	xscorch-0.2.0
-PKGREVISION=	14
+DISTNAME=	xscorch_0.2.1.orig
+PKGNAME=	${DISTNAME:S/_/-/1:S/.orig//1}
 CATEGORIES=	games
-#MASTER_SITES=	http://www.xscorch.org/releases/
+MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/x/xscorch/}
 
 MAINTAINER=	snj@NetBSD.org
-#HOMEPAGE=	http://www.xscorch.org/
+HOMEPAGE=	https://web.archive.org/web/20200117143419/http://www.xscorch.org/
 COMMENT=	Multiplayer tank shoot-em-up
+LICENSE=	gnu-gpl-v2
+
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_LIBTOOL=		YES
 USE_TOOLS+=		perl
 GNU_CONFIGURE=		YES
 
-CONFIGURE_ARGS+=	--without-gnome
-
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xscorch/distinfo b/games/xscorch/distinfo
index cc378403bb8..2a2e5a55d31 100644
--- a/games/xscorch/distinfo
+++ b/games/xscorch/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 20:57:09 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/11/20 15:15:24 nia Exp $
 
-SHA1 (xscorch-0.2.0.tar.gz) = b6d36e2b68e86e1f828d1312bf7789afd4085386
-RMD160 (xscorch-0.2.0.tar.gz) = 243a97eaadd6b29c354c6e0fe679055c0cdb53e2
-SHA512 (xscorch-0.2.0.tar.gz) = 5f35d4889d5deedea17544efd3263cc71821d38e278658887c38f5e83c91f1ef2b773c7b625b61b2f8a74120059d4899a1676c69f5cd643a84338b43b5255ac6
-Size (xscorch-0.2.0.tar.gz) = 818449 bytes
-SHA1 (patch-aa) = d30e33fcf5ccf8a8207524251a16b3912f6a0721
-SHA1 (patch-ac) = 812b75dda107434dd0ea38fd141560b22e8b368e
-SHA1 (patch-ad) = 9526c5cf549c431e189ff8e2d6ef275ce3045e65
+SHA1 (xscorch_0.2.1.orig.tar.gz) = 07f903e3767c1d6b7ad6fde2ea72ed58a597646a
+RMD160 (xscorch_0.2.1.orig.tar.gz) = ac8688e40162834db064c2aa18f904748ef56d0e
+SHA512 (xscorch_0.2.1.orig.tar.gz) = 69eeba82dc128221ae46c185a5d830cf4ce3a4e6371b51c3e7d1f79a6dfa389069759d872e6704ab2f60ff2963c6340525e74bddc937f2a0b0b386985c699d0e
+Size (xscorch_0.2.1.orig.tar.gz) = 849773 bytes
+SHA1 (patch-libj_jstr_str__trim.c) = a20309b8d5f3945e3256d7a2bb207bdb2dd7b6b4
+SHA1 (patch-sgtk_sgtk.h) = 4c97786f6160f452202a6c89d60c9c5ae2a4a7f7
diff --git a/games/xscorch/patches/patch-aa b/games/xscorch/patches/patch-aa
deleted file mode 100644
index 4d94268cf08..00000000000
--- a/games/xscorch/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/02/10 23:43:55 abs Exp $
-
---- snet/tcpnet/tn_internal.h.orig	Fri Aug 24 21:20:57 2001
-+++ snet/tcpnet/tn_internal.h
-@@ -54,6 +54,10 @@
- #define  TN_LEN_RETAIN_OLD      16              /* How many old packets to keep. */
- #define  TN_PROTOCOL_TCP        0               /* The socket() id for TCP. */
- 
-+/* Presumably a linux specific flag */
-+#ifndef MSG_NOSIGNAL
-+# define MSG_NOSIGNAL 0
-+#endif
- 
- /* Functions implemented inline. */
- 
diff --git a/games/xscorch/patches/patch-ac b/games/xscorch/patches/patch-ac
deleted file mode 100644
index c7ff2c1d696..00000000000
--- a/games/xscorch/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/05/31 20:11:21 salo Exp $
-
---- sgame/Makefile.in.orig	2002-06-18 04:33:53.000000000 +0200
-+++ sgame/Makefile.in	2003-05-31 20:53:01.000000000 +0200
-@@ -208,6 +208,7 @@
- 	-rm -f libscorch_game.a
- 	$(AR) cru libscorch_game.a $(libscorch_game_a_OBJECTS) $(libscorch_game_a_LIBADD)
- 	$(RANLIB) libscorch_game.a
-+	-ln -s libscorch_game.a libscorch_game_dup.a
- 
- tags: TAGS
- 
diff --git a/games/xscorch/patches/patch-ad b/games/xscorch/patches/patch-ad
deleted file mode 100644
index 09a4872f3e7..00000000000
--- a/games/xscorch/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/03/07 23:26:15 snj Exp $
-
---- Makefile.in.orig	2004-01-28 22:33:50.000000000 -0800
-+++ Makefile.in	2004-03-07 15:15:13.000000000 -0800
-@@ -152,13 +152,12 @@ MAINTAINERCLEANFILES = *.orig
- bin_PROGRAMS = $(GTK_PROGRAM) $(NETWORK_PROGRAM)
- 
- xscorch_SOURCES =  	xscorch.c
--
--xscorch_LDADD =  	-lm 	$(GTK_LIBS) 	$(LIBMIKMOD_LIBS) 	sgame/libscorch_game.a 	sgtk/libscorch_gtk.a 	sgtk/swidgets/libscorch_widget_gtk.a 	sai/libscorch_ai.a 	$(MIKMOD_LD_ADD) 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
-+xscorch_LDADD =  	-lm 	$(GTK_LIBS) 	$(LIBMIKMOD_LIBS) 	sgame/libscorch_game_dup.a 	sgtk/libscorch_gtk.a 	sgtk/swidgets/libscorch_widget_gtk.a 	sai/libscorch_ai.a 	$(MIKMOD_LD_ADD) 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
- 
- 
- xscorch_server_SOURCES =  	xscorch.c
- 
--xscorch_server_LDADD =  	-lm 	$(LIBREADLINE_LIBS) 	sgame/libscorch_game.a 	sconsole/libscorch_console.a 	sai/libscorch_ai.a 	ssound/libscorch_sound_null.a 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
-+xscorch_server_LDADD =  	-lm 	$(LIBREADLINE_LIBS) 	sgame/libscorch_game_dup.a 	sconsole/libscorch_console.a 	sai/libscorch_ai.a 	ssound/libscorch_sound_null.a 	$(NETWORK_LD_ADD) 	sutil/libscorch_util.a 	sgame/libscorch_game.a 	libj/jreg/libjreg.a 	libj/jstr/libjstr.a
- 
- 
- INCLUDES = -Isgame -Isgtk
diff --git a/games/xscorch/patches/patch-libj_jstr_str__trim.c b/games/xscorch/patches/patch-libj_jstr_str__trim.c
new file mode 100644
index 00000000000..8ef02f2287c
--- /dev/null
+++ b/games/xscorch/patches/patch-libj_jstr_str__trim.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-libj_jstr_str__trim.c,v 1.1 2020/11/20 15:15:24 nia Exp $
+
+Use memmove() instead of memcpy() for overlapping memory.
+
+From Debian:
+https://sources.debian.org/patches/xscorch/0.2.1-1+nmu5/overlapping-memcpy/
+
+--- libj/jstr/str_trim.c.orig	2009-04-26 17:39:30.000000000 +0000
++++ libj/jstr/str_trim.c
+@@ -47,7 +47,7 @@ char *trim(char *s) {
+       SET_LAST_NWS(ws, s);
+ 
+       /* Copy the non-ws characters in <s>. */
+-      if(ws.fnws > d) MEMCPY(d, ws.fnws, NWS_SIZE(ws));
++      if(ws.fnws > d) MEMMOVE(d, ws.fnws, NWS_SIZE(ws));
+       *(d + NWS_SIZE(ws)) = '\0';
+       return(d);
+ 
+@@ -93,7 +93,7 @@ char *ltrim(char *s) {
+ 
+    if(s != NULL) {
+       SKIM_WHITESPACE(s);
+-      MEMCPY(d, s, STRLEN(s) + 1);
++      MEMMOVE(d, s, STRLEN(s) + 1);
+       return(d);
+    }
+    return(NULL);
diff --git a/games/xscorch/patches/patch-sgtk_sgtk.h b/games/xscorch/patches/patch-sgtk_sgtk.h
new file mode 100644
index 00000000000..2c7d171f4ec
--- /dev/null
+++ b/games/xscorch/patches/patch-sgtk_sgtk.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-sgtk_sgtk.h,v 1.1 2020/11/20 15:15:24 nia Exp $
+
+Avoid implicit function declaration.
+
+From Debian:
+https://sources.debian.org/patches/xscorch/0.2.1-1+nmu5/gdk-include/
+
+--- sgtk/sgtk.h.orig	2009-04-26 17:39:48.000000000 +0000
++++ sgtk/sgtk.h
+@@ -24,6 +24,7 @@
+ #ifndef __sgtk_h_included
+ #define __sgtk_h_included
+ 
++#include <gdk/gdk.h>
+ 
+ /* This file implies xscorch.h. */
+ #include <xscorch.h>