Update to 2.8.0; fixes build with current boost.

Build system changed to cmake.

Rename patch-ab; the other pre-existing patches do not appear to be
needed any further.

No recent upstream news or changelog appears to exist. The project
home page doesn't admit the existence of versions newer than 2.0.0,
but there are several, corresponding to the recent versions of
FlightGear.

12 files changed, 106 insertions, 211 deletions

diff --git a/games/simgear/Makefile b/games/simgear/Makefile
index c8aa5002ea3..d135994475c 100644
--- a/games/simgear/Makefile
+++ b/games/simgear/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.24 2012/09/22 13:48:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2012/09/30 01:50:15 dholland Exp $
 
-DISTNAME=	SimGear-2.0.0
-PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	13
+DISTNAME=	simgear-2.8.0
 CATEGORIES=	games devel
 MASTER_SITES=	ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \
 		ftp://ftp.goflyflightgear.com/simgear/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://simgear.sourceforge.net/
 COMMENT=	Simulator Construction Tools
+LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-jpeg-factory
+USE_CMAKE=		yes
 
-BUILDLINK_API_DEPENDS.plib+= plib>=1.8.4
+BUILDLINK_API_DEPENDS.plib+= plib>=1.8.5
 
 .include "../../audio/freealut/buildlink3.mk"
 .include "../../audio/openal/buildlink3.mk"
diff --git a/games/simgear/PLIST b/games/simgear/PLIST
index cc56c26d60c..08a2fa2f278 100644
--- a/games/simgear/PLIST
+++ b/games/simgear/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/08/27 06:11:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/09/30 01:50:15 dholland Exp $
 include/simgear/bucket/newbucket.hxx
 include/simgear/compiler.h
 include/simgear/constants.h
@@ -6,7 +6,6 @@ include/simgear/debug/debug_types.h
 include/simgear/debug/logstream.hxx
 include/simgear/environment/metar.hxx
 include/simgear/environment/precipitation.hxx
-include/simgear/environment/visual_enviro.hxx
 include/simgear/ephemeris/celestialBody.hxx
 include/simgear/ephemeris/ephemeris.hxx
 include/simgear/ephemeris/jupiter.hxx
@@ -14,21 +13,27 @@ include/simgear/ephemeris/mars.hxx
 include/simgear/ephemeris/mercury.hxx
 include/simgear/ephemeris/moonpos.hxx
 include/simgear/ephemeris/neptune.hxx
+include/simgear/ephemeris/pluto.hxx
 include/simgear/ephemeris/saturn.hxx
 include/simgear/ephemeris/star.hxx
 include/simgear/ephemeris/stardata.hxx
 include/simgear/ephemeris/uranus.hxx
 include/simgear/ephemeris/venus.hxx
+include/simgear/io/HTTPClient.hxx
+include/simgear/io/HTTPRequest.hxx
 include/simgear/io/iochannel.hxx
 include/simgear/io/lowlevel.hxx
+include/simgear/io/raw_socket.hxx
 include/simgear/io/sg_binobj.hxx
 include/simgear/io/sg_file.hxx
+include/simgear/io/sg_netBuffer.hxx
+include/simgear/io/sg_netChannel.hxx
+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/magvar/coremag.hxx
 include/simgear/magvar/magvar.hxx
-include/simgear/math/Math.hxx
 include/simgear/math/SGBox.hxx
 include/simgear/math/SGCMath.hxx
 include/simgear/math/SGGeoc.hxx
@@ -54,14 +59,12 @@ include/simgear/math/SGVec4.hxx
 include/simgear/math/beziercurve.hxx
 include/simgear/math/interpolater.hxx
 include/simgear/math/leastsqs.hxx
-include/simgear/math/point3d.hxx
-include/simgear/math/polar3d.hxx
 include/simgear/math/sg_geodesy.hxx
 include/simgear/math/sg_random.h
 include/simgear/math/sg_types.hxx
-include/simgear/math/vector.hxx
-include/simgear/misc/PathOptions.hxx
+include/simgear/misc/ResourceManager.hxx
 include/simgear/misc/interpolator.hxx
+include/simgear/misc/sg_dir.hxx
 include/simgear/misc/sg_path.hxx
 include/simgear/misc/sgstream.hxx
 include/simgear/misc/stdint.hxx
