pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/games



Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug 31 14:44:58 UTC 2019

Modified Files:
        pkgsrc/games/freeciv-client: DESCR Makefile PLIST.gtk3 PLIST.sdl
            options.mk
        pkgsrc/games/freeciv-manual: Makefile
        pkgsrc/games/freeciv-server: Makefile PLIST
        pkgsrc/games/freeciv-share: Makefile Makefile.common PLIST distinfo
Removed Files:
        pkgsrc/games/freeciv-client: PLIST.gtk2 PLIST.xaw

Log Message:
freeciv-*: Update to 2.60

Huge release notes: https://freeciv.fandom.com/wiki/NEWS-2.6.0


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/freeciv-client/DESCR
cvs rdiff -u -r1.101 -r1.102 pkgsrc/games/freeciv-client/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/games/freeciv-client/PLIST.gtk2 \
    pkgsrc/games/freeciv-client/PLIST.xaw
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/freeciv-client/PLIST.gtk3 \
    pkgsrc/games/freeciv-client/PLIST.sdl
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/freeciv-client/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/freeciv-manual/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/games/freeciv-server/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/freeciv-server/PLIST
cvs rdiff -u -r1.38 -r1.39 pkgsrc/games/freeciv-share/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/games/freeciv-share/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/freeciv-share/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/games/freeciv-share/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/freeciv-client/DESCR
diff -u pkgsrc/games/freeciv-client/DESCR:1.3 pkgsrc/games/freeciv-client/DESCR:1.4
--- pkgsrc/games/freeciv-client/DESCR:1.3       Thu Feb 22 19:26:30 2007
+++ pkgsrc/games/freeciv-client/DESCR   Sat Aug 31 14:44:57 2019
@@ -5,6 +5,3 @@ players.
 You should check out the home page, as it contains much more information
 than this file and the online help. This is also where we'll inform people
 about new releases/bugs/fixes/competitions, etc.
-
-This package contains the Freeciv client with an interface built on top of
-either gtk, gtk2, xaw, xaw3d, sdl, or just plain x11.

Index: pkgsrc/games/freeciv-client/Makefile
diff -u pkgsrc/games/freeciv-client/Makefile:1.101 pkgsrc/games/freeciv-client/Makefile:1.102
--- pkgsrc/games/freeciv-client/Makefile:1.101  Thu Aug 22 12:23:08 2019
+++ pkgsrc/games/freeciv-client/Makefile        Sat Aug 31 14:44:57 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2019/08/22 12:23:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.102 2019/08/31 14:44:57 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   28
 COMMENT=       Freeciv client
 
 DEPENDS+=      freeciv-share>=${FC_VERS}:../../games/freeciv-share
@@ -28,12 +27,16 @@ SUBST_SED.themesonly2+=             -e 's|SUBDIRS =
 SUBST_SED.themesonly2+=                -e 's|^ isotrident trident|DONT_SUBDIRS =|'
 SUBST_MESSAGE.themesonly2=     Suppressing installation of non-gui-relevant data
 
-
-.include "../../games/freeciv-share/Makefile.common"
+# conflicts with freeciv-share
+post-install:
+       ${RM} -rf ${DESTDIR}${PREFIX}/share/pixmaps
+.for file in Freeciv freeciv.rc-2.0 *.tilespec *.musicspec *.soundspec *.serv *.txt *.xml
+       ${RM} -f ${DESTDIR}${PREFIX}/share/freeciv/${file}
+.endfor
 
 .include "options.mk"
-
-.include "../../audio/esound/buildlink3.mk"
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../games/freeciv-share/Makefile.common"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"

Index: pkgsrc/games/freeciv-client/PLIST.gtk3
diff -u pkgsrc/games/freeciv-client/PLIST.gtk3:1.1 pkgsrc/games/freeciv-client/PLIST.gtk3:1.2
--- pkgsrc/games/freeciv-client/PLIST.gtk3:1.1  Sun Apr 26 19:19:42 2015
+++ pkgsrc/games/freeciv-client/PLIST.gtk3      Sat Aug 31 14:44:57 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gtk3,v 1.1 2015/04/26 19:19:42 spz Exp $
+@comment $NetBSD: PLIST.gtk3,v 1.2 2019/08/31 14:44:57 nia Exp $
 bin/freeciv-gtk3
 bin/freeciv-mp-gtk3
 share/appdata/freeciv-gtk3.appdata.xml
