[csw-devel] SF.net SVN: gar:[16493] csw/mgar/pkg/freeciv/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 16493
          http://gar.svn.sourceforge.net/gar/?rev=16493&view=rev
Author:   jake_goerzen
Date:     2011-12-13 22:47:18 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
freeciv: update to 2.3.1

Modified Paths:
--------------
    csw/mgar/pkg/freeciv/trunk/Makefile
    csw/mgar/pkg/freeciv/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite.patch

Property Changed:
----------------
    csw/mgar/pkg/freeciv/trunk/


Property changes on: csw/mgar/pkg/freeciv/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/freeciv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeciv/trunk/Makefile	2011-12-13 22:35:13 UTC (rev 16492)
+++ csw/mgar/pkg/freeciv/trunk/Makefile	2011-12-13 22:47:18 UTC (rev 16493)
@@ -1,30 +1,53 @@
 NAME = freeciv
-VERSION = 2.1.8
-GARTYPE = v1
+VERSION = 2.3.1
 CATEGORIES = apps
 
-DESCRIPTION = a free turn-based multiplayer strategy game
+DESCRIPTION = Free turn-based multiplayer strategy game
 define BLURB
 Freeciv is a Free and Open Source empire-building strategy game inspired by the history of human civilization. The game commences in prehistory and your mission is to lead your tribe from the stone age to the space age...
 endef
 
 MASTER_SITES += $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWfreeciv, depend prototype )
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=138322
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibz1
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWftype2
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWgtk2
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWpango
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWfconfig
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWsdlmixer
+RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgio2-0-0
+
 GARCOMPILER = GNU
 
-PATCHFILES = dataio.c.diff configure.diff
+PATCHFILES += 0001-use-finite-instead-of-isfinite.patch
 
 TEST_SCRIPTS =
 
-CONFIGURE_ARGS = LDFLAGS='-L/opt/csw/lib -lm'
 CONFIGURE_ARGS += $(DIRPATHS)
-CONFIGURE_ARGS += --with-included-gettext
 
+# build package on Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 include gar/category.mk
+
+post-install-modulated:
+
+	perl -pi -e 's|/usr/local|/opt/csw|' \
+		$(DESTDIR)/opt/csw/share/man/man6/freeciv-*.6

Modified: csw/mgar/pkg/freeciv/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeciv/trunk/checksums	2011-12-13 22:35:13 UTC (rev 16492)
+++ csw/mgar/pkg/freeciv/trunk/checksums	2011-12-13 22:47:18 UTC (rev 16493)
@@ -1,6 +1 @@
-3e9925e868a816c1fba58993cced92ef  download/freeciv-2.1.8.tar.gz
-4f6b34dbb2143663d82ebea710c56863  download/CSWfreeciv.gspec
-fee60b5af7c882c2eb16a8ca622e3958  download/CSWfreeciv.depend
-d3acfde4316e7011beccd69b21d2ad67  download/CSWfreeciv.prototype
-892be308fb8a4e34f0e98083de3e1788  download/dataio.c.diff
-1521ec035d8abe47106b2f3ffe7a0d38  download/configure.diff
+86ec3fc7f03ac2a2e5a52d9605f41acc  freeciv-2.3.1.tar.gz

Added: csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite.patch
===================================================================
--- csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite.patch	                        (rev 0)
+++ csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite.patch	2011-12-13 22:47:18 UTC (rev 16493)
@@ -0,0 +1,25 @@
+From 7968df55fadd7ce6601d2a43581ff74dddc7fab6 Mon Sep 17 00:00:00 2001
+From: Jake Goerzen <jgoerzen at opencsw.org>
+Date: Tue, 13 Dec 2011 22:54:14 +0100
+Subject: [PATCH] use finite instead of isfinite
+
+---
+ client/cityrepdata.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/client/cityrepdata.c b/client/cityrepdata.c
+index bcc0d28..a58c741 100644
+--- a/client/cityrepdata.c
++++ b/client/cityrepdata.c
+@@ -795,7 +795,7 @@ static void split_string(struct datum_vector *data, const char *str)
+     float value;
+ 
+     value = strtof(str, &endptr);
+-    if(endptr == str || !isfinite(value)) {
++    if(endptr == str || !finite(value)) {
+       /* that wasn't a sensible number; go on */
+       str++;
+     } else {
+-- 
+1.7.6.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.