@@ -75,10 +78,12 @@ include/simgear/nasal/nasal.h
 include/simgear/props/AtomicChangeListener.hxx
 include/simgear/props/ExtendedPropertyAdapter.hxx
 include/simgear/props/condition.hxx
+include/simgear/props/propertyObject.hxx
 include/simgear/props/props.hxx
 include/simgear/props/props_io.hxx
-include/simgear/route/route.hxx
-include/simgear/route/waypoint.hxx
+include/simgear/props/propsfwd.hxx
+include/simgear/props/tiedpropertylist.hxx
+include/simgear/props/vectorPropTemplates.hxx
 include/simgear/scene/bvh/BVHBoundingBoxVisitor.hxx
 include/simgear/scene/bvh/BVHDebugCollectVisitor.hxx
 include/simgear/scene/bvh/BVHGroup.hxx
@@ -108,15 +113,16 @@ include/simgear/scene/material/TextureBuilder.hxx
 include/simgear/scene/material/mat.hxx
 include/simgear/scene/material/matlib.hxx
 include/simgear/scene/material/matmodel.hxx
+include/simgear/scene/material/mipmap.hxx
+include/simgear/scene/model/BoundingVolumeBuildVisitor.hxx
 include/simgear/scene/model/CheckSceneryVisitor.hxx
+include/simgear/scene/model/ConditionNode.hxx
 include/simgear/scene/model/ModelRegistry.hxx
 include/simgear/scene/model/SGClipGroup.hxx
 include/simgear/scene/model/SGInteractionAnimation.hxx
 include/simgear/scene/model/SGMaterialAnimation.hxx
 include/simgear/scene/model/SGOffsetTransform.hxx
-include/simgear/scene/model/SGPagedLOD.hxx
 include/simgear/scene/model/SGReaderWriterXML.hxx
-include/simgear/scene/model/SGReaderWriterXMLOptions.hxx
 include/simgear/scene/model/SGRotateTransform.hxx
 include/simgear/scene/model/SGScaleTransform.hxx
 include/simgear/scene/model/SGText.hxx
@@ -128,7 +134,6 @@ include/simgear/scene/model/particles.hxx
 include/simgear/scene/model/persparam.hxx
 include/simgear/scene/model/placement.hxx
 include/simgear/scene/sky/CloudShaderGeometry.hxx
-include/simgear/scene/sky/bbcache.hxx
 include/simgear/scene/sky/cloud.hxx
 include/simgear/scene/sky/cloudfield.hxx
 include/simgear/scene/sky/dome.hxx
@@ -139,25 +144,30 @@ include/simgear/scene/sky/sky.hxx
 include/simgear/scene/sky/sphere.hxx
 include/simgear/scene/sky/stars.hxx
 include/simgear/scene/tgdb/GroundLightManager.hxx
+include/simgear/scene/tgdb/ReaderWriterSPT.hxx
 include/simgear/scene/tgdb/ReaderWriterSTG.hxx
+include/simgear/scene/tgdb/SGBuildingBin.hxx
 include/simgear/scene/tgdb/SGDirectionalLightBin.hxx
 include/simgear/scene/tgdb/SGLightBin.hxx
+include/simgear/scene/tgdb/SGModelBin.hxx
 include/simgear/scene/tgdb/SGOceanTile.hxx
 include/simgear/scene/tgdb/SGReaderWriterBTG.hxx
-include/simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx
 include/simgear/scene/tgdb/SGTexturedTriangleBin.hxx
 include/simgear/scene/tgdb/SGTriangleBin.hxx
 include/simgear/scene/tgdb/SGVasiDrawable.hxx
 include/simgear/scene/tgdb/SGVertexArrayBin.hxx
 include/simgear/scene/tgdb/ShaderGeometry.hxx
-include/simgear/scene/tgdb/TileCache.hxx
-include/simgear/scene/tgdb/TileEntry.hxx
+include/simgear/scene/tgdb/TreeBin.hxx
 include/simgear/scene/tgdb/apt_signs.hxx
 include/simgear/scene/tgdb/obj.hxx
 include/simgear/scene/tgdb/pt_lights.hxx
 include/simgear/scene/tgdb/userdata.hxx
+include/simgear/scene/tsync/terrasync.hxx
 include/simgear/scene/util/CopyOp.hxx
 include/simgear/scene/util/NodeAndDrawableVisitor.hxx
