Update xconq to 7.3.3; changes since release 7.2.2 include:

*** 7.3.3

Fix pathnames to tcl/tk libraries.

Fix Mac bugs: 1-bit images, loading of emblems from saved games, large
map handling, removed variants.

Add better solid colors in advterr.g.

*** 7.3.2

Fix crash with no-indepside games on Unix.

Add terrain images for advances.g.

*** 7.3.1

In Unix/Windows player setup, make separate buttons to add/remove
indepside AI and to configure indepside behavior.

Add --enable-alternate-scoresdir configure option.

Update config.guess and config.sub.

*** 7.3.0

This release accumulates over two years of changes throughout the
program.  In general, the emphasis has been on improving the program's
usability, making the AI smarter, improving existing games, and
extending to Civ-type games, rather than adding random new games to
the library.

The Unix user interface has been rewritten to use tcl/tk.  It includes
a full set of menus, resizeable panes in the map windows, buttons for
common operations, a mouseover display, and many additional map
display options.  There is also a full set of dialogs for setting up a
game, plus a chat window to facilitate setting up networked games.

There is now a port to Windows, using the tcl/tk-based interface,
which means no more requirement to run an X server.  The Windows port
still has bugs though.

The Mac interface now has floating windows for most auxiliary windows,
city and research dialogs, and more display controls, including
player controls over most colors and imagery used.  Selected units
can now blink rather than being surrounded with a box.

Unix networking support now allows for more than two players in a
game, and the game setup dialogs are synchronized, so for instance
clicking on a variant checkbox causes all players' checkboxes to
change.

Hans Ronne added the game "Ancient Near East" (anc-near-east.g),
similar to Civilization but with more detail, such as different kinds
of wheat to discover.  The included map of the Near East is
spectacularly large and detailed.

A Civilization II emulation (civ2.g) has been added.  The game works,
but happiness is not implemented, most of the city improvements have
no effect, nor do the Wonders.

Linn Stanton added an extended version of the standard game (lhs.g)
that includes radar, artillery, aaa, engineers, mines, and minefields.

Many new graphic images are available, particularly for terrain.
Xconq can load images directly from image files in standard formats
(although only GIF is available at present).

Players in the standard game get towns with names appropriate to
their chosen nationalities.

It is now possible to play independent units as if they were a regular
side, and (more usefully), it's possible to have an AI run the
independent units.  Watch out for the marauding barbarians!

A second AI type, the "iplayer", is available.  It is a minimal
AI that does basic tactical planning for individual units, but
does not attempt to coordinate them.

A set of commands, agreement-draft etc, are available for setting
up agreements.  (Agreement support is still incomplete though.)

New commands:
	"c-rate" sets conversion rates for materials (division of
		trade into science/shields/luxuries in Civ, for instance).
	"collect" sets up a task to collect materials from terrain.
	"research" sets per-side research into advances.

There is a new GDL type "advance", to represent scientific or
technological advances.  Game designers can lay out a whole technology
tree, and either units or whole sides may do research to achieve
advances.

To allow "research" to apply to advances, the existing research
activity to develop tech levels has been renamed to "development".
Its characteristics remain the same however.

The "extract" action is available for units to get materials
directly from terrain.

A game design can include "advanced" units that are like Civ
cities; they are variable-sized, and can collect materials from
the surrounding terrain.

GDL includes many more variables, type properties, and tables.
Some of the more notable additions include:
	global "combat-model", to choose algorithm for combat resolution
	global "indepside-has-ai", to control indepside use of AI.
	global "country-border-color" etc, to control colors used by
		interfaces
	side property "treasury", tables "gives-to-treasury" and
		"takes-from-treasury", to accumulate materials for the
		side as a whole
	table "advance-needed-to-build", to define how the technology
		tree enables the construction of unit types
	table "terrain-density", to add random variation to synthesized
		terrain
	tables "unit-consumption-to-grow", "size-limit-without-advance",
		and "side-limit-without-occupant", to regulate the
		growth of advanced units (cities)
	table "cellwide-protection-for", that controls protection for
		all units in a cell
	unit type properties "attack" and "defend", to define generic
		attack/defense strengths
	unit type property "advanced", to define advanced units
	unit type properties "advanced-auto-construct" and
		"advanced-auto-research", to automate the activities
		of advanced units
	unit type property "ai-tactical-range", to control the area
		of awareness for a unit's tactical decisions

