Minor rehaul of the freeciv ports:

- Add nox11 port, server only [1]
- Fix conflicts
- Update comment and pkg-descr
- Minor fixes

Inspired by:	Gergely CZUCZY <phoemix@harmless.hu> [1]

10 files changed, 242 insertions, 415 deletions

diff --git a/games/Makefile b/games/Makefile
index e0012cb..7e2917f 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -203,6 +203,7 @@
     SUBDIR += freeciv
     SUBDIR += freeciv-gtk
     SUBDIR += freeciv-gtk2
+    SUBDIR += freeciv-nox11
     SUBDIR += freedoko
     SUBDIR += freedroid
     SUBDIR += freedroidrpg
diff --git a/games/freeciv-gtk/Makefile b/games/freeciv-gtk/Makefile
index 7b724fa..c2984de 100644
--- a/games/freeciv-gtk/Makefile
+++ b/games/freeciv-gtk/Makefile
@@ -1,16 +1,11 @@
 # New ports collection makefile for:	freeciv-gtk
-# Date created:         29 Feb 2000
-# Whom:                 sheldonh
+# Date created:		29 Feb 2000
+# Whom:			sheldonh
 #
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-gtk
-
-COMMENT=	A civilisation clone for X11 using GNOME; multiplayer
-
 MASTERDIR=	${.CURDIR}/../freeciv
-
 WITH_GTK=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv-gtk/pkg-descr b/games/freeciv-gtk/pkg-descr
deleted file mode 100644
index c001033..0000000
--- a/games/freeciv-gtk/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a multiplayer 'Civilisation(tm)' clone for X11, using
-the GNOME toolkit as a framework for the GUI.
-
-WWW: http://www.freeciv.org/
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index cf586dc..d31bfe4 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -1,16 +1,11 @@
-# New ports collection makefile for:	freeciv-gtk
-# Date created:         29 Feb 2000
-# Whom:                 sheldonh
+# New ports collection makefile for:	freeciv-gtk2
+# Date created:		29 Feb 2000
+# Whom:			sheldonh
 #
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-gtk2
-
-COMMENT=	A civilisation clone for X11 using GNOME2; multiplayer
-
 MASTERDIR=	${.CURDIR}/../freeciv
-
 WITH_GTK2=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv-gtk2/pkg-descr b/games/freeciv-gtk2/pkg-descr
deleted file mode 100644
index 5fadd00..0000000
--- a/games/freeciv-gtk2/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a multiplayer 'Civilisation(tm)' clone for X11, using
-the GNOME2 toolkit as a framework for the GUI.
-
-WWW: http://www.freeciv.org/
diff --git a/games/freeciv-nox11/Makefile b/games/freeciv-nox11/Makefile
new file mode 100644
index 0000000..5ec1b86
--- /dev/null
+++ b/games/freeciv-nox11/Makefile
@@ -0,0 +1,11 @@
+# New ports collection makefile for:	freeciv-nox11
+# Date created:		22 August 2006
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+MASTERDIR=	${.CURDIR}/../freeciv
+WITHOUT_X11=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index f18abbd..607ab25 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -10,28 +10,32 @@ PORTVERSION=	2.0.8
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ SF
 
-MAINTAINER?=	infofarmer@FreeBSD.org
-COMMENT?=	A civilisation clone for X11; multiplayer
-
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		png.5:${PORTSDIR}/graphics/png
+MAINTAINER=	infofarmer@FreeBSD.org
+COMMENT=	Free turn-based multiplayer strategy
 
 USE_GCC=	3.4+
 USE_GETTEXT=	yes
-USE_XPM=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN6=		civserver.6 civclient.6
 
+.ifndef WITHOUT_X11
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
+		png.5:${PORTSDIR}/graphics/png
+USE_XPM=	yes
+WANT_GNOME=	yes
+CONFIGURE_ENV+=	SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+PLIST_SUB+=	X11=""
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if 	!defined(WITH_GTK) && !defined(WITH_GTK12) && !defined(WITH_GTK2) && \
-	!defined(WITHOUT_GNOME)
+	!defined(WITHOUT_GNOME) && !defined(WITHOUT_X11)
 AUTO_DEPENDS=	yes
 .if ${HAVE_GNOME:Mgtk20}!=""
 WITH_GTK2=	yes