+include/simgear/scene/util/Noise.hxx
+include/simgear/scene/util/OsgMath.hxx
+include/simgear/scene/util/OsgSingleton.hxx
 include/simgear/scene/util/PrimitiveUtils.hxx
 include/simgear/scene/util/QuadTreeBuilder.hxx
 include/simgear/scene/util/RenderConstants.hxx
@@ -165,6 +175,7 @@ include/simgear/scene/util/SGDebugDrawCallback.hxx
 include/simgear/scene/util/SGEnlargeBoundingBox.hxx
 include/simgear/scene/util/SGNodeMasks.hxx
 include/simgear/scene/util/SGPickCallback.hxx
+include/simgear/scene/util/SGReaderWriterOptions.hxx
 include/simgear/scene/util/SGSceneFeatures.hxx
 include/simgear/scene/util/SGSceneUserData.hxx
 include/simgear/scene/util/SGStateAttributeVisitor.hxx
@@ -174,17 +185,17 @@ include/simgear/scene/util/SplicingVisitor.hxx
 include/simgear/scene/util/StateAttributeFactory.hxx
 include/simgear/scene/util/UpdateOnceCallback.hxx
 include/simgear/scene/util/VectorArrayAdapter.hxx
-include/simgear/screen/RenderTexture.h
+include/simgear/scene/util/project.hxx
 include/simgear/screen/colors.hxx
 include/simgear/screen/extensions.hxx
-include/simgear/screen/jpgfactory.hxx
 include/simgear/screen/screen-dump.hxx
-include/simgear/screen/shader.h
 include/simgear/screen/tr.h
 include/simgear/serial/serial.hxx
 include/simgear/sg_inlines.h
+include/simgear/simgear_config.h
 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/xmlsound.hxx
 include/simgear/structure/OSGUtils.hxx
@@ -192,6 +203,7 @@ include/simgear/structure/OSGVersion.hxx
 include/simgear/structure/SGAtomic.hxx
 include/simgear/structure/SGBinding.hxx
 include/simgear/structure/SGExpression.hxx
+include/simgear/structure/SGPerfMon.hxx
 include/simgear/structure/SGReferenced.hxx
 include/simgear/structure/SGSharedPtr.hxx
 include/simgear/structure/SGSmplhist.hxx
@@ -205,11 +217,11 @@ include/simgear/structure/commands.hxx
 include/simgear/structure/event_mgr.hxx
 include/simgear/structure/exception.hxx
 include/simgear/structure/intern.hxx
+include/simgear/structure/singleton.hpp
 include/simgear/structure/subsystem_mgr.hxx
 include/simgear/threads/SGGuard.hxx
 include/simgear/threads/SGQueue.hxx
 include/simgear/threads/SGThread.hxx
-include/simgear/timing/geocoord.h
 include/simgear/timing/lowleveltime.h
 include/simgear/timing/sg_time.hxx
 include/simgear/timing/timestamp.hxx
@@ -229,7 +241,6 @@ lib/libsgmisc.a
 lib/libsgmodel.a
 lib/libsgnasal.a
 lib/libsgprops.a
-lib/libsgroute.a
 lib/libsgscreen.a
 lib/libsgserial.a
 lib/libsgsky.a
@@ -238,5 +249,6 @@ lib/libsgstructure.a
 lib/libsgtgdb.a
 lib/libsgthreads.a
 lib/libsgtiming.a
+lib/libsgtsync.a
 lib/libsgutil.a
 lib/libsgxml.a
diff --git a/games/simgear/buildlink3.mk b/games/simgear/buildlink3.mk
index 13152326c6e..6908a023b9c 100644
--- a/games/simgear/buildlink3.mk
+++ b/games/simgear/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2011/12/23 13:36:45 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2012/09/30 01:50:15 dholland Exp $
 
 BUILDLINK_TREE+=	simgear
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	simgear
 SIMGEAR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.simgear+=	simgear>=2.0.0nb6
-BUILDLINK_ABI_DEPENDS.simgear+=	simgear>=1.0.0nb2
+BUILDLINK_ABI_DEPENDS.simgear+=	simgear>=2.0.0nb6
 BUILDLINK_PKGSRCDIR.simgear?=	../../games/simgear
 BUILDLINK_DEPMETHOD.simgear?=	build
 
