summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/flightgear-data/Makefile6
-rw-r--r--games/flightgear-data/distinfo10
-rw-r--r--games/flightgear/Makefile20
-rw-r--r--games/flightgear/distinfo10
-rw-r--r--games/simgear/Makefile15
-rw-r--r--games/simgear/PLIST3
-rw-r--r--games/simgear/distinfo11
-rw-r--r--games/simgear/patches/patch-simgear_nasal_cppbind_NasalHash.hxx14
8 files changed, 61 insertions, 28 deletions
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 4a474439c87..2f37cce3a2c 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2018/12/04 03:57:03 nia Exp $
+# $NetBSD: Makefile,v 1.8 2019/03/14 18:13:19 nia Exp $
-VERSION= 2018.2.2
+VERSION= 2018.3.2
DISTNAME= FlightGear-${VERSION}-data
PKGNAME= flightgear-data-${VERSION}
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.2/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.3/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index 4cea941ef93..451b3f84abc 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2018/12/04 03:57:03 nia Exp $
+$NetBSD: distinfo,v 1.5 2019/03/14 18:13:19 nia Exp $
-SHA1 (FlightGear-2018.2.2-data.tar.bz2) = 4244106a93841e8fe27422134ec7cdcd91c03658
-RMD160 (FlightGear-2018.2.2-data.tar.bz2) = 6941b1a041210c06acb5a2d5e250d71aba3044ba
-SHA512 (FlightGear-2018.2.2-data.tar.bz2) = 611a864f94eff328817b4eef3ddbf8c47c201071ab647a9322899b0d28b32a43c0af477e53a1a41fa3083503c080674c269f3f7535cbf62286a885512af3abe6
-Size (FlightGear-2018.2.2-data.tar.bz2) = 1624681801 bytes
+SHA1 (FlightGear-2018.3.2-data.tar.bz2) = fd8545cecdfd805fae7b94510100219961c81fc9
+RMD160 (FlightGear-2018.3.2-data.tar.bz2) = 93e969ad72368ca064ff6b0d7d8633e0fa1983ea
+SHA512 (FlightGear-2018.3.2-data.tar.bz2) = 64baa8a42d6a6e930cc2a14e62f6f3488f08cb3121973aece8818275b8f4934a94539e24b95646d7c5bb8bd5eef65ff91d63013c07dabf79f452908b749640bb
+Size (FlightGear-2018.3.2-data.tar.bz2) = 1744998558 bytes
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 5ec73ee1131..cde692a76be 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2019/02/16 13:26:49 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2019/03/14 18:13:18 nia Exp $
-DISTNAME= flightgear-2018.2.2
-PKGREVISION= 3
+DISTNAME= flightgear-2018.3.2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.2/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.3/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -16,18 +15,29 @@ USE_PKGLOCALEDIR= yes
USE_CMAKE= yes
LDFLAGS.NetBSD+= -lexecinfo
+CONFIGURE_DIRS= fgbuild
+BUILD_DIRS= fgbuild
+CMAKE_ARG_PATH= ..
+
BUILDLINK_TRANSFORM+= l:glut:freeglut
+# The cmake script warns against building in the source directory.
+pre-configure:
+ cd ${WRKSRC} && ${MKDIR} fgbuild
+
.include "../../audio/openal-soft/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../games/plib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.simgear+= simgear>=2.0.0
+BUILDLINK_API_DEPENDS.simgear+= simgear>=2018.3.0
.include "../../games/simgear/buildlink3.mk"
.include "../../graphics/freeglut/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glew/buildlink3.mk"
.include "../../graphics/osg/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index fa79a083414..d926d537c43 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2018/12/04 03:56:27 nia Exp $
+$NetBSD: distinfo,v 1.10 2019/03/14 18:13:18 nia Exp $
-SHA1 (flightgear-2018.2.2.tar.bz2) = 7bf06d3ad218ce4e99eede7aa250fbdf938eb7a3
-RMD160 (flightgear-2018.2.2.tar.bz2) = 1af2854949ab282c0bb0e19e79756b9ee54f25c6
-SHA512 (flightgear-2018.2.2.tar.bz2) = f845fcd24e14a4d3abba5f6011d6fe61d4c8ab587989b597c2ab16d75711e9dc6808d6c91e2ba56ff7d644278bc10e09c116e82ba0f6391b03c5bc84a546f440
-Size (flightgear-2018.2.2.tar.bz2) = 8346698 bytes
+SHA1 (flightgear-2018.3.2.tar.bz2) = d70865c66492c688b2c3870984cc7346171609dc
+RMD160 (flightgear-2018.3.2.tar.bz2) = 796fd556e7668e85c4d08112521ccac9b91ed4fc
+SHA512 (flightgear-2018.3.2.tar.bz2) = 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d
+Size (flightgear-2018.3.2.tar.bz2) = 8405351 bytes
SHA1 (patch-3rdparty_hts__engine__API_lib_HTS__misc.c) = 78de7201192e73f6f032ffcadd5ec2f63423390f
SHA1 (patch-3rdparty_iaxclient_lib_libiax2_src_iax.c) = d6ae7b47253c1ba8f79e42cde27189d32e603eea
SHA1 (patch-3rdparty_joystick_jsNone.cxx) = 4a662c71f97dd2d5093f09d4631d672e5278f082
diff --git a/games/simgear/Makefile b/games/simgear/Makefile
index aee0bfe8be6..b550373a588 100644
--- a/games/simgear/Makefile
+++ b/games/simgear/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2019/02/16 13:26:48 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2019/03/14 18:13:18 nia Exp $
-DISTNAME= simgear-2018.2.2
-PKGREVISION= 10
+DISTNAME= simgear-2018.3.2
CATEGORIES= games devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.2/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flightgear/release-2018.3/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -15,8 +14,16 @@ USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_CMAKE= yes
+CONFIGURE_DIRS= sgbuild
+BUILD_DIRS= sgbuild
+CMAKE_ARG_PATH= ..
+
LDFLAGS.SunOS+= -lsocket -lnsl
+# The cmake script warns against building in the source directory.
+pre-configure:
+ cd ${WRKSRC} && ${MKDIR} sgbuild
+
.include "../../audio/openal-soft/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
diff --git a/games/simgear/PLIST b/games/simgear/PLIST
index bb72efc514c..95d41c82b84 100644
--- a/games/simgear/PLIST
+++ b/games/simgear/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/08/04 04:04:28 nia Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/03/14 18:13:18 nia Exp $
include/simgear/bucket/newbucket.hxx
include/simgear/bvh/BVHBoundingBoxVisitor.hxx
include/simgear/bvh/BVHGroup.hxx
@@ -55,6 +55,7 @@ include/simgear/canvas/layout/SpacerItem.hxx
include/simgear/compiler.h
include/simgear/constants.h
include/simgear/debug/BufferedLogCallback.hxx
+include/simgear/debug/OsgIoCapture.hxx
include/simgear/debug/debug_types.h
include/simgear/debug/logstream.hxx
include/simgear/embedded_resources/EmbeddedResource.hxx
diff --git a/games/simgear/distinfo b/games/simgear/distinfo
index 16813b72bd2..c94e44e7859 100644
--- a/games/simgear/distinfo
+++ b/games/simgear/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.8 2018/08/06 11:03:18 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2019/03/14 18:13:18 nia Exp $
-SHA1 (simgear-2018.2.2.tar.bz2) = ba24275236aa461c4b0fee3e37e4fb6877734a1c
-RMD160 (simgear-2018.2.2.tar.bz2) = ecb7005d1fcae8b76cb1d18df7924fe89a594152
-SHA512 (simgear-2018.2.2.tar.bz2) = 2052c8e42bda751bc7c9429525b7acb733d5c0dd32dd4adea078718f89296c635abc956b464887fe67202dcc07a81fbade443a84fe8206648e473fd0f64d9365
-Size (simgear-2018.2.2.tar.bz2) = 1313890 bytes
+SHA1 (simgear-2018.3.2.tar.bz2) = 3a71172145fdf32681fabcc90ae24787e20f6424
+RMD160 (simgear-2018.3.2.tar.bz2) = 65f8ec00c52ff18bb8e140b6d046acaeb9afdcd7
+SHA512 (simgear-2018.3.2.tar.bz2) = 3f60df34f22ea84bdb3e0aa0e2c0b73b2fddf15d17ea985aee254bf4c269b7447976629a7e4b022c460c7c406940d0b2669b723c6b899499d064cfe91546f0ba
+Size (simgear-2018.3.2.tar.bz2) = 1329982 bytes
SHA1 (patch-simgear_canvas_ShivaVG_src_shConfig.h) = d9e8befec2e7ecb8c79a1edddf74bea4e759d656
SHA1 (patch-simgear_canvas_ShivaVG_src_shDefs.h) = 0da1544fecec002fb874fcb7df1155ad2889ba4d
SHA1 (patch-simgear_io_test__repository.cxx) = 4369ea0b3eab47bed5b2b08ba8a56f86f83f77a0
SHA1 (patch-simgear_io_test__untar.cxx) = b3625254f9410411b30a8c3e30845c3d1509a993
SHA1 (patch-simgear_io_untar.cxx) = 2cc21468bd0319aae012fb7c16e9e279888e34e3
SHA1 (patch-simgear_misc_strutils.cxx) = a72f601803ca285c778ccf12bfe25ff886a182cb
+SHA1 (patch-simgear_nasal_cppbind_NasalHash.hxx) = f741a9c1bd7511723f8ea35ed4400b2648c7605d
SHA1 (patch-simgear_package_md5.h) = 91dc8741ed547c26a6de8ab8bd25ee441e0e5e92
diff --git a/games/simgear/patches/patch-simgear_nasal_cppbind_NasalHash.hxx b/games/simgear/patches/patch-simgear_nasal_cppbind_NasalHash.hxx
new file mode 100644
index 00000000000..8e68a0ffcfc
--- /dev/null
+++ b/games/simgear/patches/patch-simgear_nasal_cppbind_NasalHash.hxx
@@ -0,0 +1,14 @@
+$NetBSD: patch-simgear_nasal_cppbind_NasalHash.hxx,v 1.1 2019/03/14 18:13:18 nia Exp $
+
+Uses enable_if - don't rely on indirect inclusion.
+
+--- simgear/nasal/cppbind/NasalHash.hxx.orig 2019-01-29 13:17:36.000000000 +0000
++++ simgear/nasal/cppbind/NasalHash.hxx
+@@ -23,6 +23,7 @@
+ #include "to_nasal.hxx"
+
+ #include <simgear/structure/map.hxx>
++#include <boost/core/enable_if.hpp>
+ #include <boost/iterator/iterator_facade.hpp>
+
+ namespace nasal
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-18 08:15:26 +0000