diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index f71f9f9718a..728320442ea 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,98 +1,75 @@
-# $OpenBSD: Makefile,v 1.42 2005/04/09 11:21:55 espie Exp $
+# $OpenBSD: Makefile,v 1.43 2005/07/09 10:36:18 alek Exp $
 
 COMMENT=	"Civilization clone for X11; multiplayer; game server"
 COMMENT-client=	"Freeciv client"
 COMMENT-share=	"shared data files for Freeciv"
 
-VERSION=	1.14.1
+VERSION=	2.0.2
 DISTNAME=	freeciv-${VERSION}
 PKGNAME=	freeciv-server-${VERSION}
-PKGNAME-client=	freeciv-client-${VERSION}p0
+PKGNAME-client=	freeciv-client-${VERSION}
 PKGNAME-share=	freeciv-share-${VERSION}
 CATEGORIES=	games
 HOMEPAGE=	http://www.freeciv.org/
 
-MAINTAINER=	Aleksander Piotrowski <alek@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freeciv/} \
+		ftp://ftp.freeciv.org/pub/freeciv/stable/
 EXTRACT_SUFX=	.tar.bz2
 
-FLAVORS=	gtk2 esd sdl
 PSEUDO_FLAVORS=	no_x11
 FLAVOR?=
 
-.if ${FLAVOR:L:Mno_x11} && ${FLAVOR:L} != "no_x11"
-ERRORS+=	"Fatal: FLAVOR 'no_x11' and the other FLAVORS are mutually exclusive."
-.endif
-
 MULTI_PACKAGES=	-share
 SUBPACKAGE?=
 
-.if !defined(PACKAGING) || ${SUBPACKAGE} != "-share"
-# -client and -server
-MODULES=	devel/gettext
-WANTLIB=	c m ncurses readline z
+BUILD_DEPENDS=	::lang/python/2.3
 
-.  if !${FLAVOR:L:Mno_x11}
-# -client
-USE_X11=	Yes
+MODULES=	devel/gettext
+WANTLIB=	c m z ncurses readline
+
+.if !${FLAVOR:L:Mno_x11}
 MULTI_PACKAGES+=-client
 
-.    if ${FLAVOR:L:Msdl}
-LIB_DEPENDS+=	SDL_mixer::devel/sdl-mixer
-CONFIGURE_ARGS+=--with-sdl-prefix=${LOCALBASE}
-WANTLIB+=	ICE SDL SM X11 Xaw Xext Xmu Xpm Xt pthread usbhid
-.    else
-CONFIGURE_ARGS+=--disable-sdl-mixer
-.    endif
-
-.    if ${FLAVOR:L:Mesd}
-LIB_DEPENDS+=	esd.2::audio/esound
-CONFIGURE_ARGS+=--with-esd-prefix=${LOCALBASE}
-WANTLIB+=	audiofile
-.    else
-CONFIGURE_ARGS+=--disable-esd
-.    endif
-
-.    if ${FLAVOR:L:Mgtk2}
 BUILD_DEPENDS+=	:pkgconfig-*:devel/pkgconfig
-LIB_DEPENDS+=	gtk-x11-2.0.0.5,gdk-x11-2.0.0.5,gdk_pixbuf-2.0.0.5::x11/gtk+2
-CONFIGURE_ARGS+=--enable-client=gtk2
-WANTLIB+=	X11 Xext Xft Xinerama Xrender Xcursor atk-1.0.0.0 fontconfig \
-		freetype glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
-		pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0
-.    else
-CONFIGURE_ARGS+=--enable-client=xaw
-WANTLIB+=	ICE SM X11 Xaw Xext Xmu Xpm Xt
-.    endif
+LIB_DEPENDS=	gtk-x11-2.0.0.5,gdk-x11-2.0.0.5,gdk_pixbuf-2.0.0.5::x11/gtk+2 \
+		esd.2::audio/esound 
+CONFIGURE_ARGS=	--enable-client=gtk2 \
+		--disable-sdl-mixer \
+		--with-esd-prefix=${LOCALBASE}
+WANTLIB-client=	X11  Xft Xrender atk-1.0.0.0 fontconfig freetype audiofile \
+		glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 pango-1.0.0.0 \
+		pangox-1.0.0.0 pangoxft-1.0.0.0 audiofile
+.else
+CONFIGURE_ARGS=	--enable-client=no
+.endif
 
