From 346c8b8c05163dc67833e2515adc0357dcc70424 Mon Sep 17 00:00:00 2001 From: prlw1 Date: Sun, 24 Apr 2016 06:52:44 +0000 Subject: Update freeciv to 2.5.3 Many changes listed in: http://www.freeciv.org/wiki/NEWS-2.5.3 http://www.freeciv.org/wiki/NEWS-2.5.2 http://www.freeciv.org/wiki/NEWS-2.5.1 We were after: * Build fixes: + Re-generating the configure script could fail on recent OS distributions due to a clash with the system supplied glib-gettext.m4. This did not affect most users, who would build with the configure script supplied in the tarball. GNA#24379 --- games/freeciv-share/Makefile | 3 +-- games/freeciv-share/Makefile.common | 4 ++-- games/freeciv-share/PLIST | 8 ++++++-- games/freeciv-share/distinfo | 21 +++++---------------- games/freeciv-share/suppress_installation.mk | 3 +-- 5 files changed, 15 insertions(+), 24 deletions(-) (limited to 'games/freeciv-share') diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile index d8c1ab4c2ab..98119e8fe4e 100644 --- a/games/freeciv-share/Makefile +++ b/games/freeciv-share/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2016/03/05 11:28:31 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2016/04/24 06:52:44 prlw1 Exp $ PKGNAME= ${DISTNAME:S/-/-share-/} -PKGREVISION= 1 #PKGREVISION= 0 COMMENT= Machine independent files for Freeciv diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common index 8e222c95932..826c002d491 100644 --- a/games/freeciv-share/Makefile.common +++ b/games/freeciv-share/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.46 2015/12/05 21:25:43 adam Exp $ +# $NetBSD: Makefile.common,v 1.47 2016/04/24 06:52:44 prlw1 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.0 +FC_VERS= 2.5.3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freeciv/} EXTRACT_SUFX= .tar.bz2 diff --git a/games/freeciv-share/PLIST b/games/freeciv-share/PLIST index 0ff336094ff..d34a5d769ad 100644 --- a/games/freeciv-share/PLIST +++ b/games/freeciv-share/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2015/04/26 19:19:42 spz Exp $ +@comment $NetBSD: PLIST,v 1.14 2016/04/24 06:52:44 prlw1 Exp $ etc/freeciv/database.lua lib/libfreeciv.la man/man6/freeciv-client.6 @@ -32,10 +32,10 @@ share/doc/freeciv/README.AI_modules share/doc/freeciv/README.SDLClient share/doc/freeciv/README.agents share/doc/freeciv/README.attributes -share/doc/freeciv/README.cma share/doc/freeciv/README.delta share/doc/freeciv/README.effects share/doc/freeciv/README.fcdb +share/doc/freeciv/README.governor share/doc/freeciv/README.graphics share/doc/freeciv/README.nations share/doc/freeciv/README.packaging @@ -2465,6 +2465,8 @@ share/freeciv/hex2t/select.png share/freeciv/hex2t/select.spec share/freeciv/hex2t/tiles.png share/freeciv/hex2t/tiles.spec +share/freeciv/hex2t/unitcost.png +share/freeciv/hex2t/unitcost.spec share/freeciv/isophex.tilespec share/freeciv/isophex/darkness.png share/freeciv/isophex/darkness.spec @@ -2495,6 +2497,8 @@ share/freeciv/isotrident/terrain2.png share/freeciv/isotrident/terrain2.spec share/freeciv/isotrident/tiles.png share/freeciv/isotrident/tiles.spec +share/freeciv/isotrident/unitcost.png +share/freeciv/isotrident/unitcost.spec share/freeciv/isotrident/unitextras.png share/freeciv/isotrident/unitextras.spec share/freeciv/misc/buildings-large.spec diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo index c410de58eec..f8c9f1eb8c9 100644 --- a/games/freeciv-share/distinfo +++ b/games/freeciv-share/distinfo @@ -1,17 +1,6 @@ -$NetBSD: distinfo,v 1.30 2015/11/03 20:56:50 agc Exp $ +$NetBSD: distinfo,v 1.31 2016/04/24 06:52:44 prlw1 Exp $ -SHA1 (freeciv-2.5.0.tar.bz2) = 477b60e02606e47b31a019b065353c1a6da6c305 -RMD160 (freeciv-2.5.0.tar.bz2) = 51d16d9c746bd42123c333c2103882b771c6b796 -SHA512 (freeciv-2.5.0.tar.bz2) = f03bafdca47da0677ad81ed945afe79bbd01ae871b95e6bdaf6249acb8420e78e3210dd60f520d960ec127e1d443f45c11fcc484b49b6bb59cab5904e51fc651 -Size (freeciv-2.5.0.tar.bz2) = 40323793 bytes -SHA1 (patch-aa) = bac3e05393c154defd288cc621606a3dbd7f00eb -SHA1 (patch-common_dataio.c) = 6fd08d7185f953fbfdc2c554ad67c4e5c8f2be87 -SHA1 (patch-common_dataio.h) = 4a513230ee814269466959fcb977b1360a78ee53 -SHA1 (patch-common_generate__packets.py) = 0fb74f024d1ada9ad85f62b12099c385d1e972c7 -SHA1 (patch-common_packets.c) = 7ea66b3d0068a1255d818a9808bf7e581c95fb71 -SHA1 (patch-configure.ac) = 3c9ce11318a497df6c06f2e272183b1dd1eaf483 -SHA1 (patch-dependencies_lua-5.1_src_Makefile.am) = 2d240eb7488bfd0071867b68e5a78a6927c85089 -SHA1 (patch-dependencies_tolua-5.1_src_bin_Makefile.am) = 933dd8a213a3b2fecc290d59d3d12437e9c5ce2c -SHA1 (patch-dependencies_tolua-5.1_src_lib_Makefile.am) = 8810cd3865433a52783f8ae274ebb0d8b50deee8 -SHA1 (patch-m4_x.m4) = 53e685c02ab97fcef9c39be1fee5dc5e73775588 -SHA1 (patch-server_Makefile.am) = 6f4cac8fccd8a289d944db6593bbbabb3650d4b9 +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 diff --git a/games/freeciv-share/suppress_installation.mk b/games/freeciv-share/suppress_installation.mk index 79a9c55ab76..bd34bb46b61 100644 --- a/games/freeciv-share/suppress_installation.mk +++ b/games/freeciv-share/suppress_installation.mk @@ -1,4 +1,4 @@ -# $NetBSD: suppress_installation.mk,v 1.3 2015/04/26 19:19:42 spz Exp $ +# $NetBSD: suppress_installation.mk,v 1.4 2016/04/24 06:52:44 prlw1 Exp $ # Makefile snippet to be included by freeciv-client and freeciv-server to # prevent files installed by freeciv-share from being installed again. @@ -40,4 +40,3 @@ SUBST_STAGE.installfix2= post-configure SUBST_FILES.installfix2= common/Makefile SUBST_SED.installfix2+= -e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|' SUBST_MESSAGE.installfix2= Suppressing installation of libs already in freeciv-share. - -- cgit v1.2.3