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.

13 files changed, 498 insertions, 93 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
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index e4a2615fa53..586035834e8 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,26 +1,21 @@
-# $NetBSD: Makefile,v 1.18 2004/11/03 14:20:09 adam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/24 10:43:32 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 COMMENT=	Freeciv game server
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
 
-USE_GNU_READLINE=	# uses callback interface of GNU readline
-LIBS+=			-ltermcap
-
-CONFIGURE_ARGS+=	--enable-client=no --disable-make-data
+USE_GNU_READLINE=	yes
+CONFIGURE_ARGS+=	--disable-make-data
+CONFIGURE_ARGS+=	--enable-client=no
 CONFIGURE_ARGS+=	--with-readline
+LIBS+=			-ltermcap
 
 # Uses rl_filename_completion_function() which was introduced in readline-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}
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile
index dd8f0a68163..abda3548bd5 100644
--- a/games/freeciv-share/Makefile
+++ b/games/freeciv-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/05 12:06:38 adam Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/24 10:36:02 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-share-/}
 COMMENT=	Machine independent files for Freeciv
@@ -7,5 +7,6 @@ COMMENT=	Machine independent files for Freeciv
 
 CONFIGURE_ARGS+=	--disable-server
 CONFIGURE_ARGS+=	--enable-client=no
+CONFIGURE_ARGS+=	--enable-make-data
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index d9840415b13..2a431137efe 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.19 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/08/24 10:36:02 adam Exp $
 
 DISTNAME=	freeciv-${FC_VERS}
-FC_VERS=	1.14.2
+FC_VERS=	2.0.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		http://www.freeciv.org/ftp/stable/ \
@@ -13,11 +13,22 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.freeciv.org/
 
 BUILD_USES_MSGFMT=	yes
-
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
 
+PYTHON_PATCH_SCRIPTS=	${WRKSRC}/common/generate_packets.py
+
+SUBST_CLASSES=		data
+SUBST_STAGE.data=	post-patch
+SUBST_FILES.data=	data/Makefile.in
+SUBST_SED.data+=	-e "s|@CLIENT_FALSE@|@MAKE_DATA_FALSE@|g"
+SUBST_SED.data+=	-e "s|@CLIENT_TRUE@|@MAKE_DATA_TRUE@|g"
+SUBST_SED.data+=	-e "s|@SERVER_FALSE@|@MAKE_DATA_FALSE@|g"
+SUBST_SED.data+=	-e "s|@SERVER_TRUE@|@MAKE_DATA_TRUE@|g"
+SUBST_MESSAGE.data=	"Fixing installation of data files."
+
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../lang/python/application.mk"
diff --git a/games/freeciv-share/PLIST b/games/freeciv-share/PLIST
index 319608b6b50..cd780c2c1e6 100644
--- a/games/freeciv-share/PLIST
+++ b/games/freeciv-share/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/05 12:06:38 adam Exp $
-share/freeciv/Freeciv
+@comment $NetBSD: PLIST,v 1.4 2005/08/24 10:36:02 adam Exp $
+man/man6/civclient.6
+man/man6/civserver.6
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
 share/freeciv/civ1/game.ruleset
@@ -23,59 +24,197 @@ share/freeciv/default/nations.ruleset
 share/freeciv/default/techs.ruleset
 share/freeciv/default/terrain.ruleset
 share/freeciv/default/units.ruleset
