14 files changed, 274 insertions, 201 deletions

diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 89e259c39b93..94c910a943f6 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	simgear
-PORTVERSION=	2.10.0
+PORTVERSION=	2.12.0
 CATEGORIES=	devel games
 MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \
 		ftp://ftp.de.flightgear.org/pub/simgear/Source/ \
@@ -15,17 +15,15 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		boost_thread:${PORTSDIR}/devel/boost-libs \
-		osg:${PORTSDIR}/graphics/osg
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
+		libosg.so:${PORTSDIR}/graphics/osg
 
 USE_BZIP2=	yes
-USE_GCC=	any
 USE_XORG=	ice sm x11 xext xi xt xmu
 USE_OPENAL=	al alut
 USE_GL=		gl glu glut
 USES=		cmake
 CMAKE_ARGS+=	-DJPEG_FACTORY:BOOL=ON
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index 0fee0e805290..d1b8d61ed72c 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (simgear-2.10.0.tar.bz2) = 582c0d547a58f7dbe841a0ba9eba5a894aae2b65f14ef06361e196b12022615d
-SIZE (simgear-2.10.0.tar.bz2) = 879537
+SHA256 (simgear-2.12.0.tar.bz2) = 8e90c4b2f72f6459c6f5125bcd1f16b5d4604af1ff404ab436a966349d32f46a
+SIZE (simgear-2.12.0.tar.bz2) = 961978
diff --git a/devel/simgear/pkg-descr b/devel/simgear/pkg-descr
index 37194c083786..461c1d0f9f1d 100644
--- a/devel/simgear/pkg-descr
+++ b/devel/simgear/pkg-descr
@@ -1,12 +1,8 @@
-SimGear is a set of open-source libraries designed to be used as
-building blocks for quickly assembling 3d simulations, games, and
-visualization applications.
+SimGear is a set of open-source libraries designed to be used as building
+blocks for quickly assembling 3d simulations, games, and visualization
+applications.
 
-SimGear is a relatively new project, and while quite a bit of code has
-been written in conjunction with the FlightGear project, the final
-interface and arrangements are still evolving.
+SimGear is developed by the FlightGear project and also provides the base for
+the FlightGear Flight Simulator.
 
-The term "Simulation Kernel" is a bit presumptuous for us at this
-point, but this is the direction we are heading with SimGear.
-
-WWW: http://www.simgear.org/
+WWW: http://www.flightgear.org/
diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist
index 225f4d3b5c3b..27c2db51bcca 100644
--- a/devel/simgear/pkg-plist
+++ b/devel/simgear/pkg-plist
@@ -1,53 +1,55 @@
-include/simgear/simgear_config.h
-include/simgear/compiler.h
-include/simgear/constants.h
-include/simgear/sg_inlines.h
-include/simgear/version.h
 include/simgear/bucket/newbucket.hxx
-include/simgear/bvh/BVHPageNode.hxx
+include/simgear/bvh/BVHBoundingBoxVisitor.hxx
+include/simgear/bvh/BVHGroup.hxx
+include/simgear/bvh/BVHLineGeometry.hxx
+include/simgear/bvh/BVHLineSegmentVisitor.hxx
+include/simgear/bvh/BVHMaterial.hxx
+include/simgear/bvh/BVHMotionTransform.hxx
 include/simgear/bvh/BVHNearestPointVisitor.hxx
+include/simgear/bvh/BVHNode.hxx
+include/simgear/bvh/BVHPageNode.hxx
+include/simgear/bvh/BVHPageRequest.hxx
+include/simgear/bvh/BVHPager.hxx
+include/simgear/bvh/BVHStaticBinary.hxx
+include/simgear/bvh/BVHStaticData.hxx
+include/simgear/bvh/BVHStaticGeometry.hxx
 include/simgear/bvh/BVHStaticGeometryBuilder.hxx
 include/simgear/bvh/BVHStaticLeaf.hxx
-include/simgear/bvh/BVHStaticData.hxx
-include/simgear/bvh/BVHPager.hxx
-include/simgear/bvh/BVHVisitor.hxx
-include/simgear/bvh/BVHBoundingBoxVisitor.hxx
-include/simgear/bvh/BVHTransform.hxx
-include/simgear/bvh/BVHStaticTriangle.hxx
 include/simgear/bvh/BVHStaticNode.hxx
-include/simgear/bvh/BVHNode.hxx
-include/simgear/bvh/BVHMaterial.hxx
-include/simgear/bvh/BVHLineSegmentVisitor.hxx
+include/simgear/bvh/BVHStaticTriangle.hxx
 include/simgear/bvh/BVHSubTreeCollector.hxx
-include/simgear/bvh/BVHPageRequest.hxx
-include/simgear/bvh/BVHStaticGeometry.hxx
-include/simgear/bvh/BVHGroup.hxx
-include/simgear/bvh/BVHMotionTransform.hxx
-include/simgear/bvh/BVHStaticBinary.hxx
-include/simgear/bvh/BVHLineGeometry.hxx
-include/simgear/canvas/CanvasMgr.hxx
+include/simgear/bvh/BVHTransform.hxx
+include/simgear/bvh/BVHVisitor.hxx
 include/simgear/canvas/Canvas.hxx
