Changes 2.1.2:

* Improved support for GGZ Gaming Zone.
* Fix support for Leave and Load in the same client session.
* Add GTK2 client support for saving server settings.
* Add realistic terrain requirements for three default wonders, as well a number
  of missing ones to civ1 and civ2.
* Improve startup speed, reducing duplicate internal messages sent.
* Updated GTK2 hotkeys, menus, text, and translations, especially Catalan,
  Finnish, Korean, Lithuanian, Turkish, and Ukrainian.

6 files changed, 434 insertions, 82 deletions

diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 570236f8bcb..5274744ce29 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.29 2007/03/18 13:12:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2008/01/06 16:39:15 adam Exp $
 
 DISTNAME=	freeciv-${FC_VERS}
-FC_VERS=	2.0.9
+FC_VERS=	2.1.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		http://www.freeciv.org/ftp/stable/ \
@@ -13,7 +13,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freeciv.org/
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		msgfmt pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config
 GNU_CONFIGURE=		yes
 
 DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
diff --git a/games/freeciv-share/PLIST b/games/freeciv-share/PLIST
index a360687b53a..a3bd14c1816 100644
--- a/games/freeciv-share/PLIST
+++ b/games/freeciv-share/PLIST
@@ -1,8 +1,80 @@
-@comment $NetBSD: PLIST,v 1.7 2007/03/18 13:12:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/01/06 16:39:15 adam Exp $
 man/man6/civclient.6
 man/man6/civserver.6
+share/freeciv/amplio.tilespec
+share/freeciv/amplio/ancientcities.png
+share/freeciv/amplio/ancientcities.spec
+share/freeciv/amplio/buildings.spec
+share/freeciv/amplio/cityicon.png
+share/freeciv/amplio/civicon.png
+share/freeciv/amplio/explosions.png
+share/freeciv/amplio/explosions.spec
+share/freeciv/amplio/fog.png
+share/freeciv/amplio/fog.spec
+share/freeciv/amplio/grid.png
+share/freeciv/amplio/grid.spec
+share/freeciv/amplio/icons.spec
+share/freeciv/amplio/medievalcities.png
+share/freeciv/amplio/medievalcities.spec
+share/freeciv/amplio/moderncities.png
+share/freeciv/amplio/moderncities.spec
+share/freeciv/amplio/nuke.png
+share/freeciv/amplio/nuke.spec
+share/freeciv/amplio/select-alpha.png
+share/freeciv/amplio/select.png
+share/freeciv/amplio/select.spec
+share/freeciv/amplio/terrain1.png
+share/freeciv/amplio/terrain1.spec
+share/freeciv/amplio/terrain2.png
+share/freeciv/amplio/terrain2.spec
+share/freeciv/amplio/tiles.png
+share/freeciv/amplio/tiles.spec
+share/freeciv/amplio/units.png
+share/freeciv/amplio/units.spec
+share/freeciv/amplio/wonders.spec
+share/freeciv/buildings/airport.png
+share/freeciv/buildings/aqueduct.png
+share/freeciv/buildings/bank.png
+share/freeciv/buildings/barracks_i.png
+share/freeciv/buildings/barracks_ii.png
+share/freeciv/buildings/barracks_iii.png
+share/freeciv/buildings/capitalization.png
+share/freeciv/buildings/cathedral.png
+share/freeciv/buildings/city_walls.png
+share/freeciv/buildings/coastal_defense.png
+share/freeciv/buildings/colosseum.png
+share/freeciv/buildings/courthouse.png
+share/freeciv/buildings/factory.png
+share/freeciv/buildings/granary.png
+share/freeciv/buildings/harbor.png
+share/freeciv/buildings/hydro_plant.png
+share/freeciv/buildings/library.png
+share/freeciv/buildings/marketplace.png
+share/freeciv/buildings/mass_transit.png
+share/freeciv/buildings/mfg_plant.png
+share/freeciv/buildings/nuclear_plant.png
+share/freeciv/buildings/offshore_platform.png
+share/freeciv/buildings/palace.png
+share/freeciv/buildings/police_station.png
+share/freeciv/buildings/port_facility.png
+share/freeciv/buildings/power_plant.png
+share/freeciv/buildings/recycling_center.png
+share/freeciv/buildings/research_lab.png
+share/freeciv/buildings/sam_battery.png
+share/freeciv/buildings/sdi_defense.png
+share/freeciv/buildings/sewer_system.png
+share/freeciv/buildings/solar_plant.png
+share/freeciv/buildings/space_component.png
+share/freeciv/buildings/space_modules.png
+share/freeciv/buildings/space_structural.png
+share/freeciv/buildings/stock_exchange.png
+share/freeciv/buildings/super_highways.png
+share/freeciv/buildings/supermarket.png
+share/freeciv/buildings/temple.png
+share/freeciv/buildings/university.png
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
+share/freeciv/civ1/effects.ruleset
 share/freeciv/civ1/game.ruleset
 share/freeciv/civ1/governments.ruleset
 share/freeciv/civ1/nations.ruleset
