Update xboard to 4.2.2. Changes from version 4.1.0 include a new xboard

protocol for talking to chess engines, adding a move list window,
improving the user interface w.r.t dragging pieces, and various bugfixes.
Tim Mann graciously accepted pkgsrc patches to support compiling with Xaw3d
in this release.

10 files changed, 19 insertions, 181 deletions

diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 18cfcb0ea11..4d3e5c0666d 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/02/06 03:16:57 fredb Exp $
-#
+# $NetBSD: Makefile,v 1.7 2001/02/07 06:11:23 jlam Exp $
 
-DISTNAME=		xboard-4.1.0
+DISTNAME=		xboard-4.2.2
 CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_GNU:=xboard/}
+MASTER_SITES=		${MASTER_SITE_GNU:=xboard/} \
+			http://www.research.compaq.com/SRC/personal/mann/xboard/
 
 MAINTAINER=		simonb@NetBSD.ORG
 HOMEPAGE=		http://www.research.compaq.com/SRC/personal/mann/xboard.html
diff --git a/games/xboard/files/md5 b/games/xboard/files/md5
index 04869e35468..eac1ab01788 100644
--- a/games/xboard/files/md5
+++ b/games/xboard/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/10/15 02:14:20 jlam Exp $
+$NetBSD: md5,v 1.4 2001/02/07 06:11:24 jlam Exp $
 
-MD5 (xboard-4.1.0.tar.gz) = 7c6e06f6644d308e64a3e5f00ee83f9e
+MD5 (xboard-4.2.2.tar.gz) = c87923600389620ecced9a3ccf6d54ee
diff --git a/games/xboard/files/patch-sum b/games/xboard/files/patch-sum
index c193592c79b..431f4ae7968 100644
--- a/games/xboard/files/patch-sum
+++ b/games/xboard/files/patch-sum
@@ -1,8 +1,3 @@
-$NetBSD: patch-sum,v 1.5 2000/10/15 02:14:20 jlam Exp $
+$NetBSD: patch-sum,v 1.6 2001/02/07 06:11:24 jlam Exp $
 
-MD5 (patch-aa) = d1c2a070a6f1af3e134ece7830e84612
-MD5 (patch-ab) = ccc82e971deb803ab0d8e6a39fd29e45
-MD5 (patch-ac) = 6280c803e8603b7e59f393891e5e2725
-MD5 (patch-ad) = cc991966e54604c81d84a9e4f40fa3b2
-MD5 (patch-ae) = ec2f473bd0cb810528841790fdfb8b75
-MD5 (patch-af) = ce13f63d28691b1bc03a04f40db949c0
+MD5 (patch-aa) = 176ddb2325c9e4475c1a634b20779137
diff --git a/games/xboard/patches/patch-aa b/games/xboard/patches/patch-aa
index 2b41c736e40..2d903abf8f8 100644
--- a/games/xboard/patches/patch-aa
+++ b/games/xboard/patches/patch-aa
@@ -1,26 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2000/10/15 02:14:20 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2001/02/07 06:11:24 jlam Exp $
 
---- Makefile.in.orig	Sun Sep 17 20:32:46 2000
+--- Makefile.in.orig	Sat Dec 16 21:24:38 2000
 +++ Makefile.in
-@@ -20,7 +20,7 @@
- infodir = $(prefix)/info
- 
- CC = @CC@
--CFLAGS = @CFLAGS@ -DINFODIR=\"$(infodir)\"
-+CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\"
- ALL_CFLAGS = -I. -I$(srcdir) @X_CFLAGS@ @CONF_CFLAGS@ $(CFLAGS)
- DEFINES = @DEFS@
- INSTALL = @INSTALL@
-@@ -31,7 +31,7 @@
- LEX = @LEX@
- LEXFLAGS = 
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
--LIBS = @X_LIBS@ -lXaw @PRE_XMULIB@ -lXmu @POST_XMULIB@ -lXt -lXext \
-+LIBS = @X_LIBS@ @XAW_LIBS@ @PRE_XMULIB@ -lXmu @POST_XMULIB@ -lXt -lXext \
- 	@X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ @LIBS@ -lm
- NROFF = @NROFF@
- NROFFFLAGS = @NROFFFLAGS@
-@@ -63,13 +63,13 @@
+@@ -63,14 +63,14 @@
  
  install: installdirs xboard zic2xpm cmail pxboard xboard.man cmail.man \
  		zic2xpm.man
