From f471898fbf21704b3bbfa5ea34c4a01e7f6dd998 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Tue, 3 Aug 2010 20:06:54 +0200
Subject: [PATCH] flightgear: Updated (0.9.10 -> 2.0.0)

---
 games/flightgear/X11.patch       | 61 --------------------------------
 games/flightgear/flightgear.desc |  6 ++--
 2 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 games/flightgear/X11.patch

diff --git a/games/flightgear/X11.patch b/games/flightgear/X11.patch
deleted file mode 100644
index 650eadd5f..000000000
--- a/games/flightgear/X11.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../flightgear/X11.patch
-# Copyright (C) 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- FlightGear-0.9.9/configure.orig	2006-02-13 17:19:28.000000000 +0100
-+++ FlightGear-0.9.9/configure	2006-02-15 02:56:21.000000000 +0100
-@@ -4556,11 +4556,11 @@
-     ;;
- 
- *)
--    if test -d /usr/X11R6 ; then
--        EXTRA_DIR1="/usr/X11R6"
-+    if test -d /usr/X11 ; then
-+        EXTRA_DIR1="/usr/X11"
-     fi
--    if test -d /opt/X11R6 ; then
--        EXTRA_DIR2="/opt/X11R6"
-+    if test -d /opt/X11 ; then
-+        EXTRA_DIR2="/opt/X11"
-     fi
-     EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local"
-     ;;
-@@ -4601,7 +4601,7 @@
- fi
- 
- 
--		mylibdir="${exdir}/lib${subexdir}"
-+		mylibdir="${exdir}/lib${libsuff}${subexdir}"
- 
- mylibdir="$mylibdir"
- if test -r $mylibdir ; then
-@@ -5166,7 +5166,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- LIBS=$ac_save_LIBS
--for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib${libsuff}/g`
- do
-   # Don't even attempt the hair of trying to link an X program!
-   for ac_extension in a so sl; do
-@@ -8934,7 +8934,7 @@
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_glutGetModifiers" = no; then
-   for ac_lib in  glut freeglut ; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+    LIBS="-L$ac_x_libraries -l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/games/flightgear/flightgear.desc b/games/flightgear/flightgear.desc
index 2636bce9d..ffe546956 100644
--- a/games/flightgear/flightgear.desc
+++ b/games/flightgear/flightgear.desc
@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../flightgear/flightgear.desc
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -41,8 +41,8 @@
 
 [L] GPL
 [S] Stable
-[V] 0.9.10
+[V] 2.0.0
 [P] X -----5---9 212.600
 
-[D] 374228624 FlightGear-0.9.10.tar.gz ftp://ftp.de.flightgear.org/pub/fgfs/Source/
+[D] 2529980544 FlightGear-2.0.0.tar.gz ftp://ftp.de.flightgear.org/pub/fgfs/Source/