Upgrade to 1.14.2.

Since I'm there, fix CONFLICTS and use DATADIR.

PR:		ports/73312
Submitted by:	maintainer.

3 files changed, 162 insertions, 161 deletions

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 4e3748cdd206..09cabd6b8c34 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeciv
-PORTVERSION=	1.14.1
+PORTVERSION=	1.14.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
@@ -24,8 +24,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-CONFLICTS=	freeciv-*
-
 .include <bsd.port.pre.mk>
 
 .if 	!defined(WITH_GTK) && !defined(WITH_GTK12) && !defined(WITH_GTK2) && \
@@ -39,14 +37,17 @@ WITH_GTK=	yes
 .endif
 
 .if defined(WITH_GTK2)
+CONFLICTS=	freeciv-1* freeciv-gtk-1*
 USE_GNOME+=	gtk20
 PKGNAMESUFFIX?=	-gtk2
 CONFIGURE_ARGS+=	--enable-client=gtk2
 .elif defined(WITH_GTK) || defined(WITH_GTK12)
+CONFLICTS=	freeciv-1* freeciv-gtk2-1*
 USE_GNOME+=	imlib gtk12
 PKGNAMESUFFIX?=	-gtk
 CONFIGURE_ARGS+=	--enable-client=gtk
 .else
+CONFLICTS=	freeciv-gtk-1* freeciv-gtk2-1*
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
 
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index e4cd98df6e05..2b4dcc95a339 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,2 +1,2 @@
-MD5 (freeciv-1.14.1.tar.bz2) = d328f65e7fca5252f27161f5f9e97a03
-SIZE (freeciv-1.14.1.tar.bz2) = 5850722
+MD5 (freeciv-1.14.2.tar.bz2) = 280770591c8f87ac542dcd50702da205
+SIZE (freeciv-1.14.2.tar.bz2) = 5866635
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 90ed99f50789..a043fb2d08e5 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,151 +1,151 @@
 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/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/freeciv.rc