+share/freeciv/flags/afghanistan-shield.png
+share/freeciv/flags/afghanistan.png
+share/freeciv/flags/arab.png
+share/freeciv/flags/argentina.png
+share/freeciv/flags/armenia.png
+share/freeciv/flags/assyria-shield.png
+share/freeciv/flags/assyria.png
+share/freeciv/flags/australia.png
+share/freeciv/flags/austria.png
+share/freeciv/flags/azerbaijan.png
+share/freeciv/flags/barbarian.png
+share/freeciv/flags/bavarian.png
+share/freeciv/flags/belgium.png
+share/freeciv/flags/boer.png
+share/freeciv/flags/bosnia-shield.png
+share/freeciv/flags/bosnia.png
+share/freeciv/flags/brasil.png
+share/freeciv/flags/bulgaria.png
+share/freeciv/flags/canada.png
+share/freeciv/flags/catalan.png
+share/freeciv/flags/cheyenne.png
+share/freeciv/flags/chile.png
+share/freeciv/flags/china.png
+share/freeciv/flags/columbia-shield.png
+share/freeciv/flags/columbia.png
+share/freeciv/flags/cornwall.png
+share/freeciv/flags/croatia.png
+share/freeciv/flags/cuba.png
+share/freeciv/flags/czech.png
+share/freeciv/flags/denmark.png
+share/freeciv/flags/dunedain.png
+share/freeciv/flags/egypt.png
+share/freeciv/flags/elves-shield.png
+share/freeciv/flags/elves.png
+share/freeciv/flags/england.png
+share/freeciv/flags/estonia.png
+share/freeciv/flags/ethiopia-shield.png
+share/freeciv/flags/ethiopia.png
+share/freeciv/flags/europe.png
+share/freeciv/flags/finland.png
+share/freeciv/flags/france.png
+share/freeciv/flags/galicia-shield.png
+share/freeciv/flags/galicia.png
+share/freeciv/flags/germany.png
+share/freeciv/flags/greece.png
+share/freeciv/flags/greenland.png
+share/freeciv/flags/hobbits-shield.png
+share/freeciv/flags/hobbits.png
+share/freeciv/flags/hungary.png
+share/freeciv/flags/iceland.png
+share/freeciv/flags/india.png
+share/freeciv/flags/indonesia-shield.png
+share/freeciv/flags/indonesia.png
+share/freeciv/flags/iran.png
+share/freeciv/flags/iraq_old.png
+share/freeciv/flags/ireland.png
+share/freeciv/flags/israel.png
+share/freeciv/flags/italy.png
+share/freeciv/flags/japan.png
+share/freeciv/flags/kampuchea-shield.png
+share/freeciv/flags/kampuchea.png
+share/freeciv/flags/kenya.png
+share/freeciv/flags/korea.png
+share/freeciv/flags/krev.png
+share/freeciv/flags/latvia.png
+share/freeciv/flags/lithuania.png
+share/freeciv/flags/macedonia.png
+share/freeciv/flags/malaysia-shield.png
+share/freeciv/flags/malaysia.png
+share/freeciv/flags/mars-shield.png
+share/freeciv/flags/mars.png
+share/freeciv/flags/mexico.png
+share/freeciv/flags/mongolia.png
+share/freeciv/flags/mordor.png
+share/freeciv/flags/nato.png
+share/freeciv/flags/netherlands.png
+share/freeciv/flags/nigeria-shield.png
+share/freeciv/flags/nigeria.png
+share/freeciv/flags/norway.png
+share/freeciv/flags/observer.png
+share/freeciv/flags/pakistan.png
+share/freeciv/flags/peru.png
+share/freeciv/flags/philippines.png
+share/freeciv/flags/phoenicia-shield.png
+share/freeciv/flags/phoenicia.png
+share/freeciv/flags/poland.png
+share/freeciv/flags/portugal.png
+share/freeciv/flags/quebec-shield.png
+share/freeciv/flags/quebec.png
+share/freeciv/flags/rome.png
+share/freeciv/flags/russia.png
+share/freeciv/flags/rwanda.png
+share/freeciv/flags/scotland.png
+share/freeciv/flags/serbia.png
+share/freeciv/flags/silesia.png
+share/freeciv/flags/singapore.png
+share/freeciv/flags/slovenia.png
+share/freeciv/flags/south_africa.png
+share/freeciv/flags/soviet.png
+share/freeciv/flags/spain.png
+share/freeciv/flags/stpatrick.png
+share/freeciv/flags/sumeria-shield.png
+share/freeciv/flags/sumeria.png
+share/freeciv/flags/sweden.png
+share/freeciv/flags/swiss-shield.png
+share/freeciv/flags/swiss.png
+share/freeciv/flags/syria.png
+share/freeciv/flags/taiwan-shield.png
+share/freeciv/flags/taiwan.png
+share/freeciv/flags/thailand.png
+share/freeciv/flags/tunisia.png
+share/freeciv/flags/turkey.png
+share/freeciv/flags/ukraine.png
+share/freeciv/flags/united_kingdom.png
+share/freeciv/flags/united_nations.png
+share/freeciv/flags/unknown.png
+share/freeciv/flags/usa.png
+share/freeciv/flags/vietnam.png
+share/freeciv/flags/wales.png
 share/freeciv/freeciv.rc
