diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 4ce6b2bad4c2..f239d2d61a60 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -1,45 +1,45 @@ PORTNAME= simgear -PORTVERSION= 2020.3.11 +PORTVERSION= 2020.3.12 CATEGORIES= devel games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= Toolkit for 3D games and simulations LICENSE= GPLv2+ LGPL20+ LICENSE_COMB= multi LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libosg.so:graphics/osg \ libexpat.so:textproc/expat2 \ libcurl.so:ftp/curl USES= alias cmake compiler:c++11-lib cpe gl jpeg openal:al,alut \ tar:bzip2 xorg USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut USE_LDCONFIG= yes LDFLAGS_gcc= -losgDB LDFLAGS+= ${LDFLAGS_${CHOSEN_COMPILER_TYPE}} CMAKE_ARGS+= -DSYSTEM_EXPAT:BOOL=ON \ -DENABLE_TESTS:BOOL=OFF PLIST_SUB= PORTVERSION=${PORTVERSION} .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DENABLE_SIMD:BOOL=OFF .endif post-patch: # Avoid conflict with C++20 - used version file is simgear-version @${RM} ${WRKSRC}/version .include diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo index 2bf8fdeaae2e..725f8bf283c2 100644 --- a/devel/simgear/distinfo +++ b/devel/simgear/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629663788 -SHA256 (simgear-2020.3.11.tar.bz2) = bb8dfcbc2a3b0143d1ffcf01d1a961e566ef21dd33d9cc768d6d9aa5871d4f3c -SIZE (simgear-2020.3.11.tar.bz2) = 1415047 +TIMESTAMP = 1643923029 +SHA256 (simgear-2020.3.12.tar.bz2) = 5bb299cc5539a9913ab4ebfd612cc7df2a0d8bc6044f6cb399384c725db7d78d +SIZE (simgear-2020.3.12.tar.bz2) = 1415062 diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile index 7513482954a7..63df040497ec 100644 --- a/games/flightgear-data/Makefile +++ b/games/flightgear-data/Makefile @@ -1,43 +1,43 @@ # Created by: Brian Buchanan PORTNAME= flightgear-data -PORTVERSION= 2020.3.11 +PORTVERSION= 2020.3.12 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} DISTNAME= FlightGear-${PORTVERSION}-data MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear scenery, textures, and aircraft models LICENSE= GPLv2 BROKEN_mips64= Fails to install: runaway process USES= tar:txz NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/fgdata DATADIR= ${PREFIX}/share/flightgear PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= %%DATADIR%% post-patch: @${RM} ${WRKSRC}/COPYING pre-install: @${RM} ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type d -empty | ${SORT} \ | ${SED} -e 's|^|@preexec ${MKDIR} %D/share/flightgear/|' >> ${PLIST} && \ ${FIND} * -type f | ${SORT} \ | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} -r \ | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} do-install: ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! ( -name .git -o -name .gitignore )") .include diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo index 1bb3df09c218..bb78ccbb2e99 100644 --- a/games/flightgear-data/distinfo +++ b/games/flightgear-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629665125 -SHA256 (FlightGear-2020.3.11-data.txz) = 123f151b2c0f4220f0dd55e875ca57a4ec38a94f71f8c04c58caeac077e2b558 -SIZE (FlightGear-2020.3.11-data.txz) = 1736954520 +TIMESTAMP = 1643924284 +SHA256 (FlightGear-2020.3.12-data.txz) = 802b16f5ef08b97c2625f01fc49fe73911795bf3f00a46be3bc0a1c26dba3a76 +SIZE (FlightGear-2020.3.12-data.txz) = 1787955196 diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index 5724f895921d..b3fada346e31 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -1,61 +1,61 @@ # Created by: Brian Buchanan PORTNAME= flightgear -PORTVERSION= 2020.3.11 +PORTVERSION= 2020.3.12 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear flight simulator LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING 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 \ libexpat.so:textproc/expat2 \ libSimGearCore.so:devel/simgear BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data # Disable ninja, see https://sourceforge.net/p/flightgear/codetickets/2118/ USES= alias cmake:noninja compiler:c++11-lang cpe dos2unix gl jpeg \ openal:al,alut sqlite tar:bzip2 xorg USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glew glu glut DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DSYSTEM_SQLITE:BOOL=ON \ -DENABLE_HID_INPUT:BOOL=OFF \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS_i386= -Wl,-znotext 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,linguisttools,gui,declarative,network,qmake,widgets,svg post-patch: # Avoid conflict with C++20 - used version file is flightgear-version @${RM} ${WRKSRC}/version .include diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo index a398469e56c8..e7283c4a4e87 100644 --- a/games/flightgear/distinfo +++ b/games/flightgear/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629665894 -SHA256 (flightgear-2020.3.11.tar.bz2) = fe2706c7707ea73abc5114773de45f29861ab0f8f535656af0428ed049ca4a97 -SIZE (flightgear-2020.3.11.tar.bz2) = 8926212 +TIMESTAMP = 1643923108 +SHA256 (flightgear-2020.3.12.tar.bz2) = c0f799200886534ccf064cde0423b5c44826fa265dfe15af044af665cb17d107 +SIZE (flightgear-2020.3.12.tar.bz2) = 8929319 diff --git a/games/flightgear/files/patch-src-Navaids-PositionedOctree.cxx b/games/flightgear/files/patch-src-Navaids-PositionedOctree.cxx deleted file mode 100644 index dff348dfc8a3..000000000000 --- a/games/flightgear/files/patch-src-Navaids-PositionedOctree.cxx +++ /dev/null @@ -1,13 +0,0 @@ -Backport fix from c8d5296f7bef162311a303ff904577b4010c5e80 - ---- src/Navaids/PositionedOctree.cxx.orig 2021-08-23 13:26:31 UTC -+++ src/Navaids/PositionedOctree.cxx -@@ -148,7 +148,7 @@ void Leaf::visit(const SGVec3d& aPos, double aCutoff, - - void Leaf::insertChild(FGPositioned::Type ty, PositionedID id) - { -- assert(childrenLoaded); -+ assert(_childrenLoaded); - children.insert(children.end(), TypedPositioned(ty, id)); - } -