update flightgear/simgear to 1.0.0, from Yorick Hardy per PR pkg/38160

changes:
-many bugfixes
-UI improvements
-new and improved aircraft models
pkgsrc change: pull in SDL for fullscreen mode

6 files changed, 87 insertions, 75 deletions

diff --git a/games/simgear/Makefile b/games/simgear/Makefile
index 3f1fa3a1f7d..7f1a93388fa 100644
--- a/games/simgear/Makefile
+++ b/games/simgear/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/12/29 10:02:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/03/14 14:49:53 drochner Exp $
 #
 
-DISTNAME=		SimGear-0.3.10
+DISTNAME=		SimGear-1.0.0
 PKGNAME=		${DISTNAME:S/SimGear/simgear/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.de.simgear.org/pub/simgear/
diff --git a/games/simgear/PLIST b/games/simgear/PLIST
index a20e20350ad..3a38e6063ba 100644
--- a/games/simgear/PLIST
+++ b/games/simgear/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/12 19:56:14 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/03/14 14:49:53 drochner Exp $
 include/simgear/bucket/newbucket.hxx
 include/simgear/compiler.h
 include/simgear/constants.h
@@ -26,17 +26,18 @@ include/simgear/io/sg_serial.hxx
 include/simgear/io/sg_socket.hxx
 include/simgear/io/sg_socket_udp.hxx
 include/simgear/magvar/magvar.hxx
+include/simgear/math/SGCMath.hxx
 include/simgear/math/SGGeoc.hxx
 include/simgear/math/SGGeod.hxx
 include/simgear/math/SGGeodesy.hxx
 include/simgear/math/SGLimits.hxx
 include/simgear/math/SGMath.hxx
+include/simgear/math/SGMathFwd.hxx
 include/simgear/math/SGMatrix.hxx
 include/simgear/math/SGMisc.hxx
 include/simgear/math/SGQuat.hxx
 include/simgear/math/SGVec3.hxx
 include/simgear/math/SGVec4.hxx
-include/simgear/math/fastmath.hxx
 include/simgear/math/interpolater.hxx
 include/simgear/math/leastsqs.hxx
 include/simgear/math/point3d.hxx
@@ -55,6 +56,7 @@ include/simgear/misc/strutils.hxx
 include/simgear/misc/tabbed_values.hxx
 include/simgear/misc/texcoord.hxx
 include/simgear/misc/zfstream.hxx
+include/simgear/nasal/naref.h
 include/simgear/nasal/nasal.h
 include/simgear/props/condition.hxx
 include/simgear/props/props.hxx
@@ -70,6 +72,7 @@ include/simgear/scene/model/location.hxx
 include/simgear/scene/model/model.hxx
 include/simgear/scene/model/modellib.hxx
 include/simgear/scene/model/personality.hxx
+include/simgear/scene/model/persparam.hxx
 include/simgear/scene/model/placement.hxx
 include/simgear/scene/model/placementtrans.hxx
 include/simgear/scene/model/shadowvolume.hxx
@@ -104,6 +107,8 @@ include/simgear/sound/soundmgr_openal.hxx
 include/simgear/sound/xmlsound.hxx
 include/simgear/structure/SGReferenced.hxx
 include/simgear/structure/SGSharedPtr.hxx
+include/simgear/structure/SGSmplhist.hxx
+include/simgear/structure/SGSmplstat.hxx
 include/simgear/structure/callback.hxx
 include/simgear/structure/commands.hxx
 include/simgear/structure/event_mgr.hxx
diff --git a/games/simgear/buildlink3.mk b/games/simgear/buildlink3.mk
index 0a1630d2666..ebb30cd3650 100644
--- a/games/simgear/buildlink3.mk
+++ b/games/simgear/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/12 19:56:14 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/03/14 14:49:53 drochner Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SIMGEAR_BUILDLINK3_MK:=	${SIMGEAR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsimgear}
 BUILDLINK_PACKAGES+=	simgear
 
 .if !empty(SIMGEAR_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.simgear+=	simgear>=0.3.4
+BUILDLINK_API_DEPENDS.simgear+=	simgear>=1.0.0
 BUILDLINK_PKGSRCDIR.simgear?=	../../games/simgear
 BUILDLINK_DEPMETHOD.simgear?=	build
 .endif	# SIMGEAR_BUILDLINK3_MK
diff --git a/games/simgear/distinfo b/games/simgear/distinfo
index 90b4fe6093d..500630139a3 100644
--- a/games/simgear/distinfo
+++ b/games/simgear/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.2 2007/10/05 21:06:00 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/03/14 14:49:53 drochner Exp $
 
-SHA1 (SimGear-0.3.10.tar.gz) = 83e8435b52463fdb2736ccb2f0e42b572528131f
-RMD160 (SimGear-0.3.10.tar.gz) = 11bfb77efab7562f14c9bc0688f99af9a45f4c81
-Size (SimGear-0.3.10.tar.gz) = 752225 bytes
-SHA1 (patch-aa) = a071fdd6efcb1167f1ee9fff440bca5ef97b4640
+SHA1 (SimGear-1.0.0.tar.gz) = cad6cc8a205005731633d8dec994cfa299f90e8a
+RMD160 (SimGear-1.0.0.tar.gz) = 62f260d55d621221076fafb703593f6c4e3c9d53
+Size (SimGear-1.0.0.tar.gz) = 769214 bytes
+SHA1 (patch-aa) = 53ca007000b147e966d82317869b91dae8827c3a
 SHA1 (patch-ab) = 9df1dbe00731e95e561d9d2e5a3eaaada79693ef
 SHA1 (patch-ac) = 0c3b22ab6cd2e3093e66f2fafd1b2bfcb57fe425
 SHA1 (patch-ad) = ebe7a273a53a527299c44774ee989d99b780c6b0
 SHA1 (patch-ae) = 466b9ec8f8e7e41d389795b6d9f365cf4313ec5f
 SHA1 (patch-af) = 47decffedf577d5b50166eec658c868d38f0c830
+SHA1 (patch-ag) = dbcba9fde4989560b9ee3df9ae07666758d12d18
diff --git a/games/simgear/patches/patch-aa b/games/simgear/patches/patch-aa
index 012020e2261..56441b85b29 100644
--- a/games/simgear/patches/patch-aa
+++ b/games/simgear/patches/patch-aa
@@ -1,96 +1,81 @@
-$NetBSD: patch-aa,v 1.2 2007/10/05 21:06:00 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2008/03/14 14:49:53 drochner Exp $
 
---- configure.orig	2006-04-05 18:25:04.000000000 +0000
-+++ configure
-@@ -5968,13 +5968,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" 
+--- configure.orig	2008-01-21 16:52:07.000000000 +0200
++++ configure	2008-01-21 16:58:07.000000000 +0200
+@@ -2249,7 +2249,7 @@
+ ##       CFLAGS=
+      ;;
+    esac
+-      CXX_OPTIMIZE_FLAGS=="+K3 -O3"
++      CXX_OPTIMIZE_FLAGS="+K3 -O3"
+       CXX_DEBUG_FLAGS="-g +K0"
+     ;;
+   esac
+@@ -7064,9 +7064,9 @@
  fi
  
  
--echo "$as_me:$LINENO: checking for library containing pthread_exit" >&5
--echo $ECHO_N "checking for library containing pthread_exit... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for library containing pthread_exit" >&5
+-echo $ECHO_N "checking for library containing pthread_exit... $ECHO_C" >&6; }
 -if test "${ac_cv_search_pthread_exit+set}" = set; then
-+echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
-+echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
++echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6; }
 +if test "${ac_cv_search_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