Sami Perttu contributed a supply system model; see doc/README.supply
for more detail on how to use in game designs.

The tcl/tk port includes experimental support for isometric display,
but this needs more work, and so is turned off by default.  (See the
top of tcltk/tkconq.tcl to see how to enable.)

The Unix port uses autoconf for configuration.  Xconq now conforms
better to FHS; library files reside in /usr/local/share/xconq, while
score files live in /var/lib/xconq/scores.

Many many bug fixes and smaller cleanups.

16 files changed, 222 insertions, 179 deletions

diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 226834b237e..27662e7408c 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,23 +1,28 @@
-# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:26 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/31 07:26:23 kleink Exp $
 
-DISTNAME=		xconq-7.2.2
+DISTNAME=		xconq-7.3.3
 CATEGORIES=		games x11
-MASTER_SITES=		ftp://sourceware.cygnus.com/pub/xconq/
+MASTER_SITES=		ftp://sources.redhat.com/pub/xconq/
 
 MAINTAINER=		kleink@netbsd.org
-HOMEPAGE=		http://sourceware.cygnus.com/xconq/
+HOMEPAGE=		http://sources.redhat.com/xconq/
+
+DEPENDS+=		tcl-8.0.5:../../lang/tcl80
+DEPENDS+=		tk-8.0.5:../../x11/tk80
 
 USE_X11BASE=		YES
-USE_XPM=		YES
+USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-xpm
+CONFIGURE_ARGS+=	--with-tclconfig=${LOCALBASE}/lib/tcl8.0 \
+			--with-tkconfig=${LOCALBASE}/lib/tk8.0 \
+			--enable-alternate-scoresdir=/var/games/xconq/scores
 
-INFO_FILES=     	xcdesign.info xconq.info
+INFO_FILES=     	hacking.info xcdesign.info xconq.info
 
 post-build:
-	cd ${WRKSRC}/doc && ${MAKE} info
+	cd ${WRKSRC}/doc && ${GMAKE} info
 
 post-install:
-	cd ${WRKSRC}/doc && ${MAKE} install-info
+	cd ${WRKSRC}/doc && ${GMAKE} install-info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xconq/files/md5 b/games/xconq/files/md5
index d64bc730912..9230074ab89 100644
--- a/games/xconq/files/md5
+++ b/games/xconq/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
+$NetBSD: md5,v 1.2 2000/08/31 07:26:23 kleink Exp $
 
-MD5 (xconq-7.2.2.tar.gz) = 0f54293d4903c91fcf4cfd8ebeaaa0be
+MD5 (xconq-7.3.3.tar.gz) = 7e14ddf2b3846d989dc8d6af91c32fb7
diff --git a/games/xconq/files/patch-sum b/games/xconq/files/patch-sum
index 7b6093a08bf..2ba8b7cc698 100644
--- a/games/xconq/files/patch-sum
+++ b/games/xconq/files/patch-sum
@@ -1,12 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:01 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/31 07:26:23 kleink Exp $
 
