- Update to 2.0.9

- Drop support for xaw and gtk1
- Remove -gtk and -gtk2 slave ports
- Add freeciv-sounds - the standard sound set [1]

PR:		ports/106232 (based on) [1]
Submitted by:	Bartosz Fabianowski <freebsd@chillt.de> [1]

12 files changed, 79 insertions, 111 deletions

diff --git a/games/Makefile b/games/Makefile
index 03eb00a18cd6..1631eb9b61fa 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -217,9 +217,8 @@
     SUBDIR += freebsd-games
     SUBDIR += freecell-solver
     SUBDIR += freeciv
-    SUBDIR += freeciv-gtk
-    SUBDIR += freeciv-gtk2
     SUBDIR += freeciv-nox11
+    SUBDIR += freeciv-sounds
     SUBDIR += freecol
     SUBDIR += freedoko
     SUBDIR += freedroid
diff --git a/games/freeciv-gtk/Makefile b/games/freeciv-gtk/Makefile
deleted file mode 100644
index c2984de2ebc9..000000000000
--- a/games/freeciv-gtk/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# New ports collection makefile for:	freeciv-gtk
-# Date created:		29 Feb 2000
-# Whom:			sheldonh
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../freeciv
-WITH_GTK=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
deleted file mode 100644
index d31bfe46313a..000000000000
--- a/games/freeciv-gtk2/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# New ports collection makefile for:	freeciv-gtk2
-# Date created:		29 Feb 2000
-# Whom:			sheldonh
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../freeciv
-WITH_GTK2=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/games/freeciv-sounds/Makefile b/games/freeciv-sounds/Makefile
new file mode 100644
index 000000000000..dfd37f164598
--- /dev/null
+++ b/games/freeciv-sounds/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	freeciv-sounds
+# Date created:		28 July 2007
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	freeciv
+PORTVERSION=	3
+CATEGORIES=	games
+MASTER_SITES=	GENTOO/distfiles ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/
+PKGNAMESUFFIX=	-sounds
+DISTNAME=	stdsounds${DISTVERSION}
+
+MAINTAINER=	infofarmer@FreeBSD.org
+COMMENT=	Freeciv standard sound set
+
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/data
+
+do-install:
+	@cd ${WRKSRC}/&&${COPYTREE_SHARE} . ${DATADIR}/
+
+.include <bsd.port.mk>
diff --git a/games/freeciv-sounds/distinfo b/games/freeciv-sounds/distinfo
new file mode 100644
index 000000000000..63e8ed095b08
--- /dev/null
+++ b/games/freeciv-sounds/distinfo
@@ -0,0 +1,3 @@
+MD5 (stdsounds3.tar.gz) = 77215914712f2f351092918f5e41e39e
+SHA256 (stdsounds3.tar.gz) = a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa
+SIZE (stdsounds3.tar.gz) = 118278
diff --git a/games/freeciv-sounds/pkg-descr b/games/freeciv-sounds/pkg-descr
new file mode 100644
index 000000000000..73c6c8f450cd
--- /dev/null
+++ b/games/freeciv-sounds/pkg-descr
@@ -0,0 +1,3 @@
+Freeciv-sounds provides the standard sound set for Freeciv.
+
+WWW: http://freeciv.wikia.com/wiki/Sounds
diff --git a/games/freeciv-sounds/pkg-plist b/games/freeciv-sounds/pkg-plist
new file mode 100644
index 000000000000..ee701e1906ed
--- /dev/null
+++ b/games/freeciv-sounds/pkg-plist
@@ -0,0 +1,19 @@
+%%DATADIR%%/stdsounds/LrgCan.ogg
+%%DATADIR%%/stdsounds/LrgExpl.ogg
+%%DATADIR%%/stdsounds/MedCan.ogg
+%%DATADIR%%/stdsounds/MgBar1.ogg
+%%DATADIR%%/stdsounds/MgBar2.ogg
+%%DATADIR%%/stdsounds/MgHeavy.ogg
+%%DATADIR%%/stdsounds/Mortar.ogg
+%%DATADIR%%/stdsounds/SmlExpl.ogg
+%%DATADIR%%/stdsounds/Splash.ogg
+%%DATADIR%%/stdsounds/THover.ogg
+%%DATADIR%%/stdsounds/Tread.ogg
+%%DATADIR%%/stdsounds/foot3.ogg
+%%DATADIR%%/stdsounds/inh2o.ogg
+%%DATADIR%%/stdsounds/metbrk.ogg
+%%DATADIR%%/stdsounds/wall01.ogg
+%%DATADIR%%/stdsounds/woodbrk.ogg
+%%DATADIR%%/stdsounds.soundspec
+@dirrm %%DATADIR%%/stdsounds
+@dirrmtry %%DATADIR%%
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index b04062edb408..ef863dcb75af 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	freeciv
-PORTVERSION=	2.0.8
-PORTREVISION=	3
+PORTVERSION=	2.0.9
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ SF
+MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Free turn-based multiplayer strategy
 