Index: pkgsrc/games/freeciv-client/PLIST.sdl
diff -u pkgsrc/games/freeciv-client/PLIST.sdl:1.1 pkgsrc/games/freeciv-client/PLIST.sdl:1.2
--- pkgsrc/games/freeciv-client/PLIST.sdl:1.1   Sun Apr 26 19:19:42 2015
+++ pkgsrc/games/freeciv-client/PLIST.sdl       Sat Aug 31 14:44:57 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sdl,v 1.1 2015/04/26 19:19:42 spz Exp $
+@comment $NetBSD: PLIST.sdl,v 1.2 2019/08/31 14:44:57 nia Exp $
 bin/freeciv-mp-cli
 bin/freeciv-sdl
 share/appdata/freeciv-sdl.appdata.xml

Index: pkgsrc/games/freeciv-client/options.mk
diff -u pkgsrc/games/freeciv-client/options.mk:1.9 pkgsrc/games/freeciv-client/options.mk:1.10
--- pkgsrc/games/freeciv-client/options.mk:1.9  Wed Mar  7 11:57:30 2018
+++ pkgsrc/games/freeciv-client/options.mk      Sat Aug 31 14:44:57 2019
@@ -1,20 +1,12 @@
-# $NetBSD: options.mk,v 1.9 2018/03/07 11:57:30 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2019/08/31 14:44:57 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.freeciv-client
 PKG_OPTIONS_REQUIRED_GROUPS=   backend
-#PKG_OPTIONS_GROUP.backend=    gtk2 gtk3 qt5 sdl xaw xaw3d
-PKG_OPTIONS_GROUP.backend=     gtk2 gtk3 sdl xaw xaw3d
-PKG_SUGGESTED_OPTIONS=         gtk2
+PKG_OPTIONS_GROUP.backend=     gtk3 sdl
+PKG_SUGGESTED_OPTIONS=         gtk3
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+=       --enable-client=gtk2
-CONFIGURE_ARGS+=       --enable-fcmp=gtk2
-.include "../../x11/gtk2/buildlink3.mk"
-PLIST_SRC=             ${PKGDIR}/PLIST.gtk2
-.endif
-
 .if !empty(PKG_OPTIONS:Mgtk3)
 CONFIGURE_ARGS+=       --enable-client=gtk3
 CONFIGURE_ARGS+=       --enable-fcmp=gtk3
@@ -22,36 +14,11 @@ CONFIGURE_ARGS+=    --enable-fcmp=gtk3
 PLIST_SRC=             ${PKGDIR}/PLIST.gtk3
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt5)
-CONFIGURE_ARGS+=       --enable-client=qt
-CONFIGURE_ARGS+=       --enable-fcmp=qt
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-PLIST_SRC=             ${PKGDIR}/PLIST.qt
-.endif
-
 .if !empty(PKG_OPTIONS:Msdl)
 CONFIGURE_ARGS+=       --enable-client=sdl
 CONFIGURE_ARGS+=       --enable-fcmp=cli
-.include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../devel/SDL_gfx/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 PLIST_SRC=             ${PKGDIR}/PLIST.sdl
 .endif
-
-.if !empty(PKG_OPTIONS:Mxaw)
-CONFIGURE_ARGS+=       --enable-client=xaw
-CONFIGURE_ARGS+=       --enable-fcmp=cli
-CONFIGURE_ARGS+=       --with-xaw
-.include "../../mk/xaw.buildlink3.mk"
-PLIST_SRC=             ${PKGDIR}/PLIST.xaw
-.endif
-
-.if !empty(PKG_OPTIONS:Mxaw3d)
-CONFIGURE_ARGS+=       --enable-client=xaw
-CONFIGURE_ARGS+=       --enable-fcmp=cli
-CONFIGURE_ARGS+=       --with-xaw3d
-.include "../../x11/libXaw3d/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
-PLIST_SRC=             ${PKGDIR}/PLIST.xaw
-.endif

Index: pkgsrc/games/freeciv-manual/Makefile
diff -u pkgsrc/games/freeciv-manual/Makefile:1.16 pkgsrc/games/freeciv-manual/Makefile:1.17
--- pkgsrc/games/freeciv-manual/Makefile:1.16   Sun Jan  7 21:00:23 2018
+++ pkgsrc/games/freeciv-manual/Makefile        Sat Aug 31 14:44:57 2019
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2018/01/07 21:00:23 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2019/08/31 14:44:57 nia Exp $
 #
 
 DISTNAME=      manual-1.8.1-2
 PKGNAME=       freeciv-manual-1.8.1.2
-PKGREVISION=   1
 CATEGORIES=    games
-MASTER_SITES=  http://www.freeciv.org/ftp/contrib/manual/
+MASTER_SITES=  http://files.freeciv.org/contrib/manual/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.freeciv.org/