-MD5 (patch-aa) = 75c0b57d4799041b5b618101da571265
-MD5 (patch-ab) = ebabaa8ea862ddcb280c0502038e1a8a
-MD5 (patch-ac) = 8354b874a941b28acf0fc5a276267b3e
-MD5 (patch-ad) = 21991aadef840aff863159100755db84
-MD5 (patch-ae) = 1bb94cf6ff92e3b07d51a38fb366b80b
-MD5 (patch-af) = eeadab5ff56d4c5735ebef07f5ea9bc2
-MD5 (patch-ag) = 243ea05ac36bf665d8e139e0c09ee6a2
-MD5 (patch-ah) = 61aa28fd3fa1d4208a2fca767c9648b3
-MD5 (patch-ai) = 36e424b7b040b55724cab4b1faceba7c
-MD5 (patch-aj) = e3dc9004943514a84f26e75b429c3dd5
+MD5 (patch-aa) = 7e8ab17b8c65059c7b2d4a58c029b46d
+MD5 (patch-ab) = 54ec3629d6e681b6bf6d39a76dca3714
+MD5 (patch-ac) = b97f668fe078156601d84811574277c9
+MD5 (patch-ad) = 74658bc3a1587b2bfd0752864a1fbd60
+MD5 (patch-ae) = 1563f3454d12157cdcf2cea342f2beae
+MD5 (patch-af) = 4e9a27c6efdace8e98540b161aabea27
diff --git a/games/xconq/patches/patch-aa b/games/xconq/patches/patch-aa
index 60ca0455a15..d2ce359888c 100644
--- a/games/xconq/patches/patch-aa
+++ b/games/xconq/patches/patch-aa
@@ -1,9 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/31 07:26:23 kleink Exp $
 
---- /dev/null	Tue Jun  8 21:38:55 1999
-+++ config/mh-netbsd	Tue Jun  8 21:41:47 1999
-@@ -0,0 +1,4 @@
-+X11_INCLUDE_FLAGS =	-I${X11BASE}/include
-+X11_LIB_FLAGS =		-L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-+
-+appdefaultsdir = 	${X11BASE}/lib/X11/app-defaults	
+--- Makefile.in.orig	Tue Jun 13 15:04:45 2000
++++ Makefile.in	Thu Aug 31 07:55:46 2000
+@@ -28,10 +28,10 @@
+ VPATH = @srcdir@
+ 
+ GAMEUID = games
+-GAMEGRP = bin
++GAMEGRP = games
+ 
+-GAMEPERM = 04755
+-DIRPERM  = 0755
++GAMEPERM = 02755
++DIRPERM  = 0775
+ FILEPERM = 0644
+ 
+ SHELL = /bin/sh
diff --git a/games/xconq/patches/patch-ab b/games/xconq/patches/patch-ab
index 6316867c558..fcb3679d431 100644
--- a/games/xconq/patches/patch-ab
+++ b/games/xconq/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
+$NetBSD: patch-ab,v 1.2 2000/08/31 07:26:23 kleink Exp $
 
---- config.host.orig	Wed Jul  1 06:27:39 1998
-+++ config.host	Tue Jun  8 21:57:18 1999
-@@ -37,6 +37,7 @@
-   *-*-linux*)		  host_makefile_frag=config/mh-linux ;;
-   rs6000-*-lynxos*)	  host_makefile_frag=config/mh-lynxrs6k ;;
-   *-*-lynxos*)	  	  host_makefile_frag=config/mh-lynxos ;;
-+  *-*-netbsd*)	  	  host_makefile_frag=config/mh-netbsd ;;
-   *-*-sysv4*)             host_makefile_frag=config/mh-sysv4 ;;
-   *-*-sysv*)              host_makefile_frag=config/mh-sysv ;;
-   *-*-freebsd*)           host_makefile_frag=config/mh-freebsd ;;
+--- tcltk/Makefile.in.orig	Wed Jun 14 17:02:05 2000
++++ tcltk/Makefile.in	Mon Aug 28 08:41:25 2000
+@@ -95,7 +95,7 @@
+ 
+ X11_INCLUDE_FLAGS = @XINCLUDES@
+ 
+-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS)
++ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) -I$(LOCALBASE)/include/tcl8.0 -I$(LOCALBASE)/include/tk8.0
+ 
+ .c.o:
+ 	$(CC) -c $(ALL_CFLAGS) $<
diff --git a/games/xconq/patches/patch-ac b/games/xconq/patches/patch-ac
index 56491763514..66d4bdd0c4c 100644
--- a/games/xconq/patches/patch-ac
+++ b/games/xconq/patches/patch-ac
@@ -1,13 +1,71 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
+$NetBSD: patch-ac,v 1.2 2000/08/31 07:26:23 kleink Exp $
 
