Index: head/devel/simgear/Makefile =================================================================== --- head/devel/simgear/Makefile (revision 471255) +++ head/devel/simgear/Makefile (revision 471256) @@ -1,38 +1,38 @@ # $FreeBSD$ PORTNAME= simgear -PORTVERSION= 2018.1.1 +PORTVERSION= 2018.2.1 CATEGORIES= devel games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} MAINTAINER= martymac@FreeBSD.org COMMENT= Toolkit for 3D games and simulations LICENSE= GPLv2 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 USES= alias cmake compiler:c++11-lib cpe jpeg openal:al,alut tar:bzip2 USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut .include # Needs Clang 4.0+ to build, see: # https://sourceforge.net/p/flightgear/codetickets/2015/ .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40 BUILD_DEPENDS+= ${LOCALBASE}/bin/clang40:devel/llvm40 CPP= ${LOCALBASE}/bin/clang-cpp40 CC= ${LOCALBASE}/bin/clang40 CXX= ${LOCALBASE}/bin/clang++40 .endif # Work around "'to_string' is not a member of 'std'" when building with Gcc < 6 .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 60 CFLAGS+= -D_GLIBCXX_USE_C99 .endif .include Index: head/devel/simgear/distinfo =================================================================== --- head/devel/simgear/distinfo (revision 471255) +++ head/devel/simgear/distinfo (revision 471256) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523304226 -SHA256 (simgear-2018.1.1.tar.bz2) = d403cbd8688782780c50461ea233f26ea3bb8242ff681674e69ac1da05226656 -SIZE (simgear-2018.1.1.tar.bz2) = 1303653 +TIMESTAMP = 1527106569 +SHA256 (simgear-2018.2.1.tar.bz2) = 3e2788bc1ce03fc4ca69f41d1546c28fc9502756ae773831ad6e42c4db34f535 +SIZE (simgear-2018.2.1.tar.bz2) = 1315134 Index: head/games/flightgear/Makefile =================================================================== --- head/games/flightgear/Makefile (revision 471255) +++ head/games/flightgear/Makefile (revision 471256) @@ -1,74 +1,69 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear -PORTVERSION= 2018.1.1 +PORTVERSION= 2018.2.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 RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data LLD_UNSAFE= yes USES= alias cmake compiler cpe dos2unix jpeg openal:al,alut sqlite \ tar:bzip2 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+= -DENABLE_JS_SERVER:BOOL=ON \ - -DSYSTEM_SQLITE:BOOL=ON \ +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_USE= QT5=core,buildtools,gui,qmake,qml,quick,widgets +QT5_USE= QT5=core,buildtools,gui,network,qmake,qml,quick,widgets .include # Needs Clang 4.0+ to build, see: # https://sourceforge.net/p/flightgear/codetickets/2015/ .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40 BUILD_DEPENDS+= ${LOCALBASE}/bin/clang40:devel/llvm40 CPP= ${LOCALBASE}/bin/clang-cpp40 CC= ${LOCALBASE}/bin/clang40 CXX= ${LOCALBASE}/bin/clang++40 .endif # Chase devel/simgear compiler version .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46 USE_GCC= yes CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif - -post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/utils/js_server/js_server \ - ${STAGEDIR}${PREFIX}/bin .include Index: head/games/flightgear/distinfo =================================================================== --- head/games/flightgear/distinfo (revision 471255) +++ head/games/flightgear/distinfo (revision 471256) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523305013 -SHA256 (flightgear-2018.1.1.tar.bz2) = ed1aa7867e89757622f3faaab996028c4be2f79006dfb89a3059c77b9831aab9 -SIZE (flightgear-2018.1.1.tar.bz2) = 8158999 +TIMESTAMP = 1527066607 +SHA256 (flightgear-2018.2.1.tar.bz2) = 592ad56ee434f004c78fcfa7caa17666841429705547ab6eb947058fc09e45a2 +SIZE (flightgear-2018.2.1.tar.bz2) = 8343870 Index: head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt (revision 471255) +++ head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt (nonexistent) @@ -1,10 +0,0 @@ ---- utils/CMakeLists.txt.orig 2016-11-24 08:26:29.486200480 +0000 -+++ utils/CMakeLists.txt 2016-11-24 08:26:58.661198446 +0000 -@@ -30,3 +30,7 @@ - if(ENABLE_STGMERGE) - add_subdirectory(stgmerge) - endif() -+ -+if(ENABLE_JS_SERVER) -+ add_subdirectory(js_server) -+endif() Property changes on: head/games/flightgear/files/patch-JS_SERVER-utils-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt (revision 471255) +++ head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2016-03-04 21:42:31.724356963 +0000 -+++ CMakeLists.txt 2016-03-04 21:47:33.738336446 +0000 -@@ -310,7 +310,7 @@ - endif (ENABLE_QT) - ############################################################################## - --find_package(PLIB REQUIRED puaux pu js fnt) -+find_package(PLIB REQUIRED puaux pu js fnt net) - - # FlightGear and SimGear versions need to match - find_package(SimGear ${FLIGHTGEAR_VERSION} REQUIRED) Property changes on: head/games/flightgear/files/patch-JS_SERVER-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt =================================================================== --- head/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt (revision 471255) +++ head/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt (nonexistent) @@ -1,10 +0,0 @@ ---- utils/js_server/CMakeLists.txt.orig 2012-03-09 14:44:22.999701740 +0100 -+++ utils/js_server/CMakeLists.txt 2012-03-09 14:59:36.643375244 +0100 -@@ -0,0 +1,7 @@ -+add_executable(js_server js_server.cxx) -+ -+target_link_libraries(js_server -+ ${PLIB_LIBRARIES} -+) -+ -+install(TARGETS js_server RUNTIME DESTINATION bin) Property changes on: head/games/flightgear/files/patch-JS_SERVER-utils-js_server-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/flightgear/files/patch-3rdparty-joystick-js.h =================================================================== --- head/games/flightgear/files/patch-3rdparty-joystick-js.h (nonexistent) +++ head/games/flightgear/files/patch-3rdparty-joystick-js.h (revision 471256) @@ -0,0 +1,25 @@ +Add missing defines and includes from removed ul.h + +--- 3rdparty/joystick/js.h.orig 2018-05-30 23:24:08.180090000 +0200 ++++ 3rdparty/joystick/js.h 2018-05-30 23:32:04.841896000 +0200 +@@ -25,10 +25,20 @@ + #define __INCLUDED_JS_H__ 1 + #define JS_NEW + ++#ifndef TRUE ++#define TRUE 1 ++#define FALSE 0 ++#endif ++ ++#include ++#include ++ + #include + #include + #include + ++#include /* for jsSetError and SG_WARN */ ++ + #define _JS_MAX_AXES 16 + #define _JS_MAX_BUTTONS 32 + #define _JS_MAX_HATS 4 Property changes on: head/games/flightgear/files/patch-3rdparty-joystick-js.h ___________________________________________________________________ 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: head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx =================================================================== --- head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx (nonexistent) +++ head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.cxx (revision 471256) @@ -0,0 +1,15 @@ +jsSetError() takes only two arguments (unlike ulSetError()) + +--- 3rdparty/joystick/jsBSD.cxx.orig 2018-05-28 23:22:56.449679000 +0200 ++++ 3rdparty/joystick/jsBSD.cxx 2018-05-28 23:50:32.852422000 +0200 +@@ -326,8 +289,8 @@ + error = ( joyfile == NULL ) ; + if ( error ) + { +- jsSetError ( SG_WARN, "unable to open calibration file %s (%s), joystick %i disabled (you can generate the calibration file with the plib-jscal utility)", +- joyfname, strerror ( errno ), id + 1 ); ++ jsSetError ( SG_WARN, "unable to open calibration file, you can generate " ++ "the calibration file with the plib-jscal utility" ); + return ; + } + Property changes on: head/games/flightgear/files/patch-3rdparty-joystick-jsBSD.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: head/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake =================================================================== --- head/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake (nonexistent) +++ head/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake (revision 471256) @@ -0,0 +1,13 @@ +Use all linker flags from pkgconf, including library path + +--- CMakeModules/SetupFGFSLibraries.cmake.orig 2018-05-29 23:46:55.859412000 +0200 ++++ CMakeModules/SetupFGFSLibraries.cmake 2018-05-29 23:47:59.869522000 +0200 +@@ -27,7 +27,7 @@ + endif() + + if(USE_DBUS) +- target_link_libraries(${target} ${DBUS_LIBRARIES}) ++ target_link_libraries(${target} ${DBUS_LDFLAGS}) + endif() + + if(FG_HAVE_GPERFTOOLS) Property changes on: head/games/flightgear/files/patch-CMakeModules-SetupFGFSLibraries.cmake ___________________________________________________________________ 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: head/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx =================================================================== --- head/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx (nonexistent) +++ head/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.cxx (revision 471256) @@ -0,0 +1,67 @@ +Import extra patch from x11-toolkits/plib + +--- 3rdparty/joystick/jsBSD.cxx.orig 2018-05-30 23:47:01.351096000 +0200 ++++ 3rdparty/joystick/jsBSD.cxx 2018-05-30 23:47:28.474434000 +0200 +@@ -64,6 +64,7 @@ + # else + # define HAVE_USBHID_H 1 + # include ++# include + # endif + } + #endif +@@ -116,54 +117,12 @@ + static char * + walkusbdev(int f, char *dev, char *out, int outlen) + { +- struct usb_device_info di; +- int i, a; +- char *cp; +- +- for (a = 1; a < USB_MAX_DEVICES; a++) { +- di.udi_addr = a; +- if (ioctl(f, USB_DEVICEINFO, &di) != 0) +- return NULL; +- for (i = 0; i < USB_MAX_DEVNAMES; i++) +- if (di.udi_devnames[i][0] && +- strcmp(di.udi_devnames[i], dev) == 0) { +- cp = new char[strlen(di.udi_vendor) + strlen(di.udi_product) + 2]; +- strcpy(cp, di.udi_vendor); +- strcat(cp, " "); +- strcat(cp, di.udi_product); +- strncpy(out, cp, outlen - 1); +- out[outlen - 1] = 0; +- delete cp; +- return out; +- } +- } + return NULL; + } + + static int + findusbdev(char *name, char *out, int outlen) + { +- int i, f; +- char buf[50]; +- char *cp; +- static int protection_warned = 0; +- +- for (i = 0; i < 16; i++) { +- sprintf(buf, "%s%d", USBDEV, i); +- f = open(buf, O_RDONLY); +- if (f >= 0) { +- cp = walkusbdev(f, name, out, outlen); +- close(f); +- if (cp) +- return 1; +- } else if (errno == EACCES) { +- if (!protection_warned) { +- fprintf(stderr, "Can't open %s for read!\n", +- buf); +- protection_warned = 1; +- } +- } +- } + return 0; + } + Property changes on: head/games/flightgear/files/patch-PLIB-3rdparty-joystick-jsBSD.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: head/games/flightgear/pkg-plist =================================================================== --- head/games/flightgear/pkg-plist (revision 471255) +++ head/games/flightgear/pkg-plist (revision 471256) @@ -1,42 +1,41 @@ bin/GPSsmooth bin/JSBSim bin/MIDGsmooth bin/UGsmooth bin/fgcom bin/fgelev bin/fgfs bin/fgjs bin/fgpanel bin/fgtraffic bin/fgviewer bin/js_demo -bin/js_server bin/metar bin/yasim bin/yasim-proptest man/it/man1/GPSsmooth.1.gz man/it/man1/JSBSim.1.gz man/it/man1/MIDGsmooth.1.gz man/it/man1/UGsmooth.1.gz man/it/man1/fgcom.1.gz man/it/man1/fgelev.1.gz man/it/man1/fgfs.1.gz man/it/man1/fgjs.1.gz man/it/man1/fgpanel.1.gz man/it/man1/fgviewer.1.gz man/it/man1/js_demo.1.gz man/it/man1/metar.1.gz man/it/man5/fgfsrc.5.gz man/man1/GPSsmooth.1.gz man/man1/JSBSim.1.gz man/man1/MIDGsmooth.1.gz man/man1/UGsmooth.1.gz man/man1/fgcom.1.gz man/man1/fgelev.1.gz man/man1/fgfs.1.gz man/man1/fgjs.1.gz man/man1/fgpanel.1.gz man/man1/fgviewer.1.gz man/man1/js_demo.1.gz man/man1/metar.1.gz man/man5/fgfsrc.5.gz Index: head/games/flightgear-data/Makefile =================================================================== --- head/games/flightgear-data/Makefile (revision 471255) +++ head/games/flightgear-data/Makefile (revision 471256) @@ -1,43 +1,43 @@ # Created by: Brian Buchanan # $FreeBSD$ PORTNAME= flightgear-data -PORTVERSION= 2018.1.1 +PORTVERSION= 2018.2.1 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_aarch64= Fails to install: runaway process BROKEN_mips64= Fails to install: runaway process NO_BUILD= yes USES= tar:bzip2 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 471255) +++ head/games/flightgear-data/distinfo (revision 471256) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523304831 -SHA256 (FlightGear-2018.1.1-data.tar.bz2) = dfd80e09f6bf04bd25604788c080716007969d127d46d0e10c43c2f709fb8db8 -SIZE (FlightGear-2018.1.1-data.tar.bz2) = 1576049981 +TIMESTAMP = 1527110762 +SHA256 (FlightGear-2018.2.1-data.tar.bz2) = 3d5dbf9b584b135699aadff0f51017fac37aefd1157e00adbba1d4855a1b24e9 +SIZE (FlightGear-2018.2.1-data.tar.bz2) = 1618697853