-share/freeciv/freeciv.rc-2.0
 share/freeciv/helpdata.txt
+share/freeciv/history.serv
 share/freeciv/history/buildings.ruleset
 share/freeciv/history/game.ruleset
 share/freeciv/history/governments.ruleset
 share/freeciv/history/techs.ruleset
 share/freeciv/history/terrain.ruleset
 share/freeciv/history/units.ruleset
+share/freeciv/isophex.tilespec
+share/freeciv/isophex/darkness.png
+share/freeciv/isophex/darkness.spec
+share/freeciv/isophex/gold.spec
+share/freeciv/isophex/rivers.png
+share/freeciv/isophex/rivers.spec
+share/freeciv/isophex/terrain1.png
+share/freeciv/isophex/terrain1.spec
+share/freeciv/isophex/terrain2.png
+share/freeciv/isophex/terrain2.spec
+share/freeciv/isophex/tiles.png
+share/freeciv/isophex/tiles.spec
 share/freeciv/isotrident.tilespec
+share/freeciv/isotrident/cities.png
 share/freeciv/isotrident/cities.spec
-share/freeciv/isotrident/cities.xpm
-share/freeciv/isotrident/flags.spec
-share/freeciv/isotrident/flags.xpm
+share/freeciv/isotrident/morecities.png
+share/freeciv/isotrident/morecities.spec
+share/freeciv/isotrident/nuke.png
 share/freeciv/isotrident/nuke.spec
-share/freeciv/isotrident/nuke.xpm
-share/freeciv/isotrident/small.spec
-share/freeciv/isotrident/small.xpm
+share/freeciv/isotrident/terrain1.png
 share/freeciv/isotrident/terrain1.spec
-share/freeciv/isotrident/terrain1.xpm
+share/freeciv/isotrident/terrain2.png
 share/freeciv/isotrident/terrain2.spec
-share/freeciv/isotrident/terrain2.xpm
+share/freeciv/isotrident/tiles.png
 share/freeciv/isotrident/tiles.spec
-share/freeciv/isotrident/tiles.xpm
+share/freeciv/isotrident/units.png
 share/freeciv/isotrident/units.spec
-share/freeciv/isotrident/units.xpm
+share/freeciv/misc/buildings.png
+share/freeciv/misc/buildings.spec
+share/freeciv/misc/chiefs.png
 share/freeciv/misc/chiefs.spec
-share/freeciv/misc/chiefs.xpm
-share/freeciv/misc/intro.xpm
-share/freeciv/misc/radar.xpm
+share/freeciv/misc/flags.spec
+share/freeciv/misc/intro.png
+share/freeciv/misc/radar.png
+share/freeciv/misc/shields.png
 share/freeciv/misc/shields.spec
-share/freeciv/misc/shields.xpm
+share/freeciv/misc/small.png
 share/freeciv/misc/small.spec
-share/freeciv/misc/small.xpm
+share/freeciv/misc/space.png
 share/freeciv/misc/space.spec
-share/freeciv/misc/space.xpm
+share/freeciv/misc/treaty.png
 share/freeciv/misc/treaty.spec
-share/freeciv/misc/treaty.xpm
+share/freeciv/nation/afghani.ruleset
 share/freeciv/nation/american.ruleset
 share/freeciv/nation/arab.ruleset
 share/freeciv/nation/argentine.ruleset
+share/freeciv/nation/assyrian.ruleset
 share/freeciv/nation/australian.ruleset
+share/freeciv/nation/austrian.ruleset
 share/freeciv/nation/aztec.ruleset
 share/freeciv/nation/babylonian.ruleset
 share/freeciv/nation/barbarian.ruleset
 share/freeciv/nation/bavarian.ruleset
+share/freeciv/nation/belgian.ruleset
 share/freeciv/nation/boer.ruleset
+share/freeciv/nation/bosnia.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/columbian.ruleset
 share/freeciv/nation/cornish.ruleset
 share/freeciv/nation/croatian.ruleset
 share/freeciv/nation/czech.ruleset
