Update freeciv to 1.11.4.

WHAT'S CHANGED SINCE 1.11.0:

 - Readline support added to the server.
 - May now disperse initial units over specified area.  See "dispersion"
   server option.
 - May now arrange for first client to connect to have a higher cmdlevel
   than the following clients.  See "cmdlevel" server option.
 - Save files now transparently (un)compressed when (loaded) saved.
 - Now requires a minimum number of ocean tiles to be adjacent to a land
   tile wished to be transformed into ocean.  Default is 1.
 - Added Nuclear Fallout.  Industrialization and population still
   generate Pollution.  Dropping a Nuke generates Nuclear Fallout, which
   is distinct from Pollution.  There is a new command to clean Fallout
   vs. cleaning Pollution.  Fallout contributes to Nuclear Winter --
   which also changes terrain, but tends to Desert, Tundra and Glacier.
   Added a new "cooling" icon to the info area to indicate the progress
   towards Nuclear Winter, and also an icon for Fallout on the main map.
   AIs are now more aggressive at cleaning up Pollution, but not Fallout.
 - Ported to OpenVMS.
 - Moved most of the dependencies on the "civstyle" server option to
   separate values in game.ruleset files.
 - Fixed bugs in "turns to build" displays.
 - Fixed bug whereby Diplomat/Spy investigations of cities did not
   reveal the correct supported and present unit lists.
 - Fixed multiple bugs in go-to code.
 - Fixed bug where starting a revolution, saving the game and restarting
   the server would allow switching governments without anarchy.
 - Fix bug that you could paradrop into cities you were at war with even
   if they contained enemy units.

WHAT'S CHANGED SINCE 1.10.0:

 - Internationalization extended.  Still needs improvement.
   Current localizations: de en_GB es fr hu ja nl no pl pt pt_BR ru.
 - Added full Fog of War.  Controlled by "fogofwar" server option.
 - Added explicit Diplomatic States between civilizations: war, neutral,
   no-contact, cease-fire peace and alliance.
 - Allow terrain changes to/from land/ocean.  Default ruleset allows
   Engineers to Transform Swamp to Ocean and Ocean to Swamp.  Also
   allows Forest to be Mined into Swamp.
 - Increased maximum number of players to 30.
 - Fortifying now takes a turn to complete (like Civ1/2).
 - Added correct Civ2 style of Apollo wonder (shows entire map, rather
   than just cities).  Selected by "civstyle" server option.
 - Aggressive sea units no longer cause unhappiness when in a city.
 - Added Civ2 rule that firepower is reduced to 1 for both the defender
   and the attacker when a ship bombards a land unit.
 - When changing current research, if user changes back to what was being
   researched, the penalty is not applied (you keep all your bulbs).
 - Added pop-up of more details when clicking on info box in GTK+ client.
 - Improved the global warming danger indicator.
 - Added warning of incipient city growth.
 - The server "remove <player>" command is no longer available after the
   game has started.
 - Added "fixedlength" server option to make all turns exactly "timeout"
   duration.
 - The "timeout" time may be much longer (up to a day).
 - Added goto for air units.  If destination is beyond range, they will
   stop in cities/airfields/etc. to get there.
 - May now select a unit by clicking on the unit pile display on the left.
 - Diplomats/Spies moving by goto now do pop-up the Diplomat/Spy command
   dialog when they reach a city.
 - Improved goto algorithm and implementation.
 - Help dialog displays which buildings an advance will obsolete.
 - Optionally show city food/shields/trade productions on main map.
 - Added server option "autotoggle", which toggles AI status on and off
   as players connect and disconnect.
 - Allow Hoover Dam to be built anywhere, to conform to Civ2.
 - Show turns per advance in Science Advisor dialog.
 - Improved map and unit movement drawing code.
 - Added "End Turn when done moving" local option.
 - City production penalties now applied more correctly.
 - Added Sentry and Fortify to Present Units' City Dialog pop-up.
 - More nations added.
 - Added a resource file for the GTK+ client.
 - Improved network code for more reliable connections.
 - Split nations.ruleset into individual <nation>.ruleset files.
 - Extended registry file format to allow including files and overriding
   entries.
 - Added --with-xaw and --enable-client=xaw3d options to ./configure
   script.
 - Lots of bug fixes and code cleanups.

10 files changed, 113 insertions, 45 deletions

diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index 73afc3e1d97..7633f049d41 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/28 00:35:49 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/12 06:34:35 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-gtk-/}
 