@@ -11,150 +83,328 @@ share/freeciv/civ1/terrain.ruleset
 share/freeciv/civ1/units.ruleset
 share/freeciv/civ2.serv
 share/freeciv/civ2/buildings.ruleset
+share/freeciv/civ2/cities.ruleset
+share/freeciv/civ2/effects.ruleset
 share/freeciv/civ2/game.ruleset
 share/freeciv/civ2/governments.ruleset
 share/freeciv/civ2/techs.ruleset
 share/freeciv/civ2/terrain.ruleset
 share/freeciv/civ2/units.ruleset
+share/freeciv/default.serv
 share/freeciv/default/buildings.ruleset
 share/freeciv/default/cities.ruleset
+share/freeciv/default/effects.ruleset
 share/freeciv/default/game.ruleset
 share/freeciv/default/governments.ruleset
 share/freeciv/default/nations.ruleset
+share/freeciv/default/script.lua
 share/freeciv/default/techs.ruleset
 share/freeciv/default/terrain.ruleset
 share/freeciv/default/units.ruleset
+share/freeciv/flags/aborigines-shield.png
+share/freeciv/flags/aborigines.png
 share/freeciv/flags/afghanistan-shield.png
 share/freeciv/flags/afghanistan.png
+share/freeciv/flags/algeria-shield.png
+share/freeciv/flags/algeria.png
+share/freeciv/flags/antarctica-shield.png
+share/freeciv/flags/antarctica.png
+share/freeciv/flags/arab-shield.png
 share/freeciv/flags/arab.png
+share/freeciv/flags/aram-shield.png
+share/freeciv/flags/aram.png
+share/freeciv/flags/argentina-shield.png
 share/freeciv/flags/argentina.png
+share/freeciv/flags/armenia-shield.png
 share/freeciv/flags/armenia.png
 share/freeciv/flags/assyria-shield.png
 share/freeciv/flags/assyria.png
+share/freeciv/flags/australia-shield.png
 share/freeciv/flags/australia.png
+share/freeciv/flags/austria-shield.png
 share/freeciv/flags/austria.png
+share/freeciv/flags/azerbaijan-shield.png
 share/freeciv/flags/azerbaijan.png
+share/freeciv/flags/aztec-shield.png
+share/freeciv/flags/aztec.png
+share/freeciv/flags/babylon-shield.png
+share/freeciv/flags/babylon.png
+share/freeciv/flags/bangladesh-shield.png
+share/freeciv/flags/bangladesh.png
+share/freeciv/flags/barbarian-shield.png
 share/freeciv/flags/barbarian.png
+share/freeciv/flags/bavarian-shield.png
 share/freeciv/flags/bavarian.png
+share/freeciv/flags/belgium-shield.png
 share/freeciv/flags/belgium.png
+share/freeciv/flags/boer-shield.png
 share/freeciv/flags/boer.png
 share/freeciv/flags/bosnia-shield.png
 share/freeciv/flags/bosnia.png
+share/freeciv/flags/brasil-shield.png
 share/freeciv/flags/brasil.png
+share/freeciv/flags/bulgaria-shield.png
 share/freeciv/flags/bulgaria.png
+share/freeciv/flags/byzantium-shield.png
+share/freeciv/flags/byzantium.png
+share/freeciv/flags/canada-shield.png
 share/freeciv/flags/canada.png
+share/freeciv/flags/cartago-shield.png
+share/freeciv/flags/cartago.png
+share/freeciv/flags/catalan-shield.png
 share/freeciv/flags/catalan.png
+share/freeciv/flags/cheyenne-shield.png
 share/freeciv/flags/cheyenne.png
+share/freeciv/flags/chile-shield.png
 share/freeciv/flags/chile.png
+share/freeciv/flags/china-shield.png
 share/freeciv/flags/china.png
-share/freeciv/flags/columbia-shield.png
-share/freeciv/flags/columbia.png
+share/freeciv/flags/colombia-shield.png
+share/freeciv/flags/colombia.png
+share/freeciv/flags/constantine-shield.png
+share/freeciv/flags/constantine.png
+share/freeciv/flags/cornwall-shield.png
 share/freeciv/flags/cornwall.png
+share/freeciv/flags/croatia-shield.png
 share/freeciv/flags/croatia.png
+share/freeciv/flags/cuba-shield.png
 share/freeciv/flags/cuba.png
+share/freeciv/flags/czech-shield.png
 share/freeciv/flags/czech.png
+share/freeciv/flags/denmark-shield.png
 share/freeciv/flags/denmark.png
-share/freeciv/flags/dunedain.png
+share/freeciv/flags/egypt-shield.png
 share/freeciv/flags/egypt.png
-share/freeciv/flags/elves-shield.png
-share/freeciv/flags/elves.png
+share/freeciv/flags/egypt_ancient-shield.png
+share/freeciv/flags/egypt_ancient.png
+share/freeciv/flags/england-shield.png
 share/freeciv/flags/england.png