-include/simgear/canvas/canvas_fwd.hxx
-include/simgear/canvas/ShivaVG/vgu.h
-include/simgear/canvas/ShivaVG/openvg.h
-include/simgear/canvas/elements/CanvasGroup.hxx
-include/simgear/canvas/elements/CanvasText.hxx
-include/simgear/canvas/elements/CanvasMap.hxx
-include/simgear/canvas/elements/CanvasImage.hxx
-include/simgear/canvas/elements/CanvasPath.hxx
-include/simgear/canvas/elements/CanvasElement.hxx
+include/simgear/canvas/CanvasEvent.hxx
+include/simgear/canvas/CanvasEventListener.hxx
+include/simgear/canvas/CanvasEventManager.hxx
+include/simgear/canvas/CanvasEventTypes.hxx
+include/simgear/canvas/CanvasEventVisitor.hxx
+include/simgear/canvas/CanvasMgr.hxx
+include/simgear/canvas/CanvasObjectPlacement.hxx
 include/simgear/canvas/CanvasPlacement.hxx
-include/simgear/canvas/ODGauge.hxx
 include/simgear/canvas/CanvasSystemAdapter.hxx
 include/simgear/canvas/MouseEvent.hxx
-include/simgear/canvas/CanvasEventListener.hxx
-include/simgear/canvas/CanvasEventVisitor.hxx
-include/simgear/canvas/CanvasEventManager.hxx
+include/simgear/canvas/ODGauge.hxx
+include/simgear/canvas/ShivaVG/openvg.h
+include/simgear/canvas/ShivaVG/vgu.h
 include/simgear/canvas/VGInitOperation.hxx
-include/simgear/canvas/CanvasEventTypes.hxx
-include/simgear/canvas/CanvasEvent.hxx
+include/simgear/canvas/canvas_fwd.hxx
+include/simgear/canvas/elements/CanvasElement.hxx
+include/simgear/canvas/elements/CanvasGroup.hxx
+include/simgear/canvas/elements/CanvasImage.hxx
+include/simgear/canvas/elements/CanvasMap.hxx
+include/simgear/canvas/elements/CanvasPath.hxx
+include/simgear/canvas/elements/CanvasText.hxx
+include/simgear/canvas/elements/detail/add_segment_variadic.hxx
+include/simgear/compiler.h
+include/simgear/constants.h
+include/simgear/debug/BufferedLogCallback.hxx
 include/simgear/debug/debug_types.h
 include/simgear/debug/logstream.hxx
+include/simgear/environment/metar.hxx
+include/simgear/environment/precipitation.hxx
 include/simgear/ephemeris/celestialBody.hxx
 include/simgear/ephemeris/ephemeris.hxx
 include/simgear/ephemeris/jupiter.hxx
@@ -61,6 +63,12 @@ include/simgear/ephemeris/star.hxx
 include/simgear/ephemeris/stardata.hxx
 include/simgear/ephemeris/uranus.hxx
 include/simgear/ephemeris/venus.hxx
+include/simgear/io/DAVMultiStatus.hxx
+include/simgear/io/HTTPClient.hxx
+include/simgear/io/HTTPRequest.hxx
+include/simgear/io/SVNDirectory.hxx
+include/simgear/io/SVNReportParser.hxx
+include/simgear/io/SVNRepository.hxx
 include/simgear/io/iochannel.hxx
 include/simgear/io/lowlevel.hxx
 include/simgear/io/raw_socket.hxx
@@ -72,10 +80,8 @@ 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/io/HTTPClient.hxx
-include/simgear/io/HTTPRequest.hxx
-include/simgear/magvar/magvar.hxx
 include/simgear/magvar/coremag.hxx
+include/simgear/magvar/magvar.hxx
 include/simgear/math/SGBox.hxx
 include/simgear/math/SGCMath.hxx
 include/simgear/math/SGGeoc.hxx
@@ -86,6 +92,7 @@ include/simgear/math/SGGeometryFwd.hxx
 include/simgear/math/SGIntersect.hxx
 include/simgear/math/SGLimits.hxx
 include/simgear/math/SGLineSegment.hxx
+include/simgear/math/SGLocation.hxx
 include/simgear/math/SGMath.hxx
 include/simgear/math/SGMathFwd.hxx
 include/simgear/math/SGMatrix.hxx
@@ -93,6 +100,7 @@ include/simgear/math/SGMisc.hxx
 include/simgear/math/SGPlane.hxx
 include/simgear/math/SGQuat.hxx
 include/simgear/math/SGRay.hxx
+include/simgear/math/SGRect.hxx
 include/simgear/math/SGSphere.hxx
 include/simgear/math/SGTriangle.hxx
 include/simgear/math/SGVec2.hxx
@@ -102,12 +110,13 @@ include/simgear/math/beziercurve.hxx
 include/simgear/math/interpolater.hxx
 include/simgear/math/leastsqs.hxx
 include/simgear/math/sg_geodesy.hxx
-include/simgear/math/sg_types.hxx
 include/simgear/math/sg_random.h