@@ -40,39 +44,47 @@ WITH_GTK=	yes
 .endif
 .endif
 
+CFG_PATCH=s/[[:<:]](test)[[:space:]]*([^=]*)[[:>:]][[:space:]]*==[[:space:]]*([^()|&;<>]*)[[:>:]]/\1 "\2" = "\3"/g;
+CONFLICTS_ALL=	freeciv freeciv-gtk freeciv-gtk2 freeciv-nox11
+CONFLICTS=	${CONFLICTS_ALL:S/^${PKGBASE}$//:S/$/-[0-9]*/}
+
 .if defined(WITH_GTK2)
-CONFLICTS=	freeciv-1* freeciv-gtk-1*
 USE_GNOME+=	gtk20
 PKGNAMESUFFIX?=	-gtk2
 CONFIGURE_ARGS+=	--enable-client=gtk2
 PLIST_FILES+=	%%DATADIR%%/freeciv.rc-2.0
 .elif defined(WITH_GTK) || defined(WITH_GTK12)
-CONFLICTS=	freeciv-1* freeciv-gtk2-1*
 USE_GNOME+=	imlib gtk12
 PKGNAMESUFFIX?=	-gtk
 CONFIGURE_ARGS+=	--enable-client=gtk
 PLIST_FILES+=	%%DATADIR%%/freeciv.rc
+.elif defined(WITHOUT_X11)
+PLIST_SUB+=	X11="@comment "
+PKGNAMESUFFIX?=	-nox11
+CONFIGURE_ARGS+=	--enable-client=no
 .else
-CONFLICTS=	freeciv-gtk-1* freeciv-gtk2-1*
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 CONFIGURE_ARGS+=	--enable-client=xaw3d
 PLIST_FILES+=	%%DATADIR%%/Freeciv
 .endif
 
 pre-fetch:
-.if defined(AUTO_DEPENDS)
-	@${ECHO} -n "No WITH_GTK, WITH_GTK2 or WITHOUT_GNOME defined, autodetecting: "
-.if defined(WITH_GTK)
+.ifdef AUTO_DEPENDS
+	@${ECHO} -n "No WITH_GTK, WITH_GTK2, WITHOUT_GNOME or WITHOUT_X11 defined, autodetecting: "
+.ifdef WITH_GTK
 	@${ECHO} "GTK"
-.elif defined(WITH_GTK2)
+.elifdef WITH_GTK2
 	@${ECHO} "GTK2"
+.elifdef WITHOUT_X11
+	@${ECHO} "NOX11"
 .else
 	@${ECHO} "Xaw3d"
 .endif
 .endif
 
 post-patch:
-	cd ${WRKSRC}; ${FIND} . -name Makefile.in | \
+	@${REINPLACE_CMD} -Ee '${CFG_PATCH}' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} -e 's/@program_transform_name@//'
 
 .if ${OSVERSION} < 500000
diff --git a/games/freeciv/files/patch-configure b/games/freeciv/files/patch-configure
deleted file mode 100644
index 07cd2de..0000000
--- a/games/freeciv/files/patch-configure
+++ /dev/null
@@ -1,191 +0,0 @@
---- configure.orig	Sat May  7 01:37:34 2005
-+++ configure	Sat May  7 01:47:40 2005
-@@ -12203,13 +12203,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -12316,13 +12316,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -12425,13 +12425,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -12530,13 +12530,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -12641,13 +12641,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -12749,13 +12749,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -12858,13 +12858,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -12967,13 +12967,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
-@@ -13074,13 +13074,13 @@
- 
- 
- 
--    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 x"$ac_tr_lib" = x"HAVE_LIBX11"     \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXEXT" \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXT"   \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXMU"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXPM"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW"  \
-+        || test x"$ac_tr_lib" = x"HAVE_LIBXAW3D"); then
-       cat >>confdefs.h <<_ACEOF
- #define $ac_tr_lib 1
- _ACEOF
diff --git a/games/freeciv/pkg-descr b/games/freeciv/pkg-descr
index 730fa86..c1df5a9 100644
--- a/games/freeciv/pkg-descr
+++ b/games/freeciv/pkg-descr
@@ -1,4 +1,16 @@
-This is a multiplayer 'Civilisation(tm)' clone for X11.
+Freeciv is a free turn-based multiplayer strategy game, in which each
+player becomes the leader of a civilization, fighting to obtain the
+ultimate goal: to become the greatest civilization.
+
+Players of the Civilization series by Microprose should feel at home,
+since one aim of Freeciv is to have optional modes (called rulesets)
+with compatible rules.
+
+Freeciv is maintained by an international team of coders and enthusiasts,
+and is easily one of the most fun and addictive network games out there!
+
+That also means it has very extensive multilanguage support, something
+rare in games. 
 
 WWW: http://www.freeciv.org/
 
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index e9adc75..59a3c22 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,6 +1,6 @@
-bin/civclient
 bin/civserver
