3 files changed, 134 insertions, 127 deletions

diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index dd7f010d4ab7..ec9d92aafb40 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	SimGear
-PORTVERSION=	0.3.10
-PORTREVISION=	3
+PORTVERSION=	1.0.0
 CATEGORIES=	devel games
 MASTER_SITES=	ftp://ftp.simgear.org/pub/simgear/Source/ \
-		ftp://ftp.de.flightgear.org/pub/simgear/Source/
+		ftp://ftp.de.simgear.org/pub/simgear/Source/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	A toolkit for 3D games and simulations
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
@@ -21,10 +20,13 @@ LIB_DEPENDS=	openal.0:${PORTSDIR}/audio/openal \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		alut.1:${PORTSDIR}/audio/freealut
 
-USE_GL=		yes
+USE_XORG=	ice sm x11 xext xi xt xmu
+USE_GL=	gl glu glut
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-jpeg-factory
 
 post-patch:
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index 1b4bc3b1df58..3974827e1366 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,3 +1,3 @@
-MD5 (SimGear-0.3.10.tar.gz) = 469e17b08ed4267a33dbd19eabdd976b
-SHA256 (SimGear-0.3.10.tar.gz) = fc14e986d11212a5435d684c4f7cd4245e5afa942db5a8e48b82cbd57ac84720
-SIZE (SimGear-0.3.10.tar.gz) = 752225
+MD5 (SimGear-1.0.0.tar.gz) = 6d90c1b9e6fdd3d7a4a39bef027bfd10
+SHA256 (SimGear-1.0.0.tar.gz) = 574e1d41a3a310f7904549af62dd0d7029d841c1eb78dcd2fc5649401b378a5d
+SIZE (SimGear-1.0.0.tar.gz) = 769214
diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist
index 53e8db237d61..93895e2f8312 100644
--- a/devel/simgear/pkg-plist
+++ b/devel/simgear/pkg-plist
@@ -1,147 +1,130 @@
-include/simgear/bucket/newbucket.hxx
-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/environment/visual_enviro.hxx
-include/simgear/ephemeris/celestialBody.hxx
-include/simgear/ephemeris/ephemeris.hxx
-include/simgear/ephemeris/jupiter.hxx
+include/simgear/sound/xmlsound.hxx
+include/simgear/sound/sample_openal.hxx
+include/simgear/sound/soundmgr_openal.hxx
 include/simgear/ephemeris/mars.hxx
-include/simgear/ephemeris/mercury.hxx
-include/simgear/ephemeris/moonpos.hxx
 include/simgear/ephemeris/neptune.hxx
+include/simgear/ephemeris/moonpos.hxx
 include/simgear/ephemeris/saturn.hxx
-include/simgear/ephemeris/star.hxx
-include/simgear/ephemeris/stardata.hxx
+include/simgear/ephemeris/ephemeris.hxx
 include/simgear/ephemeris/uranus.hxx
 include/simgear/ephemeris/venus.hxx
-include/simgear/io/iochannel.hxx
-include/simgear/io/lowlevel.hxx
-include/simgear/io/sg_binobj.hxx
-include/simgear/io/sg_file.hxx
+include/simgear/ephemeris/celestialBody.hxx
+include/simgear/ephemeris/stardata.hxx
+include/simgear/ephemeris/mercury.hxx
+include/simgear/ephemeris/star.hxx
+include/simgear/ephemeris/jupiter.hxx
+include/simgear/bucket/newbucket.hxx
+include/simgear/screen/screen-dump.hxx
+include/simgear/screen/RenderTexture.h
+include/simgear/screen/jpgfactory.hxx
+include/simgear/screen/shader.h
+include/simgear/screen/texture.hxx
+include/simgear/screen/colors.hxx
+include/simgear/screen/extensions.hxx
+include/simgear/screen/tr.h
 include/simgear/io/sg_serial.hxx
+include/simgear/io/lowlevel.hxx
 include/simgear/io/sg_socket.hxx
+include/simgear/io/sg_binobj.hxx
+include/simgear/io/iochannel.hxx
 include/simgear/io/sg_socket_udp.hxx