-USE_GCC=	3.4+
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--with-libiconv-prefix=${PREFIX} --program-transform-name=
 
 MAN6=		civserver.6 civclient.6
 
@@ -28,64 +29,24 @@ MAN6=		civserver.6 civclient.6
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.5:${PORTSDIR}/graphics/png
 USE_XPM=	yes
-WANT_GNOME=	yes
-CONFIGURE_ENV+=	SDL_CONFIG="${SDL_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_X11)
-AUTO_DEPENDS=	yes
-.if ${HAVE_GNOME:Mgtk20}!=""
-WITH_GTK2=	yes
-.elif ${HAVE_GNOME:Mgtk12}!=""
-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(WITHOUT_X11)
-PLIST_SUB+=	X11="@comment "
-PKGNAMESUFFIX?=	-nox11
-CONFIGURE_ARGS+=	--enable-client=no
-.elif defined(WITH_GTK2)
-USE_GNOME+=	gtk20
-PKGNAMESUFFIX?=	-gtk2
-CONFIGURE_ARGS+=	--enable-client=gtk2
-PLIST_FILES+=	%%DATADIR%%/freeciv.rc-2.0
-.elif defined(WITH_GTK) || defined(WITH_GTK12)
-USE_GNOME+=	imlib gtk12
-PKGNAMESUFFIX?=	-gtk
-CONFIGURE_ARGS+=	--enable-client=gtk
-PLIST_FILES+=	%%DATADIR%%/freeciv.rc
+USE_SDL=	mixer
+PLIST_SUB=	X11=""
+USE_GNOME=	gtk20
+CONFIGURE_ARGS+=--enable-client=gtk2
+.ifndef WITHOUT_ESOUND
+USE_GNOME+=	esound
 .else
-LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
-CONFIGURE_ARGS+=	--enable-client=xaw3d
-PLIST_FILES+=	%%DATADIR%%/Freeciv
+CONFIGURE_ARGS+=--disable-esd
 .endif
-
-pre-fetch:
-.ifdef AUTO_DEPENDS
-	@${ECHO} -n "No WITH_GTK, WITH_GTK2, WITHOUT_GNOME or WITHOUT_X11 defined, autodetecting: "
-.ifdef WITHOUT_X11
-	@${ECHO} "NOX11"
-.elifdef WITH_GTK2
-	@${ECHO} "GTK2"
-.elifdef WITH_GTK
-	@${ECHO} "GTK"
 .else