-bin/civmanual
+%%X11%%bin/civclient
+%%X11%%bin/civmanual
 %%DATADIR%%/civ1.serv
 %%DATADIR%%/civ1/buildings.ruleset
 %%DATADIR%%/civ1/game.ruleset
@@ -24,162 +24,162 @@ bin/civmanual
 %%DATADIR%%/default/techs.ruleset
 %%DATADIR%%/default/terrain.ruleset
 %%DATADIR%%/default/units.ruleset
-%%DATADIR%%/helpdata.txt
+%%X11%%%%DATADIR%%/helpdata.txt
 %%DATADIR%%/history/buildings.ruleset
 %%DATADIR%%/history/game.ruleset
 %%DATADIR%%/history/governments.ruleset
 %%DATADIR%%/history/techs.ruleset
 %%DATADIR%%/history/terrain.ruleset
 %%DATADIR%%/history/units.ruleset
-%%DATADIR%%/isotrident.tilespec
-%%DATADIR%%/isotrident/cities.spec
-%%DATADIR%%/isotrident/nuke.spec
-%%DATADIR%%/isotrident/terrain1.spec
-%%DATADIR%%/isotrident/terrain2.spec
-%%DATADIR%%/isotrident/tiles.spec
-%%DATADIR%%/isotrident/units.spec
-%%DATADIR%%/isotrident/cities.png
-%%DATADIR%%/isotrident/morecities.png
-%%DATADIR%%/isotrident/morecities.spec
-%%DATADIR%%/isotrident/nuke.png
-%%DATADIR%%/isotrident/terrain1.png
-%%DATADIR%%/isotrident/terrain2.png
-%%DATADIR%%/isotrident/tiles.png
-%%DATADIR%%/isotrident/units.png
-%%DATADIR%%/flags/afghanistan-shield.png
-%%DATADIR%%/flags/afghanistan.png
-%%DATADIR%%/flags/arab.png
-%%DATADIR%%/flags/argentina.png
-%%DATADIR%%/flags/armenia.png
-%%DATADIR%%/flags/assyria-shield.png
-%%DATADIR%%/flags/assyria.png
-%%DATADIR%%/flags/australia.png
-%%DATADIR%%/flags/austria.png
-%%DATADIR%%/flags/azerbaijan.png
-%%DATADIR%%/flags/barbarian.png
-%%DATADIR%%/flags/bavarian.png
-%%DATADIR%%/flags/belgium.png
-%%DATADIR%%/flags/boer.png
-%%DATADIR%%/flags/bosnia-shield.png
-%%DATADIR%%/flags/bosnia.png
-%%DATADIR%%/flags/brasil.png
-%%DATADIR%%/flags/bulgaria.png
-%%DATADIR%%/flags/canada.png
-%%DATADIR%%/flags/catalan.png
-%%DATADIR%%/flags/cheyenne.png
-%%DATADIR%%/flags/chile.png
-%%DATADIR%%/flags/china.png
-%%DATADIR%%/flags/columbia-shield.png
-%%DATADIR%%/flags/columbia.png
-%%DATADIR%%/flags/cornwall.png
-%%DATADIR%%/flags/croatia.png
-%%DATADIR%%/flags/cuba.png
-%%DATADIR%%/flags/czech.png
-%%DATADIR%%/flags/denmark.png
-%%DATADIR%%/flags/dunedain.png
-%%DATADIR%%/flags/egypt.png
-%%DATADIR%%/flags/elves-shield.png
-%%DATADIR%%/flags/elves.png
-%%DATADIR%%/flags/england.png
-%%DATADIR%%/flags/estonia.png
-%%DATADIR%%/flags/ethiopia-shield.png
-%%DATADIR%%/flags/ethiopia.png
-%%DATADIR%%/flags/europe.png
-%%DATADIR%%/flags/finland.png
-%%DATADIR%%/flags/france.png
-%%DATADIR%%/flags/galicia-shield.png
-%%DATADIR%%/flags/galicia.png
-%%DATADIR%%/flags/germany.png
-%%DATADIR%%/flags/greece.png
-%%DATADIR%%/flags/greenland.png
-%%DATADIR%%/flags/hobbits-shield.png
-%%DATADIR%%/flags/hobbits.png
-%%DATADIR%%/flags/hungary.png
-%%DATADIR%%/flags/iceland.png
-%%DATADIR%%/flags/india.png
-%%DATADIR%%/flags/indonesia-shield.png
-%%DATADIR%%/flags/indonesia.png
-%%DATADIR%%/flags/iran.png
-%%DATADIR%%/flags/iraq_old.png
-%%DATADIR%%/flags/ireland.png
-%%DATADIR%%/flags/israel.png
-%%DATADIR%%/flags/italy.png
-%%DATADIR%%/flags/japan.png
-%%DATADIR%%/flags/kampuchea-shield.png
-%%DATADIR%%/flags/kampuchea.png
-%%DATADIR%%/flags/kenya.png
-%%DATADIR%%/flags/korea.png
-%%DATADIR%%/flags/krev.png
-%%DATADIR%%/flags/latvia.png
-%%DATADIR%%/flags/lithuania.png
-%%DATADIR%%/flags/macedonia.png
-%%DATADIR%%/flags/malaysia-shield.png
-%%DATADIR%%/flags/malaysia.png
-%%DATADIR%%/flags/mars-shield.png
-%%DATADIR%%/flags/mars.png
-%%DATADIR%%/flags/mexico.png
-%%DATADIR%%/flags/mongolia.png
-%%DATADIR%%/flags/mordor.png
-%%DATADIR%%/flags/nato.png
-%%DATADIR%%/flags/netherlands.png
-%%DATADIR%%/flags/nigeria-shield.png
-%%DATADIR%%/flags/nigeria.png
-%%DATADIR%%/flags/norway.png
-%%DATADIR%%/flags/observer.png
-%%DATADIR%%/flags/pakistan.png
-%%DATADIR%%/flags/peru.png
-%%DATADIR%%/flags/philippines.png
-%%DATADIR%%/flags/phoenicia-shield.png
-%%DATADIR%%/flags/phoenicia.png
-%%DATADIR%%/flags/poland.png
-%%DATADIR%%/flags/portugal.png
-%%DATADIR%%/flags/quebec-shield.png
-%%DATADIR%%/flags/quebec.png
-%%DATADIR%%/flags/rome.png
-%%DATADIR%%/flags/russia.png
-%%DATADIR%%/flags/rwanda.png
-%%DATADIR%%/flags/scotland.png
-%%DATADIR%%/flags/serbia.png
-%%DATADIR%%/flags/silesia.png
-%%DATADIR%%/flags/singapore.png
-%%DATADIR%%/flags/slovenia.png
-%%DATADIR%%/flags/south_africa.png
-%%DATADIR%%/flags/soviet.png
-%%DATADIR%%/flags/spain.png
-%%DATADIR%%/flags/stpatrick.png
-%%DATADIR%%/flags/sumeria-shield.png
-%%DATADIR%%/flags/sumeria.png
-%%DATADIR%%/flags/sweden.png
-%%DATADIR%%/flags/swiss-shield.png
-%%DATADIR%%/flags/swiss.png
-%%DATADIR%%/flags/syria.png
-%%DATADIR%%/flags/taiwan-shield.png
-%%DATADIR%%/flags/taiwan.png
-%%DATADIR%%/flags/thailand.png
-%%DATADIR%%/flags/tunisia.png
-%%DATADIR%%/flags/turkey.png
-%%DATADIR%%/flags/ukraine.png
-%%DATADIR%%/flags/united_kingdom.png
-%%DATADIR%%/flags/united_nations.png
-%%DATADIR%%/flags/unknown.png
-%%DATADIR%%/flags/usa.png
-%%DATADIR%%/flags/vietnam.png
-%%DATADIR%%/flags/wales.png
-%%DATADIR%%/misc/chiefs.spec
-%%DATADIR%%/misc/shields.spec
-%%DATADIR%%/misc/small.spec
-%%DATADIR%%/misc/space.spec
-%%DATADIR%%/misc/treaty.spec
-%%DATADIR%%/misc/buildings.png
-%%DATADIR%%/misc/buildings.spec
-%%DATADIR%%/misc/chiefs.png
-%%DATADIR%%/misc/flags.spec
-%%DATADIR%%/misc/intro.png
-%%DATADIR%%/misc/radar.png
-%%DATADIR%%/misc/shields.png
-%%DATADIR%%/misc/small.png
-%%DATADIR%%/misc/space.png
-%%DATADIR%%/misc/treaty.png
+%%X11%%%%DATADIR%%/isotrident.tilespec
+%%X11%%%%DATADIR%%/isotrident/cities.spec
+%%X11%%%%DATADIR%%/isotrident/nuke.spec
+%%X11%%%%DATADIR%%/isotrident/terrain1.spec
+%%X11%%%%DATADIR%%/isotrident/terrain2.spec
+%%X11%%%%DATADIR%%/isotrident/tiles.spec
+%%X11%%%%DATADIR%%/isotrident/units.spec
+%%X11%%%%DATADIR%%/isotrident/cities.png
+%%X11%%%%DATADIR%%/isotrident/morecities.png
+%%X11%%%%DATADIR%%/isotrident/morecities.spec
+%%X11%%%%DATADIR%%/isotrident/nuke.png
+%%X11%%%%DATADIR%%/isotrident/terrain1.png
+%%X11%%%%DATADIR%%/isotrident/terrain2.png
+%%X11%%%%DATADIR%%/isotrident/tiles.png
+%%X11%%%%DATADIR%%/isotrident/units.png
+%%X11%%%%DATADIR%%/flags/afghanistan-shield.png
+%%X11%%%%DATADIR%%/flags/afghanistan.png
+%%X11%%%%DATADIR%%/flags/arab.png
+%%X11%%%%DATADIR%%/flags/argentina.png
+%%X11%%%%DATADIR%%/flags/armenia.png
+%%X11%%%%DATADIR%%/flags/assyria-shield.png
+%%X11%%%%DATADIR%%/flags/assyria.png
+%%X11%%%%DATADIR%%/flags/australia.png
+%%X11%%%%DATADIR%%/flags/austria.png
+%%X11%%%%DATADIR%%/flags/azerbaijan.png
+%%X11%%%%DATADIR%%/flags/barbarian.png
+%%X11%%%%DATADIR%%/flags/bavarian.png
+%%X11%%%%DATADIR%%/flags/belgium.png
+%%X11%%%%DATADIR%%/flags/boer.png
+%%X11%%%%DATADIR%%/flags/bosnia-shield.png
+%%X11%%%%DATADIR%%/flags/bosnia.png
+%%X11%%%%DATADIR%%/flags/brasil.png
+%%X11%%%%DATADIR%%/flags/bulgaria.png
+%%X11%%%%DATADIR%%/flags/canada.png
+%%X11%%%%DATADIR%%/flags/catalan.png
+%%X11%%%%DATADIR%%/flags/cheyenne.png
+%%X11%%%%DATADIR%%/flags/chile.png
+%%X11%%%%DATADIR%%/flags/china.png
+%%X11%%%%DATADIR%%/flags/columbia-shield.png
+%%X11%%%%DATADIR%%/flags/columbia.png
+%%X11%%%%DATADIR%%/flags/cornwall.png
+%%X11%%%%DATADIR%%/flags/croatia.png
+%%X11%%%%DATADIR%%/flags/cuba.png
+%%X11%%%%DATADIR%%/flags/czech.png
+%%X11%%%%DATADIR%%/flags/denmark.png
+%%X11%%%%DATADIR%%/flags/dunedain.png
+%%X11%%%%DATADIR%%/flags/egypt.png
+%%X11%%%%DATADIR%%/flags/elves-shield.png
+%%X11%%%%DATADIR%%/flags/elves.png
+%%X11%%%%DATADIR%%/flags/england.png
+%%X11%%%%DATADIR%%/flags/estonia.png
+%%X11%%%%DATADIR%%/flags/ethiopia-shield.png
+%%X11%%%%DATADIR%%/flags/ethiopia.png
+%%X11%%%%DATADIR%%/flags/europe.png
+%%X11%%%%DATADIR%%/flags/finland.png
+%%X11%%%%DATADIR%%/flags/france.png
+%%X11%%%%DATADIR%%/flags/galicia-shield.png
+%%X11%%%%DATADIR%%/flags/galicia.png
+%%X11%%%%DATADIR%%/flags/germany.png
+%%X11%%%%DATADIR%%/flags/greece.png
+%%X11%%%%DATADIR%%/flags/greenland.png
+%%X11%%%%DATADIR%%/flags/hobbits-shield.png
+%%X11%%%%DATADIR%%/flags/hobbits.png
+%%X11%%%%DATADIR%%/flags/hungary.png
+%%X11%%%%DATADIR%%/flags/iceland.png
+%%X11%%%%DATADIR%%/flags/india.png
+%%X11%%%%DATADIR%%/flags/indonesia-shield.png
+%%X11%%%%DATADIR%%/flags/indonesia.png
+%%X11%%%%DATADIR%%/flags/iran.png
+%%X11%%%%DATADIR%%/flags/iraq_old.png
+%%X11%%%%DATADIR%%/flags/ireland.png
+%%X11%%%%DATADIR%%/flags/israel.png
+%%X11%%%%DATADIR%%/flags/italy.png
+%%X11%%%%DATADIR%%/flags/japan.png
+%%X11%%%%DATADIR%%/flags/kampuchea-shield.png
+%%X11%%%%DATADIR%%/flags/kampuchea.png
+%%X11%%%%DATADIR%%/flags/kenya.png
+%%X11%%%%DATADIR%%/flags/korea.png
+%%X11%%%%DATADIR%%/flags/krev.png
+%%X11%%%%DATADIR%%/flags/latvia.png
+%%X11%%%%DATADIR%%/flags/lithuania.png
+%%X11%%%%DATADIR%%/flags/macedonia.png
+%%X11%%%%DATADIR%%/flags/malaysia-shield.png
+%%X11%%%%DATADIR%%/flags/malaysia.png
+%%X11%%%%DATADIR%%/flags/mars-shield.png
+%%X11%%%%DATADIR%%/flags/mars.png
+%%X11%%%%DATADIR%%/flags/mexico.png
+%%X11%%%%DATADIR%%/flags/mongolia.png
+%%X11%%%%DATADIR%%/flags/mordor.png
+%%X11%%%%DATADIR%%/flags/nato.png
+%%X11%%%%DATADIR%%/flags/netherlands.png
+%%X11%%%%DATADIR%%/flags/nigeria-shield.png
+%%X11%%%%DATADIR%%/flags/nigeria.png
+%%X11%%%%DATADIR%%/flags/norway.png
+%%X11%%%%DATADIR%%/flags/observer.png
+%%X11%%%%DATADIR%%/flags/pakistan.png
+%%X11%%%%DATADIR%%/flags/peru.png
+%%X11%%%%DATADIR%%/flags/philippines.png
+%%X11%%%%DATADIR%%/flags/phoenicia-shield.png
+%%X11%%%%DATADIR%%/flags/phoenicia.png
+%%X11%%%%DATADIR%%/flags/poland.png
+%%X11%%%%DATADIR%%/flags/portugal.png
+%%X11%%%%DATADIR%%/flags/quebec-shield.png
+%%X11%%%%DATADIR%%/flags/quebec.png
+%%X11%%%%DATADIR%%/flags/rome.png
+%%X11%%%%DATADIR%%/flags/russia.png
+%%X11%%%%DATADIR%%/flags/rwanda.png
+%%X11%%%%DATADIR%%/flags/scotland.png
+%%X11%%%%DATADIR%%/flags/serbia.png
+%%X11%%%%DATADIR%%/flags/silesia.png
+%%X11%%%%DATADIR%%/flags/singapore.png
+%%X11%%%%DATADIR%%/flags/slovenia.png
+%%X11%%%%DATADIR%%/flags/south_africa.png
+%%X11%%%%DATADIR%%/flags/soviet.png
+%%X11%%%%DATADIR%%/flags/spain.png
+%%X11%%%%DATADIR%%/flags/stpatrick.png
+%%X11%%%%DATADIR%%/flags/sumeria-shield.png
+%%X11%%%%DATADIR%%/flags/sumeria.png
+%%X11%%%%DATADIR%%/flags/sweden.png
+%%X11%%%%DATADIR%%/flags/swiss-shield.png
+%%X11%%%%DATADIR%%/flags/swiss.png
+%%X11%%%%DATADIR%%/flags/syria.png
+%%X11%%%%DATADIR%%/flags/taiwan-shield.png
+%%X11%%%%DATADIR%%/flags/taiwan.png
+%%X11%%%%DATADIR%%/flags/thailand.png
+%%X11%%%%DATADIR%%/flags/tunisia.png
+%%X11%%%%DATADIR%%/flags/turkey.png
+%%X11%%%%DATADIR%%/flags/ukraine.png
+%%X11%%%%DATADIR%%/flags/united_kingdom.png
+%%X11%%%%DATADIR%%/flags/united_nations.png
+%%X11%%%%DATADIR%%/flags/unknown.png
+%%X11%%%%DATADIR%%/flags/usa.png
+%%X11%%%%DATADIR%%/flags/vietnam.png
+%%X11%%%%DATADIR%%/flags/wales.png
+%%X11%%%%DATADIR%%/misc/chiefs.spec
+%%X11%%%%DATADIR%%/misc/shields.spec
+%%X11%%%%DATADIR%%/misc/small.spec
+%%X11%%%%DATADIR%%/misc/space.spec
+%%X11%%%%DATADIR%%/misc/treaty.spec
+%%X11%%%%DATADIR%%/misc/buildings.png
+%%X11%%%%DATADIR%%/misc/buildings.spec
+%%X11%%%%DATADIR%%/misc/chiefs.png
+%%X11%%%%DATADIR%%/misc/flags.spec
+%%X11%%%%DATADIR%%/misc/intro.png
+%%X11%%%%DATADIR%%/misc/radar.png
+%%X11%%%%DATADIR%%/misc/shields.png
+%%X11%%%%DATADIR%%/misc/small.png
+%%X11%%%%DATADIR%%/misc/space.png
+%%X11%%%%DATADIR%%/misc/treaty.png
 %%DATADIR%%/nation/american.ruleset
 %%DATADIR%%/nation/arab.ruleset
 %%DATADIR%%/nation/argentine.ruleset