@@ -83,30 +222,43 @@ share/freeciv/nation/danish.ruleset
 share/freeciv/nation/dunedain.ruleset
 share/freeciv/nation/dutch.ruleset
 share/freeciv/nation/egyptian.ruleset
+share/freeciv/nation/elvish.ruleset
 share/freeciv/nation/english.ruleset
 share/freeciv/nation/estonian.ruleset
+share/freeciv/nation/ethiopian.ruleset
 share/freeciv/nation/filipino.ruleset
 share/freeciv/nation/finnish.ruleset
 share/freeciv/nation/french.ruleset
+share/freeciv/nation/galician.ruleset
 share/freeciv/nation/german.ruleset
 share/freeciv/nation/greek.ruleset
+share/freeciv/nation/hobbits.ruleset
 share/freeciv/nation/hungarian.ruleset
+share/freeciv/nation/icelandic.ruleset
 share/freeciv/nation/inca.ruleset
 share/freeciv/nation/indian.ruleset
+share/freeciv/nation/indonesian.ruleset
 share/freeciv/nation/irish.ruleset
 share/freeciv/nation/israeli.ruleset
 share/freeciv/nation/italian.ruleset
 share/freeciv/nation/japanese.ruleset
+share/freeciv/nation/kampuchean.ruleset
 share/freeciv/nation/kenyan.ruleset
 share/freeciv/nation/korean.ruleset
 share/freeciv/nation/latvian.ruleset
 share/freeciv/nation/lithuanian.ruleset
-share/freeciv/nation/misc_cities.ruleset
+share/freeciv/nation/malaysian.ruleset
+share/freeciv/nation/martian.ruleset
+share/freeciv/nation/mexican.ruleset
 share/freeciv/nation/mongol.ruleset
 share/freeciv/nation/mordor.ruleset
+share/freeciv/nation/nigerian.ruleset
+share/freeciv/nation/observer.ruleset
 share/freeciv/nation/persian.ruleset
+share/freeciv/nation/phoenician.ruleset
 share/freeciv/nation/polish.ruleset
 share/freeciv/nation/portuguese.ruleset
+share/freeciv/nation/quebecois.ruleset
 share/freeciv/nation/roman.ruleset
 share/freeciv/nation/russian.ruleset
 share/freeciv/nation/scottish.ruleset
@@ -116,7 +268,10 @@ share/freeciv/nation/singaporean.ruleset
 share/freeciv/nation/sioux.ruleset
 share/freeciv/nation/slovenian.ruleset
 share/freeciv/nation/spanish.ruleset
+share/freeciv/nation/sumerian.ruleset
 share/freeciv/nation/swedish.ruleset
+share/freeciv/nation/swiss.ruleset
+share/freeciv/nation/taiwanese.ruleset
 share/freeciv/nation/thai.ruleset
 share/freeciv/nation/turk.ruleset
 share/freeciv/nation/ukrainian.ruleset
@@ -132,19 +287,19 @@ share/freeciv/scenario/hagworld-120x60-v1.2.sav
 share/freeciv/scenario/iberian-peninsula-136x100-v1.0.sav
 share/freeciv/trident.tilespec
 share/freeciv/trident/auto_ll.spec
+share/freeciv/trident/cities.png
 share/freeciv/trident/cities.spec
-share/freeciv/trident/cities.xpm
+share/freeciv/trident/explosions.png
 share/freeciv/trident/explosions.spec
-share/freeciv/trident/explosions.xpm
-share/freeciv/trident/flags.spec
-share/freeciv/trident/flags.xpm
+share/freeciv/trident/roads.png
 share/freeciv/trident/roads.spec
-share/freeciv/trident/roads.xpm
+share/freeciv/trident/tiles.png
 share/freeciv/trident/tiles.spec
-share/freeciv/trident/tiles.xpm
+share/freeciv/trident/units.png
 share/freeciv/trident/units.spec
-share/freeciv/trident/units.xpm
 share/freeciv/trident_shields.tilespec
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/freeciv.mo
@@ -152,9 +307,11 @@ ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/freeciv.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/he_IL/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/nb/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
@@ -169,7 +326,9 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/freeciv.mo
 @dirrm share/freeciv/nation
 @dirrm share/freeciv/misc
 @dirrm share/freeciv/isotrident
+@dirrm share/freeciv/isophex
 @dirrm share/freeciv/history