-include/simgear/magvar/magvar.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/io/sg_file.hxx
+include/simgear/route/route.hxx
+include/simgear/route/waypoint.hxx
+include/simgear/math/sg_geodesy.hxx
+include/simgear/math/SGCMath.hxx
 include/simgear/math/SGMatrix.hxx
-include/simgear/math/SGMisc.hxx
-include/simgear/math/SGQuat.hxx
+include/simgear/math/point3d.hxx
+include/simgear/math/interpolater.hxx
+include/simgear/math/SGGeodesy.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
-include/simgear/math/polar3d.hxx
-include/simgear/math/sg_geodesy.hxx
+include/simgear/math/SGMathFwd.hxx
 include/simgear/math/sg_memory.h
+include/simgear/math/SGLimits.hxx
+include/simgear/math/SGMisc.hxx
 include/simgear/math/sg_random.h
-include/simgear/math/sg_types.hxx
 include/simgear/math/vector.hxx
+include/simgear/math/polar3d.hxx
+include/simgear/math/SGQuat.hxx
+include/simgear/math/SGGeoc.hxx
+include/simgear/math/SGGeod.hxx
+include/simgear/math/sg_types.hxx
+include/simgear/math/leastsqs.hxx
+include/simgear/math/SGMath.hxx
+include/simgear/version.h
+include/simgear/constants.h
+include/simgear/structure/ssgSharedPtr.hxx
+include/simgear/structure/SGSmplstat.hxx
+include/simgear/structure/exception.hxx
+include/simgear/structure/callback.hxx
+include/simgear/structure/SGSharedPtr.hxx
+include/simgear/structure/subsystem_mgr.hxx
+include/simgear/structure/event_mgr.hxx
+include/simgear/structure/SGSmplhist.hxx
+include/simgear/structure/SGReferenced.hxx
+include/simgear/structure/commands.hxx
+include/simgear/sg_traits.hxx
+include/simgear/misc/zfstream.hxx
 include/simgear/misc/interpolator.hxx
-include/simgear/misc/sg_path.hxx
-include/simgear/misc/sgstream.hxx
-include/simgear/misc/stdint.hxx
 include/simgear/misc/stopwatch.hxx
+include/simgear/misc/sgstream.hxx
 include/simgear/misc/strutils.hxx
-include/simgear/misc/tabbed_values.hxx
+include/simgear/misc/sg_path.hxx
 include/simgear/misc/texcoord.hxx
-include/simgear/misc/zfstream.hxx
+include/simgear/misc/tabbed_values.hxx
+include/simgear/misc/stdint.hxx
+include/simgear/nasal/naref.h
 include/simgear/nasal/nasal.h
-include/simgear/props/condition.hxx
-include/simgear/props/props.hxx
+include/simgear/magvar/magvar.hxx
+include/simgear/timing/geocoord.h
+include/simgear/timing/timestamp.hxx
+include/simgear/timing/lowleveltime.h
+include/simgear/timing/sg_time.hxx
+include/simgear/timing/timezone.h
+include/simgear/environment/metar.hxx
+include/simgear/environment/visual_enviro.hxx
+include/simgear/debug/debug_types.h
+include/simgear/debug/logstream.hxx
+include/simgear/sg_inlines.h
+include/simgear/threads/SGGuard.hxx
+include/simgear/threads/SGQueue.hxx
+include/simgear/threads/SGThread.hxx
+include/simgear/serial/serial.hxx
 include/simgear/props/props_io.hxx
-include/simgear/route/route.hxx
-include/simgear/route/waypoint.hxx
-include/simgear/scene/material/mat.hxx
-include/simgear/scene/material/matlib.hxx
-include/simgear/scene/material/matmodel.hxx
-include/simgear/scene/model/animation.hxx
-include/simgear/scene/model/custtrans.hxx
-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/placement.hxx
-include/simgear/scene/model/placementtrans.hxx
-include/simgear/scene/model/shadowvolume.hxx
-include/simgear/scene/sky/bbcache.hxx
+include/simgear/props/props.hxx
+include/simgear/props/condition.hxx
+include/simgear/compiler.h
+include/simgear/scene/sky/sphere.hxx
+include/simgear/scene/sky/sky.hxx
 include/simgear/scene/sky/cloud.hxx