---- SelFile/SelFile.c.orig	Wed Jul  1 06:27:39 1998
-+++ SelFile/SelFile.c	Tue Jun  8 22:02:47 1999
-@@ -44,7 +44,7 @@
- #include <stdio.h>
- #include <errno.h>
- 
--#if !defined(__GLIBC__) && !defined(__FreeBSD__)
-+#if !defined(__GLIBC__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- /* BSD 4.3 errno.h does not declare errno */
- extern int errno;
- extern int sys_nerr;
+--- x11/Makefile.in.orig	Mon Jun 19 17:36:18 2000
++++ x11/Makefile.in	Thu Aug 31 07:57:43 2000
+@@ -25,10 +25,10 @@
+ krnsrcdir = $(srcdir)/../kernel
+ 
+ GAMEUID = games
+-GAMEGRP = bin
++GAMEGRP = games
+ 
+-GAMEPERM = 04755
+-DIRPERM  = 0755
++GAMEPERM = 02755
++DIRPERM  = 0775
+ FILEPERM = 0644
+ 
+ SHELL = /bin/sh
+@@ -49,7 +49,7 @@
+ 
+ #TCLTK_LIB = -ltk -ltcl -ldl -lm
+ #TCLTK_LIB = ../tcl/unix/libtcl8.0.a ../tk/unix/libtk8.0.a -ldl -lm
+-TCLTK_LIB = $(TCL) $(TK)
++TCLTK_LIB = $(TCL) $(TK) -Wl,-R$(libdir)
+ 
+ # Extra flags that the TCLTK files need:
+ TCLTK_CFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS)
+@@ -65,14 +65,14 @@
+ # This variable is needed when doing dynamic linking.
+ LIB_RUNTIME_DIR = $(libdir)
+ TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@
+-TCL_CFLAGS = @TCLHDIR@
++TCL_CFLAGS = -I$(LOCALBASE)/include/tcl8.0
+ TCL_DEPS =
+ 
+ TCL_DL_LIBS = @TCL_DL_LIBS@
+ 
+ # Tk stuff.
+ TK = @TK_LIB_SPEC@
+-TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@
++TK_CFLAGS = -I$(LOCALBASE)/include/tk8.0
+ TK_DEPS =
+ 
+ X11_CFLAGS = @TK_XINCLUDES@
+@@ -81,7 +81,7 @@
+ 
+ GUI_CFLAGS_X = @GUI_CFLAGS_X@
+ 
+-X11_LIB_FLAGS = @XLIBS@
++X11_LIB_FLAGS = @XLIBS@ -Wl,-R$(X11BASE)/lib
+ 
+ # Override this to disable SelFile calls.
+ 
+@@ -173,7 +173,7 @@
+ 
+ X11_INCLUDE_FLAGS = @XINCLUDES@
+ 
+-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir)  -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS)
++ALL_CFLAGS = $(CFLAGS) $(HFLAGS) $(SELFILE_CFLAGS) $(XPM_CFLAGS) $(REQD_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir)  -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS) $(XPM_INCLUDE_FLAGS) $(TCLTK_CFLAGS)
+ 
+ .c.o:
+ 	$(CC) -c $(ALL_CFLAGS) $<
+@@ -215,7 +215,7 @@
+ 	$(CC) -o imf2x $(ALL_CFLAGS) $(LDFLAGS) imf2x.o $(XUTOBJS) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(XAW_LIB) $(NET_EXTRA_LIBS)
+ 
+ ximfapp:	ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB)
+-	$(CC) -o ximfapp $(ALL_CFLAGS) $(LDFLAGS) ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(TCLTK_LIB) $(X11_LIB) $(NET_EXTRA_LIBS)
++	$(CC) -o ximfapp $(ALL_CFLAGS) $(LDFLAGS) ximfapp.o xcutil.o $(TKIAPP_LIB) $(TKIMF_LIB) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(TCLTK_LIB) $(X11_LIB) $(NET_EXTRA_LIBS) -lm
+ 
+ xshowimf:	xshowimf.o $(XUTOBJS) $(LOW_LIB)
+ 	$(CC) -o xshowimf $(ALL_CFLAGS) $(LDFLAGS) xshowimf.o $(XUTOBJS) $(LOW_LIB) $(X11_LIB_FLAGS) $(WITH_LIBS) $(SELFILE_LIB) $(XAW_LIB) $(NET_EXTRA_LIBS)
diff --git a/games/xconq/patches/patch-ad b/games/xconq/patches/patch-ad
index 1999e028b18..fb8f086e8a1 100644
--- a/games/xconq/patches/patch-ad
+++ b/games/xconq/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
+$NetBSD: patch-ad,v 1.2 2000/08/31 07:26:24 kleink Exp $
 
