Update to 2.8.0. Switches build system to cmake.

August 17, 2012 -- FlightGear v2.8.0 is Released

The FlightGear development team is happy to announce the v2.8.0
release of FlightGear, the free, open-source flight simulator. This
new version contains many exciting new features, enhancements and
bugfixes.

V2.8.0 includes improvements making FlightGear world more realistic
than ever before.  Placement of random buildings and trees match the
underlying terrain texture, and urban areas now have denser random
buildings.  Textures can be region specific, and users can select
between summer and winter textures in-sim.  An improved atmospheric
scattering and terrain haze model means the lighting of the terrain is
more realistic.  Finally, a new automated system is now available for
scenery submissions that automatically get rolled into the scenery
distribution to be enjoyed by everyone.

[...]

Some of the major changes include:

AI Traffic

    Improved aircraft models and textures.

Flight dynamics

    FlightGear has been synced with the JSBSim project.

Environment

    Region-specific terrain textures are used for Europe and Hawaii.
Now towns in Europe look different from towns in the USA.

    Cities and towns now look more populated due to random 3D
buildings, complete with lighting at night.
    Scenery looks more realistic due to improved placement of random
objects, buildings and trees.
    Airport signs are now rendered in 3D, with support for
double-sided signs. Full apt.dat 850 syntax is supported.
    You can now select between summer and winter scenery in-sim.

Instruments & HUDs

    A new flexible, 2D rendering system designed for complex
instruments such as CDUs, MFDs, EICAS, HUDs and other glass cockpit
interfaces. Canvas allows aircraft designers to easily build complex
instruments without needing specialized C++ code.

Interface

    Support for translation of the main menu into languages other than
English.
    A Nasal API is available allowing access to Navigation and
route-manager data.

Highlighted new and improved aircraft

    Airwave Xtreme 150: complete new (JSBSim) flight dynamics, new
model, advanced pilot animations.
    Cessna 337G Skymaster

Project infrastructure

    Various improvements to our scenery database make it easier than
ever to add, delete or update objects to the FlightGear world.
    The new aircraft download page allows you to easily find quality
aircraft, by filtering on status indications.

Visual effects

    Improved simulation of atmospheric light scattering with terrain
haze.
    An experimental renderer, named after the famous painter
Rembrandt, is included for testing purposes. The Rembrandt rendered
supports multiple light sources (landing lights, instrument lights),
real-time shadows and ambient occlusion across aircraft and scenery
for a much more realistic visual experience.

Other

    Additional joysticks and rudder pedals are supported out-of-the-box:
        InterLink Elite
        Micorosft Xbox 360 Controller
        Qware USB
        Saitek Cyborg X (F.L.Y. 5)
        Saitek Pro Flight Cessna Yoke
        Saitek Pro Flight Cessna Trim Wheel
        Saitek Pro Flight Cessna Rudder Pedals
        Speedlink Defender
    A French partial translation of The FlightGear Manual is now available.

Bug fixes

    See our bugtracker for an extensive list of the bugs fixed in this release.

10 files changed, 145 insertions, 44 deletions

diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 5342649e64a..264673dc33f 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -1,28 +1,26 @@
-# $NetBSD: Makefile,v 1.26 2012/09/30 01:58:19 dholland Exp $
+# $NetBSD: Makefile,v 1.27 2012/09/30 10:04:33 dholland Exp $
 
-DISTNAME=	FlightGear-2.0.0
-PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	13
+DISTNAME=	flightgear-2.8.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.flightgear.org/pub/fgfs/Source/ \
 		http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \
 		ftp://ftp.kingmont.com/flightsims/flightgear/Source/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.flightgear.org/
 COMMENT=	The FlightGear Simulator
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BROKEN=	Must be updated to match simgear.
-
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-sdl
-CONFIGURE_ARGS+=	--with-threads
+USE_CMAKE=		yes
+CMAKE_ARGS+=		-DJPEG_FACTORY:BOOL=ON
+CMAKE_ARGS+=		-DCMAKE_INSTALL_MANDIR=${PKGMANDIR}
 
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../audio/freealut/buildlink3.mk"
 .include "../../audio/openal/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
@@ -31,7 +29,6 @@ CONFIGURE_ARGS+=	--with-threads
 BUILDLINK_API_DEPENDS.simgear+=	simgear>=2.0.0
 .include "../../games/simgear/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/osg/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/flightgear/PLIST b/games/flightgear/PLIST
index 8da87af5f94..c012f0faeab 100644
--- a/games/flightgear/PLIST
+++ b/games/flightgear/PLIST
@@ -1,17 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2010/08/27 07:54:22 adam Exp $
-bin/alcinfo
-bin/est-epsilon
+@comment $NetBSD: PLIST,v 1.3 2012/09/30 10:04:33 dholland Exp $
+bin/GPSsmooth
+bin/MIDGsmooth
+bin/UGsmooth
 bin/fgfs
 bin/fgjs
+bin/fgpanel
 bin/fgviewer