Index: pkgsrc/games/freeciv-server/Makefile
diff -u pkgsrc/games/freeciv-server/Makefile:1.56 pkgsrc/games/freeciv-server/Makefile:1.57
--- pkgsrc/games/freeciv-server/Makefile:1.56   Thu Aug 22 12:23:08 2019
+++ pkgsrc/games/freeciv-server/Makefile        Sat Aug 31 14:44:57 2019
@@ -1,16 +1,10 @@
-# $NetBSD: Makefile,v 1.56 2019/08/22 12:23:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.57 2019/08/31 14:44:57 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   11
 COMMENT=       Freeciv game server
 
 DEPENDS+=      freeciv-share>=${FC_VERS}:../../games/freeciv-share
 
-USE_TOOLS+=    automake autoconf
-
-pre-configure:
-       cd ${WRKSRC} && autoreconf -i
-
 CONFIGURE_ARGS+=       --disable-client
 CONFIGURE_ARGS+=       --disable-fcmp
 CONFIGURE_ARGS+=       --disable-make-data
@@ -20,9 +14,7 @@ CONFIGURE_ARGS+=      --with-readline
 BUILDLINK_API_DEPENDS.readline+=       readline>=4.2
 
 .include "../../games/freeciv-share/suppress_installation.mk"
-
 .include "../../games/freeciv-share/Makefile.common"
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/games/freeciv-server/PLIST
diff -u pkgsrc/games/freeciv-server/PLIST:1.4 pkgsrc/games/freeciv-server/PLIST:1.5
--- pkgsrc/games/freeciv-server/PLIST:1.4       Sun Apr 26 19:19:42 2015
+++ pkgsrc/games/freeciv-server/PLIST   Sat Aug 31 14:44:57 2019
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2015/04/26 19:19:42 spz Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/08/31 14:44:57 nia Exp $
 bin/freeciv-server
+etc/freeciv/database.lua
 lib/libfreeciv-srv.la
 share/appdata/freeciv-server.appdata.xml
 share/applications/freeciv-server.desktop

Index: pkgsrc/games/freeciv-share/Makefile
diff -u pkgsrc/games/freeciv-share/Makefile:1.38 pkgsrc/games/freeciv-share/Makefile:1.39
--- pkgsrc/games/freeciv-share/Makefile:1.38    Thu Aug 22 12:23:08 2019
+++ pkgsrc/games/freeciv-share/Makefile Sat Aug 31 14:44:58 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2019/08/22 12:23:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.39 2019/08/31 14:44:58 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-share-/}
-PKGREVISION=   11
 COMMENT=       Machine independent files for Freeciv
 
 .include "../../games/freeciv-share/Makefile.common"

Index: pkgsrc/games/freeciv-share/Makefile.common
diff -u pkgsrc/games/freeciv-share/Makefile.common:1.54 pkgsrc/games/freeciv-share/Makefile.common:1.55
--- pkgsrc/games/freeciv-share/Makefile.common:1.54     Fri Apr 26 14:12:38 2019
+++ pkgsrc/games/freeciv-share/Makefile.common  Sat Aug 31 14:44:58 2019
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile.common,v 1.54 2019/04/26 14:12:38 maya Exp $
+# $NetBSD: Makefile.common,v 1.55 2019/08/31 14:44:58 nia Exp $
 
 # used by games/freeciv-share/Makefile
 # used by games/freeciv-client/Makefile
 # used by games/freeciv-server/Makefile
 
 DISTNAME=      freeciv-${FC_VERS}
-FC_VERS=       2.5.3
+FC_VERS=       2.6.0
 CATEGORIES=    games
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freeciv/}
+MASTER_SITES=  http://files.freeciv.org/stable/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.freeciv.org/
 LICENSE=       gnu-gpl-v2
 
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake gzip msgfmt pkg-config
+USE_TOOLS+=            gmake gzip pkg-config
+USE_TOOLS+=            msgfmt msgmerge xgettext
 USE_LANGUAGES+=                c99 c++
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
@@ -25,7 +25,6 @@ DISTINFO_FILE=                ${.CURDIR}/../../games/f
 PATCHDIR=              ${.CURDIR}/../../games/freeciv-share/patches
 
 REPLACE_PYTHON=                        ${WRKSRC}/common/generate_packets.py
-PYTHON_VERSIONS_INCOMPATIBLE=  36 37 # not yet ported as of 2.3.2
 
 SUBST_CLASSES+=                data
 SUBST_STAGE.data=      pre-configure

Index: pkgsrc/games/freeciv-share/PLIST
diff -u pkgsrc/games/freeciv-share/PLIST:1.14 pkgsrc/games/freeciv-share/PLIST:1.15
--- pkgsrc/games/freeciv-share/PLIST:1.14       Sun Apr 24 06:52:44 2016
+++ pkgsrc/games/freeciv-share/PLIST    Sat Aug 31 14:44:58 2019
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.14 2016/04/24 06:52:44 prlw1 Exp $
-etc/freeciv/database.lua
+@comment $NetBSD: PLIST,v 1.15 2019/08/31 14:44:58 nia Exp $
 lib/libfreeciv.la
 man/man6/freeciv-client.6
 man/man6/freeciv-gtk2.6