+share/freeciv/flags/estonia-shield.png
 share/freeciv/flags/estonia.png
 share/freeciv/flags/ethiopia-shield.png
 share/freeciv/flags/ethiopia.png
+share/freeciv/flags/europe-shield.png
 share/freeciv/flags/europe.png
+share/freeciv/flags/finland-shield.png
 share/freeciv/flags/finland.png
+share/freeciv/flags/france-shield.png
 share/freeciv/flags/france.png
+share/freeciv/flags/france_old-shield.png
+share/freeciv/flags/france_old.png
 share/freeciv/flags/galicia-shield.png
 share/freeciv/flags/galicia.png
+share/freeciv/flags/gaul-shield.png
+share/freeciv/flags/gaul.png
+share/freeciv/flags/georgia-shield.png
+share/freeciv/flags/georgia.png
+share/freeciv/flags/germany-shield.png
 share/freeciv/flags/germany.png
+share/freeciv/flags/greece-shield.png
 share/freeciv/flags/greece.png
+share/freeciv/flags/greece_ancient-shield.png
+share/freeciv/flags/greece_ancient.png
+share/freeciv/flags/greenland-shield.png
 share/freeciv/flags/greenland.png
-share/freeciv/flags/hobbits-shield.png
-share/freeciv/flags/hobbits.png
+share/freeciv/flags/hittite-shield.png
+share/freeciv/flags/hittite.png
+share/freeciv/flags/hungary-shield.png
 share/freeciv/flags/hungary.png
+share/freeciv/flags/iceland-shield.png
 share/freeciv/flags/iceland.png
+share/freeciv/flags/illyria-shield.png
+share/freeciv/flags/illyria.png
+share/freeciv/flags/inca-shield.png
+share/freeciv/flags/inca.png
+share/freeciv/flags/india-shield.png
 share/freeciv/flags/india.png
 share/freeciv/flags/indonesia-shield.png
 share/freeciv/flags/indonesia.png
+share/freeciv/flags/iran-shield.png
 share/freeciv/flags/iran.png
+share/freeciv/flags/iran_ancient-shield.png
+share/freeciv/flags/iran_ancient.png
+share/freeciv/flags/iraq-shield.png
+share/freeciv/flags/iraq.png
+share/freeciv/flags/iraq_old-shield.png
 share/freeciv/flags/iraq_old.png
+share/freeciv/flags/ireland-shield.png
 share/freeciv/flags/ireland.png
+share/freeciv/flags/iroquois-shield.png
+share/freeciv/flags/iroquois.png
+share/freeciv/flags/israel-shield.png
 share/freeciv/flags/israel.png
+share/freeciv/flags/italy-shield.png
 share/freeciv/flags/italy.png
+share/freeciv/flags/japan-shield.png
 share/freeciv/flags/japan.png
 share/freeciv/flags/kampuchea-shield.png
 share/freeciv/flags/kampuchea.png
+share/freeciv/flags/kenya-shield.png
 share/freeciv/flags/kenya.png
+share/freeciv/flags/korea-shield.png
 share/freeciv/flags/korea.png
-share/freeciv/flags/krev.png
+share/freeciv/flags/latvia-shield.png
 share/freeciv/flags/latvia.png
+share/freeciv/flags/libya-shield.png
+share/freeciv/flags/libya.png
+share/freeciv/flags/lithuania-shield.png
 share/freeciv/flags/lithuania.png
+share/freeciv/flags/macedonia-shield.png
 share/freeciv/flags/macedonia.png
+share/freeciv/flags/madagascar-shield.png
+share/freeciv/flags/madagascar.png
 share/freeciv/flags/malaysia-shield.png
 share/freeciv/flags/malaysia.png
+share/freeciv/flags/mali-shield.png
+share/freeciv/flags/mali.png
+share/freeciv/flags/maori-shield.png
+share/freeciv/flags/maori.png
 share/freeciv/flags/mars-shield.png
 share/freeciv/flags/mars.png
+share/freeciv/flags/maya-shield.png
+share/freeciv/flags/maya.png
+share/freeciv/flags/mexico-shield.png
 share/freeciv/flags/mexico.png
+share/freeciv/flags/mongolia-shield.png
 share/freeciv/flags/mongolia.png
-share/freeciv/flags/mordor.png
+share/freeciv/flags/myanmar-shield.png
+share/freeciv/flags/myanmar.png
+share/freeciv/flags/nato-shield.png
 share/freeciv/flags/nato.png
+share/freeciv/flags/netherlands-shield.png
 share/freeciv/flags/netherlands.png
+share/freeciv/flags/newzealand-shield.png
+share/freeciv/flags/newzealand.png
 share/freeciv/flags/nigeria-shield.png
 share/freeciv/flags/nigeria.png
+share/freeciv/flags/norway-shield.png
 share/freeciv/flags/norway.png
+share/freeciv/flags/observer-shield.png
 share/freeciv/flags/observer.png