@@ -271,32 +271,32 @@ bin/civmanual
 %%DATADIR%%/scenario/europe-200x100-v2.sav
 %%DATADIR%%/scenario/hagworld-120x60-v1.2.sav
 %%DATADIR%%/scenario/iberian-peninsula-136x100-v1.0.sav
-%%DATADIR%%/trident.tilespec
-%%DATADIR%%/trident/auto_ll.spec
-%%DATADIR%%/trident/cities.spec
-%%DATADIR%%/trident/explosions.spec
-%%DATADIR%%/trident/roads.spec
-%%DATADIR%%/trident/tiles.spec
-%%DATADIR%%/trident/units.spec
-%%DATADIR%%/trident_shields.tilespec
-%%DATADIR%%/trident/cities.png
-%%DATADIR%%/trident/explosions.png
-%%DATADIR%%/trident/roads.png
-%%DATADIR%%/trident/tiles.png
-%%DATADIR%%/trident/units.png
+%%X11%%%%DATADIR%%/trident.tilespec
+%%X11%%%%DATADIR%%/trident/auto_ll.spec
+%%X11%%%%DATADIR%%/trident/cities.spec
+%%X11%%%%DATADIR%%/trident/explosions.spec
+%%X11%%%%DATADIR%%/trident/roads.spec
+%%X11%%%%DATADIR%%/trident/tiles.spec
+%%X11%%%%DATADIR%%/trident/units.spec
+%%X11%%%%DATADIR%%/trident_shields.tilespec
+%%X11%%%%DATADIR%%/trident/cities.png
+%%X11%%%%DATADIR%%/trident/explosions.png
+%%X11%%%%DATADIR%%/trident/roads.png
+%%X11%%%%DATADIR%%/trident/tiles.png
+%%X11%%%%DATADIR%%/trident/units.png
 %%DATADIR%%/history.serv
