Make xboard work with XAW_TYPE. Also add a missing dependency on xpm.

8 files changed, 191 insertions, 17 deletions

diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index fe54a0870a4..261bc84c6b1 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,16 +1,31 @@
-# $NetBSD: Makefile,v 1.2 1999/09/12 00:20:01 simonb Exp $
+# $NetBSD: Makefile,v 1.3 2000/09/15 15:53:16 jlam Exp $
 #
 
-DISTNAME=	xboard-4.0.3
-CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GNU:=xboard/}
+DISTNAME=		xboard-4.0.3
+CATEGORIES=		games
+MASTER_SITES=		${MASTER_SITE_GNU:=xboard/}
 
-MAINTAINER=	simonb@NetBSD.ORG
+MAINTAINER=		simonb@NetBSD.ORG
 
-GNU_CONFIGURE=	yes
-USE_PERL5=	yes
-USE_X11=	yes
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
-INFO_FILES=     xboard.info
+GNU_CONFIGURE=		# defined
+USE_PERL5=		# defined
+USE_X11=		# defined
+USE_XAW=		# defined
+USE_XPM=		# defined
+
+INFO_FILES=		xboard.info
+
+.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:
+	cd ${WRKSRC} && autoreconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xboard/files/patch-sum b/games/xboard/files/patch-sum
index b5ad4925c6c..c0bb28787e5 100644
--- a/games/xboard/files/patch-sum
+++ b/games/xboard/files/patch-sum
@@ -1,3 +1,8 @@
-$NetBSD: patch-sum,v 1.2 1999/09/12 00:20:54 simonb Exp $
+$NetBSD: patch-sum,v 1.3 2000/09/15 15:53:16 jlam Exp $
 
-MD5 (patch-aa) = 91e96119c8ee6495a7fdcdfc0eed14be
+MD5 (patch-aa) = e7741f80bc768e19b886f01fd2401ce9
+MD5 (patch-ab) = ccc82e971deb803ab0d8e6a39fd29e45
+MD5 (patch-ac) = 6280c803e8603b7e59f393891e5e2725
+MD5 (patch-ad) = 39d3c9193501771bc749bdf3c7a596b5
+MD5 (patch-ae) = 05390b943be9d2677f88f53819e90111
+MD5 (patch-af) = fa90f263e7d3af10aad1bb000ec487d8
diff --git a/games/xboard/patches/patch-aa b/games/xboard/patches/patch-aa
index 9b896073372..d129f59d297 100644
--- a/games/xboard/patches/patch-aa
+++ b/games/xboard/patches/patch-aa
@@ -1,7 +1,25 @@
-$NetBSD: patch-aa,v 1.2 1999/09/12 00:20:01 simonb Exp $
+$NetBSD: patch-aa,v 1.3 2000/09/15 15:53:16 jlam Exp $
 
---- Makefile.in.orig	Fri Feb 26 18:25:14 1999
-+++ Makefile.in	Mon Jun 14 09:24:45 1999
+--- Makefile.in.orig	Sun Aug 15 21:36:44 1999
++++ Makefile.in
+@@ -21,7 +21,7 @@
+ 
+ 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)
+ DEFINES = @DEFS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -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@
 @@ -62,10 +62,10 @@
  
  install: installdirs xboard zic2xpm cmail pxboard xboard.man cmail.man \
@@ -17,6 +35,3 @@ $NetBSD: patch-aa,v 1.2 1999/09/12 00:20:01 simonb 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)
-
-	/usr/bin/install -c -m 644 xboard.info /usr/local/info/xboard.info
-
diff --git a/games/xboard/patches/patch-ab b/games/xboard/patches/patch-ab
new file mode 100644
index 00000000000..5f41cfcec83
--- /dev/null
+++ b/games/xboard/patches/patch-ab
@@ -0,0 +1,10 @@
+$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
new file mode 100644
index 00000000000..112b7173aac
--- /dev/null
+++ b/games/xboard/patches/patch-ac
@@ -0,0 +1,17 @@
+$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
new file mode 100644
index 00000000000..f7463c20047
--- /dev/null
+++ b/games/xboard/patches/patch-ad
@@ -0,0 +1,36 @@
+$NetBSD: patch-ad,v 1.1 2000/09/15 15:53:16 jlam Exp $
+
+--- xboard.c.orig	Sun Aug 15 21:36:55 1999
++++ xboard.c
+@@ -141,6 +141,19 @@
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
++#ifdef 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,9 +163,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>
++#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
new file mode 100644
index 00000000000..6593ee51d32
--- /dev/null
+++ b/games/xboard/patches/patch-ae
@@ -0,0 +1,38 @@
+$NetBSD: patch-ae,v 1.1 2000/09/15 15:53:16 jlam Exp $
+
+--- xedittags.c.orig	Sun Aug 15 21:36:55 1999
++++ xedittags.c
+@@ -51,6 +51,20 @@
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
++#ifdef 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 +74,11 @@
+ #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 <X11/cursorfont.h>
+ 
+ #include "common.h"
+ #include "frontend.h"
diff --git a/games/xboard/patches/patch-af b/games/xboard/patches/patch-af
new file mode 100644
index 00000000000..de96f9b5b3d
--- /dev/null
+++ b/games/xboard/patches/patch-af
@@ -0,0 +1,38 @@
+$NetBSD: patch-af,v 1.1 2000/09/15 15:53:17 jlam Exp $
+
+--- xgamelist.c.orig	Sun Aug 15 21:36:55 1999
++++ xgamelist.c
+@@ -51,6 +51,20 @@
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
++#ifdef 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 +74,11 @@
+ #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 <X11/cursorfont.h>
+ 
+ #include "common.h"
+ #include "frontend.h"