Update freeciv-share, freeciv-server, freeciv-client, and freeciv-client-gtk

to 1.12.0.  Major changes from version 1.11.4 include:

 - Big fixes, of course.
 - Better compatibility with Civilization II.
 - Better internationalization.
 - Prettier graphics/tiles.
 - More maps.
 - Players can agree to give shared vision, which means that you
   automatically see everything the other player sees.

7 files changed, 56 insertions, 25 deletions

diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index c8f9ee94ebd..a097c66802f 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/06/29 04:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/15 19:50:30 jlam Exp $
 
-.include "../../games/freeciv-share/Makefile.common"
-
-PKGNAME=		${DISTNAME:S/-/-client-gtk-/}nb1
+PKGNAME=		${DISTNAME:S/-/-client-gtk-/}
 COMMENT=		Freeciv client with GTK+ interface
 
-BUILD_USES_MSGFMT=	# defined
 DEPENDS+=		freeciv-share-${FC_VERS}:../../games/freeciv-share
 
 USE_X11=		# defined
@@ -16,6 +13,8 @@ CONFIGURE_ARGS+=	--disable-make-data
 CONFIGURE_ARGS+=	--enable-client=gtk
 CONFIGURE_ARGS+=	--program-transform-name="s,civclient,civclient-gtk,"
 
+.include "../freeciv-share/Makefile.common"
+
 do-install:
 	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 4324a3a970d..a58febb65f3 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/21 05:06:15 jlam Exp $
-
-.include "../../games/freeciv-share/Makefile.common"
+# $NetBSD: Makefile,v 1.10 2001/08/15 19:50:30 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 COMMENT=		Freeciv client with Xaw interface
@@ -20,11 +18,14 @@ CONFIGURE_ARGS+=	--disable-server
 CONFIGURE_ARGS+=	--disable-make-data
 CONFIGURE_ARGS+=	--enable-client=xaw
 
+XAW_TYPE=3d
+
 .if defined(XAW_TYPE) && (${XAW_TYPE} == "3d")
-.include "../../x11/Xaw3d/buildlink.mk"
 CONFIGURE_ARGS+=	--with-xaw3d
 .endif
 
+.include "../freeciv-share/Makefile.common"
+
 do-install:
 	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 997b9256b64..4ab6cd37350 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/21 05:06:17 jlam Exp $
-
-.include "../../games/freeciv-share/Makefile.common"
+# $NetBSD: Makefile,v 1.12 2001/08/15 19:50:31 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 COMMENT=		Freeciv game server
@@ -15,6 +13,13 @@ USE_BUILDLINK_ONLY=	# defined
 USE_GNU_READLINE=	# uses callback interface of GNU readline
 LIBS+=			-ltermcap
 
+# Uses rl_filename_completion_function() which was introduced to the readline
+# API in version 4.2.
+#
+BUILDLINK_DEPENDS.readline=	readline>=4.2
+
+.include "../freeciv-share/Makefile.common"
+
 do-install:
 	cd ${WRKSRC}/server; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile
index 486664370b8..5da9eca14ba 100644
--- a/games/freeciv-share/Makefile
+++ b/games/freeciv-share/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2001/06/21 05:06:17 jlam Exp $
-
-.include "../../games/freeciv-share/Makefile.common"
+# $NetBSD: Makefile,v 1.6 2001/08/15 19:50:31 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-share-/}
 COMMENT=		Machine independent files for Freeciv
 
 USE_BUILDLINK_ONLY=	# defined
 
+.include "../freeciv-share/Makefile.common"
+
 CONFIGURE_ARGS+=	--disable-server
 CONFIGURE_ARGS+=	--enable-client=no
 
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index d7f1e2cd655..477dd4311fc 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile.common,v 1.9 2001/06/21 05:06:17 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2001/08/15 19:50:31 jlam Exp $
 
 DISTNAME=		freeciv-${FC_VERS}
-FC_VERS=		1.11.4
+FC_VERS=		1.12.0
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.freeciv.org/pub/freeciv/stable/ \
-			http://www.freeciv.org/ftp/stable/
+			http://www.freeciv.org/ftp/stable/ \
+			ftp://ftp.freeciv.org/pub/freeciv/beta/ \
+			http://www.freeciv.org/ftp/beta/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.freeciv.org/
 
 BUILD_USES_MSGFMT=	# defined