-%%DATADIR%%/isophex.tilespec
-%%DATADIR%%/isophex/darkness.png
-%%DATADIR%%/isophex/darkness.spec
-%%DATADIR%%/isophex/gold.spec
-%%DATADIR%%/isophex/rivers.png
-%%DATADIR%%/isophex/rivers.spec
-%%DATADIR%%/isophex/terrain1.png
-%%DATADIR%%/isophex/terrain1.spec
-%%DATADIR%%/isophex/terrain2.png
-%%DATADIR%%/isophex/terrain2.spec
-%%DATADIR%%/isophex/tiles.png
-%%DATADIR%%/isophex/tiles.spec
+%%X11%%%%DATADIR%%/isophex.tilespec
+%%X11%%%%DATADIR%%/isophex/darkness.png
+%%X11%%%%DATADIR%%/isophex/darkness.spec
+%%X11%%%%DATADIR%%/isophex/gold.spec
+%%X11%%%%DATADIR%%/isophex/rivers.png
+%%X11%%%%DATADIR%%/isophex/rivers.spec
+%%X11%%%%DATADIR%%/isophex/terrain1.png
+%%X11%%%%DATADIR%%/isophex/terrain1.spec
+%%X11%%%%DATADIR%%/isophex/terrain2.png
+%%X11%%%%DATADIR%%/isophex/terrain2.spec
+%%X11%%%%DATADIR%%/isophex/tiles.png
+%%X11%%%%DATADIR%%/isophex/tiles.spec
 share/locale/da/LC_MESSAGES/freeciv.mo
 share/locale/ca/LC_MESSAGES/freeciv.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo
@@ -320,7 +320,7 @@ share/locale/ro/LC_MESSAGES/freeciv.mo
 share/locale/ru/LC_MESSAGES/freeciv.mo
 share/locale/sv/LC_MESSAGES/freeciv.mo
 share/locale/uk/LC_MESSAGES/freeciv.mo
-share/applications/freeciv.desktop
+%%X11%%share/applications/freeciv.desktop
 @dirrmtry share/locale/fi/LC_MESSAGES
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/he_IL/LC_MESSAGES
@@ -335,16 +335,16 @@ share/applications/freeciv.desktop
 @dirrmtry share/locale/ro
 @dirrmtry share/locale/sk/LC_MESSAGES
 @dirrmtry share/locale/sk
-@dirrm %%DATADIR%%/trident
+%%X11%%@dirrm %%DATADIR%%/trident
 @dirrm %%DATADIR%%/scenario
 @dirrm %%DATADIR%%/nation
-@dirrm %%DATADIR%%/misc
-@dirrm %%DATADIR%%/isotrident
+%%X11%%@dirrm %%DATADIR%%/misc
+%%X11%%@dirrm %%DATADIR%%/isotrident
 @dirrm %%DATADIR%%/history
 @dirrm %%DATADIR%%/default
 @dirrm %%DATADIR%%/civ2
 @dirrm %%DATADIR%%/civ1
-@dirrm %%DATADIR%%/flags
-@dirrm %%DATADIR%%/isophex
+%%X11%%@dirrm %%DATADIR%%/flags
+%%X11%%@dirrm %%DATADIR%%/isophex
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
+%%X11%%@dirrmtry share/applications