@@ -31,13 +13,15 @@ $NetBSD: patch-aa,v 1.4 2000/10/15 02:14:20 jlam Exp $
 -	$(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
 -	$(INSTALL_DATA) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext)
 -	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
-+	$(INSTALL_PROGRAM) xboard $(bindir)/xboard
-+	$(INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm
+-	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
++	$(BSD_INSTALL_PROGRAM) xboard $(bindir)/xboard
++	$(BSD_INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm
 +	$(BSD_INSTALL_SCRIPT) cmail $(bindir)/cmail
 +	$(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard $(bindir)/pxboard
 +	$(BSD_INSTALL_MAN) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
 +	$(BSD_INSTALL_MAN) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext)
 +	$(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
- 	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
++	$(BSD_INSTALL_DATA) xboard.info $(infodir)/xboard.info
  	-PATH=$$PATH:/sbin:/usr/sbin install-info \
  		$(infodir)/xboard.info $(infodir)/dir
+ 
diff --git a/games/xboard/patches/patch-ab b/games/xboard/patches/patch-ab
deleted file mode 100644
index 5f41cfcec83..00000000000
--- a/games/xboard/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/09/15 15:53:16 jlam Exp $
-
---- acconfig.h.orig	Sun Aug 15 21:36:55 1999
-+++ acconfig.h
-@@ -50,3 +50,5 @@
- #undef HAVE_LIBXPM
- 
- #define HAVE_USLEEP 0
-+
-+#undef USE_XAW3D
diff --git a/games/xboard/patches/patch-ac b/games/xboard/patches/patch-ac
deleted file mode 100644
index 112b7173aac..00000000000
--- a/games/xboard/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/09/15 15:53:16 jlam Exp $
-
---- configure.in.orig	Sun Aug 15 21:36:54 1999
-+++ configure.in
-@@ -35,6 +35,12 @@
- AC_PATH_PROGS(AWKPATH, awk mawk gawk nawk)
- AC_PATH_PROGS(PERLPATH, perl)
- 
-+AC_ARG_WITH(Xaw3d, [  --with-Xaw3d            Use Xaw3d instead of Xaw],
-+  [AC_DEFINE(USE_XAW3D)
-+   XAW_LIBS="-lXaw3d"],
-+  XAW_LIBS="-lXaw")
-+AC_SUBST(XAW_LIBS)
-+
- AC_HEADER_STDC
- AC_HEADER_TIME
- AC_HEADER_SYS_WAIT
diff --git a/games/xboard/patches/patch-ad b/games/xboard/patches/patch-ad
deleted file mode 100644
index 3f09d77e353..00000000000
--- a/games/xboard/patches/patch-ad
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/10/15 02:14:21 jlam Exp $
-
---- xboard.c.orig	Sun Sep 17 20:32:55 2000
-+++ xboard.c
-@@ -141,6 +141,21 @@
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
-+#include <X11/cursorfont.h>
-+#include <X11/Xatom.h>
-+#if USE_XAW3D
-+#include <X11/Xaw3d/Dialog.h>
-+#include <X11/Xaw3d/Form.h>
-+#include <X11/Xaw3d/List.h>
-+#include <X11/Xaw3d/Label.h>
-+#include <X11/Xaw3d/SimpleMenu.h>
-+#include <X11/Xaw3d/SmeBSB.h>
-+#include <X11/Xaw3d/SmeLine.h>
-+#include <X11/Xaw3d/Box.h>
-+#include <X11/Xaw3d/MenuButton.h>
-+#include <X11/Xaw3d/Text.h>
-+#include <X11/Xaw3d/AsciiText.h>
-+#else
- #include <X11/Xaw/Dialog.h>
- #include <X11/Xaw/Form.h>
- #include <X11/Xaw/List.h>
-@@ -150,10 +165,9 @@
- #include <X11/Xaw/SmeLine.h>
- #include <X11/Xaw/Box.h>
- #include <X11/Xaw/MenuButton.h>
--#include <X11/cursorfont.h>
- #include <X11/Xaw/Text.h>
- #include <X11/Xaw/AsciiText.h>
--#include <X11/Xatom.h>
-+#endif
- 
- #if HAVE_LIBXPM
- #include <X11/xpm.h>
diff --git a/games/xboard/patches/patch-ae b/games/xboard/patches/patch-ae
deleted file mode 100644
index 43b99bf3a9d..00000000000
--- a/games/xboard/patches/patch-ae
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/10/15 02:14:21 jlam Exp $
-
---- xedittags.c.orig	Sun Sep 17 20:32:55 2000
-+++ xedittags.c
-@@ -51,6 +51,21 @@
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
-+#include <X11/cursorfont.h>
-+#if USE_XAW3D
-+#include <X11/Xaw3d/Dialog.h>
-+#include <X11/Xaw3d/Form.h>
-+#include <X11/Xaw3d/List.h>
-+#include <X11/Xaw3d/Label.h>
-+#include <X11/Xaw3d/SimpleMenu.h>
-+#include <X11/Xaw3d/SmeBSB.h>
-+#include <X11/Xaw3d/SmeLine.h>
-+#include <X11/Xaw3d/Box.h>
-+#include <X11/Xaw3d/MenuButton.h>
-+#include <X11/Xaw3d/Text.h>
-+#include <X11/Xaw3d/AsciiText.h>
-+#include <X11/Xaw3d/Viewport.h>
-+#else
- #include <X11/Xaw/Dialog.h>
- #include <X11/Xaw/Form.h>
- #include <X11/Xaw/List.h>
-@@ -60,10 +75,10 @@
- #include <X11/Xaw/SmeLine.h>
- #include <X11/Xaw/Box.h>
- #include <X11/Xaw/MenuButton.h>
--#include <X11/cursorfont.h>
- #include <X11/Xaw/Text.h>
- #include <X11/Xaw/AsciiText.h>
- #include <X11/Xaw/Viewport.h>
-+#endif
- 
- #include "common.h"
- #include "frontend.h"
diff --git a/games/xboard/patches/patch-af b/games/xboard/patches/patch-af
deleted file mode 100644
index a31a7028114..00000000000
--- a/games/xboard/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/10/15 02:14:21 jlam Exp $
-
---- xgamelist.c.orig	Sun Sep 17 20:32:55 2000
-+++ xgamelist.c
-@@ -51,6 +51,21 @@
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
-+#include <X11/cursorfont.h>
-+#if USE_XAW3D
-+#include <X11/Xaw3d/Dialog.h>
-+#include <X11/Xaw3d/Form.h>
-+#include <X11/Xaw3d/List.h>
-+#include <X11/Xaw3d/Label.h>
-+#include <X11/Xaw3d/SimpleMenu.h>
-+#include <X11/Xaw3d/SmeBSB.h>
-+#include <X11/Xaw3d/SmeLine.h>
-+#include <X11/Xaw3d/Box.h>
-+#include <X11/Xaw3d/MenuButton.h>
-+#include <X11/Xaw3d/Text.h>
-+#include <X11/Xaw3d/AsciiText.h>
-+#include <X11/Xaw3d/Viewport.h>
-+#else
- #include <X11/Xaw/Dialog.h>
- #include <X11/Xaw/Form.h>
- #include <X11/Xaw/List.h>
-@@ -60,10 +75,10 @@
- #include <X11/Xaw/SmeLine.h>
- #include <X11/Xaw/Box.h>
- #include <X11/Xaw/MenuButton.h>
--#include <X11/cursorfont.h>
- #include <X11/Xaw/Text.h>
- #include <X11/Xaw/AsciiText.h>
- #include <X11/Xaw/Viewport.h>
-+#endif
- 
- #include "common.h"
- #include "frontend.h"
diff --git a/games/xboard/pkg/DESCR b/games/xboard/pkg/DESCR
index 625401ca6b4..afc0b3e8f6e 100644
--- a/games/xboard/pkg/DESCR
+++ b/games/xboard/pkg/DESCR
@@ -1,3 +1,3 @@
-XBoard is a graphical chessboard that can serve as a user interface for
-GNU Chess and Crafty, for the Internet Chess Server, or for electronic
-mail correspondence chess.  XBoard can also be used by itself.
+XBoard is a graphical chessboard that can serve as a user interface to the
+GNU Chess and Crafty chess engines, the Internet Chess Servers, electronic
+mail correspondence chess, or your own collection of saved games.