---- curses/Makefile.in.orig	Tue Apr 21 05:21:47 1998
-+++ curses/Makefile.in	Tue Jun  8 22:33:16 1999
-@@ -29,7 +29,7 @@
- SHELL = /bin/sh
+--- doc/xcdesign.texi.orig	Thu Jun  8 14:28:31 2000
++++ doc/xcdesign.texi	Wed Aug 30 21:59:48 2000
+@@ -8,6 +8,10 @@
+ @setchapternewpage odd
  
- INSTALL = install -c
--INSTALL_PROGRAM = $(INSTALL)
-+INSTALL_PROGRAM = $(INSTALL) -s
- INSTALL_DATA = $(INSTALL)
+ @ifinfo
++@dircategory Games
++@direntry
++* Xcdesign: (xcdesign.info).	Designing Games with Xconq.
++@end direntry
+ This file documents the design of games for @i{Xconq}.
  
- CC = cc
+ Copyright (C) 1987-1989, 1991-2000 Stanley T. Shebs
diff --git a/games/xconq/patches/patch-ae b/games/xconq/patches/patch-ae
index e43077bbb11..08a77118be2 100644
--- a/games/xconq/patches/patch-ae
+++ b/games/xconq/patches/patch-ae
@@ -1,22 +1,15 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
+$NetBSD: patch-ae,v 1.2 2000/08/31 07:26:24 kleink Exp $
 
---- x11/Makefile.in.orig	Tue Apr 21 05:21:21 1998
-+++ x11/Makefile.in	Wed Jun  9 00:38:37 1999
-@@ -11,7 +11,7 @@
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- libdir = $(exec_prefix)/lib
--datadir = $(prefix)/lib/xconqdir
-+datadir = $(prefix)/share/xconq
- mandir = $(prefix)/man
- man6dir = $(mandir)/man6
- infodir = $(prefix)/info
-@@ -35,7 +35,7 @@
- SHELL = /bin/sh
+--- doc/xconq.texi.orig	Thu Jun  8 14:28:31 2000
++++ doc/xconq.texi	Wed Aug 30 21:59:50 2000
+@@ -8,6 +8,10 @@
+ @setchapternewpage odd
  
- INSTALL = install -c
--INSTALL_PROGRAM = $(INSTALL)
-+INSTALL_PROGRAM = $(INSTALL) -s
- INSTALL_DATA = $(INSTALL)
+ @ifinfo
++@dircategory Games
++@direntry
++* Xconq: (xconq.info).		The Penultimate Strategy Game.
++@end direntry
+ This file documents how to play the strategy game @i{Xconq}.
  
- CC = cc
+ Copyright (C) 1987-1989, 1991-2000 Stanley T. Shebs
diff --git a/games/xconq/patches/patch-af b/games/xconq/patches/patch-af
index e054e8d9fae..d25697bb4d2 100644
--- a/games/xconq/patches/patch-af
+++ b/games/xconq/patches/patch-af
@@ -1,13 +1,15 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
+$NetBSD: patch-af,v 1.2 2000/08/31 07:26:24 kleink Exp $
 
