Changes 1.14.1:

 - The GTK+-2.0 client is now built by default.
 - Lots of improvements to the GTK+-2.0 client.
 - The GTK+-2.0 client should now compile for Win32.
 - Teams are supported.
 - Civserver now works on UTF-8 locales.
 - Lots of bug fixes.

7 files changed, 50 insertions, 56 deletions

diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index 6a7fb8566f9..f4cdb812ea5 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/05 12:09:35 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-client-gtk-/}
-PKGREVISION=		3
-COMMENT=		Freeciv client with GTK+ interface
+PKGNAME=	${DISTNAME:S/-/-client-gtk-/}
+COMMENT=	Freeciv client with GTK+ interface
 
-DEPENDS+=		freeciv-share>=${FC_VERS}:../../games/freeciv-share
-DEPENDS+=		freeciv-sounds>=2.0:../../games/freeciv-sounds
+DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
+DEPENDS+=	freeciv-sounds>=2.0:../../games/freeciv-sounds
 
-USE_BUILDLINK2=		# defined
-USE_X11=		# defined
+USE_BUILDLINK2=		yes
+USE_X11=		yes
 
-CONFIGURE_ARGS+=	--disable-server
-CONFIGURE_ARGS+=	--disable-make-data
+CONFIGURE_ARGS+=	--disable-server --disable-make-data
 CONFIGURE_ARGS+=	--enable-client=gtk
 CONFIGURE_ARGS+=	--program-transform-name="s,civclient,civclient-gtk,"
 
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 1f64c9c8ab6..76cebc4e1ff 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.17 2003/07/13 17:42:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/05 12:07:51 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-client-/}
-COMMENT=		Freeciv client with Xaw interface
+PKGNAME=	${DISTNAME:S/-/-client-/}
+COMMENT=	Freeciv client with Xaw interface
 
-DEPENDS+=		freeciv-share>=${FC_VERS}:../../games/freeciv-share
-DEPENDS+=		freeciv-sounds>=2.0:../../games/freeciv-sounds
+DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
+DEPENDS+=	freeciv-sounds>=2.0:../../games/freeciv-sounds
 
-CONFLICTS=		freeciv-client-gtk<=1.11.4
+CONFLICTS=	freeciv-client-gtk<=1.11.4
 
-.include "../../mk/bsd.prefs.mk"
-
-USE_BUILDLINK2=		# defined
-USE_X11=		# defined
+USE_BUILDLINK2=		yes
+USE_X11=		yes
 
-CONFIGURE_ARGS+=	--disable-server
-CONFIGURE_ARGS+=	--disable-make-data
+CONFIGURE_ARGS+=	--disable-server --disable-make-data
 CONFIGURE_ARGS+=	--enable-client=xaw
 
+.include "../../mk/bsd.prefs.mk"
+
 .if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
 CONFIGURE_ARGS+=	--with-xaw3d
 .endif
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 287d4b7f6b3..2cb3865b043 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.14 2003/07/13 17:42:39 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/05 12:08:51 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-server-/}
-COMMENT=		Freeciv game server
+PKGNAME=	${DISTNAME:S/-/-server-/}
+COMMENT=	Freeciv game server
 
-DEPENDS+=		freeciv-share>=${FC_VERS}:../../games/freeciv-share
-
-CONFIGURE_ARGS+=	--enable-client=no
-CONFIGURE_ARGS+=	--disable-make-data
-CONFIGURE_ARGS+=	--with-readline
+DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
 
 USE_BUILDLINK2=		# 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.
-#
+CONFIGURE_ARGS+=	--enable-client=no --disable-make-data
+CONFIGURE_ARGS+=	--with-readline
+
+# Uses rl_filename_completion_function() which was introduced in readline-4.2
 BUILDLINK_DEPENDS.readline=	readline>=4.2
 
 .include "../freeciv-share/Makefile.common"
diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile
index 97dd77451da..dd8f0a68163 100644
--- a/games/freeciv-share/Makefile
+++ b/games/freeciv-share/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/13 13:51:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/05 12:06:38 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-share-/}
-PKGREVISION=		1
-COMMENT=		Machine independent files for Freeciv
+PKGNAME=	${DISTNAME:S/-/-share-/}
+COMMENT=	Machine independent files for Freeciv
 
 .include "../freeciv-share/Makefile.common"
 
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index b4d7e34c78d..fd258ee876f 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile.common,v 1.15 2003/07/17 21:38:23 grant Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/03/05 12:06:38 adam Exp $
 
-DISTNAME=		freeciv-${FC_VERS}
-FC_VERS=		1.14.0
-CATEGORIES=		games
-MASTER_SITES=		ftp://ftp.freeciv.org/pub/freeciv/stable/ \
-			http://www.freeciv.org/ftp/stable/ \
-			ftp://ftp.freeciv.org/pub/freeciv/beta/ \
-			http://www.freeciv.org/ftp/beta/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	freeciv-${FC_VERS}
+FC_VERS=	1.14.1
+CATEGORIES=	games
+MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/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=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.freeciv.org/
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.freeciv.org/
 
-BUILD_USES_MSGFMT=	# defined
+BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		# defined
-USE_PKGLOCALEDIR=	# defined
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
 
 DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
diff --git a/games/freeciv-share/PLIST b/games/freeciv-share/PLIST
index d4659798bc6..319608b6b50 100644
--- a/games/freeciv-share/PLIST
+++ b/games/freeciv-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/23 13:18:19 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/03/05 12:06:38 adam Exp $
 share/freeciv/Freeciv
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
@@ -163,6 +163,7 @@ ${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
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/freeciv.mo
 @dirrm share/freeciv/trident
 @dirrm share/freeciv/scenario
 @dirrm share/freeciv/nation
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index 534059a6da4..d46750de2e1 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/02/23 13:18:20 salo Exp $
+$NetBSD: distinfo,v 1.6 2004/03/05 12:06:38 adam Exp $
 
-SHA1 (freeciv-1.14.0.tar.bz2) = 73a7dceb84215194c7beda4712933f5b596784ea
-Size (freeciv-1.14.0.tar.bz2) = 5416607 bytes
+SHA1 (freeciv-1.14.1.tar.bz2) = fc41f5e44eb7be37a4632999a5bd709c4cf975a2
+Size (freeciv-1.14.1.tar.bz2) = 5850722 bytes