-DEPENDS+=		freeciv-share-1.10.0:../../games/freeciv-share
+DEPENDS+=		freeciv-share-${FC_VERS}:../../games/freeciv-share
+DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		imlib-*:../../graphics/imlib
 
@@ -10,8 +11,10 @@ CONFLICTS=		freeciv-client-[0-9]*
 
 USE_X11=		# defined
 
-CONFIGURE_ARGS+=	--disable-server --disable-make-data
+CONFIGURE_ARGS+=	--disable-server
+CONFIGURE_ARGS+=	--disable-make-data
 CONFIGURE_ARGS+=	--enable-client=gtk
+CPPFLAGS+=		-I${LOCALBASE}/include		# libintl.h
 
 do-install:
 	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 5b7eeeee149..c9d80a2f1f4 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2000/04/07 18:43:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/12 06:34:33 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 
-DEPENDS+=		freeciv-share-1.10.0:../../games/freeciv-share
+DEPENDS+=		freeciv-share-${FC_VERS}:../../games/freeciv-share
+DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 DEPENDS+=		xpm-*:../../graphics/xpm
 
 CONFLICTS=		freeciv-client-gtk-*
@@ -12,8 +13,10 @@ USE_X11=		# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--disable-server --disable-make-data
+CONFIGURE_ARGS+=	--disable-server
+CONFIGURE_ARGS+=	--disable-make-data
 CONFIGURE_ARGS+=	--enable-client=xaw
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 .if defined(XAW_TYPE) && (${XAW_TYPE} == "3d")
 CONFIGURE_ARGS+=	--with-xaw3d
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 03d9fd250af..61bf79e8049 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,10 +1,18 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/28 00:34:33 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/12 06:34:36 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 
-DEPENDS+=		freeciv-share-1.10.0:../../games/freeciv-share
+DEPENDS+=		freeciv-share-${FC_VERS}:../../games/freeciv-share
+DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
+DEPENDS+=		readline-*:../../devel/readline
 
-CONFIGURE_ARGS+=	--enable-client=no --disable-make-data
+CONFIGURE_ARGS+=	--enable-client=no
+CONFIGURE_ARGS+=	--disable-make-data
+CONFIGURE_ARGS+=	--with-readline
+CONFIGURE_ENV+=		LIBS="${LIBS}"
+
+CPPFLAGS+=		-I${LOCALBASE}/include		# libintl.h, readline.h
+LIBS+=			-ltermcap
 
 do-install:
 	cd ${WRKSRC}/server; ${SETENV} ${MAKE_ENV} \
diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile
index ccade30181d..9c3da346235 100644
--- a/games/freeciv-share/Makefile
+++ b/games/freeciv-share/Makefile
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/28 00:33:37 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/12 06:34:36 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-share-/}
 
-CONFIGURE_ARGS+=	--disable-server --enable-client=no
+BUILD_DEPENDS+=		${LOCALBASE}/include/libintl.h:../../devel/gettext
+
+CONFIGURE_ARGS+=	--disable-server
+CONFIGURE_ARGS+=	--enable-client=no
+CPPFLAGS+=		-I${LOCALBASE}/include		# libintl.h
 
 .include "../../games/freeciv-share/Makefile.common"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index eda8d157fc5..09ff4385e3f 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.2 2000/03/28 06:28:28 tron Exp $
+# $NetBSD: Makefile.common,v 1.3 2000/08/12 06:34:38 jlam Exp $
 
-DISTNAME=		freeciv-1.10.0
+DISTNAME=		freeciv-${FC_VERS}
+FC_VERS=		1.11.4
 CATEGORIES=		games
-MASTER_SITES=		ftp://ftp.freeciv.org/pub/freeciv/stable_version/ \
-			http://www.freeciv.org/ftp/stable_version/
+MASTER_SITES=		ftp://ftp.freeciv.org/pub/freeciv/stable/ \
+			http://www.freeciv.org/ftp/stable/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.freeciv.org/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
-DEPENDS+=		gettext-0.10.*:../../devel/gettext
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
 FILESDIR=		${.CURDIR}/../../games/freeciv-share/files
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
@@ -18,9 +18,7 @@ PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
 GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
-CPPFLAGS+=		-I${LOCALBASE}/include		# intl.h
-
 pre-configure:
