svn commit: r343409 - head/games/freeciv
Johan van Selst
johans at FreeBSD.org
Sat Feb 8 23:31:38 UTC 2014
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 <bsd.port.options.mk>
@@ -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 <bsd.port.mk>
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%%
+ at dirrmtry share/appdata
@dirrmtry share/icons/hicolor/64x64/apps
@dirrmtry share/icons/hicolor/64x64
@dirrmtry share/icons/hicolor/48x48/apps
More information about the svn-ports-head
mailing list