-	@${ECHO} "Xaw3d"
-.endif
+PLIST_SUB=	X11="@comment "
+PKGNAMESUFFIX?=	-nox11
+CONFIGURE_ARGS+=--enable-client=no
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -Ee '${CFG_PATCH}' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name Makefile.in | \
-		${XARGS} ${REINPLACE_CMD} -e 's/@program_transform_name@//'
+	@${REINPLACE_CMD} -e '/test.*==/s|==|=|' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in|${XARGS} ${REINPLACE_CMD} -e\
+		'/pkgdatadir/s|$$[(]datadir[)]/@PACKAGE@|${DATADIR}|'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index 8274297f94a3..168640d4b255 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeciv-2.0.8.tar.bz2) = 9ebd5899c2c78362e0e2c68791673a88
-SHA256 (freeciv-2.0.8.tar.bz2) = 85b396c86f977b85f03fa1309733d21f7cc953e005ff1475f9981b77fa9f28f3
-SIZE (freeciv-2.0.8.tar.bz2) = 8535513
+MD5 (freeciv-2.0.9.tar.bz2) = 7bfa40220bd8e19a263ca247202682ce
+SHA256 (freeciv-2.0.9.tar.bz2) = e7f1eb6a240db4c48396d8920d103b8cf275b510e304dbbd2af6bb8ab5db4a98
+SIZE (freeciv-2.0.9.tar.bz2) = 8875323
diff --git a/games/freeciv/files/patch-common__packets.c b/games/freeciv/files/patch-common__packets.c
deleted file mode 100644
index 59f7ed09a072..000000000000
--- a/games/freeciv/files/patch-common__packets.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./common/packets.c.orig	Mon Mar  6 06:35:23 2006
-+++ ./common/packets.c	Tue Sep 26 11:21:55 2006
-@@ -577,6 +577,7 @@
- 	  chunk->total_length, chunk->chunk_length);
- 
-   if (chunk->total_length < 0
-+      || chunk->chunk_length < 0
-       || chunk->total_length >= MAX_ATTRIBUTE_BLOCK
-       || chunk->offset < 0
-       || chunk->offset + chunk->chunk_length > chunk->total_length
diff --git a/games/freeciv/files/patch-server__unithand.c b/games/freeciv/files/patch-server__unithand.c
deleted file mode 100644
index b52b3e41029e..000000000000
--- a/games/freeciv/files/patch-server__unithand.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./server/unithand.c.orig	Tue Dec 27 00:37:53 2005
-+++ ./server/unithand.c	Tue Sep 26 11:21:55 2006
-@@ -1593,7 +1593,8 @@
-   struct unit *punit = player_find_unit_by_id(pplayer, packet->unit_id);
-   int i;
- 
--  if (!punit || packet->length < 0 || punit->activity != ACTIVITY_IDLE) {
-+  if (!punit || packet->length < 0 || punit->activity != ACTIVITY_IDLE
-+      || packet->length > MAX_LEN_ROUTE) {
-     return;
-   }
- 
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index d8837bc57dde..83efe129e88f 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -24,6 +24,7 @@ bin/civserver
 %%DATADIR%%/default/techs.ruleset
 %%DATADIR%%/default/terrain.ruleset
 %%DATADIR%%/default/units.ruleset
+%%X11%%%%DATADIR%%/freeciv.rc-2.0
 %%X11%%%%DATADIR%%/helpdata.txt
 %%DATADIR%%/history/buildings.ruleset
 %%DATADIR%%/history/game.ruleset
@@ -297,13 +298,15 @@ bin/civserver
 %%X11%%%%DATADIR%%/isophex/terrain2.spec
 %%X11%%%%DATADIR%%/isophex/tiles.png
 %%X11%%%%DATADIR%%/isophex/tiles.spec
-share/locale/da/LC_MESSAGES/freeciv.mo
+share/locale/ar/LC_MESSAGES/freeciv.mo
 share/locale/ca/LC_MESSAGES/freeciv.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo
+share/locale/da/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/fa/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
@@ -334,5 +337,5 @@ share/locale/uk/LC_MESSAGES/freeciv.mo
 @dirrm %%DATADIR%%/civ1
 %%X11%%@dirrm %%DATADIR%%/flags
 %%X11%%@dirrm %%DATADIR%%/isophex
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%
 %%X11%%@dirrmtry share/applications