--ac_cv_search_pthread_exit=no
-+ac_cv_search_pthread_create=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5988,11 +5988,11 @@ extern "C"
+@@ -7083,11 +7083,11 @@
+ #ifdef __cplusplus
+ extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
 -char pthread_exit ();
 +char pthread_create ();
  int
  main ()
  {
--pthread_exit ();
-+pthread_create ();
+-return pthread_exit ();
++return pthread_create ();
    ;
    return 0;
  }
-@@ -6019,7 +6019,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7133,7 +7133,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  ac_cv_search_pthread_exit="none required"
-+  ac_cv_search_pthread_create="none required"
+-  ac_cv_search_pthread_exit=$ac_res
++  ac_cv_search_pthread_create=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -6027,7 +6027,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7143,21 +7143,21 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext \
+       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
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_pthread_exit" = no; then
-+if test "$ac_cv_search_pthread_create" = no; then
-   for ac_lib in pthread c_r; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -6043,11 +6043,11 @@ extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char pthread_exit ();
-+char pthread_create ();
- int
- main ()
- {
--pthread_exit ();
-+pthread_create ();
-   ;
-   return 0;
- }
-@@ -6074,7 +6074,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_search_pthread_exit="-l$ac_lib"
-+  ac_cv_search_pthread_create="-l$ac_lib"
- break
+ done
+-if test "${ac_cv_search_pthread_exit+set}" = set; then
++if test "${ac_cv_search_pthread_create+set}" = set; then
+   :
  else
