Index: head/biology/bamtools/Makefile =================================================================== --- head/biology/bamtools/Makefile (revision 522974) +++ head/biology/bamtools/Makefile (revision 522975) @@ -1,22 +1,23 @@ # $FreeBSD$ PORTNAME= bamtools DISTVERSIONPREFIX= v DISTVERSION= 2.5.1 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org COMMENT= API and toolkit for handling BAM files LICENSE= MIT LIB_DEPENDS+= libjsoncpp.so:devel/jsoncpp USES= cmake USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= pezmaster31 CMAKE_ON+= BUILD_SHARED_LIBS .include Index: head/devel/cmake/Makefile =================================================================== --- head/devel/cmake/Makefile (revision 522974) +++ head/devel/cmake/Makefile (revision 522975) @@ -1,99 +1,100 @@ # Created by: Kyle Martin # $FreeBSD$ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= 3.16.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \ https://www.cmake.org/files/v${PORTVERSION}/ MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform Makefile generator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash USES= compiler:c++11-lang ncurses HAS_CONFIGURE= yes CONFIGURE_ENV= MAKE=make CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir="/${DATADIR_REL}" \ --docdir="/${DOCSDIR_REL}" \ --system-libs \ --parallel=${MAKE_JOBS_NUMBER} \ --init="${WRKSRC}/InitialCache.cmake" OPTIONS_DEFINE= DOCS MANPAGES CPACK OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes MANPAGES_USES= python:env MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_ON= --sphinx-man CPACK_DESC= Enable FreeBSD generator in CPack (experimental) CPACK_LIB_DEPENDS= libpkg.so:ports-mgmt/pkg CPACK_USES_OFF= libarchive # When CPACK is on, uses base libarchive and won't pass stage-qa CONFLICTS_INSTALL= cmake-modules-* .include .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG) INSTALL_TARGET= install/strip .endif # Before running configure, substitute in the values of options # for the build. CMake's configure doesn't accept --with-foo # or similar options: it expects them to be set in CMake-style # syntax in the initial cache. pre-configure: @${CP} "${FILESDIR}/InitialCache.cmake" "${WRKSRC}/InitialCache.cmake" pre-configure-CPACK-on: @${REINPLACE_CMD} \ -e 's/@@CPACK_OPTION_VALUE@@/ON/' \ -e 's/@@CPACK_OPTION_COMMENT@@//' \ "${WRKSRC}/InitialCache.cmake" pre-configure-CPACK-off: @${REINPLACE_CMD} \ -e 's/@@CPACK_OPTION_VALUE@@/OFF/' \ -e 's/@@CPACK_OPTION_COMMENT@@/# /' \ "${WRKSRC}/InitialCache.cmake" post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ ${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \ s,/usr/X11R6,${LOCALBASE},g' @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${WRKSRC}/Source/cmLocalGenerator.cxx \ ${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \ ${WRKSRC}/bootstrap @${REINPLACE_CMD} -e 's,/opt/kde4,${PREFIX},g' \ ${WRKSRC}/Modules/FindKDE4.cmake @${REINPLACE_CMD} -e 's,/usr/include,${LOCALBASE}/include,' \ ${WRKSRC}/Modules/FindDCMTK.cmake @${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete # cmake-gui(1) is installed by devel/cmake-gui. Remove the man page's source to # prevent it from being built/installed by devel/cmake. ${RM} ${WRKSRC}/Help/manual/cmake-gui.1.rst post-install: ${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp # The .NoDartCoverage is supposed to suppress testing in the # source directories, but gets accidentally installed. @${FIND} ${STAGEDIR}${PREFIX} -name ".NoDartCoverage" -delete .include Index: head/devel/cmake-gui/Makefile =================================================================== --- head/devel/cmake-gui/Makefile (revision 522974) +++ head/devel/cmake-gui/Makefile (revision 522975) @@ -1,51 +1,52 @@ # $FreeBSD$ PORTNAME= cmake DISTVERSION= 3.16.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -gui MAINTAINER= kde@FreeBSD.org COMMENT= Qt-based GUI for CMake LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt BUILD_DEPENDS= sphinx-build:textproc/py-sphinx LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash USES= cmake:run,insource compiler:c++11-lang desktop-file-utils libarchive \ shared-mime-info qt:5 USE_QT= core gui widgets buildtools_build qmake_build CMAKE_OFF= BUILD_CursesDialog \ CMake_SPHINX_DEPEND_ON_EXECUTABLES CMAKE_ON= BUILD_QtDialog \ CMAKE_USE_SYSTEM_LIBRARIES \ SPHINX_MAN CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \ ALL_TARGET= cmake-gui documentation INSTALL_WRKSRC= ${WRKSRC}/Source/QtDialog DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ ${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \ s,/usr/X11R6,${LOCALBASE},g' pre-install: ${LN} -sf ${CMAKE_BIN} ${WRKSRC}/bin post-install: ${INSTALL_MAN} ${WRKSRC}/Utilities/Sphinx/man/cmake-gui.1 \ ${STAGEDIR}${PREFIX}/man/man1 .include Index: head/devel/jsoncpp/files/patch-SConstruct =================================================================== --- head/devel/jsoncpp/files/patch-SConstruct (revision 522974) +++ head/devel/jsoncpp/files/patch-SConstruct (nonexistent) @@ -1,72 +0,0 @@ ---- SConstruct.orig 2016-05-09 23:15:49 UTC -+++ SConstruct -@@ -26,7 +26,7 @@ try: - if platform == 'linux-gcc': - CXX = 'g++' # not quite right, but env is not yet available. - import commands -- version = commands.getoutput('%s -dumpversion' %CXX) -+ version = 'FreeBSD' - platform = 'linux-gcc-%s' %version - print "Using platform '%s'" %platform - LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '') -@@ -65,7 +65,7 @@ def make_environ_vars(): - return vars - - --env = Environment( ENV = make_environ_vars(), -+env = Environment( ENV = os.environ, - toolpath = ['scons-tools'], - tools=[] ) #, tools=['default'] ) - -@@ -121,6 +121,7 @@ elif platform.startswith('linux-gcc'): - env.Tool( 'default' ) - env.Append( LIBS = ['pthread'], CCFLAGS = os.environ.get("CXXFLAGS", "-Wall"), LINKFLAGS=os.environ.get("LDFLAGS", "") ) - env['SHARED_LIB_ENABLED'] = True -+ env['CXX'] = os.environ['CXX'] - else: - print "UNSUPPORTED PLATFORM." - env.Exit(1) -@@ -147,6 +148,11 @@ env['JSONCPP_VERSION'] = JSONCPP_VERSION - env['BUILD_DIR'] = env.Dir(build_dir) - env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir) - env['DIST_DIR'] = DIST_DIR -+ -+# Set SHLIBVERSION for env.InstallVersionedLib(). We use the version number -+# without the "-rcXX" part. -+env['SHLIBVERSION'] = JSONCPP_VERSION.partition('-')[0] -+ - if 'TarGz' in env['BUILDERS']: - class SrcDistAdder: - def __init__( self, env ): -@@ -164,11 +170,11 @@ env['SRCDIST_ADD'] = SrcDistAdder( env ) - env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] ) - - env_testing = env.Clone( ) --env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] ) -+env_testing.Append( LIBS = ['jsoncpp'] ) - - def buildJSONExample( env, target_sources, target_name ): - env = env.Clone() -- env.Append( CPPPATH = ['#'] ) -+ #env.Append( CPPPATH = ['#'] ) - exe = env.Program( target=target_name, - source=target_sources ) - env['SRCDIST_ADD']( source=[target_sources] ) -@@ -187,14 +193,14 @@ def buildUnitTests( env, target_sources, - env.AlwaysBuild( check_alias_target ) - - def buildLibrary( env, target_sources, target_name ): -- static_lib = env.StaticLibrary( target=target_name + '_${LIB_NAME_SUFFIX}', -+ static_lib = env.StaticLibrary( target=target_name, - source=target_sources ) - global lib_dir - env.Install( lib_dir, static_lib ) - if env['SHARED_LIB_ENABLED']: -- shared_lib = env.SharedLibrary( target=target_name + '_${LIB_NAME_SUFFIX}', -+ shared_lib = env.SharedLibrary( target=target_name, - source=target_sources ) -- env.Install( lib_dir, shared_lib ) -+ env.InstallVersionedLib( lib_dir, shared_lib ) - env['SRCDIST_ADD']( source=[target_sources] ) - - Export( 'env env_testing buildJSONExample buildLibrary buildJSONTests buildUnitTests' ) Property changes on: head/devel/jsoncpp/files/patch-SConstruct ___________________________________________________________________ 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/devel/jsoncpp/files/patch-src_lib__json_sconscript =================================================================== --- head/devel/jsoncpp/files/patch-src_lib__json_sconscript (revision 522974) +++ head/devel/jsoncpp/files/patch-src_lib__json_sconscript (nonexistent) @@ -1,8 +0,0 @@ ---- src/lib_json/sconscript.orig 2016-05-09 23:15:49 UTC -+++ src/lib_json/sconscript -@@ -5,4 +5,4 @@ buildLibrary( env, Split( """ - json_value.cpp - json_writer.cpp - """ ), -- 'json' ) -+ 'jsoncpp' ) Property changes on: head/devel/jsoncpp/files/patch-src_lib__json_sconscript ___________________________________________________________________ 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/devel/jsoncpp/Makefile =================================================================== --- head/devel/jsoncpp/Makefile (revision 522974) +++ head/devel/jsoncpp/Makefile (revision 522975) @@ -1,44 +1,20 @@ # Created by: Johan Str??m # $FreeBSD$ PORTNAME= jsoncpp -PORTVERSION= 1.8.1 -PORTREVISION= 7 +PORTVERSION= 1.9.2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= JSON reader and writer library for C++ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +USES= compiler:c++11-lang meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= open-source-parsers - -USES= compiler:c++11-lang dos2unix scons +MESON_ARGS= --default-library=both USE_LDCONFIG= yes - -PLATFORM= linux-gcc-FreeBSD -MAKE_ARGS= platform=${PLATFORM} - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp - (cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/) - ${INSTALL_DATA} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.a \ - ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/libs/${PLATFORM}/libjsoncpp.so.${DISTVERSION} \ - ${STAGEDIR}${PREFIX}/lib - ${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so.1 - ${LN} -s libjsoncpp.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libjsoncpp.so - ${CP} ${WRKSRC}/pkg-config/jsoncpp.pc.in ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc - @${REINPLACE_CMD} -i '' \ - -e 's|@CMAKE_INSTALL_FULL_LIBDIR@|${PREFIX}/lib|g' \ - -e 's|@CMAKE_INSTALL_FULL_INCLUDEDIR@|${PREFIX}/include/jsoncpp|g' \ - -e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc - -do-test: - @${ECHO} "Please note that 3 testcases are known to fail: https://github.com/open-source-parsers/jsoncpp/issues/628" - @cd ${WRKSRC} && CXX=${CXX} ${SCONS} platform=${PLATFORM} check .include Index: head/devel/jsoncpp/distinfo =================================================================== --- head/devel/jsoncpp/distinfo (revision 522974) +++ head/devel/jsoncpp/distinfo (revision 522975) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498626054 -SHA256 (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 858db2faf348f89fdf1062bd3e79256772e897e7f17df73e0624edf004f2f9ac -SIZE (open-source-parsers-jsoncpp-1.8.1_GH0.tar.gz) = 210629 +TIMESTAMP = 1577016318 +SHA256 (open-source-parsers-jsoncpp-1.9.2_GH0.tar.gz) = 77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0 +SIZE (open-source-parsers-jsoncpp-1.9.2_GH0.tar.gz) = 211341 Index: head/devel/jsoncpp/pkg-plist =================================================================== --- head/devel/jsoncpp/pkg-plist (revision 522974) +++ head/devel/jsoncpp/pkg-plist (revision 522975) @@ -1,16 +1,15 @@ -include/jsoncpp/json/allocator.h -include/jsoncpp/json/assertions.h -include/jsoncpp/json/autolink.h -include/jsoncpp/json/config.h -include/jsoncpp/json/features.h -include/jsoncpp/json/forwards.h -include/jsoncpp/json/json.h -include/jsoncpp/json/reader.h -include/jsoncpp/json/value.h -include/jsoncpp/json/version.h -include/jsoncpp/json/writer.h +include/json/allocator.h +include/json/assertions.h +include/json/autolink.h +include/json/config.h +include/json/forwards.h +include/json/json.h +include/json/json_features.h +include/json/reader.h +include/json/value.h +include/json/version.h +include/json/writer.h lib/libjsoncpp.a lib/libjsoncpp.so -lib/libjsoncpp.so.1 -lib/libjsoncpp.so.1.8.1 +lib/libjsoncpp.so.22 libdata/pkgconfig/jsoncpp.pc Index: head/devel/opendht/Makefile =================================================================== --- head/devel/opendht/Makefile (revision 522974) +++ head/devel/opendht/Makefile (revision 522975) @@ -1,44 +1,45 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= opendht DISTVERSION= 1.10.1 +PORTREVISION= 1 CATEGORIES= devel net MAINTAINER= yuri@FreeBSD.org COMMENT= Lightweight Distributed Hash Table implementation LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libargon2.so:security/libargon2 \ libjsoncpp.so:devel/jsoncpp \ libmsgpackc.so:devel/msgpack \ libnettle.so:security/nettle \ libgnutls.so:security/gnutls USES= cmake compiler:c++11-lib pathfix pkgconfig readline:port USE_GITHUB= yes GH_ACCOUNT= savoirfairelinux USE_LDCONFIG= yes CMAKE_OFF= OPENDHT_STATIC PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} OPTIONS_DEFINE= PROXY_SERVER PROXY_CLIENT PUSH_NOTIFICATIONS DOCS PROXY_SERVER_DESC= Enable DHT proxy server PROXY_CLIENT_DESC= Enable DHT proxy client PUSH_NOTIFICATIONS_DESC= Enable push notifications support PROXY_SERVER_CMAKE_BOOL= OPENDHT_PROXY_SERVER PROXY_CLIENT_CMAKE_BOOL= OPENDHT_PROXY_CLIENT PUSH_NOTIFICATIONS_CMAKE_BOOL= OPENDHT_PUSH_NOTIFICATIONS PROXY_SERVER_LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp \ librestbed.so:www/restbed PORTDOCS= * .include Index: head/graphics/open3d/Makefile =================================================================== --- head/graphics/open3d/Makefile (revision 522974) +++ head/graphics/open3d/Makefile (revision 522975) @@ -1,37 +1,37 @@ # $FreeBSD$ PORTNAME= Open3D DISTVERSIONPREFIX= v DISTVERSION= 0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org COMMENT= Modern library for 3D data processing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../LICENSE LIB_DEPENDS= libglfw.so:graphics/glfw \ libjsoncpp.so:devel/jsoncpp \ libpng.so:graphics/png USES= cmake compiler:c++14-lang eigen:3 gl jpeg localbase:ldflags \ pkgconfig USE_GITHUB= yes GH_ACCOUNT= IntelVCL USE_GL= gl glew glu USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_TESTS BUILD_PYBIND11 BUILD_PYTHON_MODULE BUILD_PYTHON_TUTORIALS WRKSRC_SUBDIR= src LDFLAGS+= -pthread # https://github.com/IntelVCL/Open3D/issues/510 post-install: # https://github.com/IntelVCL/Open3D/issues/509 .for d in include/Open3D/IO/FileFormat include/Open3D/Visualization/Shader/GLSL @${RMDIR} ${STAGEDIR}${PREFIX}/${d} .endfor .include Index: head/graphics/ossim/Makefile =================================================================== --- head/graphics/ossim/Makefile (revision 522974) +++ head/graphics/ossim/Makefile (revision 522975) @@ -1,40 +1,41 @@ # $FreeBSD$ PORTNAME= ossim DISTVERSIONPREFIX= Neptune- DISTVERSION= 2.10.1 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= lbartoletti@tuxfamily.org COMMENT= Powerful suite of geospatial libraries and applications LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/bin/git:devel/git LIB_DEPENDS= libgeos.so:graphics/geos \ libgeotiff.so:graphics/libgeotiff \ libjsoncpp.so:devel/jsoncpp \ libtiff.so:graphics/tiff \ libopenjp2.so:graphics/openjpeg \ libfreetype.so:print/freetype2 \ libOpenThreads.so:graphics/osg34 USES= cmake compiler:c++11-lang jpeg localbase USE_GITHUB= yes GH_ACCOUNT= ossimlabs USE_LDCONFIG= yes CMAKE_OFF= BUILD_OSSIM_APPS CMAKE_ARGS= -DBUILD_LIBRARY_DIR:STRING=lib \ -DLIBSUFFIX:STRING="" \ -DINSTALL_ARCHIVE_DIR:STRING=lib \ -DINSTALL_LIBRARY_DIR:STRING=lib \ -DOSSIM_INCLUDE_DIR:STRING=${WRKSRC}/include OPTIONS_DEFINE= TEST OPTIONS_SUB= yes TEST_CMAKE_BOOL= BUILD_OSSIM_TESTS .include Index: head/lang/solidity/Makefile =================================================================== --- head/lang/solidity/Makefile (revision 522974) +++ head/lang/solidity/Makefile (revision 522975) @@ -1,43 +1,44 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= solidity PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= Solidity Contract-Oriented Programming Language LICENSE= GPLv3 NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe sparc64 NOT_FOR_ARCHS_REASON= solidity currently does not support big endian systems BUILD_DEPENDS= boost-libs>=0:devel/boost-libs LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp USES= cmake compiler:c++14-lang OPTIONS_DEFINE= Z3 CVC4 OPTIONS_DEFAULT=CVC4 Z3_DESC= SMT Checker via Z3 CVC4_DESC= SMT Checker via CVC4 Z3_LIB_DEPENDS= libz3.so:math/z3 CVC4_LIB_DEPENDS= libcvc4.so:math/cvc4 libgmp.so:math/gmp Z3_CMAKE_OFF= USE_Z3 CVC4_CMAKE_OFF= USE_CVC4 CMAKE_ARGS+= -DUSE_LD_GOLD=OFF -DTESTS=OFF \ -DJSONCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/jsoncpp" \ -DJSONCPP_LIB_DIR:STRING="${LOCALBASE}/lib" PLIST_FILES= bin/solc pre-patch: @${CP} ${FILESDIR}/jsoncpp.cmake ${WRKSRC}/cmake/ @${REINPLACE_CMD} '/EthCcache/d' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} '/-Werror/d' ${WRKSRC}/cmake/EthCompilerSettings.cmake .include Index: head/math/cadabra2/Makefile =================================================================== --- head/math/cadabra2/Makefile (revision 522974) +++ head/math/cadabra2/Makefile (revision 522975) @@ -1,48 +1,49 @@ # $FreeBSD$ PORTNAME= cadabra2 DISTVERSION= 2.2.8 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Computer algebra system for solving field theory problems LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/doc/license.txt BUILD_DEPENDS= ${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp LIB_DEPENDS= ${PY_BOOST} \ libboost_system.so:devel/boost-libs \ libpcrecpp.so:devel/pcre \ libjsoncpp.so:devel/jsoncpp \ libgmp.so:math/gmp \ libuuid.so:misc/e2fsprogs-libuuid RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} USES= compiler:c++14-lang cmake:noninja dos2unix gettext-runtime gnome localbase:ldflags pkgconfig python:3.4+ sqlite # USES=python picks random python versions USE_GITHUB= yes GH_ACCOUNT= kpeeters DOS2UNIX_FILES= cmake/version.cmake USE_GNOME= glib20 glibmm libsigc++20 USE_TEX= base texmf texhash USE_LDCONFIG= yes OPTIONS_SUB= yes CMAKE_ON= ENABLE_SYSTEM_JSONCPP USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76 CMAKE_OFF= ENABLE_MATHEMATICA CXXFLAGS+= -I${LOCALBASE}/include/jsoncpp LDFLAGS+= -ljsoncpp OPTIONS_DEFINE= GUI OPTIONS_DEFAULT= GUI GUI_USES= desktop-file-utils GUI_USE= GNOME=gtkmm30,gdkpixbuf2 GUI_CMAKE_BOOL= ENABLE_FRONTEND GUI_VARS= INSTALLS_ICONS=yes post-extract: # unbundle @${RM} -r ${WRKSRC}/libs/jsoncpp ${WRKSRC}/libs/websocketpp .include Index: head/misc/ignition-fuel-tools/Makefile =================================================================== --- head/misc/ignition-fuel-tools/Makefile (revision 522974) +++ head/misc/ignition-fuel-tools/Makefile (revision 522975) @@ -1,42 +1,42 @@ # $FreeBSD$ PORTNAME= ignition-fuel-tools DISTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ MAINTAINER= yuri@FreeBSD.org COMMENT= Classes and tools for interacting with Ignition Fuel LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake LIB_DEPENDS= libcurl.so:ftp/curl \ libignition-common3.so:devel/ignition-common \ libjsoncpp.so:devel/jsoncpp \ libuuid.so:misc/e2fsprogs-libuuid \ libyaml.so:textproc/libyaml \ libzip.so:archivers/libzip USES= cmake compiler:c++17-lang pkgconfig USE_LDCONFIG= yes CMAKE_OFF= BUILD_TESTING BB_ACCOUNT= ignitionrobotics BB_PROJECT= ign-fuel-tools BB_COMMIT= 0ffbf3a2c836 WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} PLIST_SUB+= FUEL_TOOLS_IGN_VER=fuel_tools${DISTVERSION:R:R} do-test: # 4 tests are known to fail: https://bitbucket.org/ignitionrobotics/ign-fuel-tools/issues/48/4-unit-tests-fail-unit_fuelclient_test @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include Index: head/multimedia/libopenshot/Makefile =================================================================== --- head/multimedia/libopenshot/Makefile (revision 522974) +++ head/multimedia/libopenshot/Makefile (revision 522975) @@ -1,53 +1,54 @@ # $FreeBSD$ PORTNAME= libopenshot DISTVERSIONPREFIX= v DISTVERSION= 0.2.3-595 +PORTREVISION= 1 DISTVERSIONSUFFIX= -ga1158ee CATEGORIES= multimedia MAINTAINER= tatsuki_makino@hotmail.com COMMENT= OpenShot Video Library LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= swig3.0:devel/swig30 \ unittest-cpp>=0:devel/unittest-cpp \ ${LOCALBASE}/include/zmq.hpp:net/cppzmq LIB_DEPENDS= libopenshot-audio.so:audio/libopenshot-audio \ libjsoncpp.so:devel/jsoncpp \ libzmq.so:net/libzmq4 USES= cmake compiler:c++11-lang pkgconfig python:3.5+ qt:5 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= OpenShot USE_PYTHON= noflavors USE_QT= core gui network multimedia widgets qmake_build buildtools_build CMAKE_ON= USE_SYSTEM_JSONCPP DISABLE_BUNDLED_JSONCPP\ DISABLE_TESTS\ CMAKE_DISABLE_FIND_PACKAGE_Doxygen\ CMAKE_DISABLE_FIND_PACKAGE_RESVG\ CMAKE_DISABLE_FIND_PACKAGE_Ruby CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=ON OPTIONS_DEFAULT= FFMPEG OPTIONS_RADIO= IMAGEMAGICK OPTIONS_RADIO_IMAGEMAGICK= IMAGEMAGICK6 IMAGEMAGICK7 OPTIONS_SINGLE= LIBAVCODEC OPTIONS_SINGLE_LIBAVCODEC= FFMPEG LIBAV FFMPEG_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg IMAGEMAGICK6_DESC= with ImageMagick6 IMAGEMAGICK6_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 IMAGEMAGICK6_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO IMAGEMAGICK7_DESC= with ImageMagick7 IMAGEMAGICK7_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7 IMAGEMAGICK7_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick:BOOL=NO LIBAV_LIB_DEPENDS= libavformat.so:multimedia/libav .if !exists(/usr/lib/libomp.so) LIB_DEPENDS+= libomp.so:devel/openmp .endif .include Index: head/net/flower/Makefile =================================================================== --- head/net/flower/Makefile (revision 522974) +++ head/net/flower/Makefile (revision 522975) @@ -1,29 +1,29 @@ # Created by: Ed Schouten # $FreeBSD$ PORTNAME= flower DISTVERSIONPREFIX= v DISTVERSION= 0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= ed@FreeBSD.org COMMENT= Label-based networking daemon LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libarpc.so:devel/arpc \ libjsoncpp.so:devel/jsoncpp USES= cmake:insource compiler:c++17-lang localbase:ldflags tar:xz USE_GITHUB= yes GH_ACCOUNT= NuxiNL CFLAGS+= -I${LOCALBASE}/include/jsoncpp # Require the unit tests to pass prior to installing. post-build: @trap '' PIPE && ${WRKSRC}/flower_unittests .include Index: head/net/libjson-rpc-cpp/Makefile =================================================================== --- head/net/libjson-rpc-cpp/Makefile (revision 522974) +++ head/net/libjson-rpc-cpp/Makefile (revision 522975) @@ -1,36 +1,36 @@ # $FreeBSD$ PORTNAME= libjson-rpc-cpp DISTVERSIONPREFIX= v DISTVERSION= 1.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net www devel MAINTAINER= greg@unrelenting.technology COMMENT= C++ framework for JSON-RPC 1.0 and 2.0 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libcurl.so:ftp/curl \ libmicrohttpd.so:www/libmicrohttpd \ libjsoncpp.so:devel/jsoncpp \ libargtable2.so:devel/argtable USES= cmake compiler:c++11-lang pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= cinemast CMAKE_OFF= COMPILE_TESTS COMPILE_EXAMPLES CMAKE_ON= UNIX_DOMAIN_SOCKET_SERVER UNIX_DOMAIN_SOCKET_CLIENT \ FILE_DESCRIPTOR_SERVER FILE_DESCRIPTOR_CLIENT OPTIONS_DEFINE= REDIS OPTIONS_SUB= yes REDIS_CMAKE_BOOL= REDIS_SERVER REDIS_CLIENT REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis .include Index: head/science/py-tensorflow/Makefile =================================================================== --- head/science/py-tensorflow/Makefile (revision 522974) +++ head/science/py-tensorflow/Makefile (revision 522975) @@ -1,159 +1,159 @@ # $FreeBSD$ PORTNAME= tensorflow DISTVERSIONPREFIX= v DISTVERSION= 1.14.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}.tar.gz MAINTAINER= amzo1337@gmail.com COMMENT= Computation using data flow graphs for scalable machine learning LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= ${RUN_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}grpcio-tools>=1.22.0:devel/py-grpcio-tools@${PY_FLAVOR} \ bash:shells/bash \ cython:lang/cython \ swig3.0:devel/swig30 \ bazel:devel/bazel029 LIB_DEPENDS= libsnappy.so:archivers/snappy \ liblmdb.so:databases/lmdb \ libsqlite3.so:databases/sqlite3 \ libicuio.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpcre.so:devel/pcre \ libnsync.so:devel/nsync \ libprotobuf.so:devel/protobuf \ libprotobuf-c.so:devel/protobuf-c \ libre2.so:devel/re2 \ libgif.so:graphics/giflib \ libpng.so:graphics/png \ libgpr.so:devel/grpc \ libcurl.so:ftp/curl \ libgoogle_cloud_cpp_common.so:devel/google-cloud-cpp \ libflatbuffers.so:devel/flatbuffers \ libdouble-conversion.so:devel/double-conversion RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}absl>=0.7.1:devel/py-absl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}astor>=0.5:devel/py-astor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gast>=0.2.2:devel/py-gast@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-pasta>=0.1.7:devel/py-google-pasta@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.1:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}grpcio>=1.22.0:devel/py-grpcio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}keras>=2.2.4:math/py-keras@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wrapt>=1.11.2:devel/py-wrapt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} USES= python:3.6+ shebangfix jpeg ssl SHEBANG_GLOB= *.py USE_GITHUB= yes USE_PYTHON= distutils BAZEL_BOOT= --output_user_root=${WRKDIR}/bazel_out PLIST_SUB= TF_PORT_VERSION=${PORTVERSION} OPTIONS_DEFINE= CPU_OPTS CPU_OPTS_DESC= Enable optimisations using features available on your CPU CPU_OPTS_VARS= CPU_TARGET=native BAZEL_COPT="-c opt --copt=-march=native --copt=-mfpmath=sse" CPU_OPTS_VARS_OFF= CPU_TARGET=x86-64 .include "Makefile.MASTER_SITES" post-patch: # Set up a local repository with our pre-downloaded packages # This prevents bazel downloading the files without modifying # the bzl files. @${MKDIR} ${WRKDIR}/bazel-cache @${MKDIR} ${WRKDIR}/bazel-distdir .for file in ${DISTFILES:C/\:(.*)//} @${ECHO} "Moving ${file} to ${WRKDIR}/bazel-cache" @${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKDIR}/bazel-distdir .endfor @cd ${WRKSRC} && \ ${REINPLACE_CMD} "s#--batch#${BAZEL_BOOT}\', \'--batch#" \ configure.py @${CP} ${PATCHDIR}/bazelrc ${WRKDIR}/bazelrc @${REINPLACE_CMD} "s#%%BAZEL_DIR%%#${WRKDIR}#" ${WRKDIR}/bazelrc @${REINPLACE_CMD} "s#%%BAZEL_DIST%%#${WRKDIR}#" ${WRKDIR}/bazelrc @${REINPLACE_CMD} "s#%%LOCALBASE%%#${LOCALBASE}#" ${WRKDIR}/bazelrc \ ${WRKSRC}/tensorflow/tensorflow.bzl ${WRKSRC}/.bazelrc \ ${WRKSRC}/tensorflow/core/BUILD \ ${WRKSRC}/third_party/systemlibs/protobuf.bzl do-configure: @cd ${WRKSRC} && ${SETENV} \ PYTHON_BIN_PATH=${PYTHON_CMD} \ PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \ TF_NEED_JEMALLOC=0 \ TF_NEED_KAFKA=0 \ TF_NEED_OPENCL_SYCL=0 \ TF_NEED_AWS=0 \ TF_NEED_GCP=0 \ TF_NEED_HDFS=0 \ TF_NEED_S3=0 \ TF_ENABLE_XLA=0 \ TF_NEED_GDR=0 \ TF_NEED_VERBS=0 \ TF_NEED_OPENCL=0 \ TF_NEED_MPI=0 \ TF_NEED_TENSORRT=0 \ TF_NEED_NGRAPH=0 \ TF_NEED_IGNITE=0 \ TF_NEED_ROCM=0 \ TF_NEED_CUDA=0 \ TF_SET_ANDROID_WORKSPACE=0 \ TF_DOWNLOAD_CLANG=0 \ TF_NEED_NCCL=0 \ TF_NEED_OPENCL=0 \ TF_IGNORE_MAX_BAZEL_VERSION=1 \ CC_OPT_FLAGS="-march=${CPU_TARGET} -I${LOCALBASE}/include" \ PREFIX="${LOCALBASE}" \ TF_SYSTEM_LIBS="absl_py astor_archive boringssl com_github_googleapis_googleapis com_github_googlecloudplatform_google_cloud_cpp com_google_protobuf \ com_google_protobuf_cc com_googlesource_code_re2 curl cython double_conversion enum34_archive flatbuffers gast_archive gif_archive \ grpc hwloc icu jpeg jsoncpp_git keras_applications_archive lmdb nasm nsync org_sqlite pasta pcre png_archive protobuf_archive \ six_archive snappy swig termcolor_archive wrapt zlib_archive" \ ./configure do-build: @cd ${WRKSRC} && \ bazel --bazelrc="${WRKDIR}/bazelrc" ${BAZEL_BOOT} build ${BAZEL_COPT} --host_copt="-I${LOCALBASE}/include" \ --host_linkopt="-L${LOCALBASE}/lib" --linkopt="-L${LOCALBASE}/lib" --config=opt \ --incompatible_no_support_tools_in_action_inputs=false \ --verbose_failures -s \ //tensorflow:libtensorflow.so \ //tensorflow:libtensorflow_cc.so \ //tensorflow:install_headers \ //tensorflow/tools/pip_package:build_pip_package @cd ${WRKSRC} && ${SETENV} TMPDIR=${WRKDIR} \ bazel-bin/tensorflow/tools/pip_package/build_pip_package \ ${WRKDIR}/whl do-install: @${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR} @${MKDIR} ${WRKDIR}/tmp @${UNZIP_NATIVE_CMD} -d ${WRKDIR}/tmp ${WRKDIR}/whl/${PORTNAME}-${PORTVERSION}-*.whl @${FIND} ${WRKDIR}/tmp -name "*.so*" | ${XARGS} ${STRIP_CMD} cd ${WRKDIR}/tmp && ${COPYTREE_SHARE} ${PORTNAME}-${PORTVERSION}.dist-info \ ${STAGEDIR}${PYTHON_SITELIBDIR} cd ${WRKDIR}/tmp/${PORTNAME}-${PORTVERSION}.data/purelib && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR} post-install: # autoplist: thousands of files, all under ${PYTHON_SITELIBDIR} @cd ${STAGEDIR}${PREFIX} && \ ${FIND} ${PYTHON_SITELIBDIR:C|^${LOCALBASE}/||} -type f -or -type l | grep -v "egg-info/" >> ${TMPPLIST} .include Index: head/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build =================================================================== --- head/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build (nonexistent) +++ head/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build (revision 522975) @@ -0,0 +1,23 @@ +--- third_party/systemlibs/jsoncpp.BUILD.orig 2019-06-19 00:48:23.000000000 +0200 ++++ third_party/systemlibs/jsoncpp.BUILD 2020-01-13 00:12:53.470881000 +0100 +@@ -7,8 +7,10 @@ + + HEADERS = [ + "include/json/autolink.h", ++ "include/json/allocator.h", ++ "include/json/assertions.h", + "include/json/config.h", +- "include/json/features.h", ++ "include/json/json_features.h", + "include/json/forwards.h", + "include/json/json.h", + "include/json/reader.h", +@@ -23,7 +25,7 @@ + cmd = """ + for i in $(OUTS); do + i=$${i##*/} +- ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i ++ ln -sf $(INCLUDEDIR)/json/$$i $(@D)/include/json/$$i + done + """, + ) Property changes on: head/science/py-tensorflow/files/patch-third__party_systemlibs_jsoncpp.build ___________________________________________________________________ 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/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 522974) +++ head/www/chromium/Makefile (revision 522975) @@ -1,349 +1,350 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium PORTVERSION= 78.0.3904.108 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= chromium@FreeBSD.org COMMENT?= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ .if !defined(GN_ONLY) BUILD_DEPENDS+= gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ node:www/node \ ${LOCALBASE}/bin/ar:devel/binutils \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} .endif .if !defined(GN_ONLY) LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous ONLY_FOR_ARCHS= aarch64 amd64 i386 .endif .if defined(GN_ONLY) USES= compiler:c++14-lang dos2unix localbase:ldflags ninja pkgconfig \ python:2.7,build shebangfix tar:xz .else USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg .endif MAKE_ARGS= -C out/${BUILDTYPE} BINARY_ALIAS= python=${PYTHON_CMD} DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h .if !defined(GN_ONLY) CPE_VENDOR= google CPE_PRODUCT= chrome USE_GL= gl USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes .endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ jumbo_file_merge_limit=8 \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_bundled_fontconfig=false \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_jumbo_build=true \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ google_default_client_id="996322985003.apps.googleusercontent.com" \ google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" .if !defined(GN_ONLY) SUB_FILES= chromium-browser.desktop chrome pkg-message SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER KERBEROS OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true \ GN_ARGS+=enable_hevc_demuxing=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false \ GN_ARGS+=enable_hevc_demuxing=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="lots of free disk space (~ 13GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ WANTSPACE="a fair amount of free disk space (~ 6.5GB)" DRIVER_MAKE_ARGS= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not # support falling back to ALSA or PulseAudio. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .endif .include "Makefile.tests" TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts${EXTRACT_SUFX}:fonts .include # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " .else PLIST_SUB+= NOT_AARCH64="" .endif # Make better javascript with java .if !defined(GN_ONLY) JAVA_BUILD= yes JAVA_VERSION= 1.8 USE_JAVA= yes .endif # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include .if !defined(GN_ONLY) pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory" @${ECHO_MSG} "and ${WANTSPACE}." @${ECHO_MSG} post-extract-TEST-on: @${MKDIR} ${WRKSRC}/third_party/test_fonts/test_fonts @${MV} ${WRKDIR}/test_fonts ${WRKSRC}/third_party/test_fonts/ post-patch: @${REINPLACE_CMD} -e 's|@@PACKAGE@@|chromium|' \ -e 's|@@MENUNAME@@|Chromium Web Browser|' \ ${WRKSRC}/chrome/app/resources/manpage.1.in post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/sndio_input.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* ${WRKSRC}/media/audio/openbsd pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} .endif do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} .if !defined(GN_ONLY) cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node # Setup java dependency on amd64 and i386 .if ${ARCH} == amd64 || ${ARCH} == i386 @${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java .endif .endif do-test-TEST-on: .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor .if !defined(GN_ONLY) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} # ANGLE, EGL, Vk .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .if ${BUILDTYPE} == Debug .for f in libVkLayer_core_validation.so libVkLayer_object_lifetimes.so libVkLayer_stateless_validation.so \ libVkLayer_thread_safety.so libVkLayer_unique_objects.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .endif # SwiftShader .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor .endif post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/www/iridium/Makefile =================================================================== --- head/www/iridium/Makefile (revision 522974) +++ head/www/iridium/Makefile (revision 522975) @@ -1,266 +1,266 @@ # Created by: Carlos J. Puga Medina # $FreeBSD$ PORTNAME= iridium PORTVERSION= 2019.04.73 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= chromium@FreeBSD.org COMMENT= Iridium browser LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BUILD_DEPENDS= gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ bash:shells/bash \ flock:sysutils/flock \ node:www/node \ ${LOCALBASE}/bin/ar:devel/binutils \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic ONLY_FOR_ARCHS= amd64 i386 USES= bison desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg USE_GL= gl USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt MAKE_ARGS= -C out/${BUILDTYPE} DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h BINARY_ALIAS= python=${PYTHON_CMD} ALL_TARGET= chrome INSTALLS_ICONS= yes EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ jumbo_file_merge_limit=8 \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_bundled_fontconfig=false \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_jumbo_build=true \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles SUB_FILES= iridium-browser.desktop iridium SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS CODECS_DESC= Compile and enable patented codecs like H.264 OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA CODECS CUPS KERBEROS OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true \ GN_ARGS+=enable_hevc_demuxing=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false \ GN_ARGS+=enable_hevc_demuxing=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="lots of free diskspace (~ 13GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ GN_ARGS+=remove_webcore_debug_symbols=true \ WANTSPACE="a fair amount of free diskspace (~ 6.5GB)" KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not # support falling back to ALSA. In theory it supports falling back to # PulseAudio, but this is untested. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # Make better javascript with java JAVA_BUILD= yes JAVA_VERSION= 1.8 USE_JAVA= yes # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Iridium, you should have around 2GB of memory" @${ECHO_MSG} "and ${WANTSPACE}." @${ECHO_MSG} post-patch: @${REINPLACE_CMD} -e 's|@@PACKAGE@@|iridium|' \ -e 's|@@MENUNAME@@|Iridium Web Browser|' \ ${WRKSRC}/chrome/app/resources/manpage.1.in post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/sndio_input.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* ${WRKSRC}/media/audio/openbsd pre-configure: # We used to remove bundled libraries to be sure that iridium uses # system libraries and not shippen ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node # Setup java dependency @${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/iridium.1 .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/iridium.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR}/iridium cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/iridium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/iridium ${STAGEDIR}${PREFIX}/bin # ANGLE .for f in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor # SwiftShader @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} .include Index: head/www/qt5-webengine/Makefile =================================================================== --- head/www/qt5-webengine/Makefile (revision 522974) +++ head/www/qt5-webengine/Makefile (revision 522975) @@ -1,149 +1,150 @@ # $FreeBSD$ # QtWebEngine itself is a very thin layer of Qt code on top of a large part of # Chromium (everything up to the content/ layer). As such, most of the work in # this port revolves around taming Chromium and getting it to build on FreeBSD. # While it does build at the moment, there are several items that should be # investigated or improved: # - We are using several stub files, especially in Chromium's base/ and net/ # layers. We should look at implementing the missing bits instead. # - We are currently not using any sandboxing mechanism. # - We need to see if more "use_system_" flags can be passed. # - The process of porting QtWebEngine needs to be documented so we can move to # newer releases more easily. # # Also note that, due to the insane amount of patches this port needs, it tends # to lag behind the rest of the official Qt5 ones, which is why we set # QT5_VERSION and DISTINFO_FILE here. PORTNAME= webengine DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 library to render web content BUILD_DEPENDS= bison:devel/bison \ ninja:devel/ninja \ yasm:devel/yasm \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libevent.so:devel/libevent \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libjsoncpp.so:devel/jsoncpp \ liblcms2.so:graphics/lcms2 \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp DISTINFO_FILE= ${.CURDIR}/distinfo QT5_VERSION= 5.13.2 OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA AUDIO_DESC= Audio backend # Need the alsa plugins to get sound at runtime, otherwise messages # that the pcm_oss plugin can't be opened. ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins ALSA_VARS= QMAKE_CONFIGURE_ARGS+=-alsa ALSA_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-alsa PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= QMAKE_CONFIGURE_ARGS+=-pulseaudio PULSEAUDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-pulseaudio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= QMAKE_CONFIGURE_ARGS+=-sndio SNDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-sndio # We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks # whether webenginewidgets is available, which fails when qmake processes all # .pro files at once. USES= gl gnome gperf jpeg python:2.7,build pkgconfig \ qmake:norecursive,outsource qt-dist:5,webengine shebangfix xorg USE_GL= gl USE_GNOME= glib20 libxml2 libxslt USE_QT= core declarative designer gui location network webchannel \ widgets buildtools_build qmake_build printsupport USE_XORG= x11 xcb xcomposite xcursor xext xi xorgproto \ xrandr xrender xscrnsaver xtst USE_LDCONFIG= ${QT_LIBDIR} QMAKE_CONFIGURE_ARGS= -proprietary-codecs -system-ffmpeg # We could just set it to an empty string as well. "all" does not account for # dependencies correctly in the generated Makefiles, use the right target here. ALL_TARGET= first # We need ar(1) from ports because the Chromium code uses the @file syntax. # We then need to ensure ld(1) from ports is used because of the archives ar(1) # generated. USE_BINUTILS= yes CC+= "-B${LOCALBASE}/bin" CXX+= "-B${LOCALBASE}/bin" # The build system reads the environment variable $NINJA_PATH to decide whether # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are # read by some Chromium code to determine which compiler to invoke when running # some configuration tests. # Since we use USES=qmake:norecursive, we also need to pass some variables to # MAKE_ENV because part of the configuration process happens during the build. CONFIGURE_ENV+= NINJAFLAGS="-j${MAKE_JOBS_NUMBER}" \ NINJA_PATH="${LOCALBASE}/bin/ninja" \ PATH=${CONFIGURE_WRKSRC}/bin:${LOCALBASE}/bin:${PATH} MAKE_ENV+= CC="${CC}" CXX="${CXX}" \ C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include \ ${CONFIGURE_ENV} .include .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 PLIST_SUB+= BE="" LE="@comment " .else PLIST_SUB+= BE="@comment " LE="" .endif post-extract: # Install FreeBSD's freebsd.pri file. ${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/core/config/freebsd.pri post-extract-SNDIO-on: @cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd @${CP} ${FILESDIR}/sndio_*put.* \ ${WRKSRC}/src/3rdparty/chromium/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* \ ${WRKSRC}/src/3rdparty/chromium/media/audio/openbsd .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 post-patch: @${REINPLACE_CMD} -e 's/icudtl.dat/icudtb.dat/' \ ${WRKSRC}/src/core/core_module.pro .endif pre-configure: # Link in ${PYTHON_CMD} to ${CONFIGURE_WRKSRC}/bin -- the scripts hardcode 'python' # in too many places to reasonably patch. So just link in ${PYTHON_CMD} to work around # $LOCALBASE/bin/python being python3 if the default versions is set to 3.x. ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python # Unbundle a few dependencies. ${PYTHON_CMD} ${WRKSRC}/src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py \ --system-libraries libwebp libxml libxslt yasm # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers. cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION} .include Index: head/x11/polybar/Makefile =================================================================== --- head/x11/polybar/Makefile (revision 522974) +++ head/x11/polybar/Makefile (revision 522975) @@ -1,85 +1,86 @@ # $FreeBSD$ PORTNAME= polybar DISTVERSION= 3.4.2 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= https://github.com/polybar/polybar/releases/download/${DISTVERSION}/ MAINTAINER= rigoletto@FreeBSD.org COMMENT= Fast and easy-to-use status bar LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= xcb-proto>=1.9:x11/xcb-proto LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libinotify.so:devel/libinotify \ libxcb-ewmh.so:x11/xcb-util-wm \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ libxcb-util.so:x11/xcb-util \ libxcb-xrm.so:x11/xcb-util-xrm # compiler:c++11-lang is needed for powerpc64 USES= cmake compiler:c++11-lang gnome localbase:ldflags \ pkgconfig python:3.5+,build tar xorg USE_GNOME= cairo USE_XORG= xcb # Needs libnl to work. Disabling it completely. CMAKE_OFF= ENABLE_NETWORK OPTIONS_DEFINE= ALSA CURSOR DEBUG GITHUB I3 IPC MPD PULSEAUDIO \ TESTS XKEYBOARD OPTIONS_DEFAULT= CURSOR GITHUB I3 IPC MPD PULSEAUDIO XKEYBOARD OPTIONS_SUB= yes ALSA_DESC= Shows volume and mute state for Alsa CURSOR_DESC= Required for click and scroll settings GITHUB_DESC= Shows the unread notification count I3_DESC= Uses the i3 IPC to display information IPC_DESC= Built-in IPC support MPD_DESC= Support for controlling MPD TESTS_DESC= Build testsuite XKEYBOARD_DESC= Shows the current layout and active indicators ALSA_CMAKE_BOOL= ENABLE_ALSA ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib CURSOR_CMAKE_BOOL= WITH_XCURSOR CURSOR_LIB_DEPENDS= libxcb-cursor.so:x11/xcb-util-cursor GITHUB_CMAKE_BOOL= ENABLE_CURL GITHUB_LIB_DEPENDS= libcurl.so:ftp/curl DEBUG_CMAKE_BOOL= DEBUG_LOGGER I3_BUILD_DEPENDS= ${LOCALBASE}/include/i3/ipc.h:x11-wm/i3 I3_CMAKE_BOOL= ENABLE_I3 I3_LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp IPC_CMAKE_BOOL= BUILD_IPC_MSG MPD_CMAKE_BOOL= ENABLE_MPD MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient PULSEAUDIO_CMAKE_BOOL= ENABLE_PULSEAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio # fail while building on poudriere because it needs network access # during the building process to download googletest on-the-fly. TESTS_BUILD_DEPENDS= git>=0:devel/git TESTS_CMAKE_BOOL= BUILD_TESTS XKEYBOARD_CMAKE_BOOL= ENABLE_XKEYBOARD XKEYBOARD_LIB_DEPENDS= libxcb-xkb.so:x11/libxcb WRKSRC= ${WRKDIR}/${PORTNAME} do-test-TESTS-on: cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \ ${SH} ${WRKSRC}/common/travis/tests.sh .include Index: head/x11/waybar/Makefile =================================================================== --- head/x11/waybar/Makefile (revision 522974) +++ head/x11/waybar/Makefile (revision 522975) @@ -1,86 +1,87 @@ # $FreeBSD$ PORTNAME= waybar DISTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= x11 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ # https://github.com/Alexays/Waybar/pull/425 PATCHFILES+= 2e9d80139411.patch:-p1 PATCHFILES+= 9ba4bfcb20f2.patch:-p1 PATCHFILES+= 2155d9560887.patch:-p1 PATCHFILES+= abc17ff5393c.patch:-p1 PATCHFILES+= d3ad69814f28.patch:-p1 PATCHFILES+= 4ceefa8ed4d9.patch:-p1 PATCHFILES+= 7675d81f3205.patch:-p1 PATCHFILES+= 4a151db3a433.patch:-p1 PATCHFILES+= e9263a38841b.patch:-p1 PATCHFILES+= acb51ccef3ab.patch:-p1 PATCHFILES+= 6349d48af076.patch:-p1 MAINTAINER= jbeich@FreeBSD.org COMMENT= Highly customizable Wayland bar for Sway and wlroots-based compositors LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= spdlog>0:devel/spdlog \ wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp \ libfmt.so:devel/libfmt \ libwayland-client.so:graphics/wayland USES= compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= gtkmm30 GH_ACCOUNT= Alexays GH_PROJECT= Waybar CPPFLAGS+= -D_WITH_GETLINE # XXX Remove after FreeBSD 11 EOL PLIST_FILES= bin/${PORTNAME} \ etc/xdg/${PORTNAME}/config \ etc/xdg/${PORTNAME}/style.css OPTIONS_DEFINE= DBUS GLS MANPAGES MPD PULSEAUDIO UDEV OPTIONS_DEFAULT=DBUS GLS MANPAGES MPD PULSEAUDIO UDEV DBUS_LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu DBUS_MESON_ENABLED= dbusmenu-gtk GLS_DESC= Use gtk-layer-shell library for popups support GLS_LIB_DEPENDS= libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell GLS_MESON_ENABLED= gtk-layer-shell MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= man/man5/${PORTNAME}-backlight.5.gz \ man/man5/${PORTNAME}-battery.5.gz \ man/man5/${PORTNAME}-clock.5.gz \ man/man5/${PORTNAME}-cpu.5.gz \ man/man5/${PORTNAME}-custom.5.gz \ man/man5/${PORTNAME}-disk.5.gz \ man/man5/${PORTNAME}-idle-inhibitor.5.gz \ man/man5/${PORTNAME}-memory.5.gz \ man/man5/${PORTNAME}-mpd.5.gz \ man/man5/${PORTNAME}-network.5.gz \ man/man5/${PORTNAME}-pulseaudio.5.gz \ man/man5/${PORTNAME}-states.5.gz \ man/man5/${PORTNAME}-sway-mode.5.gz \ man/man5/${PORTNAME}-sway-window.5.gz \ man/man5/${PORTNAME}-sway-workspaces.5.gz \ man/man5/${PORTNAME}-temperature.5.gz \ man/man5/${PORTNAME}-tray.5.gz \ man/man5/${PORTNAME}.5.gz \ MPD_DESC= Music Player Daemon support MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient MPD_MESON_ENABLED= mpd PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_ENABLED= pulseaudio UDEV_DESC= Monitor backlight level via libudev UDEV_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libudev.so:devel/libudev-devd UDEV_MESON_ENABLED= libudev .include