-share/freeciv/freeciv.rc-2.0
-share/freeciv/helpdata.txt
-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.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/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/catalan.ruleset
-share/freeciv/nation/chilean.ruleset
-share/freeciv/nation/chinese.ruleset
-share/freeciv/nation/cornish.ruleset
-share/freeciv/nation/croatian.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/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/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/serbian.ruleset
-share/freeciv/nation/silesian.ruleset
-share/freeciv/nation/singaporean.ruleset
-share/freeciv/nation/sioux.ruleset
-share/freeciv/nation/slovenian.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/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.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
+%%DATADIR%%/Freeciv
+%%DATADIR%%/civ1.serv
+%%DATADIR%%/civ1/buildings.ruleset
+%%DATADIR%%/civ1/game.ruleset
+%%DATADIR%%/civ1/governments.ruleset
+%%DATADIR%%/civ1/nations.ruleset
+%%DATADIR%%/civ1/techs.ruleset
+%%DATADIR%%/civ1/terrain.ruleset
+%%DATADIR%%/civ1/units.ruleset
+%%DATADIR%%/civ2.serv
+%%DATADIR%%/civ2/buildings.ruleset
+%%DATADIR%%/civ2/game.ruleset
+%%DATADIR%%/civ2/governments.ruleset
+%%DATADIR%%/civ2/techs.ruleset
+%%DATADIR%%/civ2/terrain.ruleset
+%%DATADIR%%/civ2/units.ruleset
+%%DATADIR%%/default/buildings.ruleset
+%%DATADIR%%/default/cities.ruleset
+%%DATADIR%%/default/game.ruleset
+%%DATADIR%%/default/governments.ruleset
+%%DATADIR%%/default/nations.ruleset
+%%DATADIR%%/default/techs.ruleset
+%%DATADIR%%/default/terrain.ruleset
+%%DATADIR%%/default/units.ruleset
+%%DATADIR%%/freeciv.rc
+%%DATADIR%%/freeciv.rc-2.0
+%%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/cities.xpm
+%%DATADIR%%/isotrident/flags.spec
+%%DATADIR%%/isotrident/flags.xpm
+%%DATADIR%%/isotrident/nuke.spec
+%%DATADIR%%/isotrident/nuke.xpm
+%%DATADIR%%/isotrident/small.spec
+%%DATADIR%%/isotrident/small.xpm
+%%DATADIR%%/isotrident/terrain1.spec
+%%DATADIR%%/isotrident/terrain1.xpm
+%%DATADIR%%/isotrident/terrain2.spec
+%%DATADIR%%/isotrident/terrain2.xpm
+%%DATADIR%%/isotrident/tiles.spec
+%%DATADIR%%/isotrident/tiles.xpm
+%%DATADIR%%/isotrident/units.spec
+%%DATADIR%%/isotrident/units.xpm
+%%DATADIR%%/misc/chiefs.spec
+%%DATADIR%%/misc/chiefs.xpm
+%%DATADIR%%/misc/intro.xpm
+%%DATADIR%%/misc/radar.xpm
+%%DATADIR%%/misc/shields.spec
+%%DATADIR%%/misc/shields.xpm
+%%DATADIR%%/misc/small.spec
+%%DATADIR%%/misc/small.xpm
+%%DATADIR%%/misc/space.spec
+%%DATADIR%%/misc/space.xpm
+%%DATADIR%%/misc/treaty.spec
+%%DATADIR%%/misc/treaty.xpm
+%%DATADIR%%/nation/american.ruleset
+%%DATADIR%%/nation/arab.ruleset
+%%DATADIR%%/nation/argentine.ruleset
+%%DATADIR%%/nation/australian.ruleset
+%%DATADIR%%/nation/aztec.ruleset
+%%DATADIR%%/nation/babylonian.ruleset
+%%DATADIR%%/nation/barbarian.ruleset
+%%DATADIR%%/nation/bavarian.ruleset
+%%DATADIR%%/nation/boer.ruleset
+%%DATADIR%%/nation/brazilian.ruleset
+%%DATADIR%%/nation/canadian.ruleset
+%%DATADIR%%/nation/carthaginian.ruleset
+%%DATADIR%%/nation/catalan.ruleset
+%%DATADIR%%/nation/chilean.ruleset
+%%DATADIR%%/nation/chinese.ruleset
+%%DATADIR%%/nation/cornish.ruleset
+%%DATADIR%%/nation/croatian.ruleset
+%%DATADIR%%/nation/czech.ruleset
+%%DATADIR%%/nation/danish.ruleset
+%%DATADIR%%/nation/dunedain.ruleset
+%%DATADIR%%/nation/dutch.ruleset
+%%DATADIR%%/nation/egyptian.ruleset
+%%DATADIR%%/nation/english.ruleset
+%%DATADIR%%/nation/estonian.ruleset
+%%DATADIR%%/nation/filipino.ruleset
+%%DATADIR%%/nation/finnish.ruleset
+%%DATADIR%%/nation/french.ruleset
+%%DATADIR%%/nation/german.ruleset
+%%DATADIR%%/nation/greek.ruleset
+%%DATADIR%%/nation/hungarian.ruleset
+%%DATADIR%%/nation/inca.ruleset
+%%DATADIR%%/nation/indian.ruleset
+%%DATADIR%%/nation/irish.ruleset
+%%DATADIR%%/nation/israeli.ruleset
+%%DATADIR%%/nation/italian.ruleset
+%%DATADIR%%/nation/japanese.ruleset
+%%DATADIR%%/nation/kenyan.ruleset
+%%DATADIR%%/nation/korean.ruleset
+%%DATADIR%%/nation/latvian.ruleset
+%%DATADIR%%/nation/lithuanian.ruleset
+%%DATADIR%%/nation/misc_cities.ruleset
+%%DATADIR%%/nation/mongol.ruleset
+%%DATADIR%%/nation/mordor.ruleset
+%%DATADIR%%/nation/persian.ruleset
+%%DATADIR%%/nation/polish.ruleset
+%%DATADIR%%/nation/portuguese.ruleset
+%%DATADIR%%/nation/roman.ruleset
+%%DATADIR%%/nation/russian.ruleset
+%%DATADIR%%/nation/scottish.ruleset
+%%DATADIR%%/nation/serbian.ruleset
+%%DATADIR%%/nation/silesian.ruleset
+%%DATADIR%%/nation/singaporean.ruleset
+%%DATADIR%%/nation/sioux.ruleset
+%%DATADIR%%/nation/slovenian.ruleset
+%%DATADIR%%/nation/spanish.ruleset
+%%DATADIR%%/nation/swedish.ruleset
+%%DATADIR%%/nation/thai.ruleset
+%%DATADIR%%/nation/turk.ruleset
+%%DATADIR%%/nation/ukrainian.ruleset
+%%DATADIR%%/nation/vietnamese.ruleset
+%%DATADIR%%/nation/viking.ruleset
+%%DATADIR%%/nation/welsh.ruleset
+%%DATADIR%%/nation/zulu.ruleset
+%%DATADIR%%/scenario/british-isles-85x80-v2.80.sav
+%%DATADIR%%/scenario/earth-160x90-v2.sav
+%%DATADIR%%/scenario/earth-80x50-v2.sav
+%%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/cities.xpm
+%%DATADIR%%/trident/explosions.spec
+%%DATADIR%%/trident/explosions.xpm
+%%DATADIR%%/trident/flags.spec
+%%DATADIR%%/trident/flags.xpm
+%%DATADIR%%/trident/roads.spec
+%%DATADIR%%/trident/roads.xpm
+%%DATADIR%%/trident/tiles.spec
+%%DATADIR%%/trident/tiles.xpm
+%%DATADIR%%/trident/units.spec
+%%DATADIR%%/trident/units.xpm
+%%DATADIR%%/trident_shields.tilespec
 share/locale/da/LC_MESSAGES/freeciv.mo
 share/locale/de/LC_MESSAGES/freeciv.mo
 share/locale/en_GB/LC_MESSAGES/freeciv.mo
@@ -203,13 +203,13 @@ share/locale/uk/LC_MESSAGES/freeciv.mo
 @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/isotrident
-@dirrm share/freeciv/history
-@dirrm share/freeciv/default
-@dirrm share/freeciv/civ2
-@dirrm share/freeciv/civ1
-@dirrm share/freeciv
+@dirrm %%DATADIR%%/trident
+@dirrm %%DATADIR%%/scenario
+@dirrm %%DATADIR%%/nation
+@dirrm %%DATADIR%%/misc
+@dirrm %%DATADIR%%/isotrident
+@dirrm %%DATADIR%%/history
+@dirrm %%DATADIR%%/default
+@dirrm %%DATADIR%%/civ2
+@dirrm %%DATADIR%%/civ1
+@dirrm %%DATADIR%%