-   echo "$as_me: failed program was:" >&5
-@@ -6087,10 +6087,10 @@ rm -f conftest.err conftest.$ac_objext \
+-  ac_cv_search_pthread_exit=no
++  ac_cv_search_pthread_create=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_search_pthread_exit" >&5
--echo "${ECHO_T}$ac_cv_search_pthread_exit" >&6
--if test "$ac_cv_search_pthread_exit" != no; then
--  test "$ac_cv_search_pthread_exit" = "none required" || LIBS="$ac_cv_search_pthread_exit $LIBS"
-+echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
-+echo "${ECHO_T}$ac_cv_search_pthread_create" >&6
-+if test "$ac_cv_search_pthread_create" != no; then
-+  test "$ac_cv_search_pthread_create" = "none required" || LIBS="$ac_cv_search_pthread_create $LIBS"
+-{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_exit" >&5
+-echo "${ECHO_T}$ac_cv_search_pthread_exit" >&6; }
+-ac_res=$ac_cv_search_pthread_exit
++{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
++echo "${ECHO_T}$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"
  
- fi
- 
-@@ -6098,7 +6098,7 @@ if test "x$ac_cv_header_pthread_h" = "xy
+@@ -7167,7 +7167,7 @@
      CXXFLAGS="$CXXFLAGS -D_REENTRANT"
      CFLAGS="$CFLAGS -D_REENTRANT"
  
@@ -99,7 +84,7 @@ $NetBSD: patch-aa,v 1.2 2007/10/05 21:06:00 joerg Exp $
      CXXFLAGS="-pthread $CXXFLAGS"
      CFLAGS="-pthread $CFLAGS"
    fi
-@@ -8634,7 +8634,7 @@ fi
+@@ -9233,7 +9233,7 @@
  
  esac
  
@@ -108,3 +93,12 @@ $NetBSD: patch-aa,v 1.2 2007/10/05 21:06:00 joerg Exp $
      echo
      echo "You *must* have the openal library installed on your system to build"
      echo "SimGear!"
+@@ -9244,7 +9244,7 @@
+     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-ag b/games/simgear/patches/patch-ag
new file mode 100644
index 00000000000..4e0a44b05fc
--- /dev/null
+++ b/games/simgear/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2008/03/14 14:49:53 drochner Exp $
+
+--- simgear/screen/extensions.hxx.orig	2008-03-11 18:46:27.000000000 +0100
++++ simgear/screen/extensions.hxx
+@@ -415,6 +415,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