---- kernel/Makefile.in.orig	Wed May 13 15:04:16 1998
-+++ kernel/Makefile.in	Wed Jun  9 00:33:13 1999
-@@ -11,7 +11,7 @@
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- libdir = $(exec_prefix)/lib
--datadir = $(prefix)/lib/xconqdir
-+datadir = $(prefix)/share/xconq
- mandir = $(prefix)/man
- man6dir = $(mandir)/man6
- infodir = $(prefix)/info
+--- doc/hacking.texi.orig	Thu Jun  8 14:28:31 2000
++++ doc/hacking.texi	Wed Aug 30 22:02:20 2000
+@@ -8,6 +8,10 @@
+ @setchapternewpage odd
+ 
+ @ifinfo
++@dircategory Games
++@direntry
++* Hacking: (hacking.info).	Hacking Xconq.
++@end direntry
+ This file documents the internals of @i{Xconq}.
+ 
+ Copyright (C) 1987-1989, 1991-2000 Stanley T. Shebs
diff --git a/games/xconq/patches/patch-ag b/games/xconq/patches/patch-ag
deleted file mode 100644
index 8899e336c92..00000000000
--- a/games/xconq/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
-
---- Makefile.in.orig	Sun Feb 22 01:26:25 1998
-+++ Makefile.in	Wed Jun  9 00:54:07 1999
-@@ -11,7 +11,7 @@
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- libdir = $(exec_prefix)/lib
--datadir = $(prefix)/lib/xconqdir
-+datadir = $(prefix)/share/xconq
- mandir = $(prefix)/man
- man6dir = $(mandir)/man6
- infodir = $(prefix)/info
diff --git a/games/xconq/patches/patch-ah b/games/xconq/patches/patch-ah
deleted file mode 100644
index b2ecf6b8723..00000000000
--- a/games/xconq/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
-
---- lib/Makefile.in.orig	Sun Feb 22 01:13:49 1998
-+++ lib/Makefile.in	Wed Jun  9 00:59:00 1999
-@@ -11,7 +11,7 @@
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- libdir = $(exec_prefix)/lib
--datadir = $(prefix)/lib/xconqdir
-+datadir = $(prefix)/share/xconq
- mandir = $(prefix)/man
- man6dir = $(mandir)/man6
- infodir = $(prefix)/info
diff --git a/games/xconq/patches/patch-ai b/games/xconq/patches/patch-ai
deleted file mode 100644
index 8065dbb0ffd..00000000000
--- a/games/xconq/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
-
---- doc/xcdesign.texi.orig	Thu Apr  9 05:15:19 1998
-+++ doc/xcdesign.texi	Wed Jun  9 01:12:33 1999
-@@ -11,6 +11,10 @@
- @setchapternewpage odd
- 
- @ifinfo
-+@dircategory Games
-+@direntry
-+* Xcdesign: (xcdesign.info).	Designing Games with Xconq.
-+@end direntry
- This file documents the design of games for @i{Xconq}.
- 
- Copyright (C) 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 Stanley T. Shebs
diff --git a/games/xconq/patches/patch-aj b/games/xconq/patches/patch-aj
deleted file mode 100644
index 0c4324f862e..00000000000
--- a/games/xconq/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
-
---- doc/xconq.texi.orig	Thu Apr  9 05:12:56 1998
-+++ doc/xconq.texi	Wed Jun  9 01:13:42 1999
-@@ -11,6 +11,10 @@
- @setchapternewpage odd
- 
- @ifinfo
-+@dircategory Games
-+@direntry
-+* Xconq: (xconq.info).		The Penultimate Strategy Game.
-+@end direntry
- This file documents how to play the strategy game @i{Xconq}.
- 
- Copyright (C) 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 Stanley T. Shebs
diff --git a/games/xconq/pkg/COMMENT b/games/xconq/pkg/COMMENT
index a86612ef026..cb041c88ad1 100644
--- a/games/xconq/pkg/COMMENT
+++ b/games/xconq/pkg/COMMENT
@@ -1 +1 @@
-X11 empire-building strategy game, with game design language
+Xconq is a general strategy game system.
diff --git a/games/xconq/pkg/DESCR b/games/xconq/pkg/DESCR
index ce9dab353ab..be6e87b19c0 100644
--- a/games/xconq/pkg/DESCR
+++ b/games/xconq/pkg/DESCR
@@ -1,12 +1,4 @@
-Xconq is an Empire-type strategy game, where players contest for world
-domination.  In the standard game, each player (there may be up to 31)
-starts with a handful of towns and cities, and may build infantry,
-armor, airplanes, and a variety of ships.  Each side's movements are
-hidden; speed and surprise are important.  Any or all sides may be
-played by the computer.  In addition to the standard game, Xconq
-includes a game design language (GDL) that can be used to define a
-wide variety of games. Games already in the distribution's library
-include everything from basic combat to elaborate world models, with
-time periods ranging from ancient history into the distant future.
-Xconq has a huge number of features, and a lengthy manual describing
-them.
+Xconq is a general strategy game system.  It is a complete system that
+includes all the components: a portable engine, graphical interfaces
+for Unix/Linux/X11, Macintosh, and Windows, multiple AIs, networking
+for multi-player games, and an extensive game library.
diff --git a/games/xconq/pkg/PLIST b/games/xconq/pkg/PLIST
index db6b907e737..0cdef886e29 100644
--- a/games/xconq/pkg/PLIST
+++ b/games/xconq/pkg/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
-bin/cconq
+@comment $NetBSD: PLIST,v 1.2 2000/08/31 07:26:25 kleink Exp $
 bin/imf2x
 bin/x2imf
 bin/xconq
