From owner-svn-ports-head@FreeBSD.ORG Sat Feb 8 23:31:38 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 654F51FE; Sat, 8 Feb 2014 23:31:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3E36F18F0; Sat, 8 Feb 2014 23:31:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s18NVcUM052681; Sat, 8 Feb 2014 23:31:38 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s18NVbw7052678; Sat, 8 Feb 2014 23:31:37 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201402082331.s18NVbw7052678@svn.freebsd.org> From: Johan van Selst Date: Sat, 8 Feb 2014 23:31:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343409 - head/games/freeciv X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Feb 2014 23:31:38 -0000 Author: johans Date: Sat Feb 8 23:31:37 2014 New Revision: 343409 URL: http://svnweb.freebsd.org/changeset/ports/343409 QAT: https://qat.redports.org/buildarchive/r343409/ Log: Update to FreeCiv 2.4.2 Modified: head/games/freeciv/Makefile head/games/freeciv/distinfo head/games/freeciv/pkg-plist Modified: head/games/freeciv/Makefile ============================================================================== --- head/games/freeciv/Makefile Sat Feb 8 23:31:03 2014 (r343408) +++ head/games/freeciv/Makefile Sat Feb 8 23:31:37 2014 (r343409) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freeciv -PORTVERSION= 2.4.1 +PORTVERSION= 2.4.2 CATEGORIES= games MASTER_SITES= SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} @@ -24,8 +24,15 @@ CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} - --enable-aimodules --enable-shared \ --enable-fcdb=sqlite3 -OPTIONS_DEFINE?= X11 SDL MYSQL IPV6 -OPTIONS_DEFAULT?= X11 IPV6 +OPTIONS_DEFINE?= NLS X11 SDL MYSQL IPV6 +OPTIONS_DEFAULT?= NLS X11 IPV6 +OPTIONS_SUB= yes +SDL_CONFIGURE_ON= --enable-client=gtk,sdl +SDL_USE= SDL=sdl,image,ttf +MYSQL_CONFIGURE_ON= --enable-fcdb=mysql --with-mysql-prefix=${LOCALBASE} +MYSQL_USE= MYSQL=yes +IPV6_CONFIGURE_EANBALE= ipv6 +NLS_USES= gettext .include @@ -41,51 +48,30 @@ LIB_DEPENDS+= libtiff.so:${PORTSDIR}/gra libggzcore.so:${PORTSDIR}/games/ggz-client-libs \ libggzmod.so:${PORTSDIR}/games/ggz-client-libs USE_XORG= xpm -USE_SDL= mixer +USE_SDL+= mixer USE_GNOME= gtk20 INSTALLS_ICONS= yes +. if ! ${PORT_OPTIONS:MSDL} CONFIGURE_ARGS+=--enable-client=gtk +. endif CONFLICTS= freeciv-nox11-[0-9]* -PLIST_SUB+= X11="" GTK="" +PLIST_SUB+= GTK="" .else CONFIGURE_ARGS+=--enable-client=no CONFLICTS= freeciv-[0-9]* -PLIST_SUB+= X11="@comment " GTK="@comment " -.endif - -.if ${PORT_OPTIONS:MSDL} -CONFIGURE_ARGS+=--enable-client=gtk,sdl -USE_SDL= sdl image ttf -PLIST_SUB+= SDL="" -.else -PLIST_SUB+= SDL="@comment " -.endif - -.if ${PORT_OPTIONS:MMYSQL} -CONFIGURE_ARGS+=--enable-fcdb=mysql --with-mysql-prefix=${LOCALBASE} -USE_MYSQL= yes -.endif - -.if empty(PORT_OPTIONS:MIPV6) -CONFIGURE_ARGS+=--disable-ipv6 -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " +PLIST_SUB+= GTK="@comment " .endif post-patch: @${FIND} ${WRKSRC} -name Makefile.in|${XARGS} ${REINPLACE_CMD} -e \ '/pkgdatadir/s|[(]datadir)/@PACKAGE@|(prefix)/${DATADIR_REL}|' + @${REINPLACE_CMD} 's/minor=99/minor=0/' ${WRKSRC}/configure -.if ${PORT_OPTIONS:MX11} post-install: - @${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${STAGEDIR}/${DATADIR}/ +.if ${PORT_OPTIONS:MX11} + @${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${STAGEDIR}${DATADIR}/ @cd ${STAGEDIR}/${PREFIX}/bin && ${LN} -s freeciv-gtk2 freeciv-client .endif + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreeciv*.so .include Modified: head/games/freeciv/distinfo ============================================================================== --- head/games/freeciv/distinfo Sat Feb 8 23:31:03 2014 (r343408) +++ head/games/freeciv/distinfo Sat Feb 8 23:31:37 2014 (r343409) @@ -1,2 +1,2 @@ -SHA256 (freeciv-2.4.1.tar.bz2) = e8074e4c14b69fc23d6956084524a5f42dbbe4620196ffa8b612135af35bef80 -SIZE (freeciv-2.4.1.tar.bz2) = 38186597 +SHA256 (freeciv-2.4.2.tar.bz2) = 025d3cf51237a0c12422a5f100460a22ce1236b650a1e73cbd1c13c0b0676ce0 +SIZE (freeciv-2.4.2.tar.bz2) = 38545497 Modified: head/games/freeciv/pkg-plist ============================================================================== --- head/games/freeciv/pkg-plist Sat Feb 8 23:31:03 2014 (r343408) +++ head/games/freeciv/pkg-plist Sat Feb 8 23:31:37 2014 (r343409) @@ -22,8 +22,13 @@ man/man6/freeciv-qt.6.gz man/man6/freeciv-sdl.6.gz man/man6/freeciv-server.6.gz man/man6/freeciv-xaw.6.gz +%%GTK%%share/appdata/freeciv-gtk2.appdata.xml +%%SDL%%share/appdata/freeciv-sdl.appdata.xml +share/appdata/freeciv-modpack.appdata.xml +share/appdata/freeciv-server.appdata.xml share/applications/freeciv-server.desktop %%X11%%share/applications/freeciv-modpack.desktop +%%SDL%%share/applications/freeciv-sdl.desktop %%X11%%share/applications/freeciv.desktop %%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -178,6 +183,7 @@ share/applications/freeciv-server.deskto %%DATADIR%%/experimental/effects.ruleset %%DATADIR%%/experimental/game.ruleset %%DATADIR%%/experimental/governments.ruleset +%%DATADIR%%/experimental/nations.ruleset %%DATADIR%%/experimental/script.lua %%DATADIR%%/experimental/techs.ruleset %%DATADIR%%/experimental/terrain.ruleset @@ -2468,6 +2474,7 @@ share/applications/freeciv-server.deskto %%DATADIR%%/multiplayer/effects.ruleset %%DATADIR%%/multiplayer/game.ruleset %%DATADIR%%/multiplayer/governments.ruleset +%%DATADIR%%/multiplayer/nations.ruleset %%DATADIR%%/multiplayer/script.lua %%DATADIR%%/multiplayer/techs.ruleset %%DATADIR%%/multiplayer/terrain.ruleset @@ -3334,6 +3341,7 @@ share/icons/hicolor/64x64/apps/freeciv-s %%X11%%@dirrm %%DATADIR%%/trident %%X11%%@dirrm %%DATADIR%%/wonders @dirrmtry %%DATADIR%% +@dirrmtry share/appdata @dirrmtry share/icons/hicolor/64x64/apps @dirrmtry share/icons/hicolor/64x64 @dirrmtry share/icons/hicolor/48x48/apps