+man/man6/freeciv-gtk3.22.6
 man/man6/freeciv-gtk3.6
 man/man6/freeciv-manual.6
 man/man6/freeciv-modpack.6
@@ -11,7 +11,9 @@ man/man6/freeciv-mp-gtk2.6
 man/man6/freeciv-mp-gtk3.6
 man/man6/freeciv-mp-qt.6
 man/man6/freeciv-qt.6
+man/man6/freeciv-ruledit.6
 man/man6/freeciv-sdl.6
+man/man6/freeciv-sdl2.6
 man/man6/freeciv-server.6
 man/man6/freeciv-xaw.6
 share/doc/freeciv/ABOUT-NLS
@@ -26,10 +28,11 @@ share/doc/freeciv/HOWTOPLAY
 share/doc/freeciv/INSTALL
 share/doc/freeciv/INSTALL.Cygwin
 share/doc/freeciv/NEWS
-share/doc/freeciv/NEWS-2.5
+share/doc/freeciv/NEWS-2.6
 share/doc/freeciv/README.AI
 share/doc/freeciv/README.AI_modules
-share/doc/freeciv/README.SDLClient
+share/doc/freeciv/README.achievements
+share/doc/freeciv/README.actions
 share/doc/freeciv/README.agents
 share/doc/freeciv/README.attributes
 share/doc/freeciv/README.delta
@@ -37,19 +40,22 @@ share/doc/freeciv/README.effects
 share/doc/freeciv/README.fcdb
 share/doc/freeciv/README.governor
 share/doc/freeciv/README.graphics
+share/doc/freeciv/README.msys2
 share/doc/freeciv/README.nations
 share/doc/freeciv/README.packaging
-share/doc/freeciv/README.ruleset_civ2civ3
-share/doc/freeciv/README.ruleset_experimental
-share/doc/freeciv/README.ruleset_multiplayer
 share/doc/freeciv/README.rulesets
 share/doc/freeciv/README.scorelog
 share/doc/freeciv/README.sound
+share/doc/freeciv/README.tilesets
 share/doc/freeciv/TODO
 share/freeciv/Freeciv
 share/freeciv/amplio2.tilespec
-share/freeciv/amplio2/ancientcities.png
-share/freeciv/amplio2/ancientcities.spec
+share/freeciv/amplio2/activities.png
+share/freeciv/amplio2/activities.spec
+share/freeciv/amplio2/bases.png
+share/freeciv/amplio2/bases.spec
+share/freeciv/amplio2/cities.png
+share/freeciv/amplio2/cities.spec
 share/freeciv/amplio2/explosions.png
 share/freeciv/amplio2/explosions.spec
 share/freeciv/amplio2/fog.png
@@ -60,10 +66,6 @@ share/freeciv/amplio2/hills.png
 share/freeciv/amplio2/hills.spec
 share/freeciv/amplio2/maglev.png
 share/freeciv/amplio2/maglev.spec
-share/freeciv/amplio2/medievalcities.png
-share/freeciv/amplio2/medievalcities.spec
-share/freeciv/amplio2/moderncities.png
-share/freeciv/amplio2/moderncities.spec
 share/freeciv/amplio2/mountains.png
 share/freeciv/amplio2/mountains.spec
 share/freeciv/amplio2/nuke.png
@@ -71,7 +73,6 @@ share/freeciv/amplio2/nuke.spec
 share/freeciv/amplio2/ocean.png
 share/freeciv/amplio2/ocean.spec
 share/freeciv/amplio2/select-alpha.png
-share/freeciv/amplio2/select.png
 share/freeciv/amplio2/select.spec
 share/freeciv/amplio2/terrain1.png
 share/freeciv/amplio2/terrain1.spec
@@ -81,6 +82,8 @@ share/freeciv/amplio2/tiles.png
 share/freeciv/amplio2/tiles.spec
 share/freeciv/amplio2/units.png
 share/freeciv/amplio2/units.spec
+share/freeciv/amplio2/upkeep.png
+share/freeciv/amplio2/upkeep.spec
 share/freeciv/amplio2/veterancy.png
 share/freeciv/amplio2/veterancy.spec
 share/freeciv/amplio2/water.png
@@ -97,6 +100,7 @@ share/freeciv/buildings/city_walls.png
 share/freeciv/buildings/coastal_defense.png
 share/freeciv/buildings/colosseum.png
 share/freeciv/buildings/courthouse.png
+share/freeciv/buildings/ecclesiastical_palace.png
 share/freeciv/buildings/factory.png
 share/freeciv/buildings/granary.png
 share/freeciv/buildings/harbor.png
