Update to 1.11.4:

	Internationalization extended.
	Full fog of war, nuclear fallout and more new goodies.
	Lots of user interface improvements.
	Lots of little bugfixes.

Also, the distfile location has changed.
Added a new mirror.

4 files changed, 96 insertions, 25 deletions

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index bc8adb1b6004..49acd9875c20 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	freeciv
-PORTVERSION=	1.10.0
+PORTVERSION=	1.11.4
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable_version/ \
-		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable_version/
+MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
+		ftp://ftp.netc.pt/pub/freeciv/stable/ \
+		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable/
 .if defined(WITH_GTK)
 PKGNAMESUFFIX=	-gtk
 .endif
@@ -24,8 +25,8 @@ LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 .if defined(WITH_GTK)
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+GLIB_CONFIG?=	${LOCALBASE}/bin/gtk12-config
+CONFIGURE_ENV=	GTK_CONFIG="${GLIB_CONFIG}"
 .else
 CONFIGURE_ARGS=	--disable-gtktest
 .endif
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index 9bef98d17972..e2d59d363fdd 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1 +1 @@
-MD5 (freeciv-1.10.0.tar.bz2) = eea2dbb9f5dfed5f33f59845b56be506
+MD5 (freeciv-1.11.4.tar.bz2) = 06e495a5b34daa556e6a1cd5b85dab19
diff --git a/games/freeciv/pkg-descr b/games/freeciv/pkg-descr
index be0f15caeb42..00bdbeb503ca 100644
--- a/games/freeciv/pkg-descr
+++ b/games/freeciv/pkg-descr
@@ -1,3 +1,3 @@
 This is a multiplayer 'Civilisation(tm)' clone for X windows.
 
-WWW: http://www.freeciv.org
+WWW: http://www.freeciv.org/
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 47321e7c27db..687cb7e45d93 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,14 +1,17 @@
-bin/civclient
 bin/civserver
+bin/civclient
 share/freeciv/Freeciv
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
+share/freeciv/civ1/game.ruleset
 share/freeciv/civ1/governments.ruleset
+share/freeciv/civ1/nations.ruleset
 share/freeciv/civ1/techs.ruleset
 share/freeciv/civ1/terrain.ruleset
 share/freeciv/civ1/units.ruleset
 share/freeciv/civ2.serv
 share/freeciv/civ2/buildings.ruleset
+share/freeciv/civ2/game.ruleset
 share/freeciv/civ2/governments.ruleset
 share/freeciv/civ2/techs.ruleset
 share/freeciv/civ2/terrain.ruleset
@@ -16,6 +19,7 @@ share/freeciv/civ2/units.ruleset
 share/freeciv/classic/terrain.ruleset
 share/freeciv/default/buildings.ruleset
 share/freeciv/default/cities.ruleset
+share/freeciv/default/game.ruleset
 share/freeciv/default/governments.ruleset
 share/freeciv/default/nations.ruleset
 share/freeciv/default/techs.ruleset
@@ -35,6 +39,7 @@ share/freeciv/engels/tiles.xpm
 share/freeciv/engels/units.spec
 share/freeciv/engels/units.xpm
 share/freeciv/engels_shields.tilespec
+share/freeciv/freeciv.rc
 share/freeciv/helpdata.txt
 share/freeciv/misc/chiefs.spec
 share/freeciv/misc/chiefs.xpm
@@ -48,6 +53,64 @@ share/freeciv/misc/space.spec
 share/freeciv/misc/space.xpm
 share/freeciv/misc/treaty.spec
 share/freeciv/misc/treaty.xpm
