Update xconq to release 7.4.1. Notable changes include:

*** 7.4.1

The Windows port has not been built, and probably won't build without
some work, because of networking changes in shared Windows/Unix code.

Made cconq build again.

*** 7.4.0

Hans Ronne contributed a new Tolkien-inspired game "Lord of the Rings"
(lord-rings.g), and its supporting modules 3rd-age.g and t-midearth.g.

Keir Novik's "Carrier Battles" (tailhook.g), a detailed game of WWII
naval combat, and "Coral Sea", a Coral Sea scenario for it, are now
part of the game library.

Erik Sigra and Michael Burschik contributed better random name
generators, for Swedish and German place names respectively.

Standard flags now include 16-pixel-wide versions, and the 8-pixel
version use more colors.

The program tracks views of units using individual objects, which
enables more accurate display of multiple enemy units stacked at a
single location.

Networked games can be started from a mix of interactive and
command-line invocations.  The game module will not be downloaded
through the network connection, which makes startup faster.

Some unused and un-useful GDL constructs are gone, such as extension
properties, program-version, and image palettes.

The program supplies more feedback on why actions and tasks fail.

There is a "new" AI type named oplayer, which is just the previous
version of the AI.  This is mainly for testing that the AI is actually
getting smarter rather than dumber.

There is now more control available for the behavior of independent
units, for instance, you can set whether they will research and build
other units.

Sides now get colors instead of numbers if they have no emblems.

Games can use unit images that fill an entire hex, where previously
they were limited to a smaller bounding box within the hex.  This
is controlled by a new GDL variable "bigicons".

The tcl/tk interface now has a working isometric display mode.

The tcl/tk interface now lists only finished games by default,
and includes a button to list all games.

The Mac interface has many display improvements, from terrain
transitions to more floating windows.

The old Xt/Xaw interface has been removed, since it was no longer
being maintained.

There have been a host of minor improvements throughout the programs
and game libraries.

5 files changed, 29 insertions, 16 deletions

diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 09e0164051a..90739467d06 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2000/09/09 01:53:03 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/02 14:57:38 kleink Exp $
 
-DISTNAME=		xconq-7.3.3
+DISTNAME=		xconq-7.4.1
 CATEGORIES=		games x11
 MASTER_SITES=		ftp://sources.redhat.com/pub/xconq/
 
diff --git a/games/xconq/files/md5 b/games/xconq/files/md5
index 9230074ab89..e39dda0ca20 100644
--- a/games/xconq/files/md5
+++ b/games/xconq/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/08/31 07:26:23 kleink Exp $
+$NetBSD: md5,v 1.3 2001/01/02 14:57:38 kleink Exp $
 
-MD5 (xconq-7.3.3.tar.gz) = 7e14ddf2b3846d989dc8d6af91c32fb7
+MD5 (xconq-7.4.1.tar.gz) = c266e182c8f3454730ec4314e5d7b8aa
diff --git a/games/xconq/files/patch-sum b/games/xconq/files/patch-sum
index b665ff3262b..9cee900243d 100644
--- a/games/xconq/files/patch-sum
+++ b/games/xconq/files/patch-sum
@@ -1,8 +1,9 @@
-$NetBSD: patch-sum,v 1.3 2000/09/09 01:53:03 wiz Exp $
+$NetBSD: patch-sum,v 1.4 2001/01/02 14:57:38 kleink Exp $
 
 MD5 (patch-aa) = 7e8ab17b8c65059c7b2d4a58c029b46d
 MD5 (patch-ab) = d08df8f64544b021ddfea3ba50ac26a5
-MD5 (patch-ac) = 0e82d38d6852da6d0183d417f907b5e6
+MD5 (patch-ac) = 74b490dee3dc188ed4058b1e29985554
 MD5 (patch-ad) = 74658bc3a1587b2bfd0752864a1fbd60
 MD5 (patch-ae) = 1563f3454d12157cdcf2cea342f2beae
 MD5 (patch-af) = 4e9a27c6efdace8e98540b161aabea27
+MD5 (patch-ag) = 3a9a911ec6ec849f44f3becfabc8b808
diff --git a/games/xconq/patches/patch-ac b/games/xconq/patches/patch-ac
index b8c55cebbed..95ddddc084e 100644
--- a/games/xconq/patches/patch-ac
+++ b/games/xconq/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2000/09/09 01:53:04 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2001/01/02 14:57:38 kleink Exp $
 
 --- x11/Makefile.in.orig	Mon Jun 19 17:36:18 2000
 +++ x11/Makefile.in
@@ -60,12 +60,3 @@ $NetBSD: patch-ac,v 1.3 2000/09/09 01:53:04 wiz Exp $
  
  .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-ag b/games/xconq/patches/patch-ag
new file mode 100644
index 00000000000..2fa7ee52d12
--- /dev/null
+++ b/games/xconq/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.3 2001/01/02 14:57:39 kleink Exp $ 
+
+--- doc/refman.texi.orig	Sat Nov 25 16:59:16 2000
++++ doc/refman.texi	Tue Jan  2 15:33:05 2001
+@@ -4456,7 +4456,7 @@
+ (reject @var{rule-body} string-or-sym ...)
+ symbol
+ string
+-@end deffn
++@end example
+ 
+ The generation process for @code{or} works by substituting one of the
+ rule's alternatives for the symbol.  The probability of an alternative
+@@ -4473,6 +4473,7 @@
+ side in any rule, then it will be handled as a string, otherwise it will
+ be expanded in turn.  If the symbol matches a namer's name, then that
+ namer will be run and its result incorporated.
++@end deffn
+ 
+ @deffn GlobalConstant @code{or}
+ This designates a list of alternatives.