-include/simgear/scene/sky/cloudfield.hxx
-include/simgear/scene/sky/dome.hxx
-include/simgear/scene/sky/moon.hxx
+include/simgear/scene/sky/stars.hxx
 include/simgear/scene/sky/newcloud.hxx
+include/simgear/scene/sky/cloudfield.hxx
 include/simgear/scene/sky/oursun.hxx
-include/simgear/scene/sky/sky.hxx
-include/simgear/scene/sky/sphere.hxx
-include/simgear/scene/sky/stars.hxx
-include/simgear/scene/tgdb/apt_signs.hxx
+include/simgear/scene/sky/bbcache.hxx
+include/simgear/scene/sky/moon.hxx
+include/simgear/scene/sky/dome.hxx
 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/RenderTexture.h
-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/texture.hxx
-include/simgear/screen/tr.h
-include/simgear/serial/serial.hxx
-include/simgear/sg_inlines.h
-include/simgear/sg_traits.hxx
-include/simgear/sound/sample_openal.hxx
-include/simgear/sound/soundmgr_openal.hxx
-include/simgear/sound/xmlsound.hxx
-include/simgear/structure/SGReferenced.hxx
-include/simgear/structure/SGSharedPtr.hxx
-include/simgear/structure/callback.hxx
-include/simgear/structure/commands.hxx
-include/simgear/structure/event_mgr.hxx
-include/simgear/structure/exception.hxx
-include/simgear/structure/ssgSharedPtr.hxx
-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
-include/simgear/timing/timezone.h
-include/simgear/version.h
+include/simgear/scene/tgdb/userdata.hxx
+include/simgear/scene/tgdb/obj.hxx
+include/simgear/scene/tgdb/apt_signs.hxx
+include/simgear/scene/material/mat.hxx
+include/simgear/scene/material/matlib.hxx
+include/simgear/scene/material/matmodel.hxx
+include/simgear/scene/model/placementtrans.hxx
+include/simgear/scene/model/personality.hxx
+include/simgear/scene/model/custtrans.hxx
+include/simgear/scene/model/placement.hxx
+include/simgear/scene/model/modellib.hxx
+include/simgear/scene/model/persparam.hxx
+include/simgear/scene/model/location.hxx
+include/simgear/scene/model/shadowvolume.hxx
+include/simgear/scene/model/animation.hxx
+include/simgear/scene/model/model.hxx
 include/simgear/xml/easyxml.hxx
-lib/libsgbucket.a
-lib/libsgdebug.a
-lib/libsgenvironment.a
-lib/libsgephem.a
-lib/libsgio.a
-lib/libsgmagvar.a
-lib/libsgmaterial.a
-lib/libsgmath.a
-lib/libsgmisc.a
-lib/libsgmodel.a
-lib/libsgnasal.a
-lib/libsgprops.a
-lib/libsgroute.a
-lib/libsgscreen.a
-lib/libsgserial.a
-lib/libsgsky.a
-lib/libsgsound.a
-lib/libsgstructure.a
-lib/libsgtgdb.a
-lib/libsgthreads.a
-lib/libsgtiming.a
-lib/libsgxml.a
 @dirrm include/simgear/xml
 @dirrm include/simgear/timing
 @dirrm include/simgear/threads
@@ -166,3 +149,25 @@ lib/libsgxml.a
 @dirrm include/simgear/debug
 @dirrm include/simgear/bucket
 @dirrm include/simgear
+lib/libsgmisc.a
+lib/libsgprops.a
+lib/libsgmagvar.a
+lib/libsgmodel.a
+lib/libsgserial.a
+lib/libsgroute.a
+lib/libsgmath.a
+lib/libsgtgdb.a
+lib/libsgenvironment.a
+lib/libsgsky.a
+lib/libsgstructure.a
+lib/libsgdebug.a
+lib/libsgscreen.a
+lib/libsgnasal.a
+lib/libsgbucket.a
+lib/libsgxml.a
+lib/libsgsound.a
+lib/libsgthreads.a
+lib/libsgio.a
+lib/libsgtiming.a
+lib/libsgephem.a
+lib/libsgmaterial.a