+GNU_CONFIGURE=		# defined
 
 DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
 
-GNU_CONFIGURE=		# defined
-#USE_LIBINTL=		# defined
-
 .include "../../devel/gettext-lib/buildlink.mk"
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index d8fac429174..b84fcdbc9ab 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/05/02 16:34:58 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/15 19:50:31 jlam Exp $
 
-SHA1 (freeciv-1.11.4.tar.bz2) = 7460fe54cfee3223621b632e446ed340eacbe874
-Size (freeciv-1.11.4.tar.bz2) = 2599232 bytes
+SHA1 (freeciv-1.12.0.tar.bz2) = 3493b30c49b2dc2cb445199bd2bc4d4b4584829f
+Size (freeciv-1.12.0.tar.bz2) = 4103241 bytes
diff --git a/games/freeciv-share/pkg/PLIST b/games/freeciv-share/pkg/PLIST
index a0159cd708c..c9dcca9c006 100644
--- a/games/freeciv-share/pkg/PLIST
+++ b/games/freeciv-share/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/05/02 16:34:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/08/15 19:50:31 jlam Exp $
 share/freeciv/Freeciv
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
@@ -40,6 +40,20 @@ share/freeciv/engels/units.xpm
 share/freeciv/engels_shields.tilespec
 share/freeciv/freeciv.rc
 share/freeciv/helpdata.txt
+share/freeciv/hires.tilespec
+share/freeciv/hires/cities.spec
+share/freeciv/hires/cities.xpm
+share/freeciv/hires/icons.spec
+share/freeciv/hires/icons.xpm
+share/freeciv/hires/nuke.spec
+share/freeciv/hires/nuke.xpm
+share/freeciv/hires/terrain1.spec
+share/freeciv/hires/terrain1.xpm
+share/freeciv/hires/terrain2.spec
+share/freeciv/hires/terrain2.xpm
+share/freeciv/hires/tiles.spec
+share/freeciv/hires/units.spec
+share/freeciv/hires/units.xpm
 share/freeciv/misc/chiefs.spec
 share/freeciv/misc/chiefs.xpm
 share/freeciv/misc/intro.xpm
@@ -64,8 +78,11 @@ share/freeciv/nation/boer.ruleset
 share/freeciv/nation/brazilian.ruleset
 share/freeciv/nation/canadian.ruleset
 share/freeciv/nation/carthaginian.ruleset
+share/freeciv/nation/catalan.ruleset
+share/freeciv/nation/chilean.ruleset
 share/freeciv/nation/chinese.ruleset
 share/freeciv/nation/cornish.ruleset
+share/freeciv/nation/croatian.ruleset
 share/freeciv/nation/czech.ruleset
 share/freeciv/nation/danish.ruleset
 share/freeciv/nation/dunedain.ruleset
@@ -100,7 +117,11 @@ share/freeciv/nation/portuguese.ruleset
 share/freeciv/nation/roman.ruleset
 share/freeciv/nation/russian.ruleset
 share/freeciv/nation/scottish.ruleset
+share/freeciv/nation/serbian.ruleset
+share/freeciv/nation/silesian.ruleset
+share/freeciv/nation/singaporean.ruleset
 share/freeciv/nation/sioux.ruleset
+share/freeciv/nation/slovenian.ruleset
 share/freeciv/nation/spanish.ruleset
 share/freeciv/nation/swedish.ruleset
 share/freeciv/nation/thai.ruleset
@@ -110,6 +131,7 @@ share/freeciv/nation/vietnamese.ruleset
 share/freeciv/nation/viking.ruleset
 share/freeciv/nation/welsh.ruleset
 share/freeciv/nation/zulu.ruleset
+share/freeciv/scenario/british-isles-80x76-v2.51.sav
 share/freeciv/scenario/earth-160x90-v1.sav
 share/freeciv/scenario/earth-160x90-v2.sav
 share/freeciv/scenario/earth-80x50-v1.sav
@@ -136,17 +158,21 @@ ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/freeciv.mo
 @dirrm share/freeciv/trident
 @dirrm share/freeciv/scenario
 @dirrm share/freeciv/nation
 @dirrm share/freeciv/misc
+@dirrm share/freeciv/hires
 @dirrm share/freeciv/engels
 @dirrm share/freeciv/default
 @dirrm share/freeciv/classic