-	cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf
+	cd ${WRKSRC} && autoreconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-share/files/md5 b/games/freeciv-share/files/md5
index 718e3926aae..70648392bd0 100644
--- a/games/freeciv-share/files/md5
+++ b/games/freeciv-share/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/03/28 00:33:37 jlam Exp $
+$NetBSD: md5,v 1.2 2000/08/12 06:34:39 jlam Exp $
 
-MD5 (freeciv-1.10.0.tar.bz2) = eea2dbb9f5dfed5f33f59845b56be506
+MD5 (freeciv-1.11.4.tar.bz2) = 06e495a5b34daa556e6a1cd5b85dab19
diff --git a/games/freeciv-share/files/patch-sum b/games/freeciv-share/files/patch-sum
index 7c3dfa866c7..d83e06edb98 100644
--- a/games/freeciv-share/files/patch-sum
+++ b/games/freeciv-share/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/03/28 00:33:37 jlam Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/12 06:34:40 jlam Exp $
 
-MD5 (patch-aa) = 3a22a8779b6a31902d1c6b446708c296
-MD5 (patch-ab) = 0afa30243c5d1b003ea65c9aa869116e
+MD5 (patch-aa) = 457e48c4eed9fc1dfd1732c2c6a70a87
diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
index e4aefd808ac..151351c9924 100644
--- a/games/freeciv-share/patches/patch-aa
+++ b/games/freeciv-share/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/03/28 00:33:37 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/12 06:34:41 jlam Exp $
 
---- configure.in.orig	Mon Feb 21 13:44:28 2000
-+++ configure.in	Sun Mar 26 14:08:42 2000
-@@ -136,6 +136,11 @@
- ALL_LINGUAS="de en_GB es fr hu no pl pt pt_BR ru"
- AM_GNU_GETTEXT
+--- configure.in.orig	Thu Jul 20 13:26:32 2000
++++ configure.in	Fri Aug 11 21:39:28 2000
+@@ -164,6 +164,11 @@
+     LIBS="-lintl  $LIBS"
+ fi
  
 +dnl NetBSD: set DATADIRNAME to "share"
 +DATADIRNAME="share"