-include/simgear/math/SGRect.hxx
-include/simgear/math/SGLocation.hxx
+include/simgear/math/sg_types.hxx
+include/simgear/misc/CSSBorder.hxx
 include/simgear/misc/ResourceManager.hxx
+include/simgear/misc/gzcontainerfile.hxx
 include/simgear/misc/interpolator.hxx
+include/simgear/misc/make_new.hxx
 include/simgear/misc/sg_dir.hxx
 include/simgear/misc/sg_path.hxx
 include/simgear/misc/sgstream.hxx
@@ -117,63 +126,37 @@ include/simgear/misc/strutils.hxx
 include/simgear/misc/tabbed_values.hxx
 include/simgear/misc/texcoord.hxx
 include/simgear/misc/zfstream.hxx
-include/simgear/misc/gzcontainerfile.hxx
-include/simgear/nasal/naref.h
-include/simgear/nasal/nasal.h
 include/simgear/nasal/cppbind/Ghost.hxx
+include/simgear/nasal/cppbind/NasalCallContext.hxx
 include/simgear/nasal/cppbind/NasalHash.hxx
-include/simgear/nasal/cppbind/to_nasal.hxx
-include/simgear/nasal/cppbind/from_nasal_detail.hxx
+include/simgear/nasal/cppbind/NasalString.hxx
+include/simgear/nasal/cppbind/detail/from_nasal_helper.hxx
+include/simgear/nasal/cppbind/detail/functor_templates.hxx
+include/simgear/nasal/cppbind/detail/nasal_traits.hxx
+include/simgear/nasal/cppbind/detail/to_nasal_helper.hxx
 include/simgear/nasal/cppbind/from_nasal.hxx
-include/simgear/nasal/cppbind/nasal_traits.hxx
+include/simgear/nasal/cppbind/to_nasal.hxx
+include/simgear/nasal/naref.h
+include/simgear/nasal/nasal.h
+include/simgear/package/Catalog.hxx
+include/simgear/package/Delegate.hxx
+include/simgear/package/Install.hxx
+include/simgear/package/Package.hxx
+include/simgear/package/Root.hxx
 include/simgear/props/AtomicChangeListener.hxx
 include/simgear/props/ExtendedPropertyAdapter.hxx
+include/simgear/props/PropertyBasedElement.hxx
+include/simgear/props/PropertyBasedMgr.hxx
+include/simgear/props/PropertyInterpolationMgr.hxx
+include/simgear/props/PropertyInterpolator.hxx
 include/simgear/props/condition.hxx
+include/simgear/props/easing_functions.hxx
 include/simgear/props/propertyObject.hxx
 include/simgear/props/props.hxx
 include/simgear/props/props_io.hxx
 include/simgear/props/propsfwd.hxx
 include/simgear/props/tiedpropertylist.hxx
 include/simgear/props/vectorPropTemplates.hxx
-include/simgear/props/PropertyBasedMgr.hxx
-include/simgear/props/PropertyBasedElement.hxx
-include/simgear/serial/serial.hxx
-include/simgear/structure/OSGUtils.hxx
-include/simgear/structure/OSGVersion.hxx
-include/simgear/structure/SGAtomic.hxx
-include/simgear/structure/SGBinding.hxx
-include/simgear/structure/SGExpression.hxx
-include/simgear/structure/SGReferenced.hxx
-include/simgear/structure/SGSharedPtr.hxx
-include/simgear/structure/SGSmplhist.hxx
-include/simgear/structure/SGSmplstat.hxx
-include/simgear/structure/SGWeakPtr.hxx
-include/simgear/structure/SGWeakReferenced.hxx
-include/simgear/structure/SGPerfMon.hxx
-include/simgear/structure/singleton.hpp
-include/simgear/structure/Singleton.hxx
-include/simgear/structure/StringTable.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/intern.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/sg_time.hxx
-include/simgear/timing/timestamp.hxx
-include/simgear/timing/timezone.h
-include/simgear/timing/lowleveltime.h
-include/simgear/xml/easyxml.hxx
-include/simgear/environment/metar.hxx
-include/simgear/environment/precipitation.hxx
-include/simgear/screen/colors.hxx
-include/simgear/screen/extensions.hxx
-include/simgear/screen/screen-dump.hxx
-include/simgear/screen/tr.h
-include/simgear/screen/jpgfactory.hxx
 include/simgear/scene/material/Effect.hxx
 include/simgear/scene/material/EffectBuilder.hxx
 include/simgear/scene/material/EffectCullVisitor.hxx
@@ -186,18 +169,24 @@ 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/material/parseBlendFunc.hxx
+include/simgear/scene/model/BVHDebugCollectVisitor.hxx
+include/simgear/scene/model/BVHPageNodeOSG.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/PrimitiveCollector.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/SGPickAnimation.hxx
 include/simgear/scene/model/SGReaderWriterXML.hxx
 include/simgear/scene/model/SGRotateTransform.hxx
 include/simgear/scene/model/SGScaleTransform.hxx
 include/simgear/scene/model/SGText.hxx
+include/simgear/scene/model/SGTrackToAnimation.hxx
 include/simgear/scene/model/SGTranslateTransform.hxx
 include/simgear/scene/model/animation.hxx
 include/simgear/scene/model/model.hxx
