SF.net SVN: gar:[26899] csw/mgar/pkg/freeciv/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 26899
          http://sourceforge.net/p/gar/code/26899
Author:   jake_goerzen
Date:     2022-03-15 02:16:22 +0000 (Tue, 15 Mar 2022)
Log Message:
-----------
freeciv: update to 2.6.6; add patch to build with ipv6

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

Added Paths:
-----------
    csw/mgar/pkg/freeciv/trunk/files/0003-add-support-to-build-with-IPv6-on-Solaris.patch

Modified: csw/mgar/pkg/freeciv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeciv/trunk/Makefile	2022-03-14 10:53:56 UTC (rev 26898)
+++ csw/mgar/pkg/freeciv/trunk/Makefile	2022-03-15 02:16:22 UTC (rev 26899)
@@ -1,5 +1,5 @@
 NAME = freeciv
-VERSION = 2.6.0
+VERSION = 2.6.6
 GARTYPE = v2
 
 DESCRIPTION = Free turn-based multiplayer strategy game
@@ -45,7 +45,7 @@
 
 PATCHFILES += 0001-use-finite-instead-of-isfinite-function.patch
 PATCHFILES += 0002-restore-previous-version-tile.h.patch
-PATCHFILES += 0003-adjust-path-to-include-MagickWand.h.patch
+PATCHFILES += 0003-add-support-to-build-with-IPv6-on-Solaris.patch
 
 TEST_SCRIPTS =
 
@@ -52,6 +52,7 @@
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --enable-fcdb=all
 CONFIGURE_ARGS += --enable-client=gtk2,sdl,xaw
+CONFIGURE_ARGS += --disable-dependency-tracking
 CONFIGURE_ARGS += --with-magickwand=/opt/csw/include/ImageMagick-7
 
 EXTRA_INC = /opt/csw/include/ImageMagick-7/MagickWand
@@ -68,6 +69,10 @@
 
 include gar/category.mk
 
+pre-configure-modulated:
+	# We patched configure.ac so we need to rebuild configure
+	cd $(WORKDIR)/$(NAME)-$(VERSION) && autoreconf
+
 post-install-modulated:
 
 	perl -pi -e 's|/usr/local|/opt/csw|' \

Modified: csw/mgar/pkg/freeciv/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeciv/trunk/checksums	2022-03-14 10:53:56 UTC (rev 26898)
+++ csw/mgar/pkg/freeciv/trunk/checksums	2022-03-15 02:16:22 UTC (rev 26899)
@@ -1 +1 @@
-403941dc4eca22b5b76bc9e7587a1134  freeciv-2.6.0.tar.bz2
+2f40775f142b509c0bfc6db89a3a8171  freeciv-2.6.6.tar.bz2

Added: csw/mgar/pkg/freeciv/trunk/files/0003-add-support-to-build-with-IPv6-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/freeciv/trunk/files/0003-add-support-to-build-with-IPv6-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/freeciv/trunk/files/0003-add-support-to-build-with-IPv6-on-Solaris.patch	2022-03-15 02:16:22 UTC (rev 26899)
@@ -0,0 +1,34 @@
+From f8eb73a9fec76f8e513a4fa65c428ad21c656e53 Mon Sep 17 00:00:00 2001
+From: Jake Goerzen <jgoerzen at opencsw.org>
+Date: Tue, 15 Mar 2022 01:10:58 +0100
+Subject: [PATCH] add support to build with IPv6 on Solaris
+
+---
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 951d5ab..4d101d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -200,6 +200,9 @@ case "$host_os" in
+   *haiku*)
+     LIBS="$LIBS -lnetwork"
+     ;;
++  *solaris*)
++    LIBS="$LIBS -lsocket -lnsl"
++    ;;
+ esac
+ 
+ dnl Networking headers
+@@ -209,6 +212,7 @@ dnl Avoid including the unix emulation layer if we build mingw executables
+ dnl There would be type conflicts between winsock and bsd/unix includes
+ if test "x$MINGW" != "xyes"; then
+   AC_CHECK_HEADERS([sys/socket.h], [AC_DEFINE([FREECIV_HAVE_SYS_SOCKET_H], [1], [sys/socket.h available])])
++  AC_CHECK_HEADERS([netdb.h], [AC_DEFINE([FREECIV_HAVE_NETDB_H], [1], [netdb.h available])])
+ fi
+ 
+ dnl Check getaddrinfo just once here, and remember the result
+-- 
+2.4.0
+

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