-bin/xshowimf
+bin/ximfapp
+@unexec install-info --delete %D/info/hacking.info %D/info/dir
 @unexec install-info --delete %D/info/xcdesign.info %D/info/dir
 @unexec install-info --delete %D/info/xconq.info %D/info/dir
+info/hacking.info
 info/xcdesign.info
 info/xcdesign.info-1
 info/xcdesign.info-10
@@ -26,27 +27,65 @@ info/xconq.info-2
 info/xconq.info-3
 info/xconq.info-4
 info/xconq.info-5
+info/xconq.info-6
+@exec install-info %D/info/hacking.info %D/info/dir
 @exec install-info %D/info/xcdesign.info %D/info/dir
 @exec install-info %D/info/xconq.info %D/info/dir
-lib/X11/app-defaults/Xconq
-lib/X11/app-defaults/Xconq-color
-lib/X11/app-defaults/XShowimf
-lib/X11/app-defaults/XShowimf-color
-man/man6/cconq.6
 man/man6/xconq.6
+share/xconq/imfapp.tcl
+share/xconq/tkconq.tcl
+share/xconq/images/advt24x26.gif
+share/xconq/images/advt32x32.gif
+share/xconq/images/advt44x48.gif
+share/xconq/images/animals32.gif
+share/xconq/images/beach44x48.gif
+share/xconq/images/civmisc.gif
+share/xconq/images/civt44x48.gif
+share/xconq/images/cliff44x48.gif
+share/xconq/images/dirt24x26.gif
+share/xconq/images/dirt44x48.gif
+share/xconq/images/dwellings32.gif
+share/xconq/images/eur44x48.gif
+share/xconq/images/river24x26.gif
+share/xconq/images/river44x48.gif
+share/xconq/images/river88x96.gif
+share/xconq/images/riverc24x26.gif
+share/xconq/images/riverc44x48.gif
+share/xconq/images/road24x26.gif
+share/xconq/images/road44x48.gif
+share/xconq/images/rr24x26.gif
+share/xconq/images/sea.gif
+share/xconq/images/rr44x48.gif
+share/xconq/images/settlers.gif
+share/xconq/images/splash.gif
+share/xconq/images/stdt24x26.gif
+share/xconq/images/stdt44x48.gif
+share/xconq/images/stdta88x96.gif
+share/xconq/images/stdtb88x96.gif
+share/xconq/images/tran24x26.gif
+share/xconq/images/tran44x48.gif
+share/xconq/images/tran88x96.gif
+share/xconq/images/trident.gif
+@dirrm share/xconq/images
 share/xconq/lib/1756.g
 share/xconq/lib/1757.g
 share/xconq/lib/1805.g
