svn commit: r416061 - in head: devel/simgear devel/simgear/files games/flightgear games/flightgear-data games/flightgear/files

Sat May 28 18:57:00 UTC 2016

Author: martymac
Date: Sat May 28 18:56:58 2016
New Revision: 416061
URL: https://svnweb.freebsd.org/changeset/ports/416061

Log:
  Update Simgear & Flightgear ports to 2016.2.1

Added:
  head/devel/simgear/files/
  head/devel/simgear/files/patch-simgear-io-DNSClient.hxx   (contents, props changed)
  head/devel/simgear/files/patch-simgear-misc-sha1.c   (contents, props changed)
  head/devel/simgear/files/patch-simgear-misc-strutils.cxx   (contents, props changed)
Deleted:
  head/games/flightgear/files/patch-3rdparty-hts_engine_API-lib-HTS_misc.c
  head/games/flightgear/files/patch-src-GUI-resources.qrc
Modified:
  head/devel/simgear/Makefile
  head/devel/simgear/distinfo
  head/devel/simgear/pkg-plist
  head/games/flightgear-data/Makefile
  head/games/flightgear-data/distinfo
  head/games/flightgear/Makefile
  head/games/flightgear/distinfo

Modified: head/devel/simgear/Makefile
==============================================================================

--- head/devel/simgear/Makefile	Sat May 28 18:38:05 2016	(r416060)
+++ head/devel/simgear/Makefile	Sat May 28 18:56:58 2016	(r416061)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	simgear
-PORTVERSION=	2016.1.2
+PORTVERSION=	2016.2.1
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 

Modified: head/devel/simgear/distinfo
==============================================================================
--- head/devel/simgear/distinfo	Sat May 28 18:38:05 2016	(r416060)
+++ head/devel/simgear/distinfo	Sat May 28 18:56:58 2016	(r416061)
@@ -1,2 +1,3 @@
-SHA256 (simgear-2016.1.2.tar.bz2) = 8fb364a4ccf08e71a70cd9994e6a5730400deb234e29a4c112d705bfe66af396
-SIZE (simgear-2016.1.2.tar.bz2) = 1066215
+TIMESTAMP = 1463720848
+SHA256 (simgear-2016.2.1.tar.bz2) = 601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a
+SIZE (simgear-2016.2.1.tar.bz2) = 1161873

Added: head/devel/simgear/files/patch-simgear-io-DNSClient.hxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/simgear/files/patch-simgear-io-DNSClient.hxx	Sat May 28 18:56:58 2016	(r416061)
@@ -0,0 +1,10 @@
+--- simgear/io/DNSClient.hxx.orig	2016-05-26 10:14:14.778785357 +0000
++++ simgear/io/DNSClient.hxx	2016-05-26 10:15:10.233184943 +0000
+@@ -27,6 +27,7 @@
+ #include <memory> // for std::auto_ptr
+ #include <string>
+ #include <vector>
++#include <ctime>
+ #include <simgear/structure/SGReferenced.hxx>
+ #include <simgear/structure/SGSharedPtr.hxx>
+ 

Added: head/devel/simgear/files/patch-simgear-misc-sha1.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/simgear/files/patch-simgear-misc-sha1.c	Sat May 28 18:56:58 2016	(r416061)
@@ -0,0 +1,38 @@
+--- simgear/misc/sha1.c.orig	2016-05-25 05:08:11.559005375 +0000
++++ simgear/misc/sha1.c	2016-05-25 05:39:02.947268577 +0000
+@@ -6,25 +6,26 @@
+ //#include <stdint.h>
+ //#include <string.h>
+ 
++#if defined(__FreeBSD__)
++# include <machine/endian.h>
++#else
++# if !defined(_WIN32)
++#  include <endian.h>
++# endif
++#endif
+ 
+ #ifdef __BIG_ENDIAN__
+ # define SHA_BIG_ENDIAN
+-#elif defined __LITTLE_ENDIAN__
+-/* override */
+ #elif defined __BYTE_ORDER
+ # if __BYTE_ORDER__ ==  __ORDER_BIG_ENDIAN__
+ # define SHA_BIG_ENDIAN
+ # endif
+-#elif defined _WIN32
+-/* assume little-endian, there is no endian.h on MSVC */
+-#else // ! defined __LITTLE_ENDIAN__
+-# include <endian.h> // machine/endian.h
+-# if __BYTE_ORDER__ ==  __ORDER_BIG_ENDIAN__
+-#  define SHA_BIG_ENDIAN
++#elif defined BYTE_ORDER
++# if BYTE_ORDER == BIG_ENDIAN
++# define SHA_BIG_ENDIAN
+ # endif
+ #endif
+ 
+-
+ /* code */
+ #define SHA1_K0  0x5a827999
+ #define SHA1_K20 0x6ed9eba1