@@ -136,6 +140,7 @@ share/freeciv/civ1/game.ruleset
 share/freeciv/civ1/governments.ruleset
 share/freeciv/civ1/nations.ruleset
 share/freeciv/civ1/script.lua
+share/freeciv/civ1/styles.ruleset
 share/freeciv/civ1/techs.ruleset
 share/freeciv/civ1/terrain.ruleset
 share/freeciv/civ1/units.ruleset
@@ -147,10 +152,12 @@ share/freeciv/civ2/game.ruleset
 share/freeciv/civ2/governments.ruleset
 share/freeciv/civ2/nations.ruleset
 share/freeciv/civ2/script.lua
+share/freeciv/civ2/styles.ruleset
 share/freeciv/civ2/techs.ruleset
 share/freeciv/civ2/terrain.ruleset
 share/freeciv/civ2/units.ruleset
 share/freeciv/civ2civ3.serv
+share/freeciv/civ2civ3/README.civ2civ3
 share/freeciv/civ2civ3/buildings.ruleset
 share/freeciv/civ2civ3/cities.ruleset
 share/freeciv/civ2civ3/effects.ruleset
@@ -158,6 +165,7 @@ share/freeciv/civ2civ3/game.ruleset
 share/freeciv/civ2civ3/governments.ruleset
 share/freeciv/civ2civ3/nations.ruleset
 share/freeciv/civ2civ3/script.lua
+share/freeciv/civ2civ3/styles.ruleset
 share/freeciv/civ2civ3/techs.ruleset
 share/freeciv/civ2civ3/terrain.ruleset
 share/freeciv/civ2civ3/units.ruleset
@@ -169,6 +177,7 @@ share/freeciv/classic/game.ruleset
 share/freeciv/classic/governments.ruleset
 share/freeciv/classic/nations.ruleset
 share/freeciv/classic/script.lua
+share/freeciv/classic/styles.ruleset
 share/freeciv/classic/techs.ruleset
 share/freeciv/classic/terrain.ruleset
 share/freeciv/classic/units.ruleset
@@ -177,6 +186,7 @@ share/freeciv/default/ai_effects.ruleset
 share/freeciv/default/default.lua
 share/freeciv/default/nationlist.ruleset
 share/freeciv/experimental.serv
+share/freeciv/experimental/README.experimental
 share/freeciv/experimental/buildings.ruleset
 share/freeciv/experimental/cities.ruleset
 share/freeciv/experimental/effects.ruleset
@@ -184,6 +194,7 @@ share/freeciv/experimental/game.ruleset
 share/freeciv/experimental/governments.ruleset
 share/freeciv/experimental/nations.ruleset
 share/freeciv/experimental/script.lua
+share/freeciv/experimental/styles.ruleset
 share/freeciv/experimental/techs.ruleset
 share/freeciv/experimental/terrain.ruleset
 share/freeciv/experimental/units.ruleset
@@ -271,6 +282,10 @@ share/freeciv/flags/anhalt-large.png
 share/freeciv/flags/anhalt-shield-large.png
 share/freeciv/flags/anhalt-shield.png
 share/freeciv/flags/anhalt.png
+share/freeciv/flags/animals-large.png
+share/freeciv/flags/animals-shield-large.png
+share/freeciv/flags/animals-shield.png
+share/freeciv/flags/animals.png
 share/freeciv/flags/anishinaabe-large.png
 share/freeciv/flags/anishinaabe-shield-large.png
 share/freeciv/flags/anishinaabe-shield.png
@@ -2452,7 +2467,7 @@ share/freeciv/flags/zulu-shield-large.pn
 share/freeciv/flags/zulu-shield.png
 share/freeciv/flags/zulu.png
 share/freeciv/freeciv.rc-2.0
-share/freeciv/gtk_menus.xml
+share/freeciv/gtk2_menus.xml
 share/freeciv/helpdata.txt
 share/freeciv/hex2t.tilespec
 share/freeciv/hex2t/grid.png
@@ -2467,6 +2482,47 @@ share/freeciv/hex2t/tiles.png
 share/freeciv/hex2t/tiles.spec
 share/freeciv/hex2t/unitcost.png
 share/freeciv/hex2t/unitcost.spec
