Changes 2.0.0:

This is primarily a bug fix release.
(Requires SimGear-2.0.0 if compiling from source.)

5 files changed, 38 insertions, 32 deletions

diff --git a/games/flightgear/MESSAGE b/games/flightgear/MESSAGE
new file mode 100644
index 00000000000..10df80a9623
--- /dev/null
+++ b/games/flightgear/MESSAGE
@@ -0,0 +1,5 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2010/08/27 07:54:22 adam Exp $
+
+To use FlightGear, you may also need to install pkgsrc/games/flightgear-data.
+===========================================================================
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 51e6281e1b7..43b8ca2935f 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -1,34 +1,34 @@
-# $NetBSD: Makefile,v 1.9 2010/04/17 16:01:56 zafer Exp $
-#
+# $NetBSD: Makefile,v 1.10 2010/08/27 07:54:22 adam Exp $
 
-DISTNAME=		FlightGear-1.0.0
-PKGNAME=		${DISTNAME:S/FlightGear/flightgear/}
-PKGREVISION=		2
-CATEGORIES=		games
-MASTER_SITES=		ftp://ftp.flightgear.org/pub/fgfs/Source/ \
-			http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/
+DISTNAME=	FlightGear-2.0.0
+PKGNAME=	${DISTNAME:tl}
+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/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.flightgear.org/
-COMMENT=		The FlightGear Simulator
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.flightgear.org/
+COMMENT=	The FlightGear Simulator
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+LICENSE=	gnu-gpl-v2
 
-MAKE_JOBS_SAFE=		no
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_LANGUAGES+=		c c++
-
-CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ARGS+=	--enable-sdl
-CFLAGS+=		-I${LOCALBASE}/include/SDL
+CONFIGURE_ARGS+=	--with-threads
 
-.include "../../audio/openal/buildlink3.mk"
 .include "../../audio/freealut/buildlink3.mk"
+.include "../../audio/openal/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../games/simgear/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/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 3a771e450b2..8da87af5f94 100644
--- a/games/flightgear/PLIST
+++ b/games/flightgear/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/12 20:01:40 drochner Exp $
-bin/al-info
+@comment $NetBSD: PLIST,v 1.2 2010/08/27 07:54:22 adam Exp $
+bin/alcinfo
 bin/est-epsilon
 bin/fgfs
 bin/fgjs
+bin/fgviewer
 bin/gl-info
 bin/js_demo
 bin/metar
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 3ccbf9e18e4..e0ecac83867 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/03/14 14:49:53 drochner Exp $
+$NetBSD: distinfo,v 1.3 2010/08/27 07:54:22 adam Exp $
 
-SHA1 (FlightGear-1.0.0.tar.gz) = 27de60d87316160eb9eb70bb82cd7ee2ed0407df
-RMD160 (FlightGear-1.0.0.tar.gz) = 78a9c145f82bde79ac070e65d215e5d6ea555be9
-Size (FlightGear-1.0.0.tar.gz) = 2123216 bytes
-SHA1 (patch-aa) = 509c2f58e92a4f4a845cf738b9743793cd9e78d7
+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
diff --git a/games/flightgear/patches/patch-aa b/games/flightgear/patches/patch-aa
index 199cb4949a1..7be5b54e5be 100644
--- a/games/flightgear/patches/patch-aa
+++ b/games/flightgear/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2008/03/14 14:49:53 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2010/08/27 07:54:23 adam Exp $
 
---- configure.orig	2007-12-11 06:44:59.000000000 +0100
+--- configure.orig	2010-08-26 10:05:37.000000000 +0000
 +++ configure
-@@ -10128,7 +10128,7 @@ fi
+@@ -10435,7 +10435,7 @@ fi
  
  esac
  
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.1 2008/03/14 14:49:53 drochner Exp $
 +if test "$OPENAL_OK" = "no"; then
      echo
      echo "You *must* have the openal library installed on your system to build"
-     echo "FlightGear!"
-@@ -10139,7 +10139,7 @@ if test "$OPENAL_OK" == "no"; then
+     echo "SimGear!"
+@@ -10446,7 +10446,7 @@ if test "$OPENAL_OK" == "no"; then
      exit
  fi
  
@@ -19,4 +19,4 @@ $NetBSD: patch-aa,v 1.1 2008/03/14 14:49:53 drochner Exp $
 +if test "$ALUT_OK" = "no"; then
      echo
      echo "You *must* have the alut library installed on your system to build"
-     echo "FlightGear!"
+     echo "SimGear!"