+share/freeciv/nation/american.ruleset
+share/freeciv/nation/arab.ruleset
+share/freeciv/nation/argentine.ruleset
+share/freeciv/nation/australian.ruleset
+share/freeciv/nation/aztec.ruleset
+share/freeciv/nation/babylonian.ruleset
+share/freeciv/nation/barbarian.ruleset
+share/freeciv/nation/bavarian.ruleset
+share/freeciv/nation/boer.ruleset
+share/freeciv/nation/brazilian.ruleset
+share/freeciv/nation/canadian.ruleset
+share/freeciv/nation/carthaginian.ruleset
+share/freeciv/nation/chinese.ruleset
+share/freeciv/nation/cornish.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/english.ruleset
+share/freeciv/nation/estonian.ruleset
+share/freeciv/nation/filipino.ruleset
+share/freeciv/nation/finnish.ruleset
+share/freeciv/nation/french.ruleset
+share/freeciv/nation/german.ruleset
+share/freeciv/nation/greek.ruleset
+share/freeciv/nation/hungarian.ruleset
+share/freeciv/nation/inca.ruleset
+share/freeciv/nation/indian.ruleset
+share/freeciv/nation/irish.ruleset
+share/freeciv/nation/israeli.ruleset
+share/freeciv/nation/italian.ruleset
+share/freeciv/nation/japanese.ruleset
+share/freeciv/nation/kenyan.ruleset
+share/freeciv/nation/korean.ruleset
+share/freeciv/nation/krevi.ruleset
+share/freeciv/nation/latvian.ruleset
+share/freeciv/nation/lithuanian.ruleset
+share/freeciv/nation/misc_cities.ruleset
+share/freeciv/nation/mongol.ruleset
+share/freeciv/nation/mordor.ruleset
+share/freeciv/nation/olympic.ruleset
+share/freeciv/nation/persian.ruleset
+share/freeciv/nation/polish.ruleset
+share/freeciv/nation/portuguese.ruleset
+share/freeciv/nation/roman.ruleset
+share/freeciv/nation/russian.ruleset
+share/freeciv/nation/scottish.ruleset
+share/freeciv/nation/sioux.ruleset
+share/freeciv/nation/spanish.ruleset
+share/freeciv/nation/swedish.ruleset
+share/freeciv/nation/thai.ruleset
+share/freeciv/nation/turk.ruleset
+share/freeciv/nation/ukrainian.ruleset
+share/freeciv/nation/vietnamese.ruleset
+share/freeciv/nation/viking.ruleset
+share/freeciv/nation/welsh.ruleset
+share/freeciv/nation/zulu.ruleset
 share/freeciv/scenario/earth-160x90-v1.sav
 share/freeciv/scenario/earth-160x90-v2.sav
 share/freeciv/scenario/earth-80x50-v1.sav
@@ -74,38 +137,45 @@ share/locale/en_GB/LC_MESSAGES/freeciv.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
 share/locale/fr/LC_MESSAGES/freeciv.mo
 share/locale/hu/LC_MESSAGES/freeciv.mo
+share/locale/ja/LC_MESSAGES/freeciv.mo
+share/locale/nl/LC_MESSAGES/freeciv.mo
 share/locale/no/LC_MESSAGES/freeciv.mo
 share/locale/pl/LC_MESSAGES/freeciv.mo
 share/locale/pt/LC_MESSAGES/freeciv.mo
 share/locale/pt_BR/LC_MESSAGES/freeciv.mo
 share/locale/ru/LC_MESSAGES/freeciv.mo
-@dirrm share/freeciv
-@dirrm share/freeciv/misc
-@dirrm share/freeciv/trident
-@dirrm share/freeciv/engels
-@dirrm share/freeciv/default
-@dirrm share/freeciv/classic
 @dirrm share/freeciv/civ1
 @dirrm share/freeciv/civ2
+@dirrm share/freeciv/classic
+@dirrm share/freeciv/default
+@dirrm share/freeciv/engels
+@dirrm share/freeciv/misc
+@dirrm share/freeciv/nation
 @dirrm share/freeciv/scenario
-@dirrm share/locale
-@dirrm share/locale/de
+@dirrm share/freeciv/trident
+@dirrm share/freeciv
 @dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/en_GB
+@dirrm share/locale/de
 @dirrm share/locale/en_GB/LC_MESSAGES
-@dirrm share/locale/es
+@dirrm share/locale/en_GB
 @dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/fr
+@dirrm share/locale/es
 @dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/hu
+@dirrm share/locale/fr
 @dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/no
+@dirrm share/locale/hu
+@dirrm share/locale/ja/LC_MESSAGES
+@dirrm share/locale/ja
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
 @dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/pl
+@dirrm share/locale/no
 @dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pt
+@dirrm share/locale/pl
 @dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt_BR
+@dirrm share/locale/pt
 @dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/ru
+@dirrm share/locale/pt_BR
 @dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru
+@dirrm share/locale