aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGanael LAPLANCHE <martymac@FreeBSD.org>2018-09-03 15:57:00 +0000
committerGanael LAPLANCHE <martymac@FreeBSD.org>2018-09-03 15:57:00 +0000
commit1fdca8bb72b992b4414e3a0e5a59ffea1e1a6289 (patch)
treea7ad219dbb82712cd22965ce65be7b691f4382ab
parent3c7d84e9a7b6bf6c2b767a8f97dca46ed7301f5f (diff)
downloadports-1fdca8bb72b992b4414e3a0e5a59ffea1e1a6289.tar.gz
ports-1fdca8bb72b992b4414e3a0e5a59ffea1e1a6289.zip
Notes
-rw-r--r--devel/simgear/Makefile3
-rw-r--r--devel/simgear/distinfo6
-rw-r--r--games/flightgear-data/Makefile2
-rw-r--r--games/flightgear-data/distinfo6
-rw-r--r--games/flightgear/Makefile3
-rw-r--r--games/flightgear/distinfo6
-rw-r--r--games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx2
7 files changed, 13 insertions, 15 deletions
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index c7ba5863c0ed..282dbcd63a43 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= simgear
-PORTVERSION= 2018.2.1
-PORTREVISION= 2
+PORTVERSION= 2018.2.2
CATEGORIES= devel games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index bd56207595e2..fb6afa0c213f 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527106569
-SHA256 (simgear-2018.2.1.tar.bz2) = 3e2788bc1ce03fc4ca69f41d1546c28fc9502756ae773831ad6e42c4db34f535
-SIZE (simgear-2018.2.1.tar.bz2) = 1315134
+TIMESTAMP = 1535914817
+SHA256 (simgear-2018.2.2.tar.bz2) = f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5
+SIZE (simgear-2018.2.2.tar.bz2) = 1313890
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 04caf09762a6..27b9aa74caf0 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flightgear-data
-PORTVERSION= 2018.2.1
+PORTVERSION= 2018.2.2
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
DISTNAME= FlightGear-${PORTVERSION}-data
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index 449164614699..377b37715611 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527110762
-SHA256 (FlightGear-2018.2.1-data.tar.bz2) = 3d5dbf9b584b135699aadff0f51017fac37aefd1157e00adbba1d4855a1b24e9
-SIZE (FlightGear-2018.2.1-data.tar.bz2) = 1618697853
+TIMESTAMP = 1535914967
+SHA256 (FlightGear-2018.2.2-data.tar.bz2) = c89b94e4cf3cb7eda728daf6cca6dd051f7a47863776c99fd2f3fe0054400ac4
+SIZE (FlightGear-2018.2.2-data.tar.bz2) = 1624681801
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 55e558e1847f..b65363d25dbb 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flightgear
-PORTVERSION= 2018.2.1
-PORTREVISION= 2
+PORTVERSION= 2018.2.2
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index d2a08175d680..4c05a22f2979 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527066607
-SHA256 (flightgear-2018.2.1.tar.bz2) = 592ad56ee434f004c78fcfa7caa17666841429705547ab6eb947058fc09e45a2
-SIZE (flightgear-2018.2.1.tar.bz2) = 8343870
+TIMESTAMP = 1535914762
+SHA256 (flightgear-2018.2.2.tar.bz2) = 61f809ef0a3f6908d156f0c483ed5313d31b5a6ac74761955d0b266751718147
+SIZE (flightgear-2018.2.2.tar.bz2) = 8346698
diff --git a/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx b/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx
index d51ae84e3d80..486577cf6a43 100644
--- a/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx
+++ b/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx
@@ -9,7 +9,7 @@ src/AIModel/AIFlightPlanCreatePushBack.cxx:96:48: error: ordered comparison betw
FGGroundNetwork* groundNet = dep->groundNetwork();
FGParking *parking = gate.parking();
- if (parking && parking->getPushBackPoint() > 0) {
-+ if (parking && parking->getPushBackPoint() != NULL) {
++ if (parking && parking->getPushBackPoint() != nullptr) {
FGTaxiRoute route = groundNet->findShortestRoute(parking, parking->getPushBackPoint(), false);
int size = route.size();