Update xboard to 4.1.0. Changes from version 4.0.3 include importing many

more features from Winboard Plus 4.0.8 into Xboard, better interfacing with
zippy, and the usual crop of bugfixes.

9 files changed, 57 insertions, 65 deletions

diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 261bc84c6b1..291b6170e4c 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2000/09/15 15:53:16 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/10/15 02:14:20 jlam Exp $
 #
 
-DISTNAME=		xboard-4.0.3
+DISTNAME=		xboard-4.1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_GNU:=xboard/}
 
 MAINTAINER=		simonb@NetBSD.ORG
+HOMEPAGE=		http://www.research.compaq.com/SRC/personal/mann/xboard.html
 
 BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
-GNU_CONFIGURE=		# defined
 USE_PERL5=		# defined
 USE_X11=		# defined
 USE_XAW=		# defined
@@ -17,12 +17,16 @@ USE_XPM=		# defined
 
 INFO_FILES=		xboard.info
 
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--enable-xpm
+CONFIGURE_ARGS+=	--enable-zippy		# interface to ICS
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=		-I${X11PREFIX}/include
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
 CONFIGURE_ARGS+=	--with-Xaw3d
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS+=		-I${X11PREFIX}/include
 .endif
 
 pre-configure:
diff --git a/games/xboard/files/md5 b/games/xboard/files/md5
index b238cd83280..04869e35468 100644
--- a/games/xboard/files/md5
+++ b/games/xboard/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/09/12 00:20:01 simonb Exp $
+$NetBSD: md5,v 1.3 2000/10/15 02:14:20 jlam Exp $
 
-MD5 (xboard-4.0.3.tar.gz) = 98162e321ce71adb72eb23e937b50203
+MD5 (xboard-4.1.0.tar.gz) = 7c6e06f6644d308e64a3e5f00ee83f9e
diff --git a/games/xboard/files/patch-sum b/games/xboard/files/patch-sum
index bd24e4b536f..c193592c79b 100644
--- a/games/xboard/files/patch-sum
+++ b/games/xboard/files/patch-sum
@@ -1,9 +1,8 @@
-$NetBSD: patch-sum,v 1.4 2000/09/20 15:08:48 hubertf Exp $
+$NetBSD: patch-sum,v 1.5 2000/10/15 02:14:20 jlam Exp $
 
-MD5 (patch-aa) = e7741f80bc768e19b886f01fd2401ce9
+MD5 (patch-aa) = d1c2a070a6f1af3e134ece7830e84612
 MD5 (patch-ab) = ccc82e971deb803ab0d8e6a39fd29e45
 MD5 (patch-ac) = 6280c803e8603b7e59f393891e5e2725
-MD5 (patch-ad) = 39d3c9193501771bc749bdf3c7a596b5
-MD5 (patch-ae) = 05390b943be9d2677f88f53819e90111
-MD5 (patch-af) = fa90f263e7d3af10aad1bb000ec487d8
-MD5 (patch-ag) = 9bba9e0f564792d0290934382eac0890
+MD5 (patch-ad) = cc991966e54604c81d84a9e4f40fa3b2
+MD5 (patch-ae) = ec2f473bd0cb810528841790fdfb8b75
+MD5 (patch-af) = ce13f63d28691b1bc03a04f40db949c0
diff --git a/games/xboard/patches/patch-aa b/games/xboard/patches/patch-aa
index d129f59d297..2b41c736e40 100644
--- a/games/xboard/patches/patch-aa
+++ b/games/xboard/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2000/09/15 15:53:16 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2000/10/15 02:14:20 jlam Exp $
 
---- Makefile.in.orig	Sun Aug 15 21:36:44 1999
+--- Makefile.in.orig	Sun Sep 17 20:32:46 2000
 +++ Makefile.in
-@@ -21,7 +21,7 @@
+@@ -20,7 +20,7 @@
+ infodir = $(prefix)/info
  
  CC = @CC@
