Update Simgear & Flightgear ports to 2016.3.1

6 files changed, 7 insertions, 71 deletions

diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index e5bb54d37086..50e76b26f7c6 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	simgear
-PORTVERSION=	2016.2.1
+PORTVERSION=	2016.3.1
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index 873ee9fe1012..bb1287cb861a 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463720848
-SHA256 (simgear-2016.2.1.tar.bz2) = 601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a
-SIZE (simgear-2016.2.1.tar.bz2) = 1161873
+TIMESTAMP = 1473849925
+SHA256 (simgear-2016.3.1.tar.bz2) = ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd
+SIZE (simgear-2016.3.1.tar.bz2) = 1199016
diff --git a/devel/simgear/files/patch-simgear-io-DNSClient.hxx b/devel/simgear/files/patch-simgear-io-DNSClient.hxx
deleted file mode 100644
index 6f32dcafa866..000000000000
--- a/devel/simgear/files/patch-simgear-io-DNSClient.hxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
- 
diff --git a/devel/simgear/files/patch-simgear-misc-sha1.c b/devel/simgear/files/patch-simgear-misc-sha1.c
deleted file mode 100644
index bc3898b08c0f..000000000000
--- a/devel/simgear/files/patch-simgear-misc-sha1.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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
diff --git a/devel/simgear/files/patch-simgear-misc-strutils.cxx b/devel/simgear/files/patch-simgear-misc-strutils.cxx
deleted file mode 100644
index f7e875bc732e..000000000000
--- a/devel/simgear/files/patch-simgear-misc-strutils.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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));
diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist
index 023b67e898aa..fc456ad951f4 100644
--- a/devel/simgear/pkg-plist
+++ b/devel/simgear/pkg-plist
@@ -76,17 +76,12 @@ 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/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
-include/simgear/io/SVNRepository.hxx
 include/simgear/io/iochannel.hxx
 include/simgear/io/lowlevel.hxx
 include/simgear/io/raw_socket.hxx
@@ -98,6 +93,7 @@ include/simgear/io/sg_netChat.hxx
 include/simgear/io/sg_serial.hxx
 include/simgear/io/sg_socket.hxx
 include/simgear/io/sg_socket_udp.hxx
+include/simgear/io/untar.hxx
 include/simgear/magvar/coremag.hxx
 include/simgear/magvar/magvar.hxx
 include/simgear/math/SGBox.hxx
@@ -290,10 +286,9 @@ include/simgear/serial/serial.hxx
 include/simgear/sg_inlines.h
 include/simgear/simgear_config.h
 include/simgear/sound/readwav.hxx
+include/simgear/sound/sample.hxx
 include/simgear/sound/sample_group.hxx
-include/simgear/sound/sample_openal.hxx
-include/simgear/sound/sample_queue.hxx
-include/simgear/sound/soundmgr_openal.hxx
+include/simgear/sound/soundmgr.hxx
 include/simgear/sound/xmlsound.hxx
 include/simgear/structure/OSGUtils.hxx
 include/simgear/structure/OSGVersion.hxx