@@ -205,9 +194,6 @@ include/simgear/scene/model/modellib.hxx
 include/simgear/scene/model/particles.hxx
 include/simgear/scene/model/persparam.hxx
 include/simgear/scene/model/placement.hxx
-include/simgear/scene/model/BVHDebugCollectVisitor.hxx
-include/simgear/scene/model/BVHPageNodeOSG.hxx
-include/simgear/scene/model/PrimitiveCollector.hxx
 include/simgear/scene/sky/CloudShaderGeometry.hxx
 include/simgear/scene/sky/cloud.hxx
 include/simgear/scene/sky/cloudfield.hxx
@@ -221,6 +207,7 @@ 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
@@ -236,10 +223,13 @@ 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/tgdb/SGBuildingBin.hxx
+include/simgear/scene/tsync/terrasync.hxx
+include/simgear/scene/util/ColorInterpolator.hxx
 include/simgear/scene/util/CopyOp.hxx
+include/simgear/scene/util/DeletionManager.hxx
 include/simgear/scene/util/NodeAndDrawableVisitor.hxx
 include/simgear/scene/util/Noise.hxx
+include/simgear/scene/util/OptionsReadFileCallback.hxx
 include/simgear/scene/util/OsgMath.hxx
 include/simgear/scene/util/OsgSingleton.hxx
 include/simgear/scene/util/PrimitiveUtils.hxx
@@ -259,17 +249,55 @@ 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/scene/util/project.hxx
-include/simgear/scene/util/DeletionManager.hxx
 include/simgear/scene/util/parse_color.hxx
-include/simgear/scene/util/OptionsReadFileCallback.hxx
-include/simgear/scene/tsync/terrasync.hxx
+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/tr.h
+include/simgear/serial/serial.hxx
+include/simgear/sg_inlines.h
+include/simgear/simgear_config.h
+include/simgear/sound/readwav.hxx
 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/sound/readwav.hxx
+include/simgear/structure/OSGUtils.hxx
+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
+include/simgear/structure/SGSmplstat.hxx
+include/simgear/structure/SGWeakPtr.hxx
+include/simgear/structure/SGWeakReferenced.hxx
+include/simgear/structure/Singleton.hxx
+include/simgear/structure/StateMachine.hxx
+include/simgear/structure/StringTable.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/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/lowleveltime.h
+include/simgear/timing/sg_time.hxx
+include/simgear/timing/timestamp.hxx
+include/simgear/timing/timezone.h
+include/simgear/version.h
+include/simgear/xml/easyxml.hxx
+lib/libSimGearCore.a
+lib/libSimGearScene.a
 @dirrm include/simgear/xml
 @dirrm include/simgear/timing
 @dirrm include/simgear/threads
@@ -285,6 +313,8 @@ include/simgear/sound/readwav.hxx
 @dirrm include/simgear/scene/material
 @dirrm include/simgear/scene
 @dirrm include/simgear/props
+@dirrm include/simgear/package
+@dirrm include/simgear/nasal/cppbind/detail
 @dirrm include/simgear/nasal/cppbind
 @dirrm include/simgear/nasal
 @dirrm include/simgear/misc
@@ -294,11 +324,10 @@ include/simgear/sound/readwav.hxx
 @dirrm include/simgear/ephemeris
 @dirrm include/simgear/environment
 @dirrm include/simgear/debug
+@dirrm include/simgear/canvas/elements/detail
 @dirrm include/simgear/canvas/elements
 @dirrm include/simgear/canvas/ShivaVG
 @dirrm include/simgear/canvas
 @dirrm include/simgear/bvh
 @dirrm include/simgear/bucket
 @dirrm include/simgear
-lib/libSimGearCore.a
-lib/libSimGearScene.a
diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index 7befde7da1f5..ef8884348d8a 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-aircraft
-PORTVERSION=	20130221
+PORTVERSION=	20131001
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.10/ \
-		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.10/ \
-		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.10/ \
-		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.10/ \
-		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.10/
+MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.12/ \
+		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.12/ \
+		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.12/ \
+		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.12/ \
+		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.12/
 # Selection of production-ready/well-known planes
 # (planes already included in flightgear-data are excluded)
 # Please contact the MAINTAINER if a plane is missing
@@ -17,30 +17,30 @@ DISTFILES=	737-200_20120506.zip \
 		A-10_20121203.zip \
 		A300_20120717.zip \
 		Alouette-II_20120506.zip \
-		Alphajet_20120506.zip \
-		B-17_20120506.zip \
+		Alphajet_20130225.zip \
+		B-17_20130706.zip \
 		Breguet-XIX_20100829.zip \
-		C130_20120717.zip \
+		C130_20130810.zip \
 		Caravelle_20120506.zip \
 		Caudron-G3_20120506.zip \
 		F80C_20120717.zip \
-		Hurricane_20130117.zip \
+		Hurricane_20130315.zip \
 		IL-2_20110311.zip \
 		Lightning_20121005.zip \
 		Lockheed1049h_1.0.zip \
