diff options
author | martymac <martymac@FreeBSD.org> | 2013-10-30 15:13:02 +0800 |
---|---|---|
committer | martymac <martymac@FreeBSD.org> | 2013-10-30 15:13:02 +0800 |
commit | d0699402f1402deb24f984148b339470aa1bc2a6 (patch) | |
tree | fe1d2a1236a4ba0568dce4c4e613a5120172cbde /games/flightgear | |
parent | 08270ac909c0f8ddb6a02a7191a091a0fc7c0db0 (diff) | |
download | freebsd-ports-gnome-d0699402f1402deb24f984148b339470aa1bc2a6.tar.gz freebsd-ports-gnome-d0699402f1402deb24f984148b339470aa1bc2a6.tar.zst freebsd-ports-gnome-d0699402f1402deb24f984148b339470aa1bc2a6.zip |
- Update Simgear and Flightgear ports to 2.12.0
- Enable staging
- Switch to new LIB_DEPENDS format
- Refresh Simgear's pkg-descr
Diffstat (limited to 'games/flightgear')
-rw-r--r-- | games/flightgear/Makefile | 18 | ||||
-rw-r--r-- | games/flightgear/distinfo | 4 | ||||
-rw-r--r-- | games/flightgear/files/patch-src-Airports-airports_fwd.hxx | 10 | ||||
-rw-r--r-- | games/flightgear/files/patch-src-Main-bootstrap.cxx | 26 | ||||
-rw-r--r-- | games/flightgear/files/patch-utils-CMakeLists.txt | 21 | ||||
-rw-r--r-- | games/flightgear/pkg-plist | 22 |
6 files changed, 72 insertions, 29 deletions
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 |