Changes 2.0.4:

 - Fix some buffer underruns on the terrain array (this bug could have
   been the cause of arbitrary crashes on some platforms).
 - Don't automatically pop up the city dialog when in observer mode.
 - Treat an alt-left click the same as a middle click, to allow two-button
   mice to work on windows (GTK-2 client).
 - Fix a bug - when a city was transferred/conquered twice the client
   sometimes wouldn't get an update about the second exchange.
 - Fix the behavior of Granary and Pyramids in the Civ2 compatibility ruleset.
 - Fix Pyramids so they are no longer cumulative with Granary.
 - Fix a minor bug that prevented 2.0 savegames from working properly with
   1.14 Freeciv.

Changes 2.0.3:
 - Fix some bugs that show up on 64-bit machines.
 - Fix some bugs with future techs in some situations.
 - Fix some bugs that allowed naval units onto land.
 - Fix a bug that could crash the server when a player picked their nation.
 - Fix a bug with player info not being updated after an alliance is broken.
 - Fix a bug with happiness of a unit's home city when borders change.
 - Fix a bug with happiness of a unit's home city when the unit moves.
 - Fix some bugs with nation starting positions in scenarios.
 - Fix a bug when running the server without stdin input.
 - Don't allow teams to be changed when loading a game.
 - Don't allow observers to vote.
 - Fix a bug with the fallback when generator 3, startpos 3 fails.
 - Fix a crash in the help dialog (when looking at Engineers).
 - Don't popup the caravan dialogs when in observer mode.
 - Fix a crash in goto mode when the mouse is near the map overview window.
 - Fix a bug when a diplomat is killed while the diplomat dialog window is
   in the process of opening.
 - Fix a bug with the diplomat dialog window for spies when you don't have
   an embassy.

3 files changed, 47 insertions, 18 deletions

diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 0772378a579..0a1072aedb0 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,32 +1,22 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/24 10:45:32 adam Exp $
 
 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-sounds>=3.0:../../games/freeciv-sounds
 
 CONFLICTS=	freeciv-client-gtk<=1.11.4
 
-
-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
+CONFIGURE_ARGS+=	--disable-make-data
+CONFIGURE_ARGS+=	--disable-server
 
 .include "../freeciv-share/Makefile.common"
 
-do-install:
-	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
+.include "options.mk"
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-client/PLIST b/games/freeciv-client/PLIST
index 3f8e3fd59b8..200ec31358c 100644
--- a/games/freeciv-client/PLIST
+++ b/games/freeciv-client/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:52:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/08/24 10:45:32 adam Exp $
 bin/civclient
+share/applications/freeciv.desktop
diff --git a/games/freeciv-client/options.mk b/games/freeciv-client/options.mk
new file mode 100644
index 00000000000..cc8cd743f0a
--- /dev/null
+++ b/games/freeciv-client/options.mk
@@ -0,0 +1,38 @@
+# $NetBSD: options.mk,v 1.1 2005/08/24 10:45:32 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.freeciv-client
+PKG_SUPPORTED_OPTIONS=	gtk gtk2 xaw xaw3d sdl x11
+PKG_SUGGESTED_OPTIONS=	gtk2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk)
+CONFIGURE_ARGS+=	--enable-client=gtk
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+CONFIGURE_ARGS+=	--enable-client=gtk2
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mxaw)
+CONFIGURE_ARGS+=	--enable-client=xaw
+.include "../../mk/xaw.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mxaw3d)
+CONFIGURE_ARGS+=	--enable-client=xaw3d
+.include "../../x11/Xaw3d/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+=	--enable-ftwl=sdl
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=	--enable-ftwl=x11
+.include "../../mk/x11.buildlink3.mk"
+.endif