-		Messerschmitt-P1101_20101005.zip \
+		Messerschmitt-P1101_20130315.zip \
 		MirageIII_20120222.zip \
 		PaperAirplane_20101229.zip \
 		Pond-Racer_20120506.zip \
-		R44_20120506.zip \
-		Spitfire_20130117.zip \
+		R44_20130426.zip \
+		Spitfire_20130310.zip \
 		Stieglitz_20091025.zip \
 		Super-Etendard_20120501.zip \
-		Supermarine-S.6B_20110114.zip \
+		Supermarine-S.6B_20130312.zip \
 		Superwal_20100330.zip \
-		airwaveXtreme150_July-2012.zip \
-		asw20_20130115.zip \
-		bf109_20120717.zip \
+		airwaveXtreme150_July-2013.zip \
+		asw20_July-2013.zip \
+		bf109_20130615.zip \
 		c310_20130209.zip \
 		dhc3_20120506.zip \
 		f16_20120812.zip \
@@ -57,12 +57,18 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
 
-USE_ZIP=	yes
-NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST=	${WRKDIR}/.pkg-plist
+USE_ZIP=	yes
+WRKSRC=	${WRKDIR}/fgaircraft
+EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
+DATADIR=	${PREFIX}/share/flightgear/Aircraft
+
+PLIST=		${WRKDIR}/pkg-plist
+PLIST_DIRS=	%%DATADIR%%
+
+pre-extract:
+	@${MKDIR} ${WRKSRC}
 
-NO_STAGE=	yes
 post-patch:
 	@${FIND} ${WRKSRC} -type f \
 		\( -name COPYING -or -name LICENSE -or -name copyright \) -delete
@@ -71,13 +77,14 @@ pre-install:
 	@${RM} -f ${PLIST}
 	@cd ${WRKSRC} && \
 	${FIND} * -type d -empty | ${SORT} \
-		| ${SED} -e 's|^|@exec ${MKDIR} share/flightgear/Aircraft/|' >> ${PLIST} && \
+		| ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/Aircraft/|' >> ${PLIST} && \
 	${FIND} * -type f | ${SORT} \
-		| ${SED} -e 's|^|share/flightgear/Aircraft/|' >> ${PLIST} && \
+		| ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 	${FIND} * -type d | ${SORT} -r \
-		| ${SED} -e 's|^|@dirrm share/flightgear/Aircraft/|' >> ${PLIST}
+		| ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 
 do-install:
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${PREFIX}/share/flightgear/Aircraft/)
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/games/flightgear-aircraft/distinfo b/games/flightgear-aircraft/distinfo
index 989a9932fc5f..bc38717ab715 100644
--- a/games/flightgear-aircraft/distinfo
+++ b/games/flightgear-aircraft/distinfo
@@ -6,54 +6,54 @@ SHA256 (flightgear-aircraft/A300_20120717.zip) = 913236da87fd3abe1177b7e59d2dff6
 SIZE (flightgear-aircraft/A300_20120717.zip) = 386184
 SHA256 (flightgear-aircraft/Alouette-II_20120506.zip) = 755bc4bc620d1cceb208def0d979f4c4535667df42abcd0adb30dbf317d1b42c
 SIZE (flightgear-aircraft/Alouette-II_20120506.zip) = 5381104
-SHA256 (flightgear-aircraft/Alphajet_20120506.zip) = 26fbc985759d0ec6050484644a14cdca485a67fe61014d007665983e0222b525
-SIZE (flightgear-aircraft/Alphajet_20120506.zip) = 18819048
-SHA256 (flightgear-aircraft/B-17_20120506.zip) = b0910020ec348ca461b617d1fbb8494ab5cab06ff7b16560f337d683c52d9b28
-SIZE (flightgear-aircraft/B-17_20120506.zip) = 11850690
+SHA256 (flightgear-aircraft/Alphajet_20130225.zip) = 2f6460be7c9948d53681830b05f55c6add7b2d4b12a9d56564698a9ac7ba9b10
+SIZE (flightgear-aircraft/Alphajet_20130225.zip) = 19410469
+SHA256 (flightgear-aircraft/B-17_20130706.zip) = bb01931aad4bf50cfc74ab98dd69cb64307fd4d68d1cb34272363b1f60fc0060
+SIZE (flightgear-aircraft/B-17_20130706.zip) = 12486789
 SHA256 (flightgear-aircraft/Breguet-XIX_20100829.zip) = 9405ec3e475e8b3ef63ed3357273dfc5f83e88074fb1ced90764a23eb3d5a1af
 SIZE (flightgear-aircraft/Breguet-XIX_20100829.zip) = 4323944