- CFLAGS = @CFLAGS@ -DINFODIR=\"$(infodir)\"
--ALL_CFLAGS = -I. -I$(srcdir) @X_CFLAGS@ @CONF_CFLAGS@ $(CFLAGS)
-+ALL_CFLAGS = -I. -I$(srcdir) @CPPFLAGS@ @X_CFLAGS@ @CONF_CFLAGS@ $(CFLAGS)
+-CFLAGS = @CFLAGS@ -DINFODIR=\"$(infodir)\"
++CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\"
+ ALL_CFLAGS = -I. -I$(srcdir) @X_CFLAGS@ @CONF_CFLAGS@ $(CFLAGS)
  DEFINES = @DEFS@
  INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
 @@ -31,7 +31,7 @@
  LEX = @LEX@
  LEXFLAGS = 
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2000/09/15 15:53:16 jlam Exp $
  	@X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ @LIBS@ -lm
  NROFF = @NROFF@
  NROFFFLAGS = @NROFFFLAGS@
-@@ -62,10 +62,10 @@
+@@ -63,13 +63,13 @@
  
  install: installdirs xboard zic2xpm cmail pxboard xboard.man cmail.man \
  		zic2xpm.man
@@ -28,10 +28,16 @@ $NetBSD: patch-aa,v 1.3 2000/09/15 15:53:16 jlam Exp $
 -	$(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm
 -	$(INSTALL_PROGRAM) cmail $(bindir)/cmail
 -	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
+-	$(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
 +	$(BSD_INSTALL_SCRIPT) cmail $(bindir)/cmail
 +	$(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard $(bindir)/pxboard
- 	$(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
- 	$(INSTALL_DATA) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext)
- 	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
++	$(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
+ 	-PATH=$$PATH:/sbin:/usr/sbin install-info \
+ 		$(infodir)/xboard.info $(infodir)/dir
diff --git a/games/xboard/patches/patch-ad b/games/xboard/patches/patch-ad
index f7463c20047..3f09d77e353 100644
--- a/games/xboard/patches/patch-ad
+++ b/games/xboard/patches/patch-ad
@@ -1,12 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2000/09/15 15:53:16 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2000/10/15 02:14:21 jlam Exp $
 
---- xboard.c.orig	Sun Aug 15 21:36:55 1999
+--- xboard.c.orig	Sun Sep 17 20:32:55 2000
 +++ xboard.c
-@@ -141,6 +141,19 @@
+@@ -141,6 +141,21 @@
  #include <X11/Intrinsic.h>
  #include <X11/StringDefs.h>
  #include <X11/Shell.h>
-+#ifdef USE_XAW3D
++#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>
@@ -22,15 +24,15 @@ $NetBSD: patch-ad,v 1.1 2000/09/15 15:53:16 jlam Exp $
  #include <X11/Xaw/Dialog.h>
  #include <X11/Xaw/Form.h>
  #include <X11/Xaw/List.h>
-@@ -150,9 +163,10 @@
+@@ -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
-+#include <X11/cursorfont.h>
  
  #if HAVE_LIBXPM
  #include <X11/xpm.h>
diff --git a/games/xboard/patches/patch-ae b/games/xboard/patches/patch-ae
index 6593ee51d32..43b99bf3a9d 100644
--- a/games/xboard/patches/patch-ae
+++ b/games/xboard/patches/patch-ae
@@ -1,12 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/09/15 15:53:16 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2000/10/15 02:14:21 jlam Exp $
 
---- xedittags.c.orig	Sun Aug 15 21:36:55 1999
+--- xedittags.c.orig	Sun Sep 17 20:32:55 2000
 +++ xedittags.c
-@@ -51,6 +51,20 @@
+@@ -51,6 +51,21 @@
  #include <X11/Intrinsic.h>
  #include <X11/StringDefs.h>
  #include <X11/Shell.h>
-+#ifdef USE_XAW3D
++#include <X11/cursorfont.h>
++#if USE_XAW3D
 +#include <X11/Xaw3d/Dialog.h>
 +#include <X11/Xaw3d/Form.h>
 +#include <X11/Xaw3d/List.h>
@@ -23,7 +24,7 @@ $NetBSD: patch-ae,v 1.1 2000/09/15 15:53:16 jlam Exp $
  #include <X11/Xaw/Dialog.h>
  #include <X11/Xaw/Form.h>
  #include <X11/Xaw/List.h>
-@@ -60,10 +74,11 @@
+@@ -60,10 +75,10 @@
  #include <X11/Xaw/SmeLine.h>
  #include <X11/Xaw/Box.h>
  #include <X11/Xaw/MenuButton.h>
@@ -32,7 +33,6 @@ $NetBSD: patch-ae,v 1.1 2000/09/15 15:53:16 jlam Exp $
  #include <X11/Xaw/AsciiText.h>
  #include <X11/Xaw/Viewport.h>
 +#endif
-+#include <X11/cursorfont.h>
  
  #include "common.h"
  #include "frontend.h"
diff --git a/games/xboard/patches/patch-af b/games/xboard/patches/patch-af
index de96f9b5b3d..a31a7028114 100644
--- a/games/xboard/patches/patch-af
+++ b/games/xboard/patches/patch-af
@@ -1,12 +1,13 @@
-$NetBSD: patch-af,v 1.1 2000/09/15 15:53:17 jlam Exp $
+$NetBSD: patch-af,v 1.2 2000/10/15 02:14:21 jlam Exp $
 
---- xgamelist.c.orig	Sun Aug 15 21:36:55 1999
+--- xgamelist.c.orig	Sun Sep 17 20:32:55 2000
 +++ xgamelist.c
-@@ -51,6 +51,20 @@
+@@ -51,6 +51,21 @@
  #include <X11/Intrinsic.h>
  #include <X11/StringDefs.h>
  #include <X11/Shell.h>
-+#ifdef USE_XAW3D
++#include <X11/cursorfont.h>
++#if USE_XAW3D
 +#include <X11/Xaw3d/Dialog.h>
 +#include <X11/Xaw3d/Form.h>
 +#include <X11/Xaw3d/List.h>
@@ -23,7 +24,7 @@ $NetBSD: patch-af,v 1.1 2000/09/15 15:53:17 jlam Exp $
  #include <X11/Xaw/Dialog.h>
  #include <X11/Xaw/Form.h>
  #include <X11/Xaw/List.h>
-@@ -60,10 +74,11 @@
+@@ -60,10 +75,10 @@
  #include <X11/Xaw/SmeLine.h>
  #include <X11/Xaw/Box.h>
  #include <X11/Xaw/MenuButton.h>
@@ -32,7 +33,6 @@ $NetBSD: patch-af,v 1.1 2000/09/15 15:53:17 jlam Exp $
  #include <X11/Xaw/AsciiText.h>
  #include <X11/Xaw/Viewport.h>
 +#endif
-+#include <X11/cursorfont.h>
  
  #include "common.h"
  #include "frontend.h"
diff --git a/games/xboard/patches/patch-ag b/games/xboard/patches/patch-ag
deleted file mode 100644
index b807054554c..00000000000
--- a/games/xboard/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/09/20 15:08:48 hubertf Exp $
-
---- cmail.in.orig	Mon Aug 16 06:36:54 1999
-+++ cmail.in
-@@ -798,12 +798,8 @@
-     if ($mon < 10) {
- 	$mon = "0$mon" ;
-     }
--    if ($year < 94) {
--	$century = 20 ;
--    } else {
--	$century = 19 ;
--    }
--    "$century$year.$mon.$mday" ;
-+    $real_year = 1900 + $year;
-+    "$real_year.$mon.$mday" ;
- }
- #=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
- 
diff --git a/games/xboard/pkg/PLIST b/games/xboard/pkg/PLIST
index 1650ad03346..6b2fe108b29 100644
--- a/games/xboard/pkg/PLIST
+++ b/games/xboard/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/14 00:20:49 simonb Exp $
-bin/xboard
-bin/zic2xpm
+@comment $NetBSD: PLIST,v 1.2 2000/10/15 02:14:21 jlam Exp $
 bin/cmail
 bin/pxboard
+bin/xboard
+bin/zic2xpm
 @unexec install-info --delete %D/info/xboard.info %D/info/dir
 info/xboard.info
 @exec install-info %D/info/xboard.info %D/info/dir
-man/man6/xboard.6
 man/man6/cmail.6
+man/man6/xboard.6
 man/man6/zic2xpm.6