diff --git a/games/simgear/distinfo b/games/simgear/distinfo
index 37f5728b82d..6716215e8ba 100644
--- a/games/simgear/distinfo
+++ b/games/simgear/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/08/27 06:11:50 adam Exp $
+$NetBSD: distinfo,v 1.5 2012/09/30 01:50:15 dholland Exp $
 
-SHA1 (SimGear-2.0.0.tar.gz) = 38dfd5644903670bdf1405e771c73aca6d43b595
-RMD160 (SimGear-2.0.0.tar.gz) = 5e1488804053cfc9e205384997ddd788e9b5fe83
-Size (SimGear-2.0.0.tar.gz) = 1058343 bytes
-SHA1 (patch-aa) = 654a1f8eb75c0f983d3284a1f68af5f7494cf85d
-SHA1 (patch-ab) = 5bbb254eaa4b8224bf6a6cf8864419ab1a6f77fd
-SHA1 (patch-ae) = 3ca2e00721a4ec3c36e64190e127b745833cb9eb
-SHA1 (patch-af) = df17bc401501493e4130a0be7a3e73380396dfa8
-SHA1 (patch-ag) = 1815edcd98cbcbbce2390faa2dd0aae665676e4d
+SHA1 (simgear-2.8.0.tar.bz2) = 63f030e4969a014326eb9835d33e3da6b26d2900
+RMD160 (simgear-2.8.0.tar.bz2) = 1d3f832d88abc85e2e253ba99fc1946e1a5ff746
+Size (simgear-2.8.0.tar.bz2) = 766340 bytes
+SHA1 (patch-simgear_scene_sky_cloud_cxx) = 670c1b2470c449545382040ccba75365d642f72a
+SHA1 (patch-simgear_sound_sample__group_cxx) = ef4dd3534aa902ed1d3945f5879bfe3ef20d31ca
+SHA1 (patch-simgear_timing_timestamp_cxx) = 20101dd1802c9d18a6680c9b4868efd5c937f973
diff --git a/games/simgear/patches/patch-aa b/games/simgear/patches/patch-aa
deleted file mode 100644
index 8db530b5e71..00000000000
--- a/games/simgear/patches/patch-aa
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2010/08/27 06:11:50 adam Exp $
-
---- configure.orig	2010-02-17 16:05:40.000000000 +0000
-+++ configure
-@@ -2477,7 +2477,7 @@ if test "${with_cxx+set}" = set; then
- ##       CFLAGS=
-      ;;
-    esac
--      CXX_OPTIMIZE_FLAGS=="+K3 -O3"
-+      CXX_OPTIMIZE_FLAGS="+K3 -O3"
-       CXX_DEBUG_FLAGS="-g +K0"
-     ;;
-   esac
-@@ -7483,9 +7483,9 @@ $as_echo "$ac_cv_header_pthread_h" >&6; 
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for library containing pthread_exit" >&5
--$as_echo_n "checking for library containing pthread_exit... " >&6; }
--if test "${ac_cv_search_pthread_exit+set}" = set; then
-+{ $as_echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
-+$as_echo_n "checking for library containing pthread_create... " >&6; }
-+if test "${ac_cv_search_pthread_create+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_func_search_save_LIBS=$LIBS
-@@ -7502,11 +7502,11 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char pthread_exit ();
-+char pthread_create ();
- int
- main ()
- {
--return pthread_exit ();
-+return pthread_create ();
-   ;
-   return 0;
- }
-@@ -7539,7 +7539,7 @@ $as_echo "$ac_try_echo") >&5
- 	 test "$cross_compiling" = yes ||
- 	 $as_test_x conftest$ac_exeext
-        }; then
--  ac_cv_search_pthread_exit=$ac_res
-+  ac_cv_search_pthread_create=$ac_res
- else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -7550,21 +7550,21 @@ fi
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext
--  if test "${ac_cv_search_pthread_exit+set}" = set; then
-+  if test "${ac_cv_search_pthread_create+set}" = set; then
-   break
- fi
- done
--if test "${ac_cv_search_pthread_exit+set}" = set; then
-+if test "${ac_cv_search_pthread_create+set}" = set; then
-   :
- else
--  ac_cv_search_pthread_exit=no
-+  ac_cv_search_pthread_create=no
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_exit" >&5
--$as_echo "$ac_cv_search_pthread_exit" >&6; }
--ac_res=$ac_cv_search_pthread_exit
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
-+$as_echo "$ac_cv_search_pthread_create" >&6; }
-+ac_res=$ac_cv_search_pthread_create
- if test "$ac_res" != no; then
-   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
-@@ -7574,7 +7574,7 @@ if test "x$ac_cv_header_pthread_h" = "xy
-     CXXFLAGS="$CXXFLAGS -D_REENTRANT"
-     CFLAGS="$CFLAGS -D_REENTRANT"
- 
--  if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
-+  if test "x$ac_cv_search_pthread_create" = "x-lc_r"; then
-     CXXFLAGS="-pthread $CXXFLAGS"
-     CFLAGS="-pthread $CFLAGS"
-   fi
-@@ -9724,7 +9724,7 @@ fi
- 
- esac
- 
--if test "$OPENAL_OK" == "no"; then
-+if test "$OPENAL_OK" = "no"; then
-     echo
-     echo "You *must* have the openal library installed on your system to build"
-     echo "SimGear!"
-@@ -9735,7 +9735,7 @@ if test "$OPENAL_OK" == "no"; then
-     exit
- fi
- 
--if test "$ALUT_OK" == "no"; then
-+if test "$ALUT_OK" = "no"; then
-     echo
-     echo "You *must* have the alut library installed on your system to build"
-     echo "SimGear!"
diff --git a/games/simgear/patches/patch-ab b/games/simgear/patches/patch-ab
deleted file mode 100644
index 2a5492c4661..00000000000
--- a/games/simgear/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2010/08/27 06:11:50 adam Exp $
-
---- simgear/scene/sky/cloud.cxx.orig	2010-02-17 15:39:21.000000000 +0000
-+++ simgear/scene/sky/cloud.cxx
-@@ -28,7 +28,7 @@
- 
- #include <sstream>
- 
--#include <math.h>
-+#include <cmath>
- 
- #include <simgear/structure/OSGVersion.hxx>
- #include <osg/AlphaFunc>
-@@ -695,7 +695,7 @@ bool SGCloudLayer::reposition( const SGV
-         // this happens, lets just use the last known good course.
-         // This is a hack, and it would probably be better to make
-         // calc_gc_course_dist() more robust.
--        if ( isnan(course) ) {
-+        if ( std::isnan(course) ) {
-             course = last_course;
-         } else {
-             last_course = course;
diff --git a/games/simgear/patches/patch-ae b/games/simgear/patches/patch-ae
deleted file mode 100644
index 90c8018e796..00000000000
--- a/games/simgear/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2010/08/27 06:11:50 adam Exp $
-
---- configure.ac.orig	2010-02-17 15:56:16.000000000 +0000
-+++ configure.ac
-@@ -200,12 +200,12 @@ dnl Checks for libraries.
- 
- dnl Thread related checks
- AC_CHECK_HEADER(pthread.h)
--AC_SEARCH_LIBS(pthread_exit, [pthread c_r])
-+AC_SEARCH_LIBS(pthread_create, [pthread c_r])
- if test "x$ac_cv_header_pthread_h" = "xyes"; then
-     CXXFLAGS="$CXXFLAGS -D_REENTRANT"
-     CFLAGS="$CFLAGS -D_REENTRANT"
- 
--  if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
-+  if test "x$ac_cv_search_pthread_create" = "x-lc_r"; then
-     CXXFLAGS="-pthread $CXXFLAGS"
-     CFLAGS="-pthread $CFLAGS"
-   fi
diff --git a/games/simgear/patches/patch-af b/games/simgear/patches/patch-af
deleted file mode 100644
index ec47344524a..00000000000
--- a/games/simgear/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.2 2010/08/27 06:11:50 adam Exp $
-
---- simgear/screen/extensions.cxx.orig	2010-02-17 15:39:22.000000000 +0000
-+++ simgear/screen/extensions.cxx
-@@ -145,11 +145,7 @@ void *SGGetGLProcAddress(const char *fun
-     } else if (libHandle != NULL) {
-         fptr = dlsym(libHandle, func);
- 
--#if defined (__FreeBSD__)
-         const char *error = dlerror();
--#else
--        char *error = dlerror();
--#endif
-         if (error)
-             SG_LOG(SG_GENERAL, SG_INFO, error);
-     }
diff --git a/games/simgear/patches/patch-ag b/games/simgear/patches/patch-ag
deleted file mode 100644
index 04fbec7ee1e..00000000000
--- a/games/simgear/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2010/08/27 06:11:50 adam Exp $
-
---- simgear/screen/extensions.hxx.orig	2010-02-17 15:39:22.000000000 +0000
-+++ simgear/screen/extensions.hxx
-@@ -409,6 +409,7 @@ typedef BOOL (APIENTRY * wglSetPbufferAt
- 
- /* GLX pcific OpenGL extenstions */
- #include <GL/glx.h>
-+#include <GL/glxext.h>
- 
- #ifndef GLX_ARB_multisample
- #define GLX_ARB_multisample1
diff --git a/games/simgear/patches/patch-simgear_scene_sky_cloud_cxx b/games/simgear/patches/patch-simgear_scene_sky_cloud_cxx
new file mode 100644
index 00000000000..2040087e841
--- /dev/null
+++ b/games/simgear/patches/patch-simgear_scene_sky_cloud_cxx
@@ -0,0 +1,24 @@
+$NetBSD: patch-simgear_scene_sky_cloud_cxx,v 1.1 2012/09/30 01:50:16 dholland Exp $
+
+Fix build failure on NetBSD.
+
+--- simgear/scene/sky/cloud.cxx.orig	2012-08-16 14:20:29.000000000 +0000
++++ simgear/scene/sky/cloud.cxx
+@@ -27,7 +27,7 @@
+ 
+ #include <sstream>
+ 
+-#include <math.h>
++#include <cmath>
+ 
+ #include <simgear/structure/OSGVersion.hxx>
+ #include <osg/AlphaFunc>
+@@ -733,7 +733,7 @@ bool SGCloudLayer::reposition( const SGV
+             // this happens, lets just use the last known good course.
+             // This is a hack, and it would probably be better to make
+             // calc_gc_course_dist() more robust.
+-            if ( isnan(course) ) {
++            if ( std::isnan(course) ) {
+                 course = last_course;
+             } else {
+                 last_course = course;
diff --git a/games/simgear/patches/patch-simgear_sound_sample__group_cxx b/games/simgear/patches/patch-simgear_sound_sample__group_cxx
new file mode 100644
index 00000000000..a9a61fb80ee
--- /dev/null
+++ b/games/simgear/patches/patch-simgear_sound_sample__group_cxx
@@ -0,0 +1,16 @@
+$NetBSD: patch-simgear_sound_sample__group_cxx,v 1.1 2012/09/30 01:50:16 dholland Exp $
+
+Fix build failure on NetBSD.
+
+--- simgear/sound/sample_group.cxx~	2012-08-16 14:20:28.000000000 +0000
++++ simgear/sound/sample_group.cxx
+@@ -22,2 +22,4 @@
+ 
++#include <cmath>
++
+ #ifdef HAVE_CONFIG_H
+@@ -32,3 +34,3 @@
+ bool isNaN(float *v) {
+-   return (isnan(v[0]) || isnan(v[1]) || isnan(v[2]));
++   return (std::isnan(v[0]) || std::isnan(v[1]) || std::isnan(v[2]));
+ }
diff --git a/games/simgear/patches/patch-simgear_timing_timestamp_cxx b/games/simgear/patches/patch-simgear_timing_timestamp_cxx
new file mode 100644
index 00000000000..07ef4f9bb19
--- /dev/null
+++ b/games/simgear/patches/patch-simgear_timing_timestamp_cxx
@@ -0,0 +1,19 @@
+$NetBSD: patch-simgear_timing_timestamp_cxx,v 1.1 2012/09/30 01:50:16 dholland Exp $
+
+NetBSD does not have clock_nanosleep() so we can't use the
+POSIX_TIMERS code.
+
+--- simgear/timing/timestamp.cxx~	2012-08-16 14:20:29.000000000 +0000
++++ simgear/timing/timestamp.cxx
+@@ -47,6 +47,11 @@
+ #  include <time.h>
+ #endif
+ 
++#ifdef __NetBSD__
++/* XXX netbsd doesn't have clock_nanosleep */
++#undef _POSIX_TIMERS
++#endif
++
+ #ifdef WIN32
+ #  include <windows.h>
+ #  if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )