Update Flightgear and Simgear ports to 2.12.1 (bugfix release)

6 files changed, 10 insertions, 37 deletions

diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index 318788b209e2..48c4cb789691 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	flightgear-aircraft
 PORTVERSION=	20131001
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Aircraft-2.12/ \
+MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2.12/ \
 		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Aircraft-2.12/ \
 		ftp://ftp.kingmont.com/flightsims/flightgear/Aircraft-2.12/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft-2.12/ \
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 5fa33bee9e6d..68c1d0e5febe 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear-data
-PORTVERSION=	2.12.0
+PORTVERSION=	2.12.1
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/ \
+MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Shared/ \
 		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Shared/ \
 		ftp://ftp.kingmont.com/flightsims/flightgear/Shared/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Shared/ \
 		ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Shared/
-DISTNAME=	FlightGear-data-${PORTVERSION}
-EXTRACT_SUFX=	.tar.bz
+DISTNAME=	FlightGear-${PORTVERSION}-data
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	FlightGear scenery, textures, and aircraft models
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index be1594bb2a18..07a332a7f822 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FlightGear-data-2.12.0.tar.bz) = 136dfd24c8a28aa8a6a444ecaf2eb881a1e708d19c96b44352d79fcf84645b62
-SIZE (FlightGear-data-2.12.0.tar.bz) = 983303973
+SHA256 (FlightGear-2.12.1-data.tar.bz2) = 74568a130cf7e4490ca5f9b67a443b6e65ba78245b77b2eae0df5f11fedf9a42
+SIZE (FlightGear-2.12.1-data.tar.bz2) = 983305357
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index df1a6fa5e85e..2e419a7cc426 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	flightgear
-PORTVERSION=	2.12.0
+PORTVERSION=	2.12.1
 CATEGORIES=	games
 # see http://www.flightgear.org/templates.js
-MASTER_SITES=	http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \
+MASTER_SITES=	http://mirrors.ibiblio.org/flightgear/ftp/Source/ \
 		http://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Source/ \
 		ftp://ftp.kingmont.com/flightsims/flightgear/Source/ \
 		ftp://ftp.de.flightgear.org/pub/fgfs/Source/ \
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index b2f8ae7e0751..bc0358b63161 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flightgear-2.12.0.tar.bz2) = 84499d1b2a6c3c801a3c163f4f40d1f55b5fbcd4b65259fc5e5d5aa12e513341
-SIZE (flightgear-2.12.0.tar.bz2) = 3424463
+SHA256 (flightgear-2.12.1.tar.bz2) = bcc7478825c435bad1c93318c91d6a38d75d802bfbec4a3d2580e09b665240f2
+SIZE (flightgear-2.12.1.tar.bz2) = 3423670
diff --git a/games/flightgear/files/patch-src-Main-bootstrap.cxx b/games/flightgear/files/patch-src-Main-bootstrap.cxx
deleted file mode 100644
index d403099f0d09..000000000000
--- a/games/flightgear/files/patch-src-Main-bootstrap.cxx
+++ /dev/null
@@ -1,26 +0,0 @@
-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;
- }
-