Upgrade to 0.3.5.

5 files changed, 26 insertions, 14 deletions

diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index e93f9df..b9ceb65 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	SimGear
-PORTVERSION=	0.3.4
+PORTVERSION=	0.3.5
 CATEGORIES=	devel games
 MASTER_SITES=	ftp://ftp.simgear.org/pub/simgear/Source/ \
 		ftp://ftp.de.flightgear.org/pub/simgear/Source/
@@ -22,12 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libmk4.so:${PORTSDIR}/databases/metakit \
 		${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 
 USE_X_PREFIX=	yes
-USE_MESA=	yes
+USE_GL=		yes
 GNU_CONFIGURE=	yes
-# Force configure to look in /usr/local/{include,lib}
-CONFIGURE_ENV+=	CC="${CC}" CFLAGS="${CFLAGS}" \
-		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index 4e575bb..2fc7e89 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,2 +1,2 @@
-MD5 (SimGear-0.3.4.tar.gz) = 5eab33a6504b9cb164acdfa679914cd8
-SIZE (SimGear-0.3.4.tar.gz) = 892220
+MD5 (SimGear-0.3.5.tar.gz) = 24e87739c63c125a7c2c55836a27b121
+SIZE (SimGear-0.3.5.tar.gz) = 897193
diff --git a/devel/simgear/files/patch-ab b/devel/simgear/files/patch-ab
index 7f552ed..441d35f 100644
--- a/devel/simgear/files/patch-ab
+++ b/devel/simgear/files/patch-ab
@@ -13,7 +13,7 @@
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
++LIBS="${PTHREAD_LIBS} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
diff --git a/devel/simgear/files/patch-simgear::scene::sky::cloud.cxx b/devel/simgear/files/patch-simgear::scene::sky::cloud.cxx
new file mode 100644
index 0000000..48c5915
--- /dev/null
+++ b/devel/simgear/files/patch-simgear::scene::sky::cloud.cxx
@@ -0,0 +1,13 @@
+--- simgear/scene/sky/cloud.cxx.orig	Tue Jun  1 10:38:58 2004
++++ simgear/scene/sky/cloud.cxx	Tue Jun  1 10:39:08 2004
+@@ -24,8 +24,8 @@
+ // #if defined (__APPLE__) 
+ // // any C++ header file undefines isinf and isnan
+ // // so this should be included before <iostream>
+-// inline int (isinf)(double r) { return isinf(r); }
+-// inline int (isnan)(double r) { return isnan(r); } 
++inline int (isinf)(double r) { return isinf(r); }
++inline int (isnan)(double r) { return isnan(r); } 
+ // #endif
+ 
+ // #include STL_IOSTREAM
diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist
index a6b5fa1..55e1892 100644
--- a/devel/simgear/pkg-plist
+++ b/devel/simgear/pkg-plist
@@ -3,6 +3,7 @@ include/simgear/compiler.h
 include/simgear/constants.h
 include/simgear/debug/debug_types.h
 include/simgear/debug/logstream.hxx
+include/simgear/environment/metar.hxx
 include/simgear/ephemeris/celestialBody.hxx
 include/simgear/ephemeris/ephemeris.hxx
 include/simgear/ephemeris/jupiter.hxx
@@ -34,8 +35,7 @@ include/simgear/math/sg_memory.h
 include/simgear/math/sg_random.h
 include/simgear/math/sg_types.hxx
 include/simgear/math/vector.hxx
-include/simgear/metar/MetarReport.h
-include/simgear/metar/MetarStation.h
+include/simgear/misc/interpolator.hxx
 include/simgear/misc/sg_path.hxx
 include/simgear/misc/sgstream.hxx
 include/simgear/misc/stopwatch.hxx
@@ -43,6 +43,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/nasal.h
 include/simgear/props/condition.hxx
 include/simgear/props/props.hxx
 include/simgear/props/props_io.hxx
@@ -70,6 +71,7 @@ include/simgear/scene/tgdb/leaf.hxx
 include/simgear/scene/tgdb/obj.hxx
 include/simgear/scene/tgdb/pt_lights.hxx
 include/simgear/scene/tgdb/userdata.hxx
+include/simgear/scene/tgdb/vasi.hxx
 include/simgear/screen/colors.hxx
 include/simgear/screen/extensions.hxx
 include/simgear/screen/screen-dump.hxx
@@ -99,14 +101,15 @@ include/simgear/xml/easyxml.hxx
 lib/libsgbucket.a
 lib/libsgclouds3d.a
 lib/libsgdebug.a
+lib/libsgenvironment.a
 lib/libsgephem.a
 lib/libsgio.a
 lib/libsgmagvar.a
 lib/libsgmaterial.a
 lib/libsgmath.a
-lib/libsgmetar.a
 lib/libsgmisc.a
 lib/libsgmodel.a
+lib/libsgnasal.a
 lib/libsgprops.a
 lib/libsgroute.a
 lib/libsgscreen.a
@@ -135,12 +138,13 @@ lib/libsgxml.a
 @dirrm include/simgear/scene
 @dirrm include/simgear/route
 @dirrm include/simgear/props
+@dirrm include/simgear/nasal
 @dirrm include/simgear/misc
-@dirrm include/simgear/metar
 @dirrm include/simgear/math
 @dirrm include/simgear/magvar
 @dirrm include/simgear/io
 @dirrm include/simgear/ephemeris
+@dirrm include/simgear/environment
 @dirrm include/simgear/debug
 @dirrm include/simgear/bucket
 @dirrm include/simgear