+share/freeciv/flags/ottoman-shield.png
+share/freeciv/flags/ottoman.png
+share/freeciv/flags/pakistan-shield.png
 share/freeciv/flags/pakistan.png
+share/freeciv/flags/palmyra-shield.png
+share/freeciv/flags/palmyra.png
+share/freeciv/flags/papua_newguinea-shield.png
+share/freeciv/flags/papua_newguinea.png
+share/freeciv/flags/peru-shield.png
 share/freeciv/flags/peru.png
+share/freeciv/flags/philippines-shield.png
 share/freeciv/flags/philippines.png
 share/freeciv/flags/phoenicia-shield.png
 share/freeciv/flags/phoenicia.png
+share/freeciv/flags/poland-shield.png
 share/freeciv/flags/poland.png
+share/freeciv/flags/portugal-shield.png
 share/freeciv/flags/portugal.png
+share/freeciv/flags/qing-shield.png
+share/freeciv/flags/qing.png
 share/freeciv/flags/quebec-shield.png
 share/freeciv/flags/quebec.png
+share/freeciv/flags/romania-shield.png
+share/freeciv/flags/romania.png
+share/freeciv/flags/rome-shield.png
 share/freeciv/flags/rome.png
+share/freeciv/flags/russia-shield.png
 share/freeciv/flags/russia.png
+share/freeciv/flags/rwanda-shield.png
 share/freeciv/flags/rwanda.png
+share/freeciv/flags/ryukyu-shield.png
+share/freeciv/flags/ryukyu.png
+share/freeciv/flags/sapmi-shield.png
+share/freeciv/flags/sapmi.png
+share/freeciv/flags/scotland-shield.png
 share/freeciv/flags/scotland.png
+share/freeciv/flags/serbia-shield.png
 share/freeciv/flags/serbia.png
+share/freeciv/flags/silesia-shield.png
 share/freeciv/flags/silesia.png
+share/freeciv/flags/singapore-shield.png
 share/freeciv/flags/singapore.png
+share/freeciv/flags/slovakia-shield.png
+share/freeciv/flags/slovakia.png
+share/freeciv/flags/slovenia-shield.png
 share/freeciv/flags/slovenia.png
+share/freeciv/flags/south_africa-shield.png
 share/freeciv/flags/south_africa.png
+share/freeciv/flags/southern_cross-shield.png
+share/freeciv/flags/southern_cross.png
+share/freeciv/flags/soviet-shield.png
 share/freeciv/flags/soviet.png
+share/freeciv/flags/spain-shield.png
 share/freeciv/flags/spain.png
+share/freeciv/flags/srilanka-shield.png
+share/freeciv/flags/srilanka.png
+share/freeciv/flags/stpatrick-shield.png
 share/freeciv/flags/stpatrick.png
+share/freeciv/flags/sudan-shield.png
+share/freeciv/flags/sudan.png
 share/freeciv/flags/sumeria-shield.png
 share/freeciv/flags/sumeria.png
+share/freeciv/flags/swaziland-shield.png
+share/freeciv/flags/swaziland.png
+share/freeciv/flags/sweden-shield.png
 share/freeciv/flags/sweden.png
 share/freeciv/flags/swiss-shield.png
 share/freeciv/flags/swiss.png
+share/freeciv/flags/syria-shield.png
 share/freeciv/flags/syria.png
 share/freeciv/flags/taiwan-shield.png
 share/freeciv/flags/taiwan.png
+share/freeciv/flags/texas-shield.png
+share/freeciv/flags/texas.png
+share/freeciv/flags/thailand-shield.png
 share/freeciv/flags/thailand.png
+share/freeciv/flags/tibet-shield.png
+share/freeciv/flags/tibet.png
+share/freeciv/flags/tunisia-shield.png
 share/freeciv/flags/tunisia.png
+share/freeciv/flags/turkey-shield.png
 share/freeciv/flags/turkey.png
+share/freeciv/flags/ukraine-shield.png
 share/freeciv/flags/ukraine.png
+share/freeciv/flags/united_kingdom-shield.png
 share/freeciv/flags/united_kingdom.png
+share/freeciv/flags/united_nations-shield.png
 share/freeciv/flags/united_nations.png
+share/freeciv/flags/unknown-shield.png
 share/freeciv/flags/unknown.png
+share/freeciv/flags/usa-shield.png
 share/freeciv/flags/usa.png
+share/freeciv/flags/uyghur-shield.png
+share/freeciv/flags/uyghur.png
+share/freeciv/flags/venezuela-shield.png
+share/freeciv/flags/venezuela.png
+share/freeciv/flags/vietnam-shield.png
 share/freeciv/flags/vietnam.png
+share/freeciv/flags/viking-shield.png
+share/freeciv/flags/viking.png
+share/freeciv/flags/wales-shield.png
 share/freeciv/flags/wales.png
+share/freeciv/flags/westphalia-shield.png
+share/freeciv/flags/westphalia.png
+share/freeciv/flags/zulu-shield.png
+share/freeciv/flags/zulu.png
 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/hex2t.tilespec
+share/freeciv/hex2t/grid.png
+share/freeciv/hex2t/grid.spec
+share/freeciv/hex2t/items.png
+share/freeciv/hex2t/items.spec
+share/freeciv/hex2t/overlays.png
+share/freeciv/hex2t/overlays.spec
+share/freeciv/hex2t/select.png
+share/freeciv/hex2t/select.spec
+share/freeciv/hex2t/tiles.png
+share/freeciv/hex2t/tiles.spec
 share/freeciv/isophex.tilespec
 share/freeciv/isophex/darkness.png
 share/freeciv/isophex/darkness.spec
 share/freeciv/isophex/gold.spec
+share/freeciv/isophex/grid.png
+share/freeciv/isophex/grid.spec
 share/freeciv/isophex/rivers.png
 share/freeciv/isophex/rivers.spec
 share/freeciv/isophex/terrain1.png
@@ -166,37 +416,61 @@ share/freeciv/isophex/tiles.spec
 share/freeciv/isotrident.tilespec
 share/freeciv/isotrident/cities.png
 share/freeciv/isotrident/cities.spec
+share/freeciv/isotrident/fog.png
+share/freeciv/isotrident/fog.spec
+share/freeciv/isotrident/grid.png
+share/freeciv/isotrident/grid.spec
 share/freeciv/isotrident/morecities.png
 share/freeciv/isotrident/morecities.spec
 share/freeciv/isotrident/nuke.png
 share/freeciv/isotrident/nuke.spec
+share/freeciv/isotrident/select.png
+share/freeciv/isotrident/select.spec
 share/freeciv/isotrident/terrain1.png
 share/freeciv/isotrident/terrain1.spec
 share/freeciv/isotrident/terrain2.png
 share/freeciv/isotrident/terrain2.spec
 share/freeciv/isotrident/tiles.png
 share/freeciv/isotrident/tiles.spec
-share/freeciv/isotrident/units.png
-share/freeciv/isotrident/units.spec
+share/freeciv/isotrident/unitextras.png
+share/freeciv/isotrident/unitextras.spec
 share/freeciv/misc/buildings.png
 share/freeciv/misc/buildings.spec
 share/freeciv/misc/chiefs.png
 share/freeciv/misc/chiefs.spec
+share/freeciv/misc/citybar.png
+share/freeciv/misc/citybar.spec
+share/freeciv/misc/cityicon.png
+share/freeciv/misc/civicon.png
+share/freeciv/misc/colors.png
+share/freeciv/misc/colors.spec
+share/freeciv/misc/colors.tilespec
+share/freeciv/misc/cursors.png
+share/freeciv/misc/cursors.spec
 share/freeciv/misc/flags.spec
+share/freeciv/misc/icons.spec
 share/freeciv/misc/intro.png
+share/freeciv/misc/overlays.png
+share/freeciv/misc/overlays.spec
 share/freeciv/misc/radar.png
-share/freeciv/misc/shields.png
 share/freeciv/misc/shields.spec
 share/freeciv/misc/small.png
 share/freeciv/misc/small.spec
 share/freeciv/misc/space.png
 share/freeciv/misc/space.spec
+share/freeciv/misc/techs.png
+share/freeciv/misc/techs.spec
 share/freeciv/misc/treaty.png
 share/freeciv/misc/treaty.spec
+share/freeciv/nation/aborigines.ruleset
 share/freeciv/nation/afghani.ruleset
+share/freeciv/nation/algerian.ruleset
 share/freeciv/nation/american.ruleset
+share/freeciv/nation/antarctican.ruleset
 share/freeciv/nation/arab.ruleset
+share/freeciv/nation/aramean.ruleset
 share/freeciv/nation/argentine.ruleset
+share/freeciv/nation/armenian.ruleset
 share/freeciv/nation/assyrian.ruleset
 share/freeciv/nation/australian.ruleset
 share/freeciv/nation/austrian.ruleset
@@ -205,23 +479,28 @@ share/freeciv/nation/babylonian.ruleset
 share/freeciv/nation/barbarian.ruleset
 share/freeciv/nation/bavarian.ruleset
 share/freeciv/nation/belgian.ruleset
+share/freeciv/nation/bengali.ruleset
 share/freeciv/nation/boer.ruleset
 share/freeciv/nation/bosnia.ruleset
 share/freeciv/nation/brazilian.ruleset
+share/freeciv/nation/british.ruleset
+share/freeciv/nation/bulgarian.ruleset
+share/freeciv/nation/burmese.ruleset
+share/freeciv/nation/byzantium.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/colombian.ruleset
+share/freeciv/nation/confederate.ruleset
 share/freeciv/nation/cornish.ruleset
 share/freeciv/nation/croatian.ruleset
+share/freeciv/nation/cuban.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/elvish.ruleset
 share/freeciv/nation/english.ruleset
 share/freeciv/nation/estonian.ruleset
 share/freeciv/nation/ethiopian.ruleset