+.if defined(PACKAGING)
+.  if ${SUBPACKAGE} == "-share"
+PKG_ARCH=	*
+MODULES=
+LIB_DEPENDS=
+WANTLIB=
+.  elif ${SUBPACKAGE} == "-client"
+WANTLIB+=	${WANTLIB-client}
 .  else
-CONFIGURE_ARGS+=--enable-client=no
+LIB_DEPENDS=
 .  endif
 
+.  if ${SUBPACKAGE} != "-share"
+RUN_DEPENDS=	:freeciv-share-${VERSION}:games/freeciv,-share
+.  endif
 .endif
 
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-share"
-PKG_ARCH=		*
-.endif
+USE_GMAKE=	Yes
 
-.if defined(PACKAGING) && ${SUBPACKAGE} != "-share"
-RUN_DEPENDS+=	:freeciv-share-${VERSION}:games/freeciv,-share
-.endif
-
-FULLPKGNAME=		${PKGNAME}
-FULLPKGNAME-share=	${PKGNAME-share}
-
-NO_REGRESS=		Yes
-
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_STYLE=gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index ee1d4c81b1d..7e373a051c2 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,4 +1,4 @@
-MD5 (freeciv-1.14.1.tar.bz2) = d328f65e7fca5252f27161f5f9e97a03
-RMD160 (freeciv-1.14.1.tar.bz2) = a2486c39ad16dd13446bc47dc2a700842f7cdcc3
-SHA1 (freeciv-1.14.1.tar.bz2) = fc41f5e44eb7be37a4632999a5bd709c4cf975a2
-SIZE (freeciv-1.14.1.tar.bz2) = 5850722
+MD5 (freeciv-2.0.2.tar.bz2) = dadd040a767dd5e1a7f1e18c7dfa756f
+RMD160 (freeciv-2.0.2.tar.bz2) = 68eff4838530b4f4a1c20127ccdea06c7a77e580
+SHA1 (freeciv-2.0.2.tar.bz2) = 622d30417061c5a18ef3ace1df50691d729ce14d
+SIZE (freeciv-2.0.2.tar.bz2) = 8456328
diff --git a/games/freeciv/patches/patch-configure b/games/freeciv/patches/patch-configure
index 17e5ba3f0fc..7adfdfc1c41 100644
--- a/games/freeciv/patches/patch-configure
+++ b/games/freeciv/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.7 2004/08/12 15:02:25 naddy Exp $
+$OpenBSD: patch-configure,v 1.8 2005/07/09 10:36:18 alek Exp $
 --- configure.orig	2004-05-31 13:55:42.000000000 +0200
 +++ configure	2004-05-31 13:57:44.000000000 +0200
 @@ -6855,7 +6860,7 @@ if test "${ac_cv_lib_intl_ngettext+set}"
@@ -19,12 +19,3 @@ $OpenBSD: patch-configure,v 1.7 2004/08/12 15:02:25 naddy Exp $
  templang="$LANG"
  LANG="de_DE"
  if test "$cross_compiling" = yes; then
-@@ -11745,7 +11745,7 @@ if test "${ac_cv_lib_SDL_mixer_Mix_OpenA
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lSDL_mixer  $LIBS"
-+LIBS="$SDL_LIBS -lSDL_mixer  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
diff --git a/games/freeciv/pkg/DESCR b/games/freeciv/pkg/DESCR
index 4067c315efd..61fc67ba918 100644
--- a/games/freeciv/pkg/DESCR
+++ b/games/freeciv/pkg/DESCR
@@ -4,15 +4,5 @@ the extinction of all other civilizations.  Freeciv aims to be
 mostly rule-compatible with Civilization II, published by Sid Meier
 and Microprose.
 
