Index: branches/2019Q2/games/flightgear/Makefile =================================================================== --- branches/2019Q2/games/flightgear/Makefile (revision 499827) +++ branches/2019Q2/games/flightgear/Makefile (revision 499828) @@ -1,62 +1,63 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear PORTVERSION= 2018.3.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear flight simulator LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ libboost_thread.so:devel/boost-libs \ libfltk.so:x11-toolkits/fltk \ libfreetype.so:print/freetype2 \ libosg.so:graphics/osg \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ libcurl.so:ftp/curl \ libudev.so:devel/libudev-devd BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data # Disable ninja, see https://sourceforge.net/p/flightgear/codetickets/2118/ USES= alias cmake:noninja compiler cpe dos2unix gl jpeg openal:al,alut \ sqlite tar:bzip2 USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glew glu glut LLD_UNSAFE= yes DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DSYSTEM_SQLITE:BOOL=ON \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DBUS QT5 OPTIONS_DEFAULT= DBUS QT5 DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_USES= pkgconfig DBUS_CMAKE_ON= -DUSE_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF QT5_CMAKE_ON= -DENABLE_QT:BOOL=ON QT5_CMAKE_OFF= -DENABLE_QT:BOOL=OFF QT5_USES= qt:5 QT5_USE= QT=core,buildtools,gui,declarative,network,qmake,widgets,svg post-patch: # Avoid conflict with C++20 by adding .txt suffix @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt @${REINPLACE_CMD} -Ei .c++20 '/file|set_prop/s/version[[:>:]]/&.txt/' \ ${WRKSRC}/CMakeLists.txt .include Index: branches/2019Q2/games/flightgear/files/patch-src_Environment_realwx__ctrl.cxx =================================================================== --- branches/2019Q2/games/flightgear/files/patch-src_Environment_realwx__ctrl.cxx (nonexistent) +++ branches/2019Q2/games/flightgear/files/patch-src_Environment_realwx__ctrl.cxx (revision 499828) @@ -0,0 +1,14 @@ +# games/flightgear: METAR data won't download +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237400 + +--- src/Environment/realwx_ctrl.cxx.orig 2019-04-20 07:47:41 UTC ++++ src/Environment/realwx_ctrl.cxx +@@ -426,7 +426,7 @@ void NoaaMetarRealWxController::requestMetar + ) + { + static const std::string NOAA_BASE_URL = +- "http://tgftp.nws.noaa.gov/data/observations/metar/stations/"; ++ "https://tgftp.nws.noaa.gov/data/observations/metar/stations/"; + class NoaaMetarGetRequest: + public simgear::HTTP::MemoryRequest + { Property changes on: branches/2019Q2/games/flightgear/files/patch-src_Environment_realwx__ctrl.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2/games/flightgear/files/patch-src_Main_metar__main.cxx =================================================================== --- branches/2019Q2/games/flightgear/files/patch-src_Main_metar__main.cxx (nonexistent) +++ branches/2019Q2/games/flightgear/files/patch-src_Main_metar__main.cxx (revision 499828) @@ -0,0 +1,14 @@ +# games/flightgear: METAR data won't download +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237400 + +--- src/Main/metar_main.cxx.orig 2019-04-20 07:48:18 UTC ++++ src/Main/metar_main.cxx +@@ -539,7 +539,7 @@ int main(int argc, char *argv[]) + try + { + static const std::string NOAA_BASE_URL = +- "http://tgftp.nws.noaa.gov/data/observations/metar/stations/"; ++ "https://tgftp.nws.noaa.gov/data/observations/metar/stations/"; + HTTP::MemoryRequest* mr = new HTTP::MemoryRequest + ( + NOAA_BASE_URL Property changes on: branches/2019Q2/games/flightgear/files/patch-src_Main_metar__main.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 499827) +++ branches/2019Q2 (revision 499828) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r499741