Index: head/devel/simgear/Makefile =================================================================== --- head/devel/simgear/Makefile (revision 569254) +++ head/devel/simgear/Makefile (revision 569255) @@ -1,43 +1,47 @@ # $FreeBSD$ PORTNAME= simgear -PORTVERSION= 2020.3.6 +PORTVERSION= 2020.3.8 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 Index: head/devel/simgear/distinfo =================================================================== --- head/devel/simgear/distinfo (revision 569254) +++ head/devel/simgear/distinfo (revision 569255) @@ -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 Index: head/games/flightgear/Makefile =================================================================== --- head/games/flightgear/Makefile (revision 569254) +++ head/games/flightgear/Makefile (revision 569255) @@ -1,58 +1,62 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 2020.3.6 +PORTVERSION= 2020.3.8 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 Index: head/games/flightgear/distinfo =================================================================== --- head/games/flightgear/distinfo (revision 569254) +++ head/games/flightgear/distinfo (revision 569255) @@ -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 Index: head/games/flightgear-data/Makefile =================================================================== --- head/games/flightgear-data/Makefile (revision 569254) +++ head/games/flightgear-data/Makefile (revision 569255) @@ -1,44 +1,44 @@ # Created by: Brian Buchanan # $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 MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear scenery, textures, and aircraft models LICENSE= GPLv2 BROKEN_mips64= Fails to install: runaway process -USES= tar:bzip2 +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|^|@exec ${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 Index: head/games/flightgear-data/distinfo =================================================================== --- head/games/flightgear-data/distinfo (revision 569254) +++ head/games/flightgear-data/distinfo (revision 569255) @@ -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