Mon Aug 6 11:03:18 2018 UTC ()
simgear: Fix SunOS and missing dependencies.


(jperkin)
diff -r1.71 -r1.72 pkgsrc/games/simgear/Makefile
diff -r1.7 -r1.8 pkgsrc/games/simgear/distinfo
diff -r1.1 -r1.2 pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h
diff -r0 -r1.1 pkgsrc/games/simgear/patches/patch-simgear_io_test__repository.cxx
diff -r0 -r1.1 pkgsrc/games/simgear/patches/patch-simgear_io_test__untar.cxx
diff -r0 -r1.1 pkgsrc/games/simgear/patches/patch-simgear_io_untar.cxx
diff -r0 -r1.1 pkgsrc/games/simgear/patches/patch-simgear_package_md5.h
cvs diff -r1.71 -r1.72 pkgsrc/games/simgear/Makefile (expand / switch to unified diff)

--- pkgsrc/games/simgear/Makefile 2018/08/04 04:04:28 1.71
+++ pkgsrc/games/simgear/Makefile 2018/08/06 11:03:18 1.72
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.71 2018/08/04 04:04:28 nia Exp $ 1# $NetBSD: Makefile,v 1.72 2018/08/06 11:03:18 jperkin Exp $
2 2
3DISTNAME= simgear-2018.2.2 3DISTNAME= simgear-2018.2.2
4CATEGORIES= games devel 4CATEGORIES= games devel
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.2/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.2/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://home.flightgear.org/ 9HOMEPAGE= http://home.flightgear.org/
10COMMENT= Simulator Construction Tools 10COMMENT= Simulator Construction Tools
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15USE_CMAKE= yes 15USE_CMAKE= yes
16 16
17LDFLAGS.SunOS+= -lsocket -lnsl 17LDFLAGS.SunOS+= -lsocket -lnsl
18 18
19.include "../../audio/openal-soft/buildlink3.mk" 19.include "../../audio/openal-soft/buildlink3.mk"
20.include "../../devel/boost-headers/buildlink3.mk" 20.include "../../devel/boost-headers/buildlink3.mk"
21.include "../../devel/zlib/buildlink3.mk" 21.include "../../devel/zlib/buildlink3.mk"
22.include "../../graphics/MesaLib/buildlink3.mk" 22.include "../../graphics/MesaLib/buildlink3.mk"
 23.include "../../graphics/glu/buildlink3.mk"
23.include "../../graphics/osg/buildlink3.mk" 24.include "../../graphics/osg/buildlink3.mk"
24.include "../../www/curl/buildlink3.mk" 25.include "../../www/curl/buildlink3.mk"
25.include "../../mk/pthread.buildlink3.mk" 26.include "../../mk/pthread.buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/games/simgear/distinfo (expand / switch to unified diff)

--- pkgsrc/games/simgear/distinfo 2018/08/04 04:04:28 1.7
+++ pkgsrc/games/simgear/distinfo 2018/08/06 11:03:18 1.8
@@ -1,9 +1,13 @@ @@ -1,9 +1,13 @@
1$NetBSD: distinfo,v 1.7 2018/08/04 04:04:28 nia Exp $ 1$NetBSD: distinfo,v 1.8 2018/08/06 11:03:18 jperkin Exp $
2 2
3SHA1 (simgear-2018.2.2.tar.bz2) = ba24275236aa461c4b0fee3e37e4fb6877734a1c 3SHA1 (simgear-2018.2.2.tar.bz2) = ba24275236aa461c4b0fee3e37e4fb6877734a1c
4RMD160 (simgear-2018.2.2.tar.bz2) = ecb7005d1fcae8b76cb1d18df7924fe89a594152 4RMD160 (simgear-2018.2.2.tar.bz2) = ecb7005d1fcae8b76cb1d18df7924fe89a594152
5SHA512 (simgear-2018.2.2.tar.bz2) = 2052c8e42bda751bc7c9429525b7acb733d5c0dd32dd4adea078718f89296c635abc956b464887fe67202dcc07a81fbade443a84fe8206648e473fd0f64d9365 5SHA512 (simgear-2018.2.2.tar.bz2) = 2052c8e42bda751bc7c9429525b7acb733d5c0dd32dd4adea078718f89296c635abc956b464887fe67202dcc07a81fbade443a84fe8206648e473fd0f64d9365
6Size (simgear-2018.2.2.tar.bz2) = 1313890 bytes 6Size (simgear-2018.2.2.tar.bz2) = 1313890 bytes
7SHA1 (patch-simgear_canvas_ShivaVG_src_shConfig.h) = f38988911197efc56cb6eb170274a04961aa198d 7SHA1 (patch-simgear_canvas_ShivaVG_src_shConfig.h) = d9e8befec2e7ecb8c79a1edddf74bea4e759d656
8SHA1 (patch-simgear_canvas_ShivaVG_src_shDefs.h) = 0da1544fecec002fb874fcb7df1155ad2889ba4d 8SHA1 (patch-simgear_canvas_ShivaVG_src_shDefs.h) = 0da1544fecec002fb874fcb7df1155ad2889ba4d
 9SHA1 (patch-simgear_io_test__repository.cxx) = 4369ea0b3eab47bed5b2b08ba8a56f86f83f77a0
 10SHA1 (patch-simgear_io_test__untar.cxx) = b3625254f9410411b30a8c3e30845c3d1509a993
 11SHA1 (patch-simgear_io_untar.cxx) = 2cc21468bd0319aae012fb7c16e9e279888e34e3