@@ -229,89 +508,173 @@ share/freeciv/nation/filipino.ruleset
 share/freeciv/nation/finnish.ruleset
 share/freeciv/nation/french.ruleset
 share/freeciv/nation/galician.ruleset
+share/freeciv/nation/gallic.ruleset
+share/freeciv/nation/georgian.ruleset
 share/freeciv/nation/german.ruleset
 share/freeciv/nation/greek.ruleset
-share/freeciv/nation/hobbits.ruleset
+share/freeciv/nation/hellenic.ruleset
+share/freeciv/nation/hittite.ruleset
 share/freeciv/nation/hungarian.ruleset
 share/freeciv/nation/icelandic.ruleset
+share/freeciv/nation/illyrian.ruleset
 share/freeciv/nation/inca.ruleset
 share/freeciv/nation/indian.ruleset
 share/freeciv/nation/indonesian.ruleset
+share/freeciv/nation/inuit.ruleset
+share/freeciv/nation/iraqi.ruleset
 share/freeciv/nation/irish.ruleset
+share/freeciv/nation/iroquois.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/lankese.ruleset
 share/freeciv/nation/latvian.ruleset
+share/freeciv/nation/libyan.ruleset
 share/freeciv/nation/lithuanian.ruleset
+share/freeciv/nation/malagasy.ruleset
 share/freeciv/nation/malaysian.ruleset
+share/freeciv/nation/malian.ruleset
+share/freeciv/nation/manchu.ruleset
+share/freeciv/nation/maori.ruleset
 share/freeciv/nation/martian.ruleset
+share/freeciv/nation/mayan.ruleset
 share/freeciv/nation/mexican.ruleset
 share/freeciv/nation/mongol.ruleset
-share/freeciv/nation/mordor.ruleset
+share/freeciv/nation/newzealand.ruleset
 share/freeciv/nation/nigerian.ruleset
-share/freeciv/nation/observer.ruleset
+share/freeciv/nation/norwegian.ruleset
+share/freeciv/nation/ottoman.ruleset
+share/freeciv/nation/papuan.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/romanian.ruleset
 share/freeciv/nation/russian.ruleset
+share/freeciv/nation/ryukyuan.ruleset
+share/freeciv/nation/sami.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/slovakian.ruleset
 share/freeciv/nation/slovenian.ruleset
+share/freeciv/nation/southafrican.ruleset
+share/freeciv/nation/soviet.ruleset
 share/freeciv/nation/spanish.ruleset
+share/freeciv/nation/sudanese.ruleset
 share/freeciv/nation/sumerian.ruleset
+share/freeciv/nation/swazi.ruleset
 share/freeciv/nation/swedish.ruleset
 share/freeciv/nation/swiss.ruleset
 share/freeciv/nation/taiwanese.ruleset
+share/freeciv/nation/texan.ruleset
 share/freeciv/nation/thai.ruleset
+share/freeciv/nation/tibetan.ruleset
+share/freeciv/nation/tunisian.ruleset
 share/freeciv/nation/turk.ruleset
 share/freeciv/nation/ukrainian.ruleset
+share/freeciv/nation/uyghur.ruleset
+share/freeciv/nation/venezuelan.ruleset
 share/freeciv/nation/vietnamese.ruleset
 share/freeciv/nation/viking.ruleset
 share/freeciv/nation/welsh.ruleset
+share/freeciv/nation/westphalian.ruleset
 share/freeciv/nation/zulu.ruleset
-share/freeciv/scenario/british-isles-85x80-v2.80.sav
-share/freeciv/scenario/earth-160x90-v2.sav
-share/freeciv/scenario/earth-80x50-v2.sav
-share/freeciv/scenario/europe-200x100-v2.sav
-share/freeciv/scenario/hagworld-120x60-v1.2.sav
-share/freeciv/scenario/iberian-peninsula-136x100-v1.0.sav
+share/freeciv/scenario/british-isles-85x80-v2.80.sav.gz
+share/freeciv/scenario/earth-160x90-v2.sav.gz
+share/freeciv/scenario/earth-80x50-v2.sav.gz
+share/freeciv/scenario/europe-200x100-v2.sav.gz
+share/freeciv/scenario/hagworld-120x60-v1.2.sav.gz
+share/freeciv/scenario/iberian-peninsula-136x100-v1.0.sav.gz
+share/freeciv/scenario/tutorial.sav.gz
+share/freeciv/stdsounds.soundspec
+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
 share/freeciv/trident.tilespec
 share/freeciv/trident/auto_ll.spec
 share/freeciv/trident/cities.png
 share/freeciv/trident/cities.spec
 share/freeciv/trident/explosions.png
 share/freeciv/trident/explosions.spec
+share/freeciv/trident/fog.png
+share/freeciv/trident/fog.spec
+share/freeciv/trident/grid.png
+share/freeciv/trident/grid.spec
 share/freeciv/trident/roads.png
 share/freeciv/trident/roads.spec