Added: head/devel/simgear/files/patch-simgear-misc-strutils.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/simgear/files/patch-simgear-misc-strutils.cxx	Sat May 28 18:56:58 2016	(r416061)
@@ -0,0 +1,11 @@
+--- simgear/misc/strutils.cxx.orig	2016-05-20 10:23:23.498474613 +0000
++++ simgear/misc/strutils.cxx	2016-05-20 10:27:20.805099873 +0000
+@@ -615,7 +615,7 @@
+   retcode = strerror_s(buf, sizeof(buf), errnum);
+ #elif defined(_GNU_SOURCE)
+   return std::string(strerror_r(errnum, buf, sizeof(buf)));
+-#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC)
++#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__)
+   int retcode;
+   // POSIX.1-2001 and POSIX.1-2008
+   retcode = strerror_r(errnum, buf, sizeof(buf));

Modified: head/devel/simgear/pkg-plist
==============================================================================
--- head/devel/simgear/pkg-plist	Sat May 28 18:38:05 2016	(r416060)
+++ head/devel/simgear/pkg-plist	Sat May 28 18:56:58 2016	(r416061)
@@ -76,11 +76,13 @@ include/simgear/ephemeris/star.hxx
 include/simgear/ephemeris/stardata.hxx
 include/simgear/ephemeris/uranus.hxx
 include/simgear/ephemeris/venus.hxx
+include/simgear/io/AbstractRepository.hxx
 include/simgear/io/DAVMultiStatus.hxx
+include/simgear/io/DNSClient.hxx
 include/simgear/io/HTTPClient.hxx
-include/simgear/io/HTTPContentDecode.hxx
 include/simgear/io/HTTPFileRequest.hxx
 include/simgear/io/HTTPMemoryRequest.hxx
+include/simgear/io/HTTPRepository.hxx
 include/simgear/io/HTTPRequest.hxx
 include/simgear/io/SVNDirectory.hxx
 include/simgear/io/SVNReportParser.hxx
@@ -137,6 +139,7 @@ include/simgear/misc/gzcontainerfile.hxx
 include/simgear/misc/interpolator.hxx
 include/simgear/misc/make_new.hxx
 include/simgear/misc/sg_dir.hxx
+include/simgear/misc/sg_hash.hxx
 include/simgear/misc/sg_path.hxx
 include/simgear/misc/sgstream.hxx
 include/simgear/misc/stdint.hxx

Modified: head/games/flightgear-data/Makefile
==============================================================================
--- head/games/flightgear-data/Makefile	Sat May 28 18:38:05 2016	(r416060)
+++ head/games/flightgear-data/Makefile	Sat May 28 18:56:58 2016	(r416061)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-data
-PORTVERSION=	2016.1.2
+PORTVERSION=	2016.2.1
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 DISTNAME=	FlightGear-${PORTVERSION}-data

Modified: head/games/flightgear-data/distinfo
==============================================================================
--- head/games/flightgear-data/distinfo	Sat May 28 18:38:05 2016	(r416060)
+++ head/games/flightgear-data/distinfo	Sat May 28 18:56:58 2016	(r416061)
@@ -1,2 +1,3 @@
-SHA256 (FlightGear-2016.1.2-data.tar.bz2) = a69f860576e31ade6268e3870215f9ae0b28de278e06978a772e987efa0c1ebc
-SIZE (FlightGear-2016.1.2-data.tar.bz2) = 1266744537
+TIMESTAMP = 1463721111
+SHA256 (FlightGear-2016.2.1-data.tar.bz2) = 225b32f4d813635ece72f09541640e818fba95386ff8715015693978c37eaace
+SIZE (FlightGear-2016.2.1-data.tar.bz2) = 1562126790

Modified: head/games/flightgear/Makefile
==============================================================================
--- head/games/flightgear/Makefile	Sat May 28 18:38:05 2016	(r416060)
+++ head/games/flightgear/Makefile	Sat May 28 18:56:58 2016	(r416061)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	2016.1.2
+PORTVERSION=	2016.2.1
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
@@ -50,10 +50,6 @@ DBUS_CMAKE_OFF=	-DUSE_DBUS:BOOL=OFF
 USE_GCC=	yes
 .endif
 
-post-patch:
-	${MV} "${WRKSRC}/src/GUI/ndb-small-icon .png" \
-		"${WRKSRC}/src/GUI/ndb-small-icon.png"
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server \
 		${STAGEDIR}${PREFIX}/bin

Modified: head/games/flightgear/distinfo
==============================================================================
--- head/games/flightgear/distinfo	Sat May 28 18:38:05 2016	(r416060)
+++ head/games/flightgear/distinfo	Sat May 28 18:56:58 2016	(r416061)
@@ -1,2 +1,3 @@
-SHA256 (flightgear-2016.1.2.tar.bz2) = c966dc892563185f3398db42e57c6dcf89f1b5fa4f997c0aeba1bafe0d45a919
-SIZE (flightgear-2016.1.2.tar.bz2) = 7544371
+TIMESTAMP = 1463720861
+SHA256 (flightgear-2016.2.1.tar.bz2) = b554170ca6b5943fd90496759b055fb60f362ea96f6c46dfff89e3d12c940a94
+SIZE (flightgear-2016.2.1.tar.bz2) = 7556269