-FreeCiv comes without sound sets.  You can get them from:
-  ftp://ftp.freeciv.org/freeciv/contrib/sounds/
-and then start civclient with:
-  -P sound_plugin_name -S /sound/spec/file
-E.g.: civclient -P sdl -S /home/deraadt/civsounds/file.spec
-(Note: Sound specs might have relative paths.)
-
 Flavors:
         * no_x11 - don't build UI subpackage
-        * gtk2   - build UI using GTK v2 widgets
-        * sdl    - sound support using SDL library
-        * esd    - sound support using ESD library
diff --git a/games/freeciv/pkg/DESCR-client b/games/freeciv/pkg/DESCR-client
index 5bd35ae2d8b..3cf494cb777 100644
--- a/games/freeciv/pkg/DESCR-client
+++ b/games/freeciv/pkg/DESCR-client
@@ -1 +1,4 @@
 This package contains the client for Freeciv.
+
+Freeciv comes without sound sets.  You can get them from:
+        ftp://ftp.freeciv.org/freeciv/contrib/sounds/
diff --git a/games/freeciv/pkg/PLIST b/games/freeciv/pkg/PLIST
index b91e27b7cf2..abde6642aea 100644
--- a/games/freeciv/pkg/PLIST
+++ b/games/freeciv/pkg/PLIST
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.10 2004/06/02 12:40:42 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.11 2005/07/09 10:36:18 alek Exp $
 bin/civserver
+@man man/man6/civserver.6
diff --git a/games/freeciv/pkg/PLIST-client b/games/freeciv/pkg/PLIST-client
index 7590c832f67..40cd7b6073b 100644
--- a/games/freeciv/pkg/PLIST-client
+++ b/games/freeciv/pkg/PLIST-client
@@ -1,2 +1,187 @@
-@comment $OpenBSD: PLIST-client,v 1.1 2004/06/02 12:40:42 sturm Exp $
+@comment $OpenBSD: PLIST-client,v 1.2 2005/07/09 10:36:18 alek Exp $
 bin/civclient
+bin/civmanual
+@man man/man6/civclient.6
+share/applications/
+share/applications/freeciv.desktop
+share/freeciv/flags/
+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-2.0
+share/freeciv/helpdata.txt
+share/freeciv/isophex/
+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/
+share/freeciv/isotrident.tilespec
+share/freeciv/isotrident/cities.png
+share/freeciv/isotrident/cities.spec
+share/freeciv/isotrident/morecities.png
+share/freeciv/isotrident/morecities.spec
+share/freeciv/isotrident/nuke.png
+share/freeciv/isotrident/nuke.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/misc/
+share/freeciv/misc/buildings.png
+share/freeciv/misc/buildings.spec
+share/freeciv/misc/chiefs.png
+share/freeciv/misc/chiefs.spec
+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/small.png
+share/freeciv/misc/small.spec
+share/freeciv/misc/space.png
+share/freeciv/misc/space.spec
+share/freeciv/misc/treaty.png
+share/freeciv/misc/treaty.spec
+share/freeciv/trident/
+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/roads.png
+share/freeciv/trident/roads.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
diff --git a/games/freeciv/pkg/PLIST-share b/games/freeciv/pkg/PLIST-share
index fb75b7a59dd..63fcb27d0bd 100644
--- a/games/freeciv/pkg/PLIST-share
+++ b/games/freeciv/pkg/PLIST-share
@@ -1,7 +1,4 @@
-@comment $OpenBSD: PLIST-share,v 1.2 2004/09/15 00:46:09 espie Exp $
-share/freeciv/
-share/freeciv/Freeciv
-share/freeciv/civ1/
+@comment $OpenBSD: PLIST-share,v 1.3 2005/07/09 10:36:18 alek Exp $
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
 share/freeciv/civ1/game.ruleset
