diff -aurN devel/simgear.orig/Makefile devel/simgear/Makefile --- devel/simgear.orig/Makefile 2012-03-14 16:09:48.502032954 +0100 +++ devel/simgear/Makefile 2012-03-14 16:10:08.177041711 +0100 @@ -6,7 +6,7 @@ # PORTNAME= simgear -PORTVERSION= 2.4.0 +PORTVERSION= 2.6.0 CATEGORIES= devel games MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \ ftp://ftp.de.flightgear.org/pub/simgear/Source/ \ @@ -21,25 +21,14 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - boost_thread.4:${PORTSDIR}/devel/boost-libs - -.if defined(WITH_OSG_DEVEL) -LIB_DEPENDS+= osg.59:${PORTSDIR}/graphics/osg-devel -.else -LIB_DEPENDS+= osg.55:${PORTSDIR}/graphics/osg -.endif + boost_thread.4:${PORTSDIR}/devel/boost-libs \ + osg.80:${PORTSDIR}/graphics/osg USE_BZIP2= yes USE_XORG= ice sm x11 xext xi xt xmu USE_OPENAL= al alut USE_GL= gl glu glut -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ARGS= --with-jpeg-factory - -post-patch: - @${REINPLACE_CMD} -e 's|-D_REENTRANT|${PTHREAD_CFLAGS}|' \ - ${WRKSRC}/configure +USE_CMAKE= yes +CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON .include diff -aurN devel/simgear.orig/distinfo devel/simgear/distinfo --- devel/simgear.orig/distinfo 2012-03-14 16:09:48.501029317 +0100 +++ devel/simgear/distinfo 2012-03-14 16:10:08.182021100 +0100 @@ -1,2 +1,2 @@ -SHA256 (simgear-2.4.0.tar.bz2) = e26007ed015e75a61e140e3ab6a446d8163ea3cfd2baeaa763355db0be4dddf6 -SIZE (simgear-2.4.0.tar.bz2) = 834501 +SHA256 (simgear-2.6.0.tar.bz2) = a44369ca6fc7861c8432363313a4ba2a744c2d1b3bb9fff010bdb6fcd4986a2f +SIZE (simgear-2.6.0.tar.bz2) = 735811 diff -aurN devel/simgear.orig/files/patch-simgear-timing-timestamp.cxx devel/simgear/files/patch-simgear-timing-timestamp.cxx --- devel/simgear.orig/files/patch-simgear-timing-timestamp.cxx 1970-01-01 01:00:00.000000000 +0100 +++ devel/simgear/files/patch-simgear-timing-timestamp.cxx 2012-03-14 16:10:08.202014875 +0100 @@ -0,0 +1,20 @@ +--- simgear/timing/timestamp.cxx.orig 2012-03-09 10:37:52.770699568 +0100 ++++ simgear/timing/timestamp.cxx 2012-03-09 10:38:40.266717310 +0100 +@@ -139,7 +139,7 @@ + // the timer tick) accuracy which is too bad to catch 60Hz... + bool SGTimeStamp::sleepUntil(const SGTimeStamp& abstime) + { +-#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) ++#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) && !defined(__FreeBSD__) + SGTimeStamp abstimeForSleep = abstime; + + // Always undersleep by resolution of the clock +@@ -234,7 +234,7 @@ + + bool SGTimeStamp::sleepFor(const SGTimeStamp& reltime) + { +-#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) ++#if defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS) && !defined(__FreeBSD__) + struct timespec ts; + ts.tv_sec = reltime._sec; + ts.tv_nsec = reltime._nsec; diff -aurN devel/simgear.orig/pkg-plist devel/simgear/pkg-plist --- devel/simgear.orig/pkg-plist 2012-03-14 16:09:48.504007392 +0100 +++ devel/simgear/pkg-plist 2012-03-14 16:10:08.209006858 +0100 @@ -1,39 +1,11 @@ -include/simgear/xml/easyxml.hxx +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/debug/debug_types.h include/simgear/debug/logstream.hxx -include/simgear/misc/sg_path.hxx -include/simgear/misc/sgstream.hxx -include/simgear/misc/stopwatch.hxx -include/simgear/misc/strutils.hxx -include/simgear/misc/tabbed_values.hxx -include/simgear/misc/texcoord.hxx -include/simgear/misc/zfstream.hxx -include/simgear/misc/interpolator.hxx -include/simgear/misc/stdint.hxx -include/simgear/misc/PathOptions.hxx -include/simgear/misc/sg_dir.hxx -include/simgear/misc/ResourceManager.hxx -include/simgear/misc/sg_sleep.hxx -include/simgear/structure/callback.hxx -include/simgear/structure/commands.hxx -include/simgear/structure/exception.hxx -include/simgear/structure/event_mgr.hxx -include/simgear/structure/intern.hxx -include/simgear/structure/subsystem_mgr.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/Singleton.hxx -include/simgear/structure/StringTable.hxx -include/simgear/bucket/newbucket.hxx include/simgear/ephemeris/celestialBody.hxx include/simgear/ephemeris/ephemeris.hxx include/simgear/ephemeris/jupiter.hxx @@ -41,6 +13,7 @@ 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 @@ -48,22 +21,19 @@ include/simgear/ephemeris/venus.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_serial.hxx -include/simgear/io/sg_socket.hxx -include/simgear/io/sg_socket_udp.hxx -include/simgear/io/raw_socket.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/io/HTTPClient.hxx +include/simgear/io/HTTPRequest.hxx include/simgear/magvar/magvar.hxx include/simgear/magvar/coremag.hxx -include/simgear/math/interpolater.hxx -include/simgear/math/leastsqs.hxx -include/simgear/math/sg_geodesy.hxx -include/simgear/math/sg_random.h -include/simgear/math/sg_types.hxx include/simgear/math/Math.hxx include/simgear/math/SGBox.hxx include/simgear/math/SGCMath.hxx @@ -75,9 +45,9 @@ include/simgear/math/SGIntersect.hxx include/simgear/math/SGLimits.hxx include/simgear/math/SGLineSegment.hxx -include/simgear/math/SGMatrix.hxx include/simgear/math/SGMath.hxx include/simgear/math/SGMathFwd.hxx +include/simgear/math/SGMatrix.hxx include/simgear/math/SGMisc.hxx include/simgear/math/SGPlane.hxx include/simgear/math/SGQuat.hxx @@ -88,31 +58,76 @@ include/simgear/math/SGVec3.hxx include/simgear/math/SGVec4.hxx include/simgear/math/beziercurve.hxx -include/simgear/math/project.hxx -include/simgear/nasal/nasal.h +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/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 +include/simgear/misc/stopwatch.hxx +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/props/condition.hxx -include/simgear/props/props.hxx -include/simgear/props/props_io.hxx +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/props/propsfwd.hxx include/simgear/props/tiedpropertylist.hxx include/simgear/route/route.hxx include/simgear/route/waypoint.hxx include/simgear/serial/serial.hxx -include/simgear/timing/lowleveltime.h +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/environment/visual_enviro.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/bvh/BVHBoundingBoxVisitor.hxx include/simgear/scene/bvh/BVHDebugCollectVisitor.hxx include/simgear/scene/bvh/BVHGroup.hxx -include/simgear/scene/bvh/BVHLineSegmentVisitor.hxx include/simgear/scene/bvh/BVHLineGeometry.hxx +include/simgear/scene/bvh/BVHLineSegmentVisitor.hxx include/simgear/scene/bvh/BVHMotionTransform.hxx include/simgear/scene/bvh/BVHNearestPointVisitor.hxx include/simgear/scene/bvh/BVHNode.hxx @@ -131,6 +146,7 @@ include/simgear/scene/material/EffectCullVisitor.hxx include/simgear/scene/material/EffectGeode.hxx include/simgear/scene/material/GLPredicate.hxx +include/simgear/scene/material/Noise.hxx include/simgear/scene/material/Pass.hxx include/simgear/scene/material/Technique.hxx include/simgear/scene/material/TextureBuilder.hxx @@ -138,90 +154,82 @@ include/simgear/scene/material/matlib.hxx include/simgear/scene/material/matmodel.hxx include/simgear/scene/material/mipmap.hxx -include/simgear/scene/model/animation.hxx -include/simgear/scene/model/particles.hxx -include/simgear/scene/model/model.hxx -include/simgear/scene/model/modellib.hxx -include/simgear/scene/model/ModelRegistry.hxx -include/simgear/scene/model/persparam.hxx -include/simgear/scene/model/placement.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/SGTranslateTransform.hxx include/simgear/scene/model/SGText.hxx +include/simgear/scene/model/SGTranslateTransform.hxx +include/simgear/scene/model/animation.hxx +include/simgear/scene/model/model.hxx +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/sky/CloudShaderGeometry.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/newcloud.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/sky/cloudfield.hxx -include/simgear/scene/sky/newcloud.hxx -include/simgear/scene/sky/CloudShaderGeometry.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/tgdb/GroundLightManager.hxx +include/simgear/scene/tgdb/ReaderWriterSPT.hxx include/simgear/scene/tgdb/ReaderWriterSTG.hxx -include/simgear/scene/tgdb/SGVasiDrawable.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/GroundLightManager.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/util/CopyOp.hxx +include/simgear/scene/util/NodeAndDrawableVisitor.hxx +include/simgear/scene/util/PrimitiveUtils.hxx +include/simgear/scene/util/QuadTreeBuilder.hxx +include/simgear/scene/util/RenderConstants.hxx 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 include/simgear/scene/util/SGTextureStateAttributeVisitor.hxx include/simgear/scene/util/SGUpdateVisitor.hxx -include/simgear/scene/util/CopyOp.hxx -include/simgear/scene/util/NodeAndDrawableVisitor.hxx -include/simgear/scene/util/PrimitiveUtils.hxx -include/simgear/scene/util/QuadTreeBuilder.hxx -include/simgear/scene/util/RenderConstants.hxx 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/PathOptions.hxx +include/simgear/scene/util/project.hxx include/simgear/scene/tsync/terrasync.hxx -include/simgear/sound/soundmgr_openal.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/screen/jpgfactory.hxx -include/simgear/screen/screen-dump.hxx -include/simgear/screen/colors.hxx -include/simgear/screen/tr.h -include/simgear/screen/extensions.hxx -include/simgear/threads/SGGuard.hxx -include/simgear/threads/SGQueue.hxx -include/simgear/threads/SGThread.hxx -include/simgear/compiler.h -include/simgear/constants.h -include/simgear/sg_inlines.h -include/simgear/version.h @dirrm include/simgear/xml @dirrm include/simgear/timing @dirrm include/simgear/threads diff -aurN games/flightgear-data.orig/Makefile games/flightgear-data/Makefile --- games/flightgear-data.orig/Makefile 2012-03-14 16:09:48.520024041 +0100 +++ games/flightgear-data/Makefile 2012-03-14 16:10:27.508009009 +0100 @@ -6,7 +6,7 @@ # PORTNAME= flightgear-data -PORTVERSION= 2.4.0 +PORTVERSION= 2.6.0 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/ \ diff -aurN games/flightgear-data.orig/distinfo games/flightgear-data/distinfo --- games/flightgear-data.orig/distinfo 2012-03-14 16:09:48.521028504 +0100 +++ games/flightgear-data/distinfo 2012-03-14 16:10:27.512010167 +0100 @@ -1,2 +1,2 @@ -SHA256 (FlightGear-data-2.4.0.tar.bz2) = 9f88a37ec2e21746c01f9b441bd58df4b95817e676fae13e481e73ee91bfe67e -SIZE (FlightGear-data-2.4.0.tar.bz2) = 431295521 +SHA256 (FlightGear-data-2.6.0.tar.bz2) = fabbb20c50c251e75e2f9500432d01fa78b3f8292d79f39d7adc1bca40c59800 +SIZE (FlightGear-data-2.6.0.tar.bz2) = 560727464 diff -aurN games/flightgear.orig/Makefile games/flightgear/Makefile --- games/flightgear.orig/Makefile 2012-03-14 16:09:48.539063435 +0100 +++ games/flightgear/Makefile 2012-03-14 16:10:24.737010701 +0100 @@ -6,7 +6,7 @@ # PORTNAME= flightgear -PORTVERSION= 2.4.0 +PORTVERSION= 2.6.0 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \ @@ -20,35 +20,33 @@ LICENSE= GPLv2 -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ + boost_thread.4:${PORTSDIR}/devel/boost-libs \ + fltk.1:${PORTSDIR}/x11-toolkits/fltk \ + osg.80:${PORTSDIR}/graphics/osg BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \ ${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data -.if defined(WITH_OSG_DEVEL) -LIB_DEPENDS+= osg.59:${PORTSDIR}/graphics/osg-devel -.else -LIB_DEPENDS+= osg.55:${PORTSDIR}/graphics/osg -.endif - USE_BZIP2= yes -USE_XORG= ice sm x11 xext xi xt xmu +USE_XORG= ice sm x11 xext xft xi xinerama xt xmu USE_GL= gl glu glut -USE_OPENAL= al -USE_GMAKE= yes -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ARGS= --datadir=${LOCALBASE}/share -MAKE_JOBS_UNSAFE=yes - -MAN1= est-epsilon.1 js_demo.1 pstest.1 fgjs.1 gl-info.1 fgfs.1 - -post-patch: - @${REINPLACE_CMD} 's|-D_REENTRANT|${PTHREAD_CFLAGS}|' \ - ${WRKSRC}/configure +USE_OPENAL= al alut +USE_CMAKE= yes +CMAKE_ARGS+= -DJPEG_FACTORY:BOOL=ON \ + -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ + -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ + -DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR} + +PORTDOCS= README README.OSG README.OpenAL README.SimGear README.plib + +.if defined(NOPORTDOCS) +CMAKE_ARGS+= -DNOPORTDOCS:BOOL=ON +.endif + +MAN1= js_demo.1 fgjs.1 gl-info.1 fgfs.1 fgpanel.1 terrasync.1 post-install: ${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server ${PREFIX}/bin diff -aurN games/flightgear.orig/distinfo games/flightgear/distinfo --- games/flightgear.orig/distinfo 2012-03-14 16:09:48.536008311 +0100 +++ games/flightgear/distinfo 2012-03-14 16:10:24.740009323 +0100 @@ -1,2 +1,2 @@ -SHA256 (flightgear-2.4.0.tar.bz2) = 3f2fdad171b86746b0dfa67510aabfb0c24731951a6d5646c6f0a4f98f01dbe1 -SIZE (flightgear-2.4.0.tar.bz2) = 1909473 +SHA256 (flightgear-2.6.0.tar.bz2) = 1554efbe20ad5002ad169225605ae95fca46d381bdff03dd624d92cf24b1a40f +SIZE (flightgear-2.6.0.tar.bz2) = 2280644 diff -aurN games/flightgear.orig/files/patch-CMakeLists.txt games/flightgear/files/patch-CMakeLists.txt --- games/flightgear.orig/files/patch-CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ games/flightgear/files/patch-CMakeLists.txt 2012-03-14 16:10:24.750008550 +0100 @@ -0,0 +1,22 @@ +--- CMakeLists.txt.orig 2012-02-17 23:41:13.982306000 +0100 ++++ CMakeLists.txt 2012-03-09 15:39:46.949702574 +0100 +@@ -226,7 +226,7 @@ + endif(LIBSVN_FOUND) + endif(ENABLE_LIBSVN) + +-find_package(PLIB REQUIRED puaux pu js fnt) ++find_package(PLIB REQUIRED puaux pu js fnt net) + find_package(SimGear 2.6.0 REQUIRED) + + if (JPEG_FACTORY) +@@ -342,7 +342,9 @@ + README.OSG + README.SimGear) + +-INSTALL(FILES ${INSTALL_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL) ++if(NOT NOPORTDOCS) ++ INSTALL(FILES ${INSTALL_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL) ++endif() + + #----------------------------------------------------------------------------- + ### uninstall target diff -aurN games/flightgear.orig/files/patch-utils-CMakeLists.txt games/flightgear/files/patch-utils-CMakeLists.txt --- games/flightgear.orig/files/patch-utils-CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ games/flightgear/files/patch-utils-CMakeLists.txt 2012-03-14 16:10:24.753008088 +0100 @@ -0,0 +1,10 @@ +--- 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) + + if (FLTK_FOUND) + if (EXISTS ${FLTK_FLUID_EXECUTABLE}) diff -aurN games/flightgear.orig/files/patch-utils-js_server-CMakeLists.txt games/flightgear/files/patch-utils-js_server-CMakeLists.txt --- games/flightgear.orig/files/patch-utils-js_server-CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ games/flightgear/files/patch-utils-js_server-CMakeLists.txt 2012-03-14 16:10:24.755010777 +0100 @@ -0,0 +1,10 @@ +--- utils/js_server/CMakeLists.txt.orig 2012-03-09 14:44:22.999701740 +0100 ++++ utils/js_server/CMakeLists.txt 2012-03-09 14:59:36.643375244 +0100 +@@ -0,0 +1,7 @@ ++add_executable(js_server js_server.cxx) ++ ++target_link_libraries(js_server ++ ${PLIB_LIBRARIES} ++) ++ ++install(TARGETS js_server RUNTIME DESTINATION bin) diff -aurN games/flightgear.orig/pkg-plist games/flightgear/pkg-plist --- games/flightgear.orig/pkg-plist 2012-03-14 16:09:48.538016045 +0100 +++ games/flightgear/pkg-plist 2012-03-14 16:10:24.757009705 +0100 @@ -1,11 +1,13 @@ bin/fgfs bin/js_server -bin/gl-info -bin/est-epsilon bin/fgviewer bin/js_demo -bin/alcinfo bin/fgjs bin/metar bin/terrasync bin/yasim +bin/GPSsmooth +bin/MIDGsmooth +bin/UGsmooth +bin/fgadmin +bin/fgpanel diff -aurN games/flightgear-aircraft.orig/Makefile games/flightgear-aircraft/Makefile --- games/flightgear-aircraft.orig/Makefile 2012-03-14 16:09:48.569019014 +0100 +++ games/flightgear-aircraft/Makefile 2012-03-14 16:10:33.320035469 +0100 @@ -6,19 +6,19 @@ # PORTNAME= flightgear-aircraft -PORTVERSION= 20111013 +PORTVERSION= 20120309 CATEGORIES= games # see http://www.flightgear.org/templates.js -MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.4/ \ - http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.4/ \ - ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.4/ \ - ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.4/ \ - ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.4/ +MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.6/ \ + http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.6/ \ + ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.6/ \ + ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.6/ \ + ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Aircraft-2.6/ # Selection of production-ready/well-known planes # (planes already included in flightgear-data are excluded) # Please contact the MAINTAINER if a plane is missing DISTFILES= 737-200_20110713.zip \ - A-10_20110629.zip \ + A-10_20120104.zip \ A300_20101217.zip \ Alouette-II_20110523.zip \ Alphajet_20110228.zip \ @@ -27,27 +27,27 @@ C130_20101217.zip \ Caravelle_20101217.zip \ Caudron-G3_20101217.zip \ - F80C_20101217.zip \ - Hurricane_20110815.zip \ + F80C_20110915.zip \ + Hurricane_20111202.zip \ IL-2_20110324.zip \ - Lightning_20110705.zip \ + Lightning_20111219.zip \ Lockheed1049h_1.0.zip \ Messerschmitt-P1101_20101217.zip \ MirageIII_20110124.zip \ PaperAirplane_20110103.zip \ Pond-Racer_20101217.zip \ - R44_20110523.zip \ - Spitfire_20110705.zip \ + R44_20111024.zip \ + Spitfire_20120217.zip \ Stieglitz_20101217.zip \ Super-Etendard_20110324.zip \ Supermarine-S.6B_20110118.zip \ Superwal_20101217.zip \ airwaveXtreme150_20101217.zip \ asw20_20101217.zip \ - bf109_20110629.zip \ - c310_20110113.zip \ + bf109_20111212.zip \ + c310_20120117.zip \ dhc3_20110411.zip \ - f16_20110629.zip \ + f16_20120104.zip \ harrier_20101217.zip \ pa24-250_20110222.zip \ tu154_20101217.zip \ diff -aurN games/flightgear-aircraft.orig/distinfo games/flightgear-aircraft/distinfo --- games/flightgear-aircraft.orig/distinfo 2012-03-14 16:09:48.568015285 +0100 +++ games/flightgear-aircraft/distinfo 2012-03-14 16:10:33.326019229 +0100 @@ -1,70 +1,70 @@ -SHA256 (flightgear-aircraft/737-200_20110713.zip) = a4812ecdaadf8632f9d5e555754e93732d3d8ff2d1dc065bb620872b6ad9c4b9 +SHA256 (flightgear-aircraft/737-200_20110713.zip) = b915993c41d5e9383a7338baac8dfddffb12cf91ae11d8433815f014e6b09948 SIZE (flightgear-aircraft/737-200_20110713.zip) = 12401584 -SHA256 (flightgear-aircraft/A-10_20110629.zip) = 4d837b07b05d98830f6491d3fac5b6b406e0ddb5f11fe8b1b686ccd099b98860 -SIZE (flightgear-aircraft/A-10_20110629.zip) = 9057927 -SHA256 (flightgear-aircraft/A300_20101217.zip) = c01ef084796497e1bb00da8defcac4f3cb19c9935822b921738bacd4091d49b5 +SHA256 (flightgear-aircraft/A-10_20120104.zip) = 097e6a3bc16b1f22becac0494cf551e18e7a081dfe5a404ef89085d9d58be20a +SIZE (flightgear-aircraft/A-10_20120104.zip) = 9056138 +SHA256 (flightgear-aircraft/A300_20101217.zip) = 7bc4087825a98222af4fc0ae6cc1d8650567dba439a5309dbb577e7e57a39530 SIZE (flightgear-aircraft/A300_20101217.zip) = 386184 -SHA256 (flightgear-aircraft/Alouette-II_20110523.zip) = 0e33185ea15d69ca36005714a381a6f4535a203ed556a2726a196d2c118fc0a3 +SHA256 (flightgear-aircraft/Alouette-II_20110523.zip) = 9529f86fa82e1aca24e319436a043ec0fbb6a49582ad167c4db88be38d9c4647 SIZE (flightgear-aircraft/Alouette-II_20110523.zip) = 5381078 -SHA256 (flightgear-aircraft/Alphajet_20110228.zip) = d9f8d92dded443b469a7ed0d8241d7cd6c98d1416a0dd2cab44fbc645383912b +SHA256 (flightgear-aircraft/Alphajet_20110228.zip) = 2336b57b25f4543209f7653fb50973ef14220fb86cd4cf2af6d62be4608e16b3 SIZE (flightgear-aircraft/Alphajet_20110228.zip) = 18186505 -SHA256 (flightgear-aircraft/B-17_20110516.zip) = c42d0e7316eb1a17aaa9a38a26724470d7145695449f1c65c976614bdbdc4b22 +SHA256 (flightgear-aircraft/B-17_20110516.zip) = 5a24bc39a3bf88a7eb3bd6e4dac2e28d5c4aa82649c0ebf72e038890eda608bb SIZE (flightgear-aircraft/B-17_20110516.zip) = 11850686 -SHA256 (flightgear-aircraft/Breguet-XIX_20101217.zip) = dcbef6132e0b635a8d7f61ed2f9ef90f73c83152838b66a1e585978a1ac5bba6 +SHA256 (flightgear-aircraft/Breguet-XIX_20101217.zip) = a6e0b85e26447329e97ea6b8f6d37dbb5ce5b823ab7b66f1d2061be0e1624670 SIZE (flightgear-aircraft/Breguet-XIX_20101217.zip) = 4323944 -SHA256 (flightgear-aircraft/C130_20101217.zip) = 1b71d7b8c8872804feb099642e3441b4489e68da4a776cb775c5d5d02c643dbf +SHA256 (flightgear-aircraft/C130_20101217.zip) = 578a55508cbd7aec170129b3c2b000efbdf4548a63cdb679071da31455371d41 SIZE (flightgear-aircraft/C130_20101217.zip) = 24933297 -SHA256 (flightgear-aircraft/Caravelle_20101217.zip) = 3b86f36e11bebdf248db31eb62bdb13d1eaa706e3ad6ac9d07cf41975291ac69 +SHA256 (flightgear-aircraft/Caravelle_20101217.zip) = 215752d77ee19f70b8e7e6e9ec1eb8af514212fa49cfb7c0ff20ecd05a667903 SIZE (flightgear-aircraft/Caravelle_20101217.zip) = 14686920 -SHA256 (flightgear-aircraft/Caudron-G3_20101217.zip) = 75d69493f57ee2da6f07cee23b322e7082949e18b01ff6d54961cde548bd2ddb +SHA256 (flightgear-aircraft/Caudron-G3_20101217.zip) = b363af4796c483f1e56d44f2d291e2aab1771144f2b9449bdf29b4c4c4693dd8 SIZE (flightgear-aircraft/Caudron-G3_20101217.zip) = 4531623 -SHA256 (flightgear-aircraft/F80C_20101217.zip) = 492fa101f1d643be75357d3890a83ef07a63629bd1312d5e45076aa1b5a07f8d -SIZE (flightgear-aircraft/F80C_20101217.zip) = 1528351 -SHA256 (flightgear-aircraft/Hurricane_20110815.zip) = 426c77ac8dd173168daf1ff4a19ff4f03c235219a7da2d2279480b57bd2953b7 -SIZE (flightgear-aircraft/Hurricane_20110815.zip) = 11065537 -SHA256 (flightgear-aircraft/IL-2_20110324.zip) = 86b12ff67f36c113d5fb68b4088a0e18029e5610cbcf9bd0b001715dde567a17 +SHA256 (flightgear-aircraft/F80C_20110915.zip) = a79f64e0f85577b9a64992ad5fc67530b54cd6038ed3612f7c3348281f691e5c +SIZE (flightgear-aircraft/F80C_20110915.zip) = 1528349 +SHA256 (flightgear-aircraft/Hurricane_20111202.zip) = 4218b911ee68f50a18c185565d52e03c543aa68770c31a80d68851053d50952d +SIZE (flightgear-aircraft/Hurricane_20111202.zip) = 10586483 +SHA256 (flightgear-aircraft/IL-2_20110324.zip) = 5726bb6d6ad225ad67e7e87a3466fed1a291b1e8e853c8e8c44cc02909250a71 SIZE (flightgear-aircraft/IL-2_20110324.zip) = 3933481 -SHA256 (flightgear-aircraft/Lightning_20110705.zip) = 2b2e616cf8055c981d1ae19da4aafe04724a4b87ec55e1c087fac07e44c5ef5a -SIZE (flightgear-aircraft/Lightning_20110705.zip) = 4853754 -SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = cdd3e9a8f7516d7a8073665b3d293fffa99294a96d8734aade383cc1c5893cc5 +SHA256 (flightgear-aircraft/Lightning_20111219.zip) = b1ab2a666c3a4186e4da6746c0e44ec71e96d96f61e9cfc05ab89b075232e0f7 +SIZE (flightgear-aircraft/Lightning_20111219.zip) = 4854327 +SHA256 (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7374e32aab617e466c228262004d1c292d9667375e74481d74f7a5210dfd60fd SIZE (flightgear-aircraft/Lockheed1049h_1.0.zip) = 7529096 -SHA256 (flightgear-aircraft/Messerschmitt-P1101_20101217.zip) = 2492a3d98a644214a2802fa2b30a75c5883fc91899114ba4031d07af7fd7a885 +SHA256 (flightgear-aircraft/Messerschmitt-P1101_20101217.zip) = a4136e1030c93e217a43d155c4027fe29e020876eef102de3b8410750b917acf SIZE (flightgear-aircraft/Messerschmitt-P1101_20101217.zip) = 4565272 -SHA256 (flightgear-aircraft/MirageIII_20110124.zip) = 675f8b9029a6c3d64415bc7fe5806eda284d7af1ac4acc76098aa7af9d5349f0 +SHA256 (flightgear-aircraft/MirageIII_20110124.zip) = addcea18293e10c157483746089e57747642567f91e2b989b589f489770b779f SIZE (flightgear-aircraft/MirageIII_20110124.zip) = 15268883 -SHA256 (flightgear-aircraft/PaperAirplane_20110103.zip) = 6d53b1910fe5d66da8a15d336e3deb97f9f96804a60821038fe900a5e88aaa13 +SHA256 (flightgear-aircraft/PaperAirplane_20110103.zip) = 8f592b92718c9d4140031f7ebebd366b431854b2ab3afaca186c0b40564ccf97 SIZE (flightgear-aircraft/PaperAirplane_20110103.zip) = 867872 -SHA256 (flightgear-aircraft/Pond-Racer_20101217.zip) = 3a439077bea7fff74253db5d04d588d702a6a6b0cceb925fc8c40583f2288a97 +SHA256 (flightgear-aircraft/Pond-Racer_20101217.zip) = fa1a6525182c733564c4e71984c69d65dcdf2446dc665578000afe5a2992ea38 SIZE (flightgear-aircraft/Pond-Racer_20101217.zip) = 3063481 -SHA256 (flightgear-aircraft/R44_20110523.zip) = 5afc79d7de2a4eebe834414d491bfb8415fe9a1d68ec97c5d7194024212fd221 -SIZE (flightgear-aircraft/R44_20110523.zip) = 11204033 -SHA256 (flightgear-aircraft/Spitfire_20110705.zip) = 40cb7769a821761b40f7fd9b6d403c56ba9af9b5be40a5cdd8fe4d5bf8b1e08a -SIZE (flightgear-aircraft/Spitfire_20110705.zip) = 13646354 -SHA256 (flightgear-aircraft/Stieglitz_20101217.zip) = 44f9fb25a90e065925ebd108f254cc3262b58750bcb1a731e0e5ed0ed8c9d9de +SHA256 (flightgear-aircraft/R44_20111024.zip) = 3e6514a050dbb960edd7735b85ab863f1a7b755c8ab197bc18ec45bfdffb0ec7 +SIZE (flightgear-aircraft/R44_20111024.zip) = 11161369 +SHA256 (flightgear-aircraft/Spitfire_20120217.zip) = f0377e73c30d6c2393e2ef0c4aa05a97b99da0de8147a65fe32f224046096c81 +SIZE (flightgear-aircraft/Spitfire_20120217.zip) = 15539898 +SHA256 (flightgear-aircraft/Stieglitz_20101217.zip) = 466fdf901014c94f82d5fc74ff4f3393da619074b824381458f96f24b359a0ed SIZE (flightgear-aircraft/Stieglitz_20101217.zip) = 4499810 -SHA256 (flightgear-aircraft/Super-Etendard_20110324.zip) = 0b414f06fd8f5b9b5fa63969658866ce5b4786f740c20f807452de19592cd3a3 +SHA256 (flightgear-aircraft/Super-Etendard_20110324.zip) = 8bdaa175df1568450d47dc6279a530751786681b6d312e4cdbf93faeaeddbd81 SIZE (flightgear-aircraft/Super-Etendard_20110324.zip) = 12386980 -SHA256 (flightgear-aircraft/Supermarine-S.6B_20110118.zip) = 136490097b6e630305bd581450a8fff8136a42ff61f92dc2916049cfe7227853 +SHA256 (flightgear-aircraft/Supermarine-S.6B_20110118.zip) = ea70dc690b97af5f4f369dd950b625ec75e00f6e7427d6b335398da6ba60dd92 SIZE (flightgear-aircraft/Supermarine-S.6B_20110118.zip) = 3154967 -SHA256 (flightgear-aircraft/Superwal_20101217.zip) = 55b756ff7d1036d44ab6761935c73f4a88387ccda91e30acaa16c538e0249ec5 +SHA256 (flightgear-aircraft/Superwal_20101217.zip) = 901ae47b6311d9e17174c3e6edb0ace7d675d7d7c8e788844f077652bf892351 SIZE (flightgear-aircraft/Superwal_20101217.zip) = 2654839 -SHA256 (flightgear-aircraft/airwaveXtreme150_20101217.zip) = ec16ebd2335b8aeda0f858cda4ac1b780def84e2ee2e5f907d8171e46c01248e +SHA256 (flightgear-aircraft/airwaveXtreme150_20101217.zip) = 407e94aa62b8931d75617dbd9b47681ef61e01ff546b29a0d6afc9feb41925f0 SIZE (flightgear-aircraft/airwaveXtreme150_20101217.zip) = 29789 -SHA256 (flightgear-aircraft/asw20_20101217.zip) = 8a12916a53980aa6cf29343db003f5f6977ade364a0d6ad3cdf36222a51dfd02 +SHA256 (flightgear-aircraft/asw20_20101217.zip) = 261380f07a1a4d05e53d316ca2dd6128e3e71537c6b1b82f5b804ead56ee43b5 SIZE (flightgear-aircraft/asw20_20101217.zip) = 286802 -SHA256 (flightgear-aircraft/bf109_20110629.zip) = 32156fb286dcc7cdc7cc6e2375a7ca7750c51ec06fcf815a80c43b2f927051f0 -SIZE (flightgear-aircraft/bf109_20110629.zip) = 24201246 -SHA256 (flightgear-aircraft/c310_20110113.zip) = a38b8ed25fd06445e75ca7dae16ae645f930ed0f7cd27fc1992894d29f2950bd -SIZE (flightgear-aircraft/c310_20110113.zip) = 611125 -SHA256 (flightgear-aircraft/dhc3_20110411.zip) = 5429a3ffb2972eeaf10935dfdfa0733da462f64fa36a300b4db670d1e9e40679 +SHA256 (flightgear-aircraft/bf109_20111212.zip) = f7ff8e66eb2c377bcba0d80c4622b0681b6bda39b98c1cca6dfeaf36a17b96ed +SIZE (flightgear-aircraft/bf109_20111212.zip) = 24201651 +SHA256 (flightgear-aircraft/c310_20120117.zip) = 1eea7c3116bfd40d9e133f20884466fd7c302c2e7210798d61e6e0fa1bf3b2a3 +SIZE (flightgear-aircraft/c310_20120117.zip) = 615092 +SHA256 (flightgear-aircraft/dhc3_20110411.zip) = 64110a7544eb21477a155364e2f870b8f9a120a6ed1448d273f51bab76c5331d SIZE (flightgear-aircraft/dhc3_20110411.zip) = 20788992 -SHA256 (flightgear-aircraft/f16_20110629.zip) = 3c6923b51a88fdb56e904d7d3bd67747b68d0af1f620c0fb85677adf11d0e369 -SIZE (flightgear-aircraft/f16_20110629.zip) = 27372054 -SHA256 (flightgear-aircraft/harrier_20101217.zip) = 7d1047836efeeb30cc47dd6e45a8ace190f192abecd04d9de412e070e470f501 +SHA256 (flightgear-aircraft/f16_20120104.zip) = 8919618279e6527806358d8a51ae1a0ba5480249d78d588f451060523dd5386c +SIZE (flightgear-aircraft/f16_20120104.zip) = 19551076 +SHA256 (flightgear-aircraft/harrier_20101217.zip) = 49669fd3c6a37b83014e454ec99512fd3eef8a06da484a97cb30398e202336f6 SIZE (flightgear-aircraft/harrier_20101217.zip) = 4208120 -SHA256 (flightgear-aircraft/pa24-250_20110222.zip) = 4826207457616ec0c0d6fe6879e53d6b183a7bd9be940d78a3ccfd374955681a +SHA256 (flightgear-aircraft/pa24-250_20110222.zip) = 0e9b537d15f6393444d2f1c7e4eaec168abb777a3f1d983ac56bdfd9c5c56792 SIZE (flightgear-aircraft/pa24-250_20110222.zip) = 2100101 -SHA256 (flightgear-aircraft/tu154_20101217.zip) = 11e473d74dea5bd41e0ad920312cc9ccb686d777695765304c9beca1f9b8e196 +SHA256 (flightgear-aircraft/tu154_20101217.zip) = e05d0206c4903d6eb0937d01a1da16fb6d81f1a83459ac90c178b9dee3266808 SIZE (flightgear-aircraft/tu154_20101217.zip) = 1387134 -SHA256 (flightgear-aircraft/wrightFlyer1903_20101217.zip) = 968185b45f26ef012ae4c183218d8041c86c643446a193c06196f4c7d4063175 +SHA256 (flightgear-aircraft/wrightFlyer1903_20101217.zip) = 011041a5cb43419f212b26e73d5038307bf76ad9bee74785de9d125b2b11bd2c SIZE (flightgear-aircraft/wrightFlyer1903_20101217.zip) = 1371750