+@dirrm share/freeciv/flags
 @dirrm share/freeciv/default
 @dirrm share/freeciv/civ2
 @dirrm share/freeciv/civ1
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index 34cda07e4b1..9defd764186 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 23:11:57 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/08/24 10:36:02 adam Exp $
 
-SHA1 (freeciv-1.14.2.tar.bz2) = 454cb40f862dfad264241db667ef19903163764a
-RMD160 (freeciv-1.14.2.tar.bz2) = c6bf1686ff72edb14b797d11bc78a7f929395b44
-Size (freeciv-1.14.2.tar.bz2) = 5866635 bytes
+SHA1 (freeciv-2.0.4.tar.bz2) = a665ecdf24d08df93efc64b41be3ea4d09996784
+RMD160 (freeciv-2.0.4.tar.bz2) = 1aac6d2f7255a6ddf0e2a13afc4574299c34f1fa
+Size (freeciv-2.0.4.tar.bz2) = 8464445 bytes
+SHA1 (patch-aa) = 54d4f8298827872350a3e8be791918da50369c19
+SHA1 (patch-ab) = 24cb0f428323fd295e61d4fc49e5dfdff7e4615b
diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
new file mode 100644
index 00000000000..06b9d64faa9
--- /dev/null
+++ b/games/freeciv-share/patches/patch-aa
@@ -0,0 +1,193 @@
+$NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
+
+--- configure.orig	2005-08-23 16:22:20.000000000 +0000
++++ configure
+@@ -12203,13 +12203,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12316,13 +12316,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12425,13 +12425,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12530,13 +12530,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12641,13 +12641,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12749,13 +12749,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12858,13 +12858,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -12967,13 +12967,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
+@@ -13074,13 +13074,13 @@ echo "${ECHO_T}yes" >&6
+ 
+ 
+ 
+-    if (test $ac_tr_lib == HAVE_LIBX11     \
+-        || test $ac_tr_lib == HAVE_LIBXEXT \
+-        || test $ac_tr_lib == HAVE_LIBXT   \
+-        || test $ac_tr_lib == HAVE_LIBXMU  \
+-        || test $ac_tr_lib == HAVE_LIBXPM  \
+-        || test $ac_tr_lib == HAVE_LIBXAW  \
+-        || test $ac_tr_lib == HAVE_LIBXAW3D); then
++    if (test $ac_tr_lib = HAVE_LIBX11     \
++        || test $ac_tr_lib = HAVE_LIBXEXT \
++        || test $ac_tr_lib = HAVE_LIBXT   \
++        || test $ac_tr_lib = HAVE_LIBXMU  \
++        || test $ac_tr_lib = HAVE_LIBXPM  \
++        || test $ac_tr_lib = HAVE_LIBXAW  \
++        || test $ac_tr_lib = HAVE_LIBXAW3D); then
+       cat >>confdefs.h <<_ACEOF
+ #define $ac_tr_lib 1
+ _ACEOF
diff --git a/games/freeciv-share/patches/patch-ab b/games/freeciv-share/patches/patch-ab
new file mode 100644
index 00000000000..72d9e886596
--- /dev/null
+++ b/games/freeciv-share/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2005/08/24 10:36:41 adam Exp $
+
+--- Makefile.in.orig	2005-08-23 18:06:02.000000000 +0000
++++ Makefile.in
+@@ -276,8 +276,8 @@ target_vendor = @target_vendor@
+ @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual
+ @SERVER_FALSE@MSUBDIRS = 
+ @MAKE_DATA_FALSE@DSUBDIRS = 
+-@MAKE_DATA_TRUE@DSUBDIRS = data
+-SUBDIRS = $(DSUBDIRS) intl utility common tests $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
++@MAKE_DATA_TRUE@DSUBDIRS = data po doc
++SUBDIRS = $(DSUBDIRS) intl utility common tests $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS)
+ EXTRA_DIST = acconfig.old			\
+ 		autogen.sh 			\
+ 		config.mac.h			\
diff --git a/games/freeciv-sounds/Makefile b/games/freeciv-sounds/Makefile
index 4a289340d5d..13326993a30 100644
--- a/games/freeciv-sounds/Makefile
+++ b/games/freeciv-sounds/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.4 2005/06/16 06:57:54 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.5 2005/08/24 10:44:07 adam Exp $
 
