- Update to 2.0.1

PR:		ports/80196
Submitted by:	Vsevolod Stakhov <vsevolod@highsecure.ru>
Approved by:	maintainer timeout (2 weeks)

4 files changed, 204 insertions, 31 deletions

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 09cabd6b8c34..89cafeea7fe8 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeciv
-PORTVERSION=	1.14.2
+PORTVERSION=	2.0.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
@@ -15,6 +15,8 @@ MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 MAINTAINER?=	rehsack@liwing.de
 COMMENT?=	A civilisation clone for X11; multiplayer
 
+LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
+
 USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_BZIP2=	yes
@@ -22,7 +24,7 @@ WANT_GNOME=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index 2b4dcc95a339..70a5f43d16d7 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,2 +1,2 @@
-MD5 (freeciv-1.14.2.tar.bz2) = 280770591c8f87ac542dcd50702da205
-SIZE (freeciv-1.14.2.tar.bz2) = 5866635
+MD5 (freeciv-2.0.1.tar.bz2) = b1a2d0b493af74f40179ef78ed2b6070
+Size (freeciv-2.0.1.tar.bz2) = 8441146
diff --git a/games/freeciv/files/patch-server_meta.c b/games/freeciv/files/patch-server_meta.c
new file mode 100644
index 000000000000..0675a606340a
--- /dev/null
+++ b/games/freeciv/files/patch-server_meta.c
@@ -0,0 +1,11 @@
+--- server/meta.c.orig	Thu May  5 22:30:10 2005
++++ server/meta.c	Thu May  5 22:30:28 2005
+@@ -21,6 +21,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <sys/types.h>
++
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 5c7fe271919a..6223251f4b82 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -1,6 +1,6 @@
 bin/civclient
 bin/civserver
-%%DATADIR%%/Freeciv
+bin/civmanual
 %%DATADIR%%/civ1.serv
 %%DATADIR%%/civ1/buildings.ruleset
 %%DATADIR%%/civ1/game.ruleset
@@ -24,7 +24,6 @@ bin/civserver
 %%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
@@ -35,33 +34,153 @@ bin/civserver
 %%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%%/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/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%%/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
 %%DATADIR%%/nation/american.ruleset
 %%DATADIR%%/nation/arab.ruleset
 %%DATADIR%%/nation/argentine.ruleset
@@ -102,7 +221,6 @@ bin/civserver
 %%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
@@ -125,6 +243,29 @@ bin/civserver
 %%DATADIR%%/nation/viking.ruleset
 %%DATADIR%%/nation/welsh.ruleset
 %%DATADIR%%/nation/zulu.ruleset
+%%DATADIR%%/nation/afghani.ruleset
+%%DATADIR%%/nation/assyrian.ruleset
+%%DATADIR%%/nation/austrian.ruleset
+%%DATADIR%%/nation/belgian.ruleset
+%%DATADIR%%/nation/bosnia.ruleset
+%%DATADIR%%/nation/columbian.ruleset
+%%DATADIR%%/nation/elvish.ruleset
+%%DATADIR%%/nation/ethiopian.ruleset
+%%DATADIR%%/nation/galician.ruleset
+%%DATADIR%%/nation/hobbits.ruleset
+%%DATADIR%%/nation/icelandic.ruleset
+%%DATADIR%%/nation/indonesian.ruleset
+%%DATADIR%%/nation/kampuchean.ruleset
+%%DATADIR%%/nation/malaysian.ruleset
+%%DATADIR%%/nation/martian.ruleset
+%%DATADIR%%/nation/mexican.ruleset
+%%DATADIR%%/nation/nigerian.ruleset
+%%DATADIR%%/nation/observer.ruleset
+%%DATADIR%%/nation/phoenician.ruleset
+%%DATADIR%%/nation/quebecois.ruleset
+%%DATADIR%%/nation/sumerian.ruleset
+%%DATADIR%%/nation/swiss.ruleset
+%%DATADIR%%/nation/taiwanese.ruleset
 %%DATADIR%%/scenario/british-isles-85x80-v2.80.sav
 %%DATADIR%%/scenario/earth-160x90-v2.sav
 %%DATADIR%%/scenario/earth-80x50-v2.sav
@@ -134,28 +275,43 @@ bin/civserver
 %%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
+%%DATADIR%%/trident/cities.png
+%%DATADIR%%/trident/explosions.png
+%%DATADIR%%/trident/roads.png
+%%DATADIR%%/trident/tiles.png
+%%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
 share/locale/da/LC_MESSAGES/freeciv.mo
+share/locale/ca/LC_MESSAGES/freeciv.mo
+share/locale/cs/LC_MESSAGES/freeciv.mo
 share/locale/de/LC_MESSAGES/freeciv.mo
 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
@@ -165,6 +321,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
 @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/no/LC_MESSAGES 2>/dev/null || true
@@ -186,4 +343,7 @@ share/locale/uk/LC_MESSAGES/freeciv.mo
 @dirrm %%DATADIR%%/default
 @dirrm %%DATADIR%%/civ2
 @dirrm %%DATADIR%%/civ1
+@dirrm %%DATADIR%%/flags
+@dirrm %%DATADIR%%/isophex
 @dirrm %%DATADIR%%
+@unexec rmdir %D/share/applications 2>/dev/null || true