+share/freeciv/trident/select.png
+share/freeciv/trident/select.spec
 share/freeciv/trident/tiles.png
 share/freeciv/trident/tiles.spec
 share/freeciv/trident/units.png
 share/freeciv/trident/units.spec
-share/freeciv/trident_shields.tilespec
+share/freeciv/wonders/apollo_program.png
+share/freeciv/wonders/asmiths_trading_co.png
+share/freeciv/wonders/colossus.png
+share/freeciv/wonders/copernicus_observatory.png
+share/freeciv/wonders/cure_for_cancer.png
+share/freeciv/wonders/darwins_voyage.png
+share/freeciv/wonders/eiffel_tower.png
+share/freeciv/wonders/great_library.png
+share/freeciv/wonders/great_wall.png
+share/freeciv/wonders/hanging_gardens.png
+share/freeciv/wonders/hoover_dam.png
+share/freeciv/wonders/isaac_newtons_college.png
+share/freeciv/wonders/js_bachs_cathedral.png
+share/freeciv/wonders/king_richards_crusade.png
+share/freeciv/wonders/leonardos_workshop.png
+share/freeciv/wonders/lighthouse.png
+share/freeciv/wonders/magellans_expedition.png
+share/freeciv/wonders/manhattan_project.png
+share/freeciv/wonders/marco_polos_embassy.png
+share/freeciv/wonders/michelangelos_chapel.png
+share/freeciv/wonders/oracle.png
+share/freeciv/wonders/pyramids.png
+share/freeciv/wonders/seti_program.png
+share/freeciv/wonders/shakespeares_theatre.png
+share/freeciv/wonders/statue_of_liberty.png
+share/freeciv/wonders/sun_tzus_war_academy.png
+share/freeciv/wonders/united_nations.png
+share/freeciv/wonders/womens_suffrage.png
 share/locale/ar/LC_MESSAGES/freeciv.mo
 share/locale/ca/LC_MESSAGES/freeciv.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo
 share/locale/da/LC_MESSAGES/freeciv.mo
 share/locale/de/LC_MESSAGES/freeciv.mo
+share/locale/el/LC_MESSAGES/freeciv.mo
 share/locale/en_GB/LC_MESSAGES/freeciv.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
 share/locale/et/LC_MESSAGES/freeciv.mo
 share/locale/fa/LC_MESSAGES/freeciv.mo
 share/locale/fi/LC_MESSAGES/freeciv.mo
 share/locale/fr/LC_MESSAGES/freeciv.mo
-share/locale/he_IL/LC_MESSAGES/freeciv.mo
+share/locale/he/LC_MESSAGES/freeciv.mo
 share/locale/hu/LC_MESSAGES/freeciv.mo
 share/locale/it/LC_MESSAGES/freeciv.mo
 share/locale/ja/LC_MESSAGES/freeciv.mo
+share/locale/ko/LC_MESSAGES/freeciv.mo
+share/locale/lt/LC_MESSAGES/freeciv.mo
 share/locale/nb/LC_MESSAGES/freeciv.mo
 share/locale/nl/LC_MESSAGES/freeciv.mo
 share/locale/no/LC_MESSAGES/freeciv.mo
@@ -321,16 +684,23 @@ share/locale/pt_BR/LC_MESSAGES/freeciv.mo
 share/locale/ro/LC_MESSAGES/freeciv.mo
 share/locale/ru/LC_MESSAGES/freeciv.mo
 share/locale/sv/LC_MESSAGES/freeciv.mo
+share/locale/tr/LC_MESSAGES/freeciv.mo
 share/locale/uk/LC_MESSAGES/freeciv.mo
+share/locale/zh_CN/LC_MESSAGES/freeciv.mo
+share/pixmaps/freeciv-client.png
+@dirrm share/freeciv/wonders
 @dirrm share/freeciv/trident
+@dirrm share/freeciv/stdsounds
 @dirrm share/freeciv/scenario
 @dirrm share/freeciv/nation
 @dirrm share/freeciv/misc
 @dirrm share/freeciv/isotrident
 @dirrm share/freeciv/isophex
-@dirrm share/freeciv/history
+@dirrm share/freeciv/hex2t
 @dirrm share/freeciv/flags
 @dirrm share/freeciv/default
 @dirrm share/freeciv/civ2
 @dirrm share/freeciv/civ1
+@dirrm share/freeciv/buildings
+@dirrm share/freeciv/amplio
 @dirrm share/freeciv
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index 10decb90ad1..a41ef765953 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.15 2007/03/18 13:12:14 adam Exp $
+$NetBSD: distinfo,v 1.16 2008/01/06 16:39:15 adam Exp $
 