-DISTNAME=	stdsounds2
-PKGNAME=	freeciv-sounds-2.0
+DISTNAME=	stdsounds3
+PKGNAME=	freeciv-sounds-3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/freeciv/contrib/sounds/sets/
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.freeciv.org/sounds/
+HOMEPAGE=	http://www.freeciv.org/
 COMMENT=	Freeciv sound sets
 
 DEPENDS=	freeciv-share-[0-9]*:../../games/freeciv-share
 
-NO_BUILD=	YES
+WRKSRC=			${WRKDIR}/data
+NO_BUILD=		yes
 
 INSTALLATION_DIRS=	share/freeciv
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/stdsounds.soundspec \
-		${PREFIX}/share/freeciv/
-	cd ${WRKDIR} && ${PAX} -rw stdsounds ${PREFIX}/share/freeciv/
+	${INSTALL_DATA} ${WRKSRC}/stdsounds.soundspec ${PREFIX}/share/freeciv/
+	cd ${WRKSRC} && ${PAX} -rw stdsounds ${PREFIX}/share/freeciv/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-sounds/PLIST b/games/freeciv-sounds/PLIST
index 286b566faba..f25b2b17cf0 100644
--- a/games/freeciv-sounds/PLIST
+++ b/games/freeciv-sounds/PLIST
@@ -1,18 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/23 13:16:09 salo Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/08/24 10:44:07 adam Exp $
 share/freeciv/stdsounds.soundspec
-share/freeciv/stdsounds/amb18.wav
-share/freeciv/stdsounds/bang10.wav
-share/freeciv/stdsounds/cfx01.wav
-share/freeciv/stdsounds/cfx11.wav
-share/freeciv/stdsounds/chineseprc09.wav
-share/freeciv/stdsounds/foot3.wav
-share/freeciv/stdsounds/gong10.wav
-share/freeciv/stdsounds/guncock.wav
-share/freeciv/stdsounds/inh2o.wav
-share/freeciv/stdsounds/metbrk.wav
-share/freeciv/stdsounds/plopp.wav
-share/freeciv/stdsounds/r_exp3.wav
-share/freeciv/stdsounds/rhino.wav
-share/freeciv/stdsounds/wall01.wav
-share/freeciv/stdsounds/woodbrk.wav
+share/freeciv/stdsounds/LrgCan.ogg
+share/freeciv/stdsounds/LrgExpl.ogg
+share/freeciv/stdsounds/MedCan.ogg
+share/freeciv/stdsounds/MgBar1.ogg
+share/freeciv/stdsounds/MgBar2.ogg
+share/freeciv/stdsounds/MgHeavy.ogg
+share/freeciv/stdsounds/Mortar.ogg
+share/freeciv/stdsounds/SmlExpl.ogg
+share/freeciv/stdsounds/Splash.ogg
+share/freeciv/stdsounds/THover.ogg
+share/freeciv/stdsounds/Tread.ogg
+share/freeciv/stdsounds/foot3.ogg
+share/freeciv/stdsounds/inh2o.ogg
+share/freeciv/stdsounds/metbrk.ogg
+share/freeciv/stdsounds/wall01.ogg
+share/freeciv/stdsounds/woodbrk.ogg
 @dirrm share/freeciv/stdsounds
diff --git a/games/freeciv-sounds/distinfo b/games/freeciv-sounds/distinfo
index fdf39e8f06d..004f5961cad 100644
--- a/games/freeciv-sounds/distinfo
+++ b/games/freeciv-sounds/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 23:11:57 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/08/24 10:44:07 adam Exp $
 
-SHA1 (stdsounds2.tar.gz) = 62d9253ce3f4d9f4c9be3dd0f1162179ce482c37
-RMD160 (stdsounds2.tar.gz) = 5dd825da1b8664d51a1461a95f6017e508cfb38e
-Size (stdsounds2.tar.gz) = 1223738 bytes
+SHA1 (stdsounds3.tar.gz) = 103d02a0702687fb038f5187a321f8074b4ebfb5
+RMD160 (stdsounds3.tar.gz) = 46bb5fef4b2d3acf9959b3228c962bdf6591ea09
+Size (stdsounds3.tar.gz) = 118278 bytes