aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/simgear/Makefile6
-rw-r--r--devel/simgear/distinfo6
-rw-r--r--games/flightgear-data/Makefile4
-rw-r--r--games/flightgear-data/distinfo6
-rw-r--r--games/flightgear/Makefile6
-rw-r--r--games/flightgear/distinfo6
6 files changed, 21 insertions, 13 deletions
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index f11ca3977f8f..009073c845b2 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= simgear
-PORTVERSION= 2020.3.6
+PORTVERSION= 2020.3.8
CATEGORIES= devel games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
@@ -40,4 +40,8 @@ PLIST_SUB= PORTVERSION=${PORTVERSION}
CMAKE_ARGS+= -DENABLE_SIMD:BOOL=OFF
.endif
+post-patch:
+# Avoid conflict with C++20 <version> - used version file is simgear-version
+ @${RM} ${WRKSRC}/version
+
.include <bsd.port.post.mk>
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index d9c85b80f755..2234a155bcf8 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614115000
-SHA256 (simgear-2020.3.6.tar.bz2) = ec3eca44d21f7e052beafc1b9e2d57c16fbc1ad5f033abc967b57afd02c35669
-SIZE (simgear-2020.3.6.tar.bz2) = 1408963
+TIMESTAMP = 1616713044
+SHA256 (simgear-2020.3.8.tar.bz2) = 51771657d30fbbb73e425163ae1c6d43aaee01cc6e2ad7b0c2986ee2db797567
+SIZE (simgear-2020.3.8.tar.bz2) = 1410292
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 342e0f83a9e4..71e7616db830 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flightgear-data
-PORTVERSION= 2020.3.6
+PORTVERSION= 2020.3.8
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
DISTNAME= FlightGear-${PORTVERSION}-data
@@ -14,7 +14,7 @@ LICENSE= GPLv2
BROKEN_mips64= Fails to install: runaway process
-USES= tar:bzip2
+USES= tar:txz
NO_BUILD= yes
NO_ARCH= yes
diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo
index 6679b0982059..3a848c55f123 100644
--- a/games/flightgear-data/distinfo
+++ b/games/flightgear-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614115332
-SHA256 (FlightGear-2020.3.6-data.tar.bz2) = c11a6c6dd596a82dd9bf59326c2ef7fb971ba79a236b4036db633bb6721a41ff
-SIZE (FlightGear-2020.3.6-data.tar.bz2) = 2009894075
+TIMESTAMP = 1616713393
+SHA256 (FlightGear-2020.3.8-data.txz) = fca16e987464991bec53f2f58b5d631bf29baa86e73843fb9789723cc287c9c0
+SIZE (FlightGear-2020.3.8-data.txz) = 1826816084
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index cd691ebb5fc9..81fb71905180 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flightgear
-PORTVERSION= 2020.3.6
+PORTVERSION= 2020.3.8
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
@@ -55,4 +55,8 @@ QT5_CMAKE_OFF= -DENABLE_QT:BOOL=OFF
QT5_USES= qt:5
QT5_USE= QT=core,buildtools,linguisttools,gui,declarative,network,qmake,widgets,svg
+post-patch:
+# Avoid conflict with C++20 <version> - used version file is flightgear-version
+ @${RM} ${WRKSRC}/version
+
.include <bsd.port.mk>
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 71c222fa551c..e76625e4af61 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614115086
-SHA256 (flightgear-2020.3.6.tar.bz2) = 07d6fed32498d60c0bc27803330aa0d8f7cfb9260ab17df2a13af0d68383259e
-SIZE (flightgear-2020.3.6.tar.bz2) = 8837251
+TIMESTAMP = 1616713091
+SHA256 (flightgear-2020.3.8.tar.bz2) = 5d70ea859f6747e1704372dab997bc886c4e8e5c835c3ac4b63eb50501950d87
+SIZE (flightgear-2020.3.8.tar.bz2) = 8922064