1) Upgrade to 1.12.0.

2) Fix -gtk slave port.
3) Remove stupid pre-patch rubbish from Makefile

Too many patches are being implemented as Perl scripts embedded in
Makefiles.

Submitted by:	olgeni (1)

3 files changed, 34 insertions, 18 deletions

diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index 0ce17a95b1fa..9ec1a4ff1ae8 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeciv
-PORTVERSION=	1.11.4
+PORTVERSION=	1.12.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 		ftp://ftp.netc.pt/pub/freeciv/stable/ \
@@ -18,23 +18,16 @@ LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 USE_XPM=	yes
 USE_BZIP2=	yes
-WANT_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
+.if defined(WITH_GTK)
 USE_IMLIB=	yes
 .else
 CONFIGURE_ARGS=	--disable-gtktest
 .endif
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
-		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
-
 .include <bsd.port.post.mk>
diff --git a/games/freeciv-gtk2/distinfo b/games/freeciv-gtk2/distinfo
index e2d59d363fdd..574b12b717d7 100644
--- a/games/freeciv-gtk2/distinfo
+++ b/games/freeciv-gtk2/distinfo
@@ -1 +1 @@
-MD5 (freeciv-1.11.4.tar.bz2) = 06e495a5b34daa556e6a1cd5b85dab19
+MD5 (freeciv-1.12.0.tar.bz2) = 6233848d2cd1933ee7585e268b2099d3
diff --git a/games/freeciv-gtk2/pkg-plist b/games/freeciv-gtk2/pkg-plist
index 55b1cb3b9b47..bd5e42fdc713 100644
--- a/games/freeciv-gtk2/pkg-plist
+++ b/games/freeciv-gtk2/pkg-plist
@@ -41,6 +41,20 @@ share/freeciv/engels/units.xpm
 share/freeciv/engels_shields.tilespec
 share/freeciv/freeciv.rc
 share/freeciv/helpdata.txt
+share/freeciv/hires.tilespec
+share/freeciv/hires/cities.spec
+share/freeciv/hires/cities.xpm
+share/freeciv/hires/icons.spec
+share/freeciv/hires/icons.xpm
+share/freeciv/hires/nuke.spec
+share/freeciv/hires/nuke.xpm
+share/freeciv/hires/terrain1.spec
+share/freeciv/hires/terrain1.xpm
+share/freeciv/hires/terrain2.spec
+share/freeciv/hires/terrain2.xpm
+share/freeciv/hires/tiles.spec
+share/freeciv/hires/units.spec
+share/freeciv/hires/units.xpm
 share/freeciv/misc/chiefs.spec
 share/freeciv/misc/chiefs.xpm
 share/freeciv/misc/intro.xpm
@@ -65,8 +79,11 @@ 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
@@ -101,7 +118,11 @@ 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
@@ -111,6 +132,7 @@ 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-80x76-v2.51.sav
 share/freeciv/scenario/earth-160x90-v1.sav
 share/freeciv/scenario/earth-160x90-v2.sav
 share/freeciv/scenario/earth-80x50-v1.sav
@@ -144,13 +166,14 @@ 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/scenario
+@dirrm share/freeciv/nation
+@dirrm share/freeciv/misc
+@dirrm share/freeciv/hires
+@dirrm share/freeciv/engels
+@dirrm share/freeciv/default
+@dirrm share/freeciv/classic
+@dirrm share/freeciv/civ2
+@dirrm share/freeciv/civ1
 @dirrm share/freeciv