-bin/gl-info
 bin/js_demo
 bin/metar
 bin/terrasync
 bin/yasim
-man/man1/est-epsilon.1
+bin/yasim-proptest
 man/man1/fgfs.1
 man/man1/fgjs.1
+man/man1/fgpanel.1
 man/man1/gl-info.1
 man/man1/js_demo.1
-man/man1/pstest.1
+man/man1/terrasync.1
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index e0ecac83867..cf0964a78c8 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.3 2010/08/27 07:54:22 adam Exp $
+$NetBSD: distinfo,v 1.4 2012/09/30 10:04:33 dholland Exp $
 
-SHA1 (FlightGear-2.0.0.tar.gz) = 666d7a165e121feaabd2235959f5ed853ee88126
-RMD160 (FlightGear-2.0.0.tar.gz) = 0b7cd19c5f4413c82bc9e7e17cd423f823e03607
-Size (FlightGear-2.0.0.tar.gz) = 2425099 bytes
-SHA1 (patch-aa) = 5efea4534eb54f8eaf0c569add5f697509ad1e8c
+SHA1 (flightgear-2.8.0.tar.bz2) = fee4b2f1f6aca8e163ea018ae9897b99971c20bd
+RMD160 (flightgear-2.8.0.tar.bz2) = 97d8f572aeb186bfed27eb5b06803a0fa5213a61
+Size (flightgear-2.8.0.tar.bz2) = 2311023 bytes
+SHA1 (patch-CMakeModules_FindPLIB_cmake) = c5761d425743761f5f0c711ef2ca384a06f6d524
+SHA1 (patch-src_Canvas_ShivaVG_src_shConfig_h) = bd70a1e41a59196e31789e38ec67e65cef546edf
+SHA1 (patch-src_Main_locale_cxx) = 327f4103ff3aea60f2394a2ed192c5f6af36f60b
+SHA1 (patch-src_Network_ATC-Inputs_cxx) = 08644c682ddddcefea48aa84fa538b8fd20289c0
+SHA1 (patch-src_Network_ATC-Outputs_cxx) = d5367f8536988b2705b2ba4f8d86e28576b04648
+SHA1 (patch-utils_TerraSync_terrasync_cxx) = 48855911a5052301f2c7a449ac8ff14ada9ae8ea
diff --git a/games/flightgear/patches/patch-CMakeModules_FindPLIB_cmake b/games/flightgear/patches/patch-CMakeModules_FindPLIB_cmake
new file mode 100644
index 00000000000..b0608ad44ca
--- /dev/null
+++ b/games/flightgear/patches/patch-CMakeModules_FindPLIB_cmake
@@ -0,0 +1,25 @@
+$NetBSD: patch-CMakeModules_FindPLIB_cmake,v 1.1 2012/09/30 10:04:33 dholland Exp $
+
+Recognize BSDs other than FreeBSD.
+
+--- CMakeModules/FindPLIB.cmake~	2012-08-16 14:20:57.000000000 +0000
++++ CMakeModules/FindPLIB.cmake
+@@ -169,6 +169,18 @@ if(${haveJs} GREATER -1)
+         find_library(USBHID_LIBRARY usbhid)
+         # check_function_exists(hidinit)
+         set(JS_LIBS ${USBHID_LIBRARY})
++    elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
++        find_library(USBHID_LIBRARY usbhid)
++        # check_function_exists(hidinit)
++        set(JS_LIBS ${USBHID_LIBRARY})
++    elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++        find_library(USBHID_LIBRARY usbhid)
++        # check_function_exists(hidinit)
++        set(JS_LIBS ${USBHID_LIBRARY})
++    elseif(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
++        find_library(USBHID_LIBRARY usbhid)
++        # check_function_exists(hidinit)
++        set(JS_LIBS ${USBHID_LIBRARY})
+     else()
+         message(WARNING "Unsupported platform for PLIB JS libs")
+     endif()
diff --git a/games/flightgear/patches/patch-aa b/games/flightgear/patches/patch-aa
deleted file mode 100644
index 7be5b54e5be..00000000000
--- a/games/flightgear/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/08/27 07:54:23 adam Exp $
-
---- configure.orig	2010-08-26 10:05:37.000000000 +0000
-+++ configure
-@@ -10435,7 +10435,7 @@ fi
- 
- esac
- 
--if test "$OPENAL_OK" == "no"; then
-+if test "$OPENAL_OK" = "no"; then
-     echo
-     echo "You *must* have the openal library installed on your system to build"
-     echo "SimGear!"
-@@ -10446,7 +10446,7 @@ if test "$OPENAL_OK" == "no"; then
-     exit
- fi
- 
--if test "$ALUT_OK" == "no"; then
-+if test "$ALUT_OK" = "no"; then
-     echo
-     echo "You *must* have the alut library installed on your system to build"
-     echo "SimGear!"
diff --git a/games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h b/games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h
new file mode 100644
index 00000000000..6862d8e14eb
--- /dev/null
+++ b/games/flightgear/patches/patch-src_Canvas_ShivaVG_src_shConfig_h
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_Canvas_ShivaVG_src_shConfig_h,v 1.1 2012/09/30 10:04:33 dholland Exp $
+
+This sublibrary insists on being able to work out its OS type, and
+only knows a few, even though it uses the results for just about
+nothing. So give it some crayons to play with.
+
+--- src/Canvas/ShivaVG/src/shConfig.h~	2012-08-16 14:20:56.000000000 +0000
++++ src/Canvas/ShivaVG/src/shConfig.h
+@@ -34,7 +34,8 @@
+ #else

+ 

+     // Unsupported system

+-    #error This operating system is not supported by SFML library

++    //#error This operating system is not supported by SFML library

++    #define VG_API_OTHER

+ 

+ #endif

+ 

diff --git a/games/flightgear/patches/patch-src_Main_locale_cxx b/games/flightgear/patches/patch-src_Main_locale_cxx
new file mode 100644
index 00000000000..72fa37ec200
--- /dev/null
+++ b/games/flightgear/patches/patch-src_Main_locale_cxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Main_locale_cxx,v 1.1 2012/09/30 10:04:33 dholland Exp $
+
+Use standard headers.
+
+--- src/Main/locale.cxx~	2012-08-16 14:20:56.000000000 +0000
++++ src/Main/locale.cxx
+@@ -20,6 +20,8 @@
+ 
+ #ifdef HAVE_WINDOWS_H
+ #include <windows.h>
++#else
++#include <cstdlib>
+ #endif
+ 
+ #include <simgear/props/props_io.hxx>
diff --git a/games/flightgear/patches/patch-src_Network_ATC-Inputs_cxx b/games/flightgear/patches/patch-src_Network_ATC-Inputs_cxx
new file mode 100644
index 00000000000..3ff16738206
--- /dev/null
+++ b/games/flightgear/patches/patch-src_Network_ATC-Inputs_cxx
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_Network_ATC-Inputs_cxx,v 1.1 2012/09/30 10:04:33 dholland Exp $
+
+Fix build failure.
+
+--- src/Network/ATC-Inputs.cxx~	2012-08-16 14:20:57.000000000 +0000
++++ src/Network/ATC-Inputs.cxx
+@@ -27,14 +27,14 @@
+ 
+ #include <simgear/compiler.h>
+ 
+-#if defined( unix ) || defined( __CYGWIN__ )
++//#if defined( unix ) || defined( __CYGWIN__ )
+ #  include <sys/types.h>
+ #  include <sys/stat.h>
+ #  include <fcntl.h>
+ #  include <stdlib.h>
+ #  include <unistd.h>
+ #  include <istream>
+-#endif
++//#endif
+ 
+ #include <errno.h>
+ #include <math.h>
diff --git a/games/flightgear/patches/patch-src_Network_ATC-Outputs_cxx b/games/flightgear/patches/patch-src_Network_ATC-Outputs_cxx
new file mode 100644
index 00000000000..4934e6923dd
--- /dev/null
+++ b/games/flightgear/patches/patch-src_Network_ATC-Outputs_cxx
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_Network_ATC-Outputs_cxx,v 1.1 2012/09/30 10:04:33 dholland Exp $
+
+Fix build failure.
+
+--- src/Network/ATC-Outputs.cxx~	2012-08-16 14:20:57.000000000 +0000
++++ src/Network/ATC-Outputs.cxx
+@@ -27,14 +27,14 @@
+ 
+ #include <simgear/compiler.h>
+ 
+-#if defined( unix ) || defined( __CYGWIN__ )
++//#if defined( unix ) || defined( __CYGWIN__ )
+ #  include <sys/types.h>
+ #  include <sys/stat.h>
+ #  include <fcntl.h>
+ #  include <stdlib.h>
+ #  include <unistd.h>
+ #  include <ostream>
+-#endif
++//#endif
+ 
+ #include <errno.h>
+ #include <math.h>
diff --git a/games/flightgear/patches/patch-utils_TerraSync_terrasync_cxx b/games/flightgear/patches/patch-utils_TerraSync_terrasync_cxx
new file mode 100644
index 00000000000..1a019ec236f
--- /dev/null
+++ b/games/flightgear/patches/patch-utils_TerraSync_terrasync_cxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-utils_TerraSync_terrasync_cxx,v 1.1 2012/09/30 10:04:33 dholland Exp $
+
+Recognize more BSDs.
+
+--- utils/TerraSync/terrasync.cxx~	2012-08-16 14:20:53.000000000 +0000
++++ utils/TerraSync/terrasync.cxx
+@@ -51,7 +51,7 @@
+ 
+ #if defined(_MSC_VER) || defined(__MINGW32__)
+     typedef void (__cdecl * sighandler_t)(int);
+-#elif defined( __APPLE__ ) || defined (__FreeBSD__)
++#elif defined( __APPLE__ ) || defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+     typedef sig_t sighandler_t;
+ #endif
+