+share/freeciv/hexemplio.tilespec
+share/freeciv/hexemplio/activities.png
+share/freeciv/hexemplio/activities.spec
+share/freeciv/hexemplio/bases.png
+share/freeciv/hexemplio/bases.spec
+share/freeciv/hexemplio/cities.png
+share/freeciv/hexemplio/cities.spec
+share/freeciv/hexemplio/embellishments.png
+share/freeciv/hexemplio/embellishments.spec
+share/freeciv/hexemplio/forests.png
+share/freeciv/hexemplio/forests.spec
+share/freeciv/hexemplio/grid.png
+share/freeciv/hexemplio/grid.spec
+share/freeciv/hexemplio/hills.png
+share/freeciv/hexemplio/hills.spec
+share/freeciv/hexemplio/mountains.png
+share/freeciv/hexemplio/mountains.spec
+share/freeciv/hexemplio/rivers.png
+share/freeciv/hexemplio/rivers.spec
+share/freeciv/hexemplio/roads-maglevs.png
+share/freeciv/hexemplio/roads-maglevs.spec
+share/freeciv/hexemplio/roads-rails.png
+share/freeciv/hexemplio/roads-rails.spec
+share/freeciv/hexemplio/roads.png
+share/freeciv/hexemplio/roads.spec
+share/freeciv/hexemplio/select.png
+share/freeciv/hexemplio/select.spec
+share/freeciv/hexemplio/terrain.png
+share/freeciv/hexemplio/terrain.spec
+share/freeciv/hexemplio/tiles.png
+share/freeciv/hexemplio/tiles.spec
+share/freeciv/hexemplio/unitcost.png
+share/freeciv/hexemplio/unitcost.spec
+share/freeciv/hexemplio/unitextras.png
+share/freeciv/hexemplio/unitextras.spec
+share/freeciv/hexemplio/water1.png
+share/freeciv/hexemplio/water1.spec
+share/freeciv/hexemplio/water2.png
+share/freeciv/hexemplio/water2.spec
+share/freeciv/hexemplio/water3.png
+share/freeciv/hexemplio/water3.spec
 share/freeciv/isophex.tilespec
 share/freeciv/isophex/darkness.png
 share/freeciv/isophex/darkness.spec
@@ -2515,6 +2571,8 @@ share/freeciv/misc/cursors.png
 share/freeciv/misc/cursors.spec
 share/freeciv/misc/editor.png
 share/freeciv/misc/editor.spec
+share/freeciv/misc/events.png
+share/freeciv/misc/events.spec
 share/freeciv/misc/flags-large.spec
 share/freeciv/misc/flags.spec
 share/freeciv/misc/governments.png
@@ -2539,6 +2597,7 @@ share/freeciv/misc/treaty.png
 share/freeciv/misc/treaty.spec
 share/freeciv/misc/wonders-large.spec
 share/freeciv/multiplayer.serv
+share/freeciv/multiplayer/README.multiplayer
 share/freeciv/multiplayer/buildings.ruleset
 share/freeciv/multiplayer/cities.ruleset
 share/freeciv/multiplayer/effects.ruleset
@@ -2546,6 +2605,7 @@ share/freeciv/multiplayer/game.ruleset
 share/freeciv/multiplayer/governments.ruleset
 share/freeciv/multiplayer/nations.ruleset
 share/freeciv/multiplayer/script.lua
+share/freeciv/multiplayer/styles.ruleset
 share/freeciv/multiplayer/techs.ruleset
 share/freeciv/multiplayer/terrain.ruleset
 share/freeciv/multiplayer/units.ruleset
@@ -2571,6 +2631,7 @@ share/freeciv/nation/american.ruleset
 share/freeciv/nation/andorran.ruleset
 share/freeciv/nation/angolan.ruleset
 share/freeciv/nation/anhaltian.ruleset
+share/freeciv/nation/animals.ruleset
 share/freeciv/nation/anishinaabe.ruleset
 share/freeciv/nation/antarctican.ruleset
 share/freeciv/nation/antiguan.ruleset
@@ -3106,10 +3167,29 @@ share/freeciv/nation/zapotec.ruleset
 share/freeciv/nation/zhuang.ruleset
 share/freeciv/nation/zimbabwean.ruleset
 share/freeciv/nation/zulu.ruleset
+share/freeciv/override/flags-large.spec
+share/freeciv/override/flags.spec
+share/freeciv/override/nation.ruleset
+share/freeciv/override/shields-large.spec
+share/freeciv/override/shields.spec
+share/freeciv/sandbox.serv
+share/freeciv/sandbox/README.sandbox
+share/freeciv/sandbox/buildings.ruleset
+share/freeciv/sandbox/cities.ruleset
+share/freeciv/sandbox/effects.ruleset
+share/freeciv/sandbox/game.ruleset
+share/freeciv/sandbox/governments.ruleset
+share/freeciv/sandbox/nations.ruleset
+share/freeciv/sandbox/script.lua
+share/freeciv/sandbox/styles.ruleset
+share/freeciv/sandbox/techs.ruleset
+share/freeciv/sandbox/terrain.ruleset
+share/freeciv/sandbox/units.ruleset
 share/freeciv/scenarios/british-isles-85x80-v2.80.sav.gz
 share/freeciv/scenarios/earth-160x90-v2.sav.gz
 share/freeciv/scenarios/earth-80x50-v3.sav.gz
 share/freeciv/scenarios/europe-200x100-v2.sav.gz