-SHA256 (flightgear-aircraft/C130_20120717.zip) = 36e4a819dd077f4896b4bb6e09ec28de7527bd2fa7662585cd754752e1b1561e
-SIZE (flightgear-aircraft/C130_20120717.zip) = 31813153
+SHA256 (flightgear-aircraft/C130_20130810.zip) = 38e9a897cd14a785a0848314484ff75c1698d50c2789e52e3f29a196fdee3b84
+SIZE (flightgear-aircraft/C130_20130810.zip) = 25474281
 SHA256 (flightgear-aircraft/Caravelle_20120506.zip) = b936271471312502cf3b755f9b1c8ca6a68c1d1172508c0274ea4b3cebb68412
 SIZE (flightgear-aircraft/Caravelle_20120506.zip) = 14686948
 SHA256 (flightgear-aircraft/Caudron-G3_20120506.zip) = 191a68c00fa75a034ee0d6f75e0cc456e152fd1cc735dac401da48ad8b283902
 SIZE (flightgear-aircraft/Caudron-G3_20120506.zip) = 4531626
 SHA256 (flightgear-aircraft/F80C_20120717.zip) = 633016a2ea70f9be59927d5201c48af985ef7d2414888ddff3488f25261526d5
 SIZE (flightgear-aircraft/F80C_20120717.zip) = 1528349
-SHA256 (flightgear-aircraft/Hurricane_20130117.zip) = d5a547b321245ff9533413d3eb8f75254f394ff9771473f409909b09c23b08c8
-SIZE (flightgear-aircraft/Hurricane_20130117.zip) = 12062365
+SHA256 (flightgear-aircraft/Hurricane_20130315.zip) = f224341124f6f696a0dd5991cc6ed925a3bf5b6098459e74a7287c7c027223b3
+SIZE (flightgear-aircraft/Hurricane_20130315.zip) = 12062920
 SHA256 (flightgear-aircraft/IL-2_20110311.zip) = 1c7e126956247f7a6ed93cd4fc2abe65c756b07275559ed1f0bd03d731a51ee0
 SIZE (flightgear-aircraft/IL-2_20110311.zip) = 3933481
 SHA256 (flightgear-aircraft/Lightning_20121005.zip) = 6f8a27edf887aceef8da17465c658c110cf6b1d55c10ba023cb2660dd61a66ab
 SIZE (flightgear-aircraft/Lightning_20121005.zip) = 4784876
 SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7374e32aab617e466c228262004d1c292d9667375e74481d74f7a5210dfd60fd
 SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529096