@@ -10,7 +7,6 @@ share/freeciv/civ1/nations.ruleset
 share/freeciv/civ1/techs.ruleset
 share/freeciv/civ1/terrain.ruleset
 share/freeciv/civ1/units.ruleset
-share/freeciv/civ2/
 share/freeciv/civ2.serv
 share/freeciv/civ2/buildings.ruleset
 share/freeciv/civ2/game.ruleset
@@ -18,7 +14,6 @@ share/freeciv/civ2/governments.ruleset
 share/freeciv/civ2/techs.ruleset
 share/freeciv/civ2/terrain.ruleset
 share/freeciv/civ2/units.ruleset
-share/freeciv/default/
 share/freeciv/default/buildings.ruleset
 share/freeciv/default/cities.ruleset
 share/freeciv/default/game.ruleset
@@ -27,63 +22,34 @@ share/freeciv/default/nations.ruleset
 share/freeciv/default/techs.ruleset
 share/freeciv/default/terrain.ruleset
 share/freeciv/default/units.ruleset
-share/freeciv/freeciv.rc
-share/freeciv/freeciv.rc-2.0
-share/freeciv/helpdata.txt
-share/freeciv/history/
+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/isotrident/
-share/freeciv/isotrident.tilespec
-share/freeciv/isotrident/cities.spec
-share/freeciv/isotrident/cities.xpm
-share/freeciv/isotrident/flags.spec
-share/freeciv/isotrident/flags.xpm
-share/freeciv/isotrident/nuke.spec
-share/freeciv/isotrident/nuke.xpm
-share/freeciv/isotrident/small.spec
-share/freeciv/isotrident/small.xpm
-share/freeciv/isotrident/terrain1.spec
-share/freeciv/isotrident/terrain1.xpm
-share/freeciv/isotrident/terrain2.spec
-share/freeciv/isotrident/terrain2.xpm
-share/freeciv/isotrident/tiles.spec
-share/freeciv/isotrident/tiles.xpm
-share/freeciv/isotrident/units.spec
-share/freeciv/isotrident/units.xpm
-share/freeciv/misc/
-share/freeciv/misc/chiefs.spec
-share/freeciv/misc/chiefs.xpm
-share/freeciv/misc/intro.xpm
-share/freeciv/misc/radar.xpm
-share/freeciv/misc/shields.spec
-share/freeciv/misc/shields.xpm
-share/freeciv/misc/small.spec
-share/freeciv/misc/small.xpm
-share/freeciv/misc/space.spec
-share/freeciv/misc/space.xpm
-share/freeciv/misc/treaty.spec
-share/freeciv/misc/treaty.xpm
-share/freeciv/nation/
+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
@@ -91,30 +57,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
@@ -124,7 +103,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,41 +114,26 @@ share/freeciv/nation/vietnamese.ruleset
 share/freeciv/nation/viking.ruleset
 share/freeciv/nation/welsh.ruleset
 share/freeciv/nation/zulu.ruleset
-share/freeciv/scenario/
 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/trident/
-share/freeciv/trident.tilespec
-share/freeciv/trident/auto_ll.spec
-share/freeciv/trident/cities.spec
-share/freeciv/trident/cities.xpm
-share/freeciv/trident/explosions.spec
-share/freeciv/trident/explosions.xpm
-share/freeciv/trident/flags.spec
-share/freeciv/trident/flags.xpm
-share/freeciv/trident/roads.spec
-share/freeciv/trident/roads.xpm
-share/freeciv/trident/tiles.spec
-share/freeciv/trident/tiles.xpm
-share/freeciv/trident/units.spec
-share/freeciv/trident/units.xpm
-share/freeciv/trident_shields.tilespec
+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/en_GB/
-share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/freeciv.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
 share/locale/et/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/hu/LC_MESSAGES/freeciv.mo
 share/locale/it/LC_MESSAGES/freeciv.mo
 share/locale/ja/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
 share/locale/pl/LC_MESSAGES/freeciv.mo