+share/freeciv/scenarios/europe_1900_WWI.sav.gz
 share/freeciv/scenarios/france-140x90-v2.sav.gz
 share/freeciv/scenarios/hagworld-120x60-v1.2.sav.gz
 share/freeciv/scenarios/iberian-peninsula-136x100-v1.0.sav.gz
@@ -3117,6 +3197,8 @@ share/freeciv/scenarios/italy-100x100-v1
 share/freeciv/scenarios/japan-88x100-v1.3.sav.gz
 share/freeciv/scenarios/north_america_116x100-v1.2.sav.gz
 share/freeciv/scenarios/tutorial.sav.gz
+share/freeciv/stdmusic.musicspec
+share/freeciv/stdmusic/CullamBruce-Lockhart--Dawning_Fanfare.ogg
 share/freeciv/stdsounds.soundspec
 share/freeciv/stdsounds/LrgCan.ogg
 share/freeciv/stdsounds/LrgExpl.ogg
@@ -3133,8 +3215,10 @@ share/freeciv/stdsounds/foot3.ogg
 share/freeciv/stdsounds/illegal.ogg
 share/freeciv/stdsounds/inh2o.ogg
 share/freeciv/stdsounds/metbrk.ogg
+share/freeciv/stdsounds/wakeup.ogg
 share/freeciv/stdsounds/wall01.ogg
 share/freeciv/stdsounds/woodbrk.ogg
+share/freeciv/toonhex.tilespec
 share/freeciv/trident.tilespec
 share/freeciv/trident/auto_ll.spec
 share/freeciv/trident/cities.png
@@ -3188,76 +3272,112 @@ share/freeciv/wonders/temple_of_artemis.
 share/freeciv/wonders/united_nations.png
 share/freeciv/wonders/womens_suffrage.png
 share/locale/ar/LC_MESSAGES/freeciv-nations.mo
+share/locale/ar/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/ar/LC_MESSAGES/freeciv.mo
 share/locale/bg/LC_MESSAGES/freeciv-nations.mo
+share/locale/bg/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/bg/LC_MESSAGES/freeciv.mo
 share/locale/ca/LC_MESSAGES/freeciv-nations.mo
+share/locale/ca/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/ca/LC_MESSAGES/freeciv.mo
 share/locale/cs/LC_MESSAGES/freeciv-nations.mo
+share/locale/cs/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo
 share/locale/da/LC_MESSAGES/freeciv-nations.mo
+share/locale/da/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/da/LC_MESSAGES/freeciv.mo
 share/locale/de/LC_MESSAGES/freeciv-nations.mo
+share/locale/de/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/de/LC_MESSAGES/freeciv.mo
 share/locale/el/LC_MESSAGES/freeciv-nations.mo
+share/locale/el/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/el/LC_MESSAGES/freeciv.mo
 share/locale/en_GB/LC_MESSAGES/freeciv-nations.mo
+share/locale/en_GB/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/en_GB/LC_MESSAGES/freeciv.mo
 share/locale/eo/LC_MESSAGES/freeciv-nations.mo
+share/locale/eo/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/eo/LC_MESSAGES/freeciv.mo
 share/locale/es/LC_MESSAGES/freeciv-nations.mo
+share/locale/es/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
 share/locale/et/LC_MESSAGES/freeciv-nations.mo
+share/locale/et/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/et/LC_MESSAGES/freeciv.mo
 share/locale/fa/LC_MESSAGES/freeciv-nations.mo
+share/locale/fa/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/fa/LC_MESSAGES/freeciv.mo
 share/locale/fi/LC_MESSAGES/freeciv-nations.mo
+share/locale/fi/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/fi/LC_MESSAGES/freeciv.mo
 share/locale/fr/LC_MESSAGES/freeciv-nations.mo
+share/locale/fr/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/fr/LC_MESSAGES/freeciv.mo
 share/locale/ga/LC_MESSAGES/freeciv-nations.mo
+share/locale/ga/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/ga/LC_MESSAGES/freeciv.mo
 share/locale/gd/LC_MESSAGES/freeciv-nations.mo
+share/locale/gd/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/gd/LC_MESSAGES/freeciv.mo
 share/locale/he/LC_MESSAGES/freeciv-nations.mo
+share/locale/he/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/he/LC_MESSAGES/freeciv.mo
 share/locale/hu/LC_MESSAGES/freeciv-nations.mo
+share/locale/hu/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/hu/LC_MESSAGES/freeciv.mo
 share/locale/id/LC_MESSAGES/freeciv-nations.mo
+share/locale/id/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/id/LC_MESSAGES/freeciv.mo
 share/locale/it/LC_MESSAGES/freeciv-nations.mo