diff --git a/games/freeciv-share/patches/patch-ab b/games/freeciv-share/patches/patch-ab
deleted file mode 100644
index 0bdabd8a481..00000000000
--- a/games/freeciv-share/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/03/28 00:33:37 jlam Exp $
-
---- po/Makefile.in.in.orig	Sat Jul 17 04:46:56 1999
-+++ po/Makefile.in.in	Sun Mar 26 13:56:41 2000
-@@ -120,7 +120,7 @@
- 	  cat=`basename $$cat`; \
- 	  case "$$cat" in \
- 	    *.gmo) destdir=$(gnulocaledir);; \
--	    *)     destdir=$(localedir);; \
-+	    *)     destdir=$(gnulocaledir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/games/freeciv-share/pkg/PLIST b/games/freeciv-share/pkg/PLIST
index 5900da4e41d..264d82c05ab 100644
--- a/games/freeciv-share/pkg/PLIST
+++ b/games/freeciv-share/pkg/PLIST
@@ -1,13 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/03/28 00:33:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/12 06:34:47 jlam Exp $
 share/freeciv/Freeciv
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
+share/freeciv/civ1/game.ruleset
 share/freeciv/civ1/governments.ruleset
+share/freeciv/civ1/nations.ruleset
 share/freeciv/civ1/techs.ruleset
 share/freeciv/civ1/terrain.ruleset
 share/freeciv/civ1/units.ruleset
 share/freeciv/civ2.serv
 share/freeciv/civ2/buildings.ruleset
+share/freeciv/civ2/game.ruleset
 share/freeciv/civ2/governments.ruleset
 share/freeciv/civ2/techs.ruleset
 share/freeciv/civ2/terrain.ruleset
@@ -15,6 +18,7 @@ share/freeciv/civ2/units.ruleset
 share/freeciv/classic/terrain.ruleset
 share/freeciv/default/buildings.ruleset
 share/freeciv/default/cities.ruleset
+share/freeciv/default/game.ruleset
 share/freeciv/default/governments.ruleset
 share/freeciv/default/nations.ruleset
 share/freeciv/default/techs.ruleset
@@ -34,6 +38,7 @@ share/freeciv/engels/tiles.xpm
 share/freeciv/engels/units.spec
 share/freeciv/engels/units.xpm
 share/freeciv/engels_shields.tilespec
+share/freeciv/freeciv.rc
 share/freeciv/helpdata.txt
 share/freeciv/misc/chiefs.spec
 share/freeciv/misc/chiefs.xpm
@@ -47,6 +52,64 @@ share/freeciv/misc/space.spec
 share/freeciv/misc/space.xpm
 share/freeciv/misc/treaty.spec
 share/freeciv/misc/treaty.xpm
+share/freeciv/nation/american.ruleset
+share/freeciv/nation/arab.ruleset
+share/freeciv/nation/argentine.ruleset
+share/freeciv/nation/australian.ruleset
+share/freeciv/nation/aztec.ruleset
+share/freeciv/nation/babylonian.ruleset
+share/freeciv/nation/barbarian.ruleset
+share/freeciv/nation/bavarian.ruleset
+share/freeciv/nation/boer.ruleset
+share/freeciv/nation/brazilian.ruleset
+share/freeciv/nation/canadian.ruleset
+share/freeciv/nation/carthaginian.ruleset
+share/freeciv/nation/chinese.ruleset
+share/freeciv/nation/cornish.ruleset
+share/freeciv/nation/czech.ruleset
+share/freeciv/nation/danish.ruleset
+share/freeciv/nation/dunedain.ruleset
+share/freeciv/nation/dutch.ruleset
+share/freeciv/nation/egyptian.ruleset
+share/freeciv/nation/english.ruleset
+share/freeciv/nation/estonian.ruleset
+share/freeciv/nation/filipino.ruleset
+share/freeciv/nation/finnish.ruleset
+share/freeciv/nation/french.ruleset
+share/freeciv/nation/german.ruleset
+share/freeciv/nation/greek.ruleset
+share/freeciv/nation/hungarian.ruleset
+share/freeciv/nation/inca.ruleset
+share/freeciv/nation/indian.ruleset
+share/freeciv/nation/irish.ruleset
+share/freeciv/nation/israeli.ruleset
+share/freeciv/nation/italian.ruleset
+share/freeciv/nation/japanese.ruleset
+share/freeciv/nation/kenyan.ruleset
+share/freeciv/nation/korean.ruleset
+share/freeciv/nation/krevi.ruleset
+share/freeciv/nation/latvian.ruleset
+share/freeciv/nation/lithuanian.ruleset
+share/freeciv/nation/misc_cities.ruleset
+share/freeciv/nation/mongol.ruleset
+share/freeciv/nation/mordor.ruleset
+share/freeciv/nation/olympic.ruleset
+share/freeciv/nation/persian.ruleset
+share/freeciv/nation/polish.ruleset
+share/freeciv/nation/portuguese.ruleset
+share/freeciv/nation/roman.ruleset
+share/freeciv/nation/russian.ruleset
+share/freeciv/nation/scottish.ruleset
+share/freeciv/nation/sioux.ruleset
+share/freeciv/nation/spanish.ruleset
+share/freeciv/nation/swedish.ruleset
+share/freeciv/nation/thai.ruleset
+share/freeciv/nation/turk.ruleset
+share/freeciv/nation/ukrainian.ruleset
+share/freeciv/nation/vietnamese.ruleset
+share/freeciv/nation/viking.ruleset
+share/freeciv/nation/welsh.ruleset
+share/freeciv/nation/zulu.ruleset
 share/freeciv/scenario/earth-160x90-v1.sav
 share/freeciv/scenario/earth-160x90-v2.sav
 share/freeciv/scenario/earth-80x50-v1.sav
@@ -73,6 +136,8 @@ share/locale/en_GB/LC_MESSAGES/freeciv.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
 share/locale/fr/LC_MESSAGES/freeciv.mo
 share/locale/hu/LC_MESSAGES/freeciv.mo
+share/locale/ja/LC_MESSAGES/freeciv.mo
+share/locale/nl/LC_MESSAGES/freeciv.mo
 share/locale/no/LC_MESSAGES/freeciv.mo
 share/locale/pl/LC_MESSAGES/freeciv.mo
 share/locale/pt/LC_MESSAGES/freeciv.mo
@@ -80,6 +145,7 @@ share/locale/pt_BR/LC_MESSAGES/freeciv.mo
 share/locale/ru/LC_MESSAGES/freeciv.mo
 @dirrm share/freeciv/trident
 @dirrm share/freeciv/scenario
+@dirrm share/freeciv/nation
 @dirrm share/freeciv/misc
 @dirrm share/freeciv/engels
 @dirrm share/freeciv/default