5 files changed, 82 insertions, 195 deletions

diff --git a/games/freeciv-gtk/Makefile b/games/freeciv-gtk/Makefile
index 57cd7603219e..7b724fa67086 100644
--- a/games/freeciv-gtk/Makefile
+++ b/games/freeciv-gtk/Makefile
@@ -6,11 +6,11 @@
 #
 
 PKGNAMESUFFIX=	-gtk
-MASTERDIR=	${.CURDIR}/../freeciv
 
-MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	A civilisation clone for X11 using GNOME; multiplayer
 
-USE_GNOME=	gtk12
+MASTERDIR=	${.CURDIR}/../freeciv
+
+WITH_GTK=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv-gtk/pkg-plist b/games/freeciv-gtk/pkg-plist
deleted file mode 100644
index 656566889762..000000000000
--- a/games/freeciv-gtk/pkg-plist
+++ /dev/null
@@ -1,181 +0,0 @@
-bin/civclient
-bin/civserver
-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
-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
-share/freeciv/default/terrain.ruleset
-share/freeciv/default/units.ruleset
-share/freeciv/engels.tilespec
-share/freeciv/engels/cities.spec
-share/freeciv/engels/cities.xpm
-share/freeciv/engels/explosions.spec
-share/freeciv/engels/explosions.xpm
-share/freeciv/engels/flags.spec
-share/freeciv/engels/flags.xpm
-share/freeciv/engels/roads.spec
-share/freeciv/engels/roads.xpm
-share/freeciv/engels/tiles.spec
-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
-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/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
-share/freeciv/scenario/earth-80x50-v2.sav
-share/freeciv/scenario/europe-200x100-v1.sav
-share/freeciv/scenario/europe-200x100-v2.sav
-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/de/LC_MESSAGES/freeciv.mo
-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/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/freeciv/trident
-@dirrm share/freeciv
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/en_GB/LC_MESSAGES
-@dirrm share/locale/en_GB
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/hu/LC_MESSAGES
-@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/no
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 78675d75e1f6..4e3748cdd206 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	freeciv
-PORTVERSION=	1.14.0
-PORTREVISION=	1
+PORTVERSION=	1.14.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
 		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable/
 
-MAINTAINER?=	adam-ports@blacktabby.org
+MAINTAINER?=	rehsack@liwing.de
 COMMENT?=	A civilisation clone for X11; multiplayer
 
 USE_GETTEXT=	yes
@@ -25,16 +24,46 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+CONFLICTS=	freeciv-*
+
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME+=	imlib
-PKGNAMESUFFIX?=	-imlib
+.if 	!defined(WITH_GTK) && !defined(WITH_GTK12) && !defined(WITH_GTK2) && \
+	!defined(WITHOUT_GNOME)
+AUTO_DEPENDS=	yes
+.if ${HAVE_GNOME:Mgtk20}!=""
+WITH_GTK2=	yes
+.elif ${HAVE_GNOME:Mgtk12}!=""
+WITH_GTK=	yes
+.endif
+.endif
+
+.if defined(WITH_GTK2)
+USE_GNOME+=	gtk20
+PKGNAMESUFFIX?=	-gtk2
+CONFIGURE_ARGS+=	--enable-client=gtk2
+.elif defined(WITH_GTK) || defined(WITH_GTK12)
+USE_GNOME+=	imlib gtk12
+PKGNAMESUFFIX?=	-gtk
+CONFIGURE_ARGS+=	--enable-client=gtk
 .else
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
 
+pre-fetch:
+.if defined(AUTO_DEPENDS)
+	@${ECHO} -n "No WITH_GTK, WITH_GTK2 or WITHOUT_GNOME defined, autodetecting: "
+.if defined(WITH_GTK)
+	@${ECHO} "GTK"
+.elif defined(WITH_GTK2)
+	@${ECHO} "GTK2"
+.else
+	@${ECHO} "Xaw3d"
+.endif
+.endif
+
 post-patch:
-	cd ${WRKSRC}; ${FIND} . -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's/@program_transform_name@//'
+	cd ${WRKSRC}; ${FIND} . -name Makefile.in | \
+		${XARGS} ${REINPLACE_CMD} -e 's/@program_transform_name@//'
 
 .include <bsd.port.post.mk>
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index f965262452f6..e4cd98df6e05 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,2 +1,2 @@
-MD5 (freeciv-1.14.0.tar.bz2) = c506ec29b94ea516aaa02a107129cf10
-SIZE (freeciv-1.14.0.tar.bz2) = 5416607
+MD5 (freeciv-1.14.1.tar.bz2) = d328f65e7fca5252f27161f5f9e97a03
+SIZE (freeciv-1.14.1.tar.bz2) = 5850722
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index bab69cedd2b1..90ed99f50789 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -126,8 +126,8 @@ share/freeciv/nation/viking.ruleset
 share/freeciv/nation/welsh.ruleset
 share/freeciv/nation/zulu.ruleset
 share/freeciv/scenario/british-isles-85x80-v2.80.sav
-share/freeciv/scenario/earth-80x50-v2.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
@@ -164,12 +164,51 @@ 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/uk/LC_MESSAGES/freeciv.mo
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale/en_GB/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/en_GB 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/et 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/hu 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ja 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk 2>/dev/null || true
 @dirrm share/freeciv/trident
 @dirrm share/freeciv/scenario
 @dirrm share/freeciv/nation
 @dirrm share/freeciv/misc
-@dirrm share/freeciv/history
 @dirrm share/freeciv/isotrident
+@dirrm share/freeciv/history
 @dirrm share/freeciv/default
 @dirrm share/freeciv/civ2
 @dirrm share/freeciv/civ1