+share/locale/it/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/it/LC_MESSAGES/freeciv.mo
 share/locale/ja/LC_MESSAGES/freeciv-nations.mo
+share/locale/ja/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/ja/LC_MESSAGES/freeciv.mo
 share/locale/ko/LC_MESSAGES/freeciv-nations.mo
+share/locale/ko/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/ko/LC_MESSAGES/freeciv.mo
 share/locale/lt/LC_MESSAGES/freeciv-nations.mo
+share/locale/lt/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/lt/LC_MESSAGES/freeciv.mo
 share/locale/nb/LC_MESSAGES/freeciv-nations.mo
+share/locale/nb/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/nb/LC_MESSAGES/freeciv.mo
 share/locale/nl/LC_MESSAGES/freeciv-nations.mo
+share/locale/nl/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/nl/LC_MESSAGES/freeciv.mo
 share/locale/pl/LC_MESSAGES/freeciv-nations.mo
+share/locale/pl/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/pl/LC_MESSAGES/freeciv.mo
 share/locale/pt/LC_MESSAGES/freeciv-nations.mo
+share/locale/pt/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/pt/LC_MESSAGES/freeciv.mo
 share/locale/pt_BR/LC_MESSAGES/freeciv-nations.mo
+share/locale/pt_BR/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/pt_BR/LC_MESSAGES/freeciv.mo
 share/locale/ro/LC_MESSAGES/freeciv-nations.mo
+share/locale/ro/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/ro/LC_MESSAGES/freeciv.mo
 share/locale/ru/LC_MESSAGES/freeciv-nations.mo
+share/locale/ru/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/ru/LC_MESSAGES/freeciv.mo
 share/locale/sr/LC_MESSAGES/freeciv-nations.mo
+share/locale/sr/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/sr/LC_MESSAGES/freeciv.mo
 share/locale/sv/LC_MESSAGES/freeciv-nations.mo
+share/locale/sv/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/sv/LC_MESSAGES/freeciv.mo
 share/locale/tr/LC_MESSAGES/freeciv-nations.mo
+share/locale/tr/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/tr/LC_MESSAGES/freeciv.mo
 share/locale/uk/LC_MESSAGES/freeciv-nations.mo
+share/locale/uk/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/uk/LC_MESSAGES/freeciv.mo
 share/locale/zh_CN/LC_MESSAGES/freeciv-nations.mo
+share/locale/zh_CN/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/zh_CN/LC_MESSAGES/freeciv.mo
 share/locale/zh_TW/LC_MESSAGES/freeciv-nations.mo
+share/locale/zh_TW/LC_MESSAGES/freeciv-ruledit.mo
 share/locale/zh_TW/LC_MESSAGES/freeciv.mo
 share/pixmaps/freeciv-client.png
 @pkgdir share/icons/hicolor/64x64/apps
@@ -3267,3 +3387,4 @@ share/pixmaps/freeciv-client.png
 @pkgdir share/icons/hicolor/128x128/apps
 @pkgdir share/applications
 @pkgdir share/appdata
+@pkgdir bin

Index: pkgsrc/games/freeciv-share/distinfo
diff -u pkgsrc/games/freeciv-share/distinfo:1.31 pkgsrc/games/freeciv-share/distinfo:1.32
--- pkgsrc/games/freeciv-share/distinfo:1.31    Sun Apr 24 06:52:44 2016
+++ pkgsrc/games/freeciv-share/distinfo Sat Aug 31 14:44:58 2019
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.31 2016/04/24 06:52:44 prlw1 Exp $
+$NetBSD: distinfo,v 1.32 2019/08/31 14:44:58 nia Exp $
 
-SHA1 (freeciv-2.5.3.tar.bz2) = 070900a13c5861a9ce23e7dad03552277e3b9395
-RMD160 (freeciv-2.5.3.tar.bz2) = c20bc780f744e1ff79656c86b3776c97b66faee5
-SHA512 (freeciv-2.5.3.tar.bz2) = a3e1ee5f585be062ec5fc7783dfe24f4cd313bea016af47b868e01561fc3958a86ed310edd41130fc5ede6ca2547ca38198c8dbb18974db7d14defd103277b4b
-Size (freeciv-2.5.3.tar.bz2) = 41010519 bytes
+SHA1 (freeciv-2.6.0.tar.bz2) = 19b5181e3e9e40b31332c79a2226fbcc3706a9c2
+RMD160 (freeciv-2.6.0.tar.bz2) = 9ffdc49773161cc1396e631db0e28d0ddc911bcc
+SHA512 (freeciv-2.6.0.tar.bz2) = 658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8
+Size (freeciv-2.6.0.tar.bz2) = 51912466 bytes



Home | Main Index | Thread Index | Old Index