-SHA1 (freeciv-2.0.9.tar.bz2) = 9e1b64a96f38821abadc636621d276f70dedd686
-RMD160 (freeciv-2.0.9.tar.bz2) = e79cfc1d00f4f1b7ff28e84aca42dd2ef1e158d5
-Size (freeciv-2.0.9.tar.bz2) = 8875323 bytes
-SHA1 (patch-aa) = 7ea40fe657a1e1dd0078a9eea341087479e87e30
-SHA1 (patch-ab) = 7d1b9a0280c921753eb3541176fa90b50bce70de
-SHA1 (patch-ac) = e986b8c7a6d4007170a10f75c8f96e886179eada
+SHA1 (freeciv-2.1.2.tar.bz2) = 533d179685ad29eefd61c310cab031e5e0930215
+RMD160 (freeciv-2.1.2.tar.bz2) = 1e790415bc75bc8aff414f7ec4d9019e1b66979e
+Size (freeciv-2.1.2.tar.bz2) = 29407276 bytes
+SHA1 (patch-aa) = 34523216c37e86e0bf7b401481d26654dedac5a0
+SHA1 (patch-ab) = c5f1f5dc794358bb4ce9e4669fb99cb04ca89b94
diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
index e65776a8593..e6cdac1aba5 100644
--- a/games/freeciv-share/patches/patch-aa
+++ b/games/freeciv-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
+$NetBSD: patch-aa,v 1.7 2008/01/06 16:39:15 adam Exp $
 
---- configure.orig	2007-03-18 13:46:06.000000000 +0100
+--- configure.orig	2007-12-23 13:00:04.000000000 +0100
 +++ configure
-@@ -14364,13 +14364,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -12902,13 +12902,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14475,13 +14475,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13006,13 +13006,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14582,13 +14582,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13106,13 +13106,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14685,13 +14685,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13202,13 +13202,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -86,7 +86,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14794,13 +14794,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13304,13 +13304,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -107,7 +107,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -14900,13 +14900,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13403,13 +13403,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -15007,13 +15007,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13503,13 +13503,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -149,7 +149,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -15114,13 +15114,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13603,13 +13603,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
@@ -170,7 +170,7 @@ $NetBSD: patch-aa,v 1.6 2007/03/18 13:12:14 adam Exp $
        cat >>confdefs.h <<_ACEOF
  #define $ac_tr_lib 1
  _ACEOF
-@@ -15219,13 +15219,13 @@ echo "${ECHO_T}yes" >&6; }
+@@ -13701,13 +13701,13 @@ echo "${ECHO_T}yes" >&6
  
  
  
diff --git a/games/freeciv-share/patches/patch-ab b/games/freeciv-share/patches/patch-ab
index a2b677d614c..c3c147a9fcf 100644
--- a/games/freeciv-share/patches/patch-ab
+++ b/games/freeciv-share/patches/patch-ab
@@ -1,15 +1,17 @@
-$NetBSD: patch-ab,v 1.5 2007/03/18 13:12:14 adam Exp $
+$NetBSD: patch-ab,v 1.6 2008/01/06 16:39:16 adam Exp $
 
---- Makefile.in.orig	2007-02-12 00:38:05.000000000 +0100
+--- Makefile.in.orig	2007-12-23 13:00:17.000000000 +0100
 +++ Makefile.in
-@@ -283,8 +283,8 @@ target_vendor = @target_vendor@
+@@ -199,10 +199,10 @@ packagesrcdir = @packagesrcdir@
  @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual
  @SERVER_FALSE@MSUBDIRS = 
- @MAKE_DATA_FALSE@DSUBDIRS = 
+ 
 -@MAKE_DATA_TRUE@DSUBDIRS = data
--SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
 +@MAKE_DATA_TRUE@DSUBDIRS = data po doc
+ @MAKE_DATA_FALSE@DSUBDIRS = 
+ 
+-SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
 +SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS)
- EXTRA_DIST = acconfig.old			\
- 		autogen.sh 			\
+ 
+ EXTRA_DIST = autogen.sh 			\
  		config.mac.h			\
diff --git a/games/freeciv-share/patches/patch-ac b/games/freeciv-share/patches/patch-ac
deleted file mode 100644
index 24554217d51..00000000000
--- a/games/freeciv-share/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/07/15 20:05:18 rillig Exp $
-
-SunPro treats incompatible types in the ?: operator as error.
-
---- client/helpdata.c.orig	2005-10-13 09:45:45.000000000 +0200
-+++ client/helpdata.c	2006-07-15 21:58:31.317408915 +0200
-@@ -553,10 +553,10 @@ char *helptext_building(char *buf, size_
- 
- #define req_append(s)							    \
-       (req_buf[0] != '\0'						    \
--       ? my_snprintf(req_buf + strlen(req_buf),				    \
-+       ? (void)my_snprintf(req_buf + strlen(req_buf),			    \
- 		     sizeof(req_buf) - strlen(req_buf),			    \
- 		     ", %s", (s))					    \
--       : sz_strlcpy(req_buf, (s)))
-+       : (void)sz_strlcpy(req_buf, (s)))
- 
-       if (b->tech_req != A_NONE) {
- 	req_append(get_tech_name(game.player_ptr, b->tech_req));