9SHA1 (patch-simgear_misc_strutils.cxx) = a72f601803ca285c778ccf12bfe25ff886a182cb 12SHA1 (patch-simgear_misc_strutils.cxx) = a72f601803ca285c778ccf12bfe25ff886a182cb
 13SHA1 (patch-simgear_package_md5.h) = 91dc8741ed547c26a6de8ab8bd25ee441e0e5e92
cvs diff -r1.1 -r1.2 pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h (expand / switch to unified diff)

--- pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h 2018/08/04 04:04:28 1.1
+++ pkgsrc/games/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig.h 2018/08/06 11:03:18 1.2
@@ -1,18 +1,27 @@ @@ -1,18 +1,27 @@
1$NetBSD: patch-simgear_canvas_ShivaVG_src_shConfig.h,v 1.1 2018/08/04 04:04:28 nia Exp $ 1$NetBSD: patch-simgear_canvas_ShivaVG_src_shConfig.h,v 1.2 2018/08/06 11:03:18 jperkin Exp $
2 2
3Support NetBSD. 3Support NetBSD and SunOS.
4 4
5--- simgear/canvas/ShivaVG/src/shConfig.h.orig 2018-06-03 18:56:36.000000000 +0000 5--- simgear/canvas/ShivaVG/src/shConfig.h.orig 2018-06-03 18:56:36.000000000 +0000
6+++ simgear/canvas/ShivaVG/src/shConfig.h 6+++ simgear/canvas/ShivaVG/src/shConfig.h
 7@@ -16,7 +16,7 @@
 8 #define NOMINMAX
 9 #endif
 10
 11-#elif defined(linux) || defined(__linux)
 12+#elif defined(linux) || defined(__linux) || defined(__sun)
 13
 14 // Linux
 15 #define VG_API_LINUX
7@@ -31,6 +31,11 @@ 16@@ -31,6 +31,11 @@
8 // FreeBSD 17 // FreeBSD
9 #define VG_API_FREEBSD 18 #define VG_API_FREEBSD
10  19
11+#elif defined(__NetBSD__) 20+#elif defined(__NetBSD__)
12+ 21+
13+ // NetBSD 22+ // NetBSD
14+ #define VG_API_NETBSD 23+ #define VG_API_NETBSD
15+ 24+
16 #else 25 #else
17  26
18 // Unsupported system 27 // Unsupported system
File Added: pkgsrc/games/simgear/patches/Attic/patch-simgear_io_test__repository.cxx
$NetBSD: patch-simgear_io_test__repository.cxx,v 1.1 2018/08/06 11:03:18 jperkin Exp $

SunOS needs alloca.h

--- simgear/io/test_repository.cxx.orig	2018-06-03 18:56:36.000000000 +0000
+++ simgear/io/test_repository.cxx
@@ -5,6 +5,10 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#ifdef __sun
+#include <alloca.h>
+#endif
+
 #include <boost/algorithm/string/case_conv.hpp>
 
 #include <simgear/simgear_config.h>
File Added: pkgsrc/games/simgear/patches/patch-simgear_io_test__untar.cxx
$NetBSD: patch-simgear_io_test__untar.cxx,v 1.1 2018/08/06 11:03:18 jperkin Exp $

SunOS needs alloca.h

--- simgear/io/test_untar.cxx.orig	2018-06-03 18:56:36.000000000 +0000
+++ simgear/io/test_untar.cxx
@@ -7,6 +7,10 @@
 
 #include <iostream>
 
+#ifdef __sun
+#include <alloca.h>
+#endif
+
 #include "untar.hxx"
 
 #include <simgear/misc/test_macros.hxx>
File Added: pkgsrc/games/simgear/patches/patch-simgear_io_untar.cxx
$NetBSD: patch-simgear_io_untar.cxx,v 1.1 2018/08/06 11:03:18 jperkin Exp $

SunOS needs alloca.h

--- simgear/io/untar.cxx.orig	2018-06-03 18:56:36.000000000 +0000
+++ simgear/io/untar.cxx
@@ -17,6 +17,10 @@
 
 #include <simgear_config.h>
 
+#ifdef __sun
+#include <alloca.h>
+#endif
+
 #include "untar.hxx"
 
 #include <cstdlib>
File Added: pkgsrc/games/simgear/patches/patch-simgear_package_md5.h
$NetBSD: patch-simgear_package_md5.h,v 1.1 2018/08/06 11:03:18 jperkin Exp $

Add non-standard typedefs.

--- simgear/package/md5.h.orig	2018-06-03 18:56:36.000000000 +0000
+++ simgear/package/md5.h
@@ -23,6 +23,10 @@
 typedef unsigned char    u_int8_t;
 typedef unsigned int     u_int32_t;
 typedef unsigned __int64 u_int64_t;
+#elif defined(__sun)
+typedef uint8_t		u_int8_t;
+typedef uint32_t	u_int32_t;
+typedef uint64_t	u_int64_t;
 #endif
      
 #define	MD5_BLOCK_LENGTH		64