-SHA256 (flightgear-aircraft/Messerschmitt-P1101_20101005.zip) = 76c1a79348a59fa2eccd0a6eb1218db4d706ba967b7d626ddc263abda6d12ed1
-SIZE (flightgear-aircraft/Messerschmitt-P1101_20101005.zip) = 4565272
+SHA256 (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 6a1a53902ffd6ff33c412a1d605e2a43615b3dcdaa7efebdff1f647ebe4b40ec
+SIZE (flightgear-aircraft/Messerschmitt-P1101_20130315.zip) = 4359275
 SHA256 (flightgear-aircraft/MirageIII_20120222.zip) = f99bd3f446a5d861a0ee04df08c6e6ced04ebff2cb3c810ea9f9a78fdfa57a7b
 SIZE (flightgear-aircraft/MirageIII_20120222.zip) = 11112429
 SHA256 (flightgear-aircraft/PaperAirplane_20101229.zip) = b458c06510d1687b2be5769db5823fa0bb9165a3e5aef6094e4a23803efb3bb4
 SIZE (flightgear-aircraft/PaperAirplane_20101229.zip) = 867872
 SHA256 (flightgear-aircraft/Pond-Racer_20120506.zip) = 707d8401d394095475e0f3442cd01a66b9c3e7f8c08512dd685824e8d782ef94
 SIZE (flightgear-aircraft/Pond-Racer_20120506.zip) = 3063526
-SHA256 (flightgear-aircraft/R44_20120506.zip) = 4a8534af61ceb7749b7596cae6b30edbac23d2ee6c1473dd40277423ad9ad097
-SIZE (flightgear-aircraft/R44_20120506.zip) = 11161383
-SHA256 (flightgear-aircraft/Spitfire_20130117.zip) = 30641c30d53f437447ae7cecf1c4dd38ce01587a394d427984ca0beda5b98d40
-SIZE (flightgear-aircraft/Spitfire_20130117.zip) = 21051159
+SHA256 (flightgear-aircraft/R44_20130426.zip) = fef35003f5d8c10df1deaeab1f70d00825ba376bb837d1f58ffbd5bf35b10a89
+SIZE (flightgear-aircraft/R44_20130426.zip) = 8909152
+SHA256 (flightgear-aircraft/Spitfire_20130310.zip) = cb886772228c4cea6a301b037dad4f9c6ee5afee593c04822369bff422c88ed8
+SIZE (flightgear-aircraft/Spitfire_20130310.zip) = 21052226
 SHA256 (flightgear-aircraft/Stieglitz_20091025.zip) = 05393d31f11bc718bbbe43d539f18020b2ab9ed34b68c6bf7dff8c543b6fb3bd
 SIZE (flightgear-aircraft/Stieglitz_20091025.zip) = 4499810
 SHA256 (flightgear-aircraft/Super-Etendard_20120501.zip) = e89f96034f2ee64f34917a8062e6e87f75674ff7f595be5a884ae4b4904a5eb5
 SIZE (flightgear-aircraft/Super-Etendard_20120501.zip) = 9855236
-SHA256 (flightgear-aircraft/Supermarine-S.6B_20110114.zip) = 0c197f1b2ca811bf40f2fe0fc90dae760ade845659c3af4f96c41ec58f023325
-SIZE (flightgear-aircraft/Supermarine-S.6B_20110114.zip) = 3154967
+SHA256 (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 4222889bf64693630d1a0c9abcaefcc1a61af2529c3a00730f1f6a36bdaba5d4
+SIZE (flightgear-aircraft/Supermarine-S.6B_20130312.zip) = 3275253
 SHA256 (flightgear-aircraft/Superwal_20100330.zip) = cd013f6c6ab073cea4c5eef59acb3b51c8a40d47652a3dfcbebfc79c30504384
 SIZE (flightgear-aircraft/Superwal_20100330.zip) = 2654839
-SHA256 (flightgear-aircraft/airwaveXtreme150_July-2012.zip) = 9c20e9bd435c35921003aae82954e7538636710c1f3f0c34665bd670acf33b3e
-SIZE (flightgear-aircraft/airwaveXtreme150_July-2012.zip) = 1208012
-SHA256 (flightgear-aircraft/asw20_20130115.zip) = 3dc1529520d468dd5c357e56637cf3f42f425be757239964a6d6774ddbf9b2b3
-SIZE (flightgear-aircraft/asw20_20130115.zip) = 2576605
-SHA256 (flightgear-aircraft/bf109_20120717.zip) = a34162707163a871cf5456559a3bf0f8a161cbbdb635d395ce924cdd1b2e13ec
-SIZE (flightgear-aircraft/bf109_20120717.zip) = 24201651
+SHA256 (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 12ca13fe06e7ff4e7a2e9bf7971c2397b86a06b2e83f2eb2e21b640edc5ab817
+SIZE (flightgear-aircraft/airwaveXtreme150_July-2013.zip) = 1209981
+SHA256 (flightgear-aircraft/asw20_July-2013.zip) = 4c5aeb273f2f9e2ae3f4c2f3bcdc44b1079681fdfbef20e8f669891cccc73064
+SIZE (flightgear-aircraft/asw20_July-2013.zip) = 3588458
+SHA256 (flightgear-aircraft/bf109_20130615.zip) = 1245ba5d1c00a01b74cef208f28f70ffe27f6285f7d52c4ddd901b370e3aca94
+SIZE (flightgear-aircraft/bf109_20130615.zip) = 24201689
 SHA256 (flightgear-aircraft/c310_20130209.zip) = 07d765eac4a6cb9bc115dc4d302fed972776f5148cb1154f666b6a7f3c27543a
 SIZE (flightgear-aircraft/c310_20130209.zip) = 615078
 SHA256 (flightgear-aircraft/dhc3_20120506.zip) = 808215533d23b9e2a23b0249bacff9504b72a8e4263a562058dea9c6060c12f9
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index fcc0275a9b6e..9948cbbba57e 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-data
-PORTVERSION=	2.10.0
+PORTVERSION=	2.12.0
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/ \
@@ -11,6 +11,7 @@ MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ \
 		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Shared/
 DISTNAME=	FlightGear-data-${PORTVERSION}
+EXTRACT_SUFX=	.tar.bz
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	FlightGear scenery, textures, and aircraft models
@@ -19,15 +20,14 @@ LICENSE=	GPLv2
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/data
+WRKSRC=		${WRKDIR}/fgdata
 DATADIR=	${PREFIX}/share/flightgear
 
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	%%DATADIR%%
 
-MANUAL_PACKAGE_BUILD=	very large distfile (>400 MB)
+MANUAL_PACKAGE_BUILD=	very large distfile (>900 MB)
 
-NO_STAGE=	yes
 post-patch:
 	@${RM} -f ${WRKSRC}/COPYING
 
@@ -42,7 +42,7 @@ pre-install:
 		| ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 
 do-install:
-	${MKDIR} ${DATADIR}
-	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${DATADIR})
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index 056a54a0cc05..be1594bb2a18 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FlightGear-data-2.10.0.tar.bz2) = 2fa0280ea9a1a0bee3eab27f034ec45d4cf44a2b818a7036b481da6668f7229f
-SIZE (FlightGear-data-2.10.0.tar.bz2) = 758115094
+SHA256 (FlightGear-data-2.12.0.tar.bz) = 136dfd24c8a28aa8a6a444ecaf2eb881a1e708d19c96b44352d79fcf84645b62
+SIZE (FlightGear-data-2.12.0.tar.bz) = 983303973
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index f00ff0d22b5d..8b1f4f52b138 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	2.10.0
+PORTVERSION=	2.12.0
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
 MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \
@@ -16,10 +16,11 @@ COMMENT=	The FlightGear flight simulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		boost_thread:${PORTSDIR}/devel/boost-libs \
-		fltk:${PORTSDIR}/x11-toolkits/fltk \
-		osg:${PORTSDIR}/graphics/osg
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
+		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
+		libosg.so:${PORTSDIR}/graphics/osg
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/lib/libSimGearCore.a:${PORTSDIR}/devel/simgear
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
@@ -32,16 +33,13 @@ USE_GL=		gl glu glut
 USE_OPENAL=	al alut
 USES=		cmake
 CMAKE_ARGS+=	-DJPEG_FACTORY:BOOL=ON \
+		-DENABLE_JS_SERVER:BOOL=ON \
 		-DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \
 		-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man
 
-MAN1=	js_demo.1 fgjs.1 gl-info.1 fgfs.1 fgpanel.1 terrasync.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${PREFIX}/bin
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 018386cd911a..b2f8ae7e0751 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flightgear-2.10.0.tar.bz2) = 067e24acb69a21721a97e48c1a088a2982bd08b8084a9073c90a5dde3db7055f
-SIZE (flightgear-2.10.0.tar.bz2) = 3378859
+SHA256 (flightgear-2.12.0.tar.bz2) = 84499d1b2a6c3c801a3c163f4f40d1f55b5fbcd4b65259fc5e5d5aa12e513341
+SIZE (flightgear-2.12.0.tar.bz2) = 3424463
diff --git a/games/flightgear/files/patch-src-Airports-airports_fwd.hxx b/games/flightgear/files/patch-src-Airports-airports_fwd.hxx
new file mode 100644
index 000000000000..8b55e284f19c
--- /dev/null
+++ b/games/flightgear/files/patch-src-Airports-airports_fwd.hxx
@@ -0,0 +1,10 @@
+--- src/Airports/airports_fwd.hxx.orig	2013-10-09 15:45:38.000000000 +0200
++++ src/Airports/airports_fwd.hxx	2013-10-09 10:56:51.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <map>
+ #include <vector>
+ #include <string>
++#include <ctime>
+ 
+ // forward decls
+ class FGAirport;
diff --git a/games/flightgear/files/patch-src-Main-bootstrap.cxx b/games/flightgear/files/patch-src-Main-bootstrap.cxx
new file mode 100644
index 000000000000..d403099f0d09
--- /dev/null
+++ b/games/flightgear/files/patch-src-Main-bootstrap.cxx
@@ -0,0 +1,26 @@
+Backport of patch 78f2f2f,
+fixes issue #1231
+
+--- src/Main/bootstrap.cxx.orig
++++ src/Main/bootstrap.cxx
+@@ -236,6 +236,11 @@ int main ( int argc, char **argv )
+     // FIXME: add other, more specific
+     // exceptions.
+     try {
++        // http://code.google.com/p/flightgear-bugs/issues/detail?id=1231
++        // ensure sglog is inited before atexit() is registered, so logging
++        // is possible inside fgExitCleanup
++        sglog();
++        
+         std::set_terminate(fg_terminate);
+         atexit(fgExitCleanup);
+         if (fgviewer)
+@@ -277,6 +282,8 @@ void fgExitCleanup() {
+     if (_bootstrap_OSInit != 0)
+         fgSetMouseCursor(MOUSE_CURSOR_POINTER);
+ 
++    // on the common exit path globals is already deleted, and NULL,
++    // so this only happens on error paths.
+     delete globals;
+ }
+ 
diff --git a/games/flightgear/files/patch-utils-CMakeLists.txt b/games/flightgear/files/patch-utils-CMakeLists.txt
index 035d1520ec7c..d1241f36ff97 100644
--- a/games/flightgear/files/patch-utils-CMakeLists.txt
+++ b/games/flightgear/files/patch-utils-CMakeLists.txt
@@ -1,10 +1,13 @@
---- utils/CMakeLists.txt.orig	2012-03-09 13:50:13.026701925 +0100
-+++ utils/CMakeLists.txt	2012-03-09 13:50:24.126886556 +0100
-@@ -1,6 +1,7 @@
- add_subdirectory(TerraSync)
- add_subdirectory(fgviewer)
- add_subdirectory(GPSsmooth)
-+add_subdirectory(js_server)
+--- utils/CMakeLists.txt.orig	2013-10-01 16:13:22.000000000 +0200
++++ utils/CMakeLists.txt	2013-10-01 16:13:47.000000000 +0200
+@@ -29,4 +29,8 @@
  
- if (FLTK_FOUND)
-     if (EXISTS ${FLTK_FLUID_EXECUTABLE})
+ if(ENABLE_TERRASYNC)
+     add_subdirectory(TerraSync)
+-endif()
+\ No newline at end of file
++endif()
++
++if(ENABLE_JS_SERVER)
++    add_subdirectory(js_server)
++endif()
diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist
index 22375934367b..89c414add70f 100644
--- a/games/flightgear/pkg-plist
+++ b/games/flightgear/pkg-plist
@@ -1,15 +1,21 @@
+bin/GPSsmooth
+bin/MIDGsmooth
+bin/UGsmooth
+bin/fgadmin
+bin/fgelev
 bin/fgfs
-bin/js_server
+bin/fgjs
+bin/fgpanel
 bin/fgviewer
 bin/js_demo
-bin/fgjs
+bin/js_server
 bin/metar
 bin/terrasync
 bin/yasim
 bin/yasim-proptest
-bin/GPSsmooth
-bin/MIDGsmooth
-bin/UGsmooth
-bin/fgadmin
-bin/fgpanel
-bin/fgelev
+man/man1/fgfs.1.gz
+man/man1/fgjs.1.gz
+man/man1/fgpanel.1.gz
+man/man1/gl-info.1.gz
+man/man1/js_demo.1.gz
+man/man1/terrasync.1.gz