+share/xconq/lib/advances.g
+share/xconq/lib/advterr.g
 share/xconq/lib/africa-1850.g
 share/xconq/lib/africa.g
 share/xconq/lib/aircraft.imf
+share/xconq/lib/anc-near-east.g
+share/xconq/lib/ancient.g
 share/xconq/lib/ancient.imf
 share/xconq/lib/animals.imf
 share/xconq/lib/arms.imf
 share/xconq/lib/beirut.g
+share/xconq/lib/blasts.imf
 share/xconq/lib/cave.g
 share/xconq/lib/cherbourg.g
 share/xconq/lib/chess.g
+share/xconq/lib/civ2.g
 share/xconq/lib/classic.g
 share/xconq/lib/cobra.g
 share/xconq/lib/colors.imf
@@ -79,8 +118,10 @@ share/xconq/lib/imf.dir
 share/xconq/lib/insects.g
 share/xconq/lib/insects.imf
 share/xconq/lib/intro.g
+share/xconq/lib/lhs.g
+share/xconq/lib/lhsunit.g
 share/xconq/lib/magellan.g
-share/xconq/lib/magnusvew.g
+share/xconq/lib/magnuszew.g
 share/xconq/lib/mars.g
 share/xconq/lib/metz-1944.g
 share/xconq/lib/midway.g
@@ -95,19 +136,22 @@ share/xconq/lib/napoleon.g
 share/xconq/lib/nat-names.g
 share/xconq/lib/neurope.g
 share/xconq/lib/news.txt
+share/xconq/lib/ng-african.g
 share/xconq/lib/ng-american.g
+share/xconq/lib/ng-asian.g
 share/xconq/lib/ng-chinese.g
 share/xconq/lib/ng-english.g
+share/xconq/lib/ng-european.g
+share/xconq/lib/ng-features.g
 share/xconq/lib/ng-german.g
 share/xconq/lib/ng-italian.g
 share/xconq/lib/ng-japanese.g
+share/xconq/lib/ng-misc.g
 share/xconq/lib/ng-nickname.g
 share/xconq/lib/ng-ships.g
 share/xconq/lib/ng-weird.g
 share/xconq/lib/normandy.g
 share/xconq/lib/nw-europe.g
-share/xconq/lib/ob-nor-alld.g
-share/xconq/lib/ob-nor-axis.g
 share/xconq/lib/objects.imf
 share/xconq/lib/old-empire.g
 share/xconq/lib/omaha.g
@@ -130,7 +174,7 @@ share/xconq/lib/simple.g
 share/xconq/lib/space.g
 share/xconq/lib/standard.g
 share/xconq/lib/standard.imf
-share/xconq/lib/std-c.imf
+share/xconq/lib/std-s.imf
 share/xconq/lib/stdterr.g
 share/xconq/lib/stdunit.g
 share/xconq/lib/steppes.g
@@ -139,6 +183,7 @@ share/xconq/lib/t-cent-eur.g
 share/xconq/lib/t-e1-river.g
 share/xconq/lib/t-e50-river.g
 share/xconq/lib/t-eastmed.g
+share/xconq/lib/t-near-east.g
 share/xconq/lib/t-normandy.g
 share/xconq/lib/t-nw-eur.g
 share/xconq/lib/t-pacific.g
@@ -171,12 +216,8 @@ share/xconq/lib/ww2-div-pac.g
 share/xconq/lib/ww2-eur-42.g
 share/xconq/lib/ww2-pac-41.g
 share/xconq/lib/ww2-sides.g
-share/xconq/lib/ww2-stdunit.g
 share/xconq/lib/ww2s-42.g
 share/xconq/lib/ww2s-eur-42.g
 share/xconq/lib/ww2s-pac-41.g
 @dirrm share/xconq/lib
-share/xconq/lib-x11/README
-@dirrm share/xconq/lib-x11
-@dirrm share/xconq/scores
 @dirrm share/xconq