Index: head/databases/clickhouse/Makefile =================================================================== --- head/databases/clickhouse/Makefile (revision 513800) +++ head/databases/clickhouse/Makefile (revision 513801) @@ -1,117 +1,117 @@ # Created by: proler@gmail.com # $FreeBSD$ PORTNAME= clickhouse PORTVERSION= 19.11.5.28 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -stable -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MAINTAINER= proler@gmail.com COMMENT= ClickHouse is a column-oriented database management system LICENSE= APACHE20 ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "Only supported on amd64" BUILD_DEPENDS= bash:shells/bash \ sparsehash>=0:devel/sparsehash \ cctz>=0:devel/cctz \ rapidjson>=0:devel/rapidjson \ double-conversion>=0:devel/double-conversion LIB_DEPENDS= libtcmalloc.so:devel/google-perftools \ libodbc.so:databases/unixODBC \ libltdl.so:devel/libltdl \ libicudata.so:devel/icu \ libboost_program_options.so:devel/boost-libs \ libzookeeper_mt.so:devel/libzookeeper \ libre2.so:devel/re2 \ libzstd.so:archivers/zstd \ liblz4.so:archivers/liblz4 \ libPocoNet.so:devel/poco \ libunwind.so:devel/libunwind \ libcpuid.so:sysutils/libcpuid \ libbrotlicommon.so:archivers/brotli \ libsnappy.so:archivers/snappy \ libprotobuf.so:devel/protobuf \ libhs.so:devel/hyperscan \ libgtest.so:devel/googletest \ libdouble-conversion.so:devel/double-conversion RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ curl:ftp/curl \ bash:shells/bash \ expect:lang/expect \ sudo:security/sudo USES= compiler:c++17-lang cmake:insource iconv mysql perl5 python ssl \ readline shebangfix USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= yandex GH_PROJECT= ClickHouse USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= dbms/tests/performance/create_benchmark_page.py \ dbms/tests/clickhouse-test CMAKE_ARGS= -DUNBUNDLED=1 \ -DUSE_STATIC_LIBRARIES=0 \ -DENABLE_EMBEDDED_COMPILER=0 \ -DNO_WERROR=1 USERS= clickhouse GROUPS= clickhouse # The version stamp of libclickhouse.so doesn't always match ${PORTVERSION} SOVERSION= ${PORTVERSION} PLIST_SUB= SOVERSION=${SOVERSION} OPTIONS_DEFINE= TEST TEST_CMAKE_BOOL= ENABLE_TESTS .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif # Building with tests fails on 13.0-CURRENT@r346346 amd64 # Clang segfaults with an assertion error - see PR #237619 .if ${PORT_OPTIONS:MTEST} && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300014 BROKEN= fails to compile with Clang 8: Assertion error in getZExtValue() .endif .include post-patch: @${REINPLACE_CMD} -e 's|/var/lib/clickhouse|/var/db/clickhouse|;s|/var/log/clickhouse-server|/var/log/clickhouse|;s|/etc/clickhouse-server|${PREFIX}/etc/clickhouse-server|' ${WRKSRC}/dbms/programs/server/config.xml post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/clickhouse-compressor @${RM} ${STAGEDIR}${PREFIX}/bin/config-processor @${RM} ${STAGEDIR}${PREFIX}/bin/corrector_utf8 @${RM} -r ${STAGEDIR}${PREFIX}/include/gtest @${RM} ${STAGEDIR}${PREFIX}/lib/libgtest* ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/clickhouse-client/config.xml \ ${STAGEDIR}${PREFIX}/etc/clickhouse-client/config.xml.sample ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/clickhouse-server/config.xml \ ${STAGEDIR}${PREFIX}/etc/clickhouse-server/config.xml.sample ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/clickhouse-server/users.xml \ ${STAGEDIR}${PREFIX}/etc/clickhouse-server/users.xml.sample @${MKDIR} ${STAGEDIR}/var/db/clickhouse @${MKDIR} ${STAGEDIR}/var/log/clickhouse @${MKDIR} ${STAGEDIR}/var/run/clickhouse do-test-TEST-on: cd ${WRKSRC} && ctest -j4 -V .include Index: head/devel/android-tools-adb/files/Makefile =================================================================== --- head/devel/android-tools-adb/files/Makefile (revision 513800) +++ head/devel/android-tools-adb/files/Makefile (revision 513801) @@ -1,144 +1,142 @@ # $FreeBSD$ PROG_CXX=adb NOMAN= # DragonFly, NetBSD, OpenBSD NO_MAN= # FreeBSD BINDIR?=/usr/bin FILESDIR?=${DOCDIR}/${PROG} FILES= OVERVIEW.TXT SERVICES.TXT SYNC.TXT protocol.txt SRCS+= adb.cpp SRCS+= adb_io.cpp SRCS+= adb_listeners.cpp SRCS+= adb_trace.cpp SRCS+= adb_utils.cpp SRCS+= services.cpp SRCS+= shell_service_protocol.cpp SRCS+= socket_spec.cpp SRCS+= ../adb/sockets.cpp SRCS+= sysdeps_unix.cpp SRCS+= transport.cpp SRCS+= transport_local.cpp SRCS+= transport_usb.cpp TEST_SRCS+= adb_io_test.cpp TEST_SRCS+= adb_listeners_test.cpp TEST_SRCS+= adb_utils_test.cpp TEST_SRCS+= bugreport_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp TEST_SRCS+= socket_spec_test.cpp TEST_SRCS+= socket_test.cpp TEST_SRCS+= sysdeps_test.cpp TEST_SRCS+= transport_test.cpp TEST_SRCS+= types_test.cpp .PATH: ${.CURDIR}/client SRCS+= adb_client.cpp SRCS+= adb_install.cpp SRCS+= auth.cpp SRCS+= bugreport.cpp SRCS+= commandline.cpp SRCS+= console.cpp SRCS+= file_sync_client.cpp SRCS+= line_printer.cpp SRCS+= main.cpp SRCS+= transport_mdns${MDNSEXT}.cpp SRCS+= usb_libusb.cpp .PATH: ${.CURDIR}/fdevent SRCS+= fdevent.cpp SRCS+= fdevent_poll.cpp TEST_SRCS+= fdevent_test.cpp .PATH: ${.CURDIR}/sysdeps SRCS+= errno.cpp TEST_SRCS+= stat_test.cpp .PATH: ${.CURDIR}/sysdeps/posix SRCS+= network.cpp .PATH: ${.CURDIR}/../base SRCS+= chrono_utils.cpp SRCS+= file.cpp SRCS+= logging.cpp SRCS+= parsenetaddress.cpp SRCS+= stringprintf.cpp SRCS+= strings.cpp TEST_SRCS+= file_test.cpp TEST_SRCS+= logging_test.cpp TEST_SRCS+= parsenetaddress_test.cpp TEST_SRCS+= stringprintf_test.cpp TEST_SRCS+= strings_test.cpp TEST_SRCS+= test_main.cpp TEST_SRCS+= test_utils.cpp .PATH: ${.CURDIR}/../diagnose_usb SRCS+= diagnose_usb.cpp .PATH: ${.CURDIR}/../libcrypto_utils SRCS+= android_pubkey.c .PATH: ${.CURDIR}/../libcrypto_utils/tests TEST_SRCS+= android_pubkey_test.cpp .PATH: ${.CURDIR}/../libcutils SRCS+= socket_inaddr_any_server_unix.cpp SRCS+= socket_local_client_unix.cpp SRCS+= socket_local_server_unix.cpp SRCS+= socket_network_client_unix.cpp SRCS+= ../libcutils/sockets.cpp SRCS+= threads.cpp # DragonFly, NetBSD, OpenBSD CPPFLAGS.sockets.cpp+= -o ${.TARGET} CPPFLAGS+= -DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\"" CPPFLAGS+= -DADB_HOST=1 CPPFLAGS+= -Doff64_t=off_t CPPFLAGS+= -Dlseek64=lseek CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/client CPPFLAGS+= -I${.CURDIR}/../include CPPFLAGS+= -I${.CURDIR}/../base/include CPPFLAGS+= -I${.CURDIR}/../diagnose_usb/include CPPFLAGS+= -I${.CURDIR}/../libcrypto_utils/include CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}} CPPFLAGS+= $$(${PKG_CONFIG} libcrypto --cflags 2>/dev/null) CPPFLAGS+= $$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null) CXXFLAGS+= -std=gnu++2a .ifndef COMPILE.c CFLAGS+= ${CPPFLAGS} CXXFLAGS+= ${CPPFLAGS} .endif -TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags) -TEST_CPPFLAGS+= $$(${GMOCK_CONFIG} --cppflags) +TEST_CPPFLAGS+= $$(${PKG_CONFIG} gtest --cflags) +TEST_CPPFLAGS+= $$(${PKG_CONFIG} gmock --cflags) .for f in ${TEST_SRCS} CPPFLAGS.${f}+= ${TEST_CPPFLAGS} .endfor LDADD+= $$(${PKG_CONFIG} libcrypto --libs 2>/dev/null || echo -lcrypto) LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb) LDADD+= \-lpthread DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} -TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags) -TEST_LDADD+= $$(${GMOCK_CONFIG} --libs --ldflags) +TEST_LDADD+= $$(${PKG_CONFIG} gtest --libs) +TEST_LDADD+= $$(${PKG_CONFIG} gmock --libs) TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/} CLEANFILES+= ${PROG}_test ${TEST_OBJS} -GTEST_CONFIG?= gtest-config -GMOCK_CONFIG?= gmock-config PKG_CONFIG?= pkg-config beforeinstall: ${INSTALL} -d ${DESTDIR}${FILESDIR} .include test: ${PROG}_test @for f in ${.ALLSRC}; do ./$$f; done ${PROG}_test: ${OBJS:Nmain.o:Nadb_install.o:Ncommandline.o} ${TEST_OBJS} ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD} Index: head/devel/android-tools-simpleperf/files/Makefile =================================================================== --- head/devel/android-tools-simpleperf/files/Makefile (revision 513800) +++ head/devel/android-tools-simpleperf/files/Makefile (revision 513801) @@ -1,110 +1,110 @@ # $FreeBSD$ PROG_CXX=simpleperf NO_MAN= BINDIR?=/usr/bin SRCS+= callchain.cpp SRCS+= cmd_dumprecord.cpp SRCS+= cmd_help.cpp SRCS+= cmd_report.cpp SRCS+= command.cpp SRCS+= dso.cpp SRCS+= event_attr.cpp SRCS+= event_type.cpp SRCS+= main.cpp SRCS+= perf_regs.cpp SRCS+= read_apk.cpp SRCS+= read_elf.cpp SRCS+= record.cpp SRCS+= record_file_reader.cpp SRCS+= sample_tree.cpp SRCS+= thread_tree.cpp SRCS+= utils.cpp TEST_SRCS+= cmd_report_test.cpp TEST_SRCS+= command_test.cpp TEST_SRCS+= gtest_main.cpp TEST_SRCS+= read_apk_test.cpp TEST_SRCS+= read_elf_test.cpp TEST_SRCS+= record_test.cpp TEST_SRCS+= sample_tree_test.cpp .PATH: ${.CURDIR}/nonlinux_support SRCS+= nonlinux_support.cpp # required by simpleperf .PATH: ${.CURDIR}/../base SRCS+= file.cpp SRCS+= logging.cpp SRCS+= stringprintf.cpp SRCS+= strings.cpp TEST_SRCS+= file_test.cpp TEST_SRCS+= logging_test.cpp TEST_SRCS+= stringprintf_test.cpp TEST_SRCS+= strings_test.cpp TEST_SRCS+= test_utils.cpp # required by base .PATH: ${.CURDIR}/../liblog SRCS+= config_write.c SRCS+= fake_log_device.c SRCS+= fake_writer.c SRCS+= logger_lock.c SRCS+= logger_name.c SRCS+= logger_write.c CPPFLAGS.config_write.c+= -DFAKE_LOG_DEVICE=1 # required by libziparchive .PATH: ${.CURDIR}/../libutils SRCS+= FileMap.cpp # required by simpleperf .PATH: ${.CURDIR}/../libziparchive SRCS+= zip_archive.cc CPPFLAGS+= -D_WITH_GETLINE CPPFLAGS+= -DUSE_BIONIC_UAPI_HEADERS CPPFLAGS+= -Doff64_t=off_t CPPFLAGS+= -Dftruncate64=ftruncate CPPFLAGS+= -Dlseek64=lseek CPPFLAGS+= -Dmmap64=mmap CPPFLAGS+= -Dpread64=pread CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/nonlinux_support/include CPPFLAGS+= -I${.CURDIR}/../include CPPFLAGS+= -I${.CURDIR}/../base/include CPPFLAGS+= -I${.CURDIR}/../bionic/libc/kernel CPPFLAGS+= $$(${LLVM_CONFIG} --cppflags) CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}} CXXFLAGS+= -std=gnu++11 .ifndef COMPILE.c CFLAGS+= ${CPPFLAGS} CXXFLAGS+= ${CPPFLAGS} .endif -TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags) +TEST_CPPFLAGS+= $$(${PKG_CONFIG} gtest --cflags) .for f in ${TEST_SRCS} CPPFLAGS.${f}+= ${TEST_CPPFLAGS} .endfor LDADD!= ${LLVM_CONFIG} --system-libs --libs --ldflags --link-static LDADD+= -lz \-lpthread # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223191#c3 LDADD:= ${LDADD:S,-l/usr/lib/libexecinfo.so,-lexecinfo,} -TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags) +TEST_LDADD+= $$(${PKG_CONFIG} gtest --libs) TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/} CLEANFILES+= ${PROG}_test ${TEST_OBJS} LLVM_CONFIG?= llvm-config -GTEST_CONFIG?= gtest-config +PKG_CONFIG?= pkg-config .include test: ${PROG}_test @for f in ${.ALLSRC}; do ./$$f -t ${.CURDIR}/testdata; done ${PROG}_test: ${OBJS:Nmain.o} ${TEST_OBJS} ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD} Index: head/devel/googlemock/files/patch-Makefile.am =================================================================== --- head/devel/googlemock/files/patch-Makefile.am (revision 513800) +++ head/devel/googlemock/files/patch-Makefile.am (nonexistent) @@ -1,16 +0,0 @@ -Move custom headers into their own directory - ---- Makefile.am.orig 2016-11-03 20:36:28 UTC -+++ Makefile.am -@@ -42,7 +42,10 @@ pkginclude_internaldir = $(pkgincludedir - pkginclude_internal_HEADERS = \ - include/gmock/internal/gmock-generated-internal-utils.h \ - include/gmock/internal/gmock-internal-utils.h \ -- include/gmock/internal/gmock-port.h \ -+ include/gmock/internal/gmock-port.h -+ -+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom -+pkginclude_internal_custom_HEADERS = \ - include/gmock/internal/custom/gmock-generated-actions.h \ - include/gmock/internal/custom/gmock-matchers.h \ - include/gmock/internal/custom/gmock-port.h Property changes on: head/devel/googlemock/files/patch-Makefile.am ___________________________________________________________________ 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/googlemock/Makefile =================================================================== --- head/devel/googlemock/Makefile (revision 513800) +++ head/devel/googlemock/Makefile (revision 513801) @@ -1,45 +1,38 @@ # Created by: Cheng-Lung Sung # $FreeBSD$ PORTNAME= googlemock DISTVERSIONPREFIX= release- -DISTVERSION= 1.8.1 -PORTREVISION= 2 +DISTVERSION= 1.10.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Library for writing and using C++ mock classes LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_pthread.m4:devel/autoconf-archive \ - googletest>=1.8.0:devel/googletest LIB_DEPENDS= libgtest.so:devel/googletest USE_GITHUB= yes GH_ACCOUNT= google GH_PROJECT= googletest -USES= autoreconf compiler:c++11-lang libtool localbase python:run shebangfix -SHEBANG_FILES= scripts/gmock_doctor.py -WRKSRC_SUBDIR= ${PORTNAME} -GNU_CONFIGURE= yes -# fused-src python tests are only useful for bundling. There's no point in -# running them before installing system-wide without source files. -CONFIGURE_ENV= ac_cv_path_PYTHON=":" -TEST_TARGET= check -INSTALL_TARGET= install-strip +USES= cmake compiler:c++11-lib USE_LDCONFIG= yes +CMAKE_ON= BUILD_GMOCK BUILD_SHARED_LIBS -post-patch: - @${REINPLACE_CMD} '/acx_pthread.m4/d' ${WRKSRC}/configure.ac -# enable vendor make install again (revert 52277c9) - @${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \ - ${WRKSRC}/Makefile.am +OPTIONS_DEFINE= TEST +TEST_USES= python:build +TEST_CMAKE_BOOL= gmock_build_tests +TEST_TEST_TARGET= test + post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin +# Clean unused stuff: googletest, unprocessed headers + ${FIND} ${STAGEDIR}${PREFIX} \( -ipath "*gtest*" -o \ + -name '*.pump' -o -empty \) -delete + +pre-install-TEST-on: do-test .include Index: head/devel/googlemock/distinfo =================================================================== --- head/devel/googlemock/distinfo (revision 513800) +++ head/devel/googlemock/distinfo (revision 513801) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535728917 -SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c -SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298 +TIMESTAMP = 1570114335 +SHA256 (google-googletest-release-1.10.0_GH0.tar.gz) = 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb +SIZE (google-googletest-release-1.10.0_GH0.tar.gz) = 904349 Index: head/devel/googlemock/pkg-plist =================================================================== --- head/devel/googlemock/pkg-plist (revision 513800) +++ head/devel/googlemock/pkg-plist (revision 513801) @@ -1,27 +1,23 @@ -bin/gmock-config -bin/gmock_doctor.py include/gmock/gmock-actions.h include/gmock/gmock-cardinalities.h +include/gmock/gmock-function-mocker.h include/gmock/gmock-generated-actions.h include/gmock/gmock-generated-function-mockers.h include/gmock/gmock-generated-matchers.h -include/gmock/gmock-generated-nice-strict.h include/gmock/gmock-matchers.h include/gmock/gmock-more-actions.h include/gmock/gmock-more-matchers.h +include/gmock/gmock-nice-strict.h include/gmock/gmock-spec-builders.h include/gmock/gmock.h +include/gmock/internal/custom/README.md include/gmock/internal/custom/gmock-generated-actions.h include/gmock/internal/custom/gmock-matchers.h include/gmock/internal/custom/gmock-port.h -include/gmock/internal/gmock-generated-internal-utils.h include/gmock/internal/gmock-internal-utils.h include/gmock/internal/gmock-port.h -lib/libgmock.a +include/gmock/internal/gmock-pp.h lib/libgmock.so -lib/libgmock.so.0 -lib/libgmock.so.0.0.0 -lib/libgmock_main.a lib/libgmock_main.so -lib/libgmock_main.so.0 -lib/libgmock_main.so.0.0.0 +libdata/pkgconfig/gmock.pc +libdata/pkgconfig/gmock_main.pc Index: head/devel/googletest/files/patch-Makefile.am =================================================================== --- head/devel/googletest/files/patch-Makefile.am (revision 513800) +++ head/devel/googletest/files/patch-Makefile.am (nonexistent) @@ -1,16 +0,0 @@ -Move custom headers into their own directory - ---- Makefile.am.orig 2017-09-23 23:21:02 UTC -+++ Makefile.am -@@ -208,7 +208,10 @@ pkginclude_internal_HEADERS = \ - include/gtest/internal/gtest-port-arch.h \ - include/gtest/internal/gtest-string.h \ - include/gtest/internal/gtest-tuple.h \ -- include/gtest/internal/gtest-type-util.h \ -+ include/gtest/internal/gtest-type-util.h -+ -+pkginclude_internal_customdir = $(pkgincludedir)/internal/custom -+pkginclude_internal_custom_HEADERS = \ - include/gtest/internal/custom/gtest.h \ - include/gtest/internal/custom/gtest-port.h \ - include/gtest/internal/custom/gtest-printers.h Property changes on: head/devel/googletest/files/patch-Makefile.am ___________________________________________________________________ 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/googletest/files/patch-bsd-defines =================================================================== --- head/devel/googletest/files/patch-bsd-defines (revision 513800) +++ head/devel/googletest/files/patch-bsd-defines (nonexistent) @@ -1,178 +0,0 @@ -o Add DragonFly and GNU/kFreeBSD support -o Implement GetThreadCount() for BSDs - ---- include/gtest/internal/gtest-port-arch.h.orig 2017-09-23 23:21:02 UTC -+++ include/gtest/internal/gtest-port-arch.h -@@ -67,6 +67,10 @@ - # if TARGET_OS_IPHONE - # define GTEST_OS_IOS 1 - # endif -+#elif defined __DragonFly__ -+# define GTEST_OS_DRAGONFLY 1 -+#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__) -+# define GTEST_OS_GNU_KFREEBSD 1 - #elif defined __FreeBSD__ - # define GTEST_OS_FREEBSD 1 - #elif defined __Fuchsia__ ---- include/gtest/internal/gtest-port.h.orig 2018-08-31 15:21:57 UTC -+++ include/gtest/internal/gtest-port.h -@@ -125,7 +125,9 @@ - // - // GTEST_OS_AIX - IBM AIX - // GTEST_OS_CYGWIN - Cygwin -+// GTEST_OS_DRAGONFLY - DragonFly - // GTEST_OS_FREEBSD - FreeBSD -+// GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD - // GTEST_OS_FUCHSIA - Fuchsia - // GTEST_OS_HPUX - HP-UX - // GTEST_OS_LINUX - Linux -@@ -623,6 +625,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE - // to your compiler flags. - #define GTEST_HAS_PTHREAD \ - (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX || \ -+ GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_OPENBSD || \ - GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) - #endif // GTEST_HAS_PTHREAD - -@@ -829,7 +832,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE - (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ - GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ - GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || \ -- GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) -+ GTEST_OS_NETBSD || GTEST_OS_FUCHSIA || GTEST_OS_DRAGONFLY || \ -+ GTEST_OS_GNU_KFREEBSD) - # define GTEST_HAS_DEATH_TEST 1 - #endif - -@@ -856,7 +860,8 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE - (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX) - - // Determines whether test results can be streamed to a socket. --#if GTEST_OS_LINUX -+#if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \ -+ GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD - # define GTEST_CAN_STREAM_RESULTS_ 1 - #endif - ---- src/gtest-port.cc.orig 2017-09-23 23:21:02 UTC -+++ src/gtest-port.cc -@@ -52,6 +52,14 @@ - # include - #endif // GTEST_OS_MAC - -+#if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \ -+ GTEST_OS_NETBSD || GTEST_OS_OPENBSD -+# include -+# if GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD -+# include -+# endif -+#endif -+ - #if GTEST_OS_QNX - # include - # include -@@ -131,6 +139,80 @@ size_t GetThreadCount() { - } - } - -+#elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \ -+ GTEST_OS_NETBSD -+ -+#if GTEST_OS_NETBSD -+#undef KERN_PROC -+#define KERN_PROC KERN_PROC2 -+#define kinfo_proc kinfo_proc2 -+#endif -+ -+#if GTEST_OS_DRAGONFLY -+#define KP_NLWP(kp) (kp.kp_nthreads) -+#elif GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD -+#define KP_NLWP(kp) (kp.ki_numthreads) -+#elif GTEST_OS_NETBSD -+#define KP_NLWP(kp) (kp.p_nlwps) -+#endif -+ -+// Returns the number of threads running in the process, or 0 to indicate that -+// we cannot detect it. -+size_t GetThreadCount() { -+ int mib[] = { -+ CTL_KERN, -+ KERN_PROC, -+ KERN_PROC_PID, -+ getpid(), -+#if GTEST_OS_NETBSD -+ sizeof(struct kinfo_proc), -+ 1, -+#endif -+ }; -+ u_int miblen = sizeof(mib) / sizeof(mib[0]); -+ struct kinfo_proc info; -+ size_t size = sizeof(info); -+ if (sysctl(mib, miblen, &info, &size, NULL, 0)) { -+ return 0; -+ } -+ return KP_NLWP(info); -+} -+#elif GTEST_OS_OPENBSD -+ -+// Returns the number of threads running in the process, or 0 to indicate that -+// we cannot detect it. -+size_t GetThreadCount() { -+ int mib[] = { -+ CTL_KERN, -+ KERN_PROC, -+ KERN_PROC_PID | KERN_PROC_SHOW_THREADS, -+ getpid(), -+ sizeof(struct kinfo_proc), -+ 0, -+ }; -+ u_int miblen = sizeof(mib) / sizeof(mib[0]); -+ -+ // get number of structs -+ size_t size; -+ if (sysctl(mib, miblen, NULL, &size, NULL, 0)) { -+ return 0; -+ } -+ mib[5] = size / mib[4]; -+ -+ // populate array of structs -+ struct kinfo_proc info[mib[5]]; -+ if (sysctl(mib, miblen, &info, &size, NULL, 0)) { -+ return 0; -+ } -+ -+ // exclude empty members -+ int nthreads = 0; -+ for (int i = 0; i < size / mib[4]; i++) { -+ if (info[i].p_tid != -1) -+ nthreads++; -+ } -+ return nthreads; -+} - #elif GTEST_OS_QNX - - // Returns the number of threads running in the process, or 0 to indicate that ---- src/gtest.cc.orig 2017-09-23 23:21:02 UTC -+++ src/gtest.cc -@@ -127,7 +127,7 @@ - #endif - - #if GTEST_CAN_STREAM_RESULTS_ --# include // NOLINT -+# include // NOLINT - # include // NOLINT - # include // NOLINT - # include // NOLINT ---- test/googletest-port-test.cc.orig 2018-08-31 15:21:57 UTC -+++ test/googletest-port-test.cc -@@ -293,7 +293,9 @@ TEST(FormatCompilerIndependentFileLocationTest, Format - EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1)); - } - --#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA -+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || \ -+ GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \ -+ GTEST_OS_NETBSD || GTEST_OS_OPENBSD - void* ThreadFunc(void* data) { - internal::Mutex* mutex = static_cast(data); - mutex->Lock(); Property changes on: head/devel/googletest/files/patch-bsd-defines ___________________________________________________________________ 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/googletest/Makefile =================================================================== --- head/devel/googletest/Makefile (revision 513800) +++ head/devel/googletest/Makefile (revision 513801) @@ -1,43 +1,31 @@ # Created by: Cheng-Lung Sung # $FreeBSD$ PORTNAME= googletest DISTVERSIONPREFIX= release- -DISTVERSION= 1.8.1 -PORTREVISION= 3 +DISTVERSION= 1.10.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Framework for writing C++ tests on a variety of platforms LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= google -USES= autoreconf compiler:c++11-lang libtool -WRKSRC_SUBDIR= ${PORTNAME} -GNU_CONFIGURE= yes -# fused-src python tests are only useful for bundling. There's no point in -# running them before installing system-wide without source files. -CONFIGURE_ENV= ac_cv_path_PYTHON=":" -TEST_TARGET= check -INSTALL_TARGET= install-strip +USES= cmake compiler:c++11-lib USE_LDCONFIG= yes +CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_OFF= BUILD_GMOCK -# googletest requires pthread in order to function and does not properly -# detect pthread support. -# -# See: https://github.com/google/googletest/issues/2162 -LIBS+= -lpthread +OPTIONS_DEFINE= TEST -post-patch: -# enable vendor make install again (revert 661758e) - @${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \ - ${WRKSRC}/Makefile.am +TEST_USES= python:build +TEST_CMAKE_BOOL= gtest_build_tests +TEST_TEST_TARGET= test -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin +pre-install-TEST-on: do-test .include Index: head/devel/googletest/distinfo =================================================================== --- head/devel/googletest/distinfo (revision 513800) +++ head/devel/googletest/distinfo (revision 513801) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535728917 -SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c -SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298 +TIMESTAMP = 1570114335 +SHA256 (google-googletest-release-1.10.0_GH0.tar.gz) = 9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb +SIZE (google-googletest-release-1.10.0_GH0.tar.gz) = 904349 Index: head/devel/googletest/pkg-plist =================================================================== --- head/devel/googletest/pkg-plist (revision 513800) +++ head/devel/googletest/pkg-plist (revision 513801) @@ -1,34 +1,32 @@ -bin/gtest-config include/gtest/gtest-death-test.h +include/gtest/gtest-matchers.h include/gtest/gtest-message.h include/gtest/gtest-param-test.h include/gtest/gtest-printers.h include/gtest/gtest-spi.h include/gtest/gtest-test-part.h include/gtest/gtest-typed-test.h include/gtest/gtest.h include/gtest/gtest_pred_impl.h include/gtest/gtest_prod.h +include/gtest/internal/custom/README.md include/gtest/internal/custom/gtest-port.h include/gtest/internal/custom/gtest-printers.h include/gtest/internal/custom/gtest.h include/gtest/internal/gtest-death-test-internal.h include/gtest/internal/gtest-filepath.h include/gtest/internal/gtest-internal.h -include/gtest/internal/gtest-linked_ptr.h -include/gtest/internal/gtest-param-util-generated.h include/gtest/internal/gtest-param-util.h include/gtest/internal/gtest-port-arch.h include/gtest/internal/gtest-port.h include/gtest/internal/gtest-string.h -include/gtest/internal/gtest-tuple.h include/gtest/internal/gtest-type-util.h -lib/libgtest.a +include/gtest/internal/gtest-type-util.h.pump +lib/cmake/GTest/GTestConfig.cmake +lib/cmake/GTest/GTestConfigVersion.cmake +lib/cmake/GTest/GTestTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/GTest/GTestTargets.cmake lib/libgtest.so -lib/libgtest.so.0 -lib/libgtest.so.0.0.0 -lib/libgtest_main.a lib/libgtest_main.so -lib/libgtest_main.so.0 -lib/libgtest_main.so.0.0.0 -share/aclocal/gtest.m4 +libdata/pkgconfig/gtest.pc +libdata/pkgconfig/gtest_main.pc Index: head/devel/msgpack/Makefile =================================================================== --- head/devel/msgpack/Makefile (revision 513800) +++ head/devel/msgpack/Makefile (revision 513801) @@ -1,35 +1,39 @@ # $FreeBSD$ PORTNAME= msgpack PORTVERSION= 3.2.0 PORTREVISION= 1 DISTVERSIONPREFIX= cpp- CATEGORIES= devel MAINTAINER= adamw@FreeBSD.org COMMENT= Efficient binary serialization, like JSON but smaller and faster LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE_1_0.txt TEST_DEPENDS= googletest>0:devel/googletest USES= cmake pathfix USE_LDCONFIG= yes USE_GITHUB= yes GH_PROJECT= msgpack-c CMAKE_OFF= MSGPACK_BUILD_EXAMPLES TEST_TARGET= test .include .if ${ARCH} == "sparc64" # required for __sync _* atomic operations on sparc USE_GCC= yes .endif +post-patch: +# GoogleTest doesn't support C++98 consumers since 1.10.0 + @${REINPLACE_CMD} -e 's/c++98/c++11/' ${WRKSRC}/CMakeLists.txt + pre-test: cd ${WRKSRC} && ${CMAKE_BIN} . && ${MAKE_CMD} .include Index: head/finance/gnucash/Makefile =================================================================== --- head/finance/gnucash/Makefile (revision 513800) +++ head/finance/gnucash/Makefile (revision 513801) @@ -1,121 +1,121 @@ # $FreeBSD$ # $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $ PORTNAME= gnucash PORTVERSION= 3.7 PORTREVISION= 1 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Quicken-like money and finance manager LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libsecret-1.so:security/libsecret \ libsoup-2.4.so:devel/libsoup \ libguile-2.2.so:lang/guile2 \ libgc-threaded.so:devel/boehm-gc-threaded \ libboost_date_time.so:devel/boost-libs \ libicudata.so:devel/icu RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-Finance-Quote>=0:finance/p5-Finance-Quote USES= cmake:insource compiler:c++11-lib desktop-file-utils gettext-tools gnome libtool \ localbase perl5 pkgconfig shebangfix tar:bzip2 USE_XORG= x11 USE_CXXSTD= c++11 USE_GNOME= cairo gtk30 intltool libxml2 libxslt USE_LDCONFIG= yes INSTALLS_ICONS= yes CMAKE_ARGS= -DCOMPILE_GSCHEMAS=OFF \ -DENABLE_BINRELOC=OFF \ -DGNC_SHELL=/bin/sh SHEBANG_FILES= common/gnc-test-env.pl libgnucash/quotes/gnc-fq-dump WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} GLIB_SCHEMAS= org.gnucash.dialogs.business.gschema.xml \ org.gnucash.dialogs.checkprinting.gschema.xml \ org.gnucash.dialogs.commodities.gschema.xml \ org.gnucash.dialogs.export.csv.gschema.xml \ org.gnucash.dialogs.gschema.xml \ org.gnucash.dialogs.import.csv.gschema.xml \ org.gnucash.dialogs.import.generic.gschema.xml \ org.gnucash.dialogs.import.qif.gschema.xml \ org.gnucash.dialogs.reconcile.gschema.xml \ org.gnucash.dialogs.sxs.gschema.xml \ org.gnucash.dialogs.totd.gschema.xml \ org.gnucash.general.finance-quote.gschema.xml \ org.gnucash.gschema.xml \ org.gnucash.history.gschema.xml \ org.gnucash.warnings.gschema.xml \ org.gnucash.window.pages.account.tree.gschema.xml \ org.gnucash.window.pages.gschema.xml OPTIONS_DEFINE= AQBANKING DATABASE DOCS NLS OFX PYTHON TEST OPTIONS_DEFAULT= AQBANKING OFX AQBANKING_DESC= AqBanking support (HBCI/OpenHBCI) DATABASE_DESC= Enable SQL database backends OFX_DESC= OFX support OPTIONS_SUB= yes AQBANKING_CMAKE_BOOL= WITH_AQBANKING AQBANKING_LIB_DEPENDS= libgwenhywfar.so:devel/gwenhywfar \ libgwenhywfar.so:devel/gwenhywfar \ libktoblzcheck.so:finance/ktoblzcheck \ libaqbanking.so:finance/aqbanking AQBANKING_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.hbci.gschema.xml DATABASE_CMAKE_BOOL= WITH_SQL DATABASE_BUILD_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers DATABASE_LIB_DEPENDS= libdbi.so:databases/libdbi DATABASE_RUN_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers NLS_CMAKE_BOOL_OFF= DISABLE_NLS NLS_USES= gettext-runtime OFX_CMAKE_BOOL= WITH_OFX OFX_LIB_DEPENDS= libofx.so:finance/libofx OFX_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.ofx.gschema.xml PYTHON_CMAKE_BOOL= WITH_PYTHON PYTHON_USES= python:3.3+ TEST_BUILD_DEPENDS= ${NONEXISTENT}:devel/googlemock:build \ - gtest-config:devel/googletest + googletest>0:devel/googletest .include .if ${PORT_OPTIONS:MTEST} GMOCK_WRKSRC!= cd ${PORTSDIR}/devel/googlemock && ${MAKE} -V WRKSRC CONFIGURE_ENV+= GMOCK_ROOT="${GMOCK_WRKSRC}" .endif post-patch-TEST-off: @(cd ${WRKSRC} ; \ ${FIND} . -type f -name CMakeLists.txt \ -exec ${REINPLACE_CMD} -e '/add_subdirectory *(test.*)/d' \ -e '/enable_testing()/d' -e '/include (GncAddTest)/d' \ -e '/gnc_gtest_configure()/d' -e '/scm-test-core/d' {} +) post-install: @(cd ${STAGEDIR}${DATADIR}/icons/hicolor && \ ${RMDIR} 16x16/apps 22x22/apps 22x22 24x24/apps 32x32/apps 32x32\ 48x48/apps 48x48 64x64/apps 64x64 96x96/apps 96x96 \ 128x128/apps 128x128 256x256/apps 256x256 scalable/apps scalable) @(cd ${STAGEDIR}${PREFIX}/share/icons/hicolor && \ ${RMDIR} 24x24/actions 16x16/actions) post-install-PYTHON-on: @(cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @(cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so .include Index: head/lang/cling/Makefile =================================================================== --- head/lang/cling/Makefile (revision 513800) +++ head/lang/cling/Makefile (revision 513801) @@ -1,75 +1,75 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME= cling DISTVERSION= 0.5-2018-08-13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang devel MASTER_SITES= https://root.cern.ch/download/cling/ DISTNAME= ${PORTNAME}_${DISTVERSION:C/^[0-9]\.[0-9]-//}_sources MAINTAINER= mmokhi@FreeBSD.org COMMENT= Interactive C++ Interpreter Based on LLVM and Clang Libs LICENSE= LLVM NCSA LICENSE_COMB= multi LICENSE_NAME_LLVM= LLVM Release License LICENSE_FILE_LLVM= ${WRKSRC}/LICENSE.TXT LICENSE_FILE_NCSA= ${WRKSRC}/tools/cling/LICENSE.TXT LICENSE_PERMS_LLVM= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_armv6= fails to compile: AArch64TargetMachine.cpp: relocation truncated to fit: R_ARM_CALL against symbol '__aeabi_uldivmod' BROKEN_armv7= fails to compile: AArch64TargetMachine.cpp: relocation truncated to fit: R_ARM_CALL against symbol '__aeabi_uldivmod' LIB_DEPENDS= libgtest.so:devel/googletest \ libz3.so:math/z3 WRKSRC= ${WRKDIR}/src LLVM_RELEASE= 5.0.0 LLVM_SUFFIX= 50_cern-root LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} USES= cmake compiler:c11 compiler:c++11-lib cpe \ libedit ncurses python:build shebangfix tar:bzip2 USE_GNOME= libxml2 USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= tools/clang/tools/clang-format/clang-format-diff.py \ tools/clang/tools/clang-format/git-clang-format \ tools/clang/tools/scan-view/bin/scan-view CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= LLVM_BUILD_EXAMPLES LLVM_INCLUDE_TESTS LLVM_INCLUDE_GO_TESTS SUB_LIST+= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" PLIST_SUB+= LLVM_SUFFIX=${LLVM_SUFFIX} LLVM_RELEASE=${LLVM_RELEASE} CMAKE_BUILD_TYPE= Release CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ --target ${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|g' \ ${PATCH_WRKSRC}/tools/cling/tools/driver/cling.cpp @${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|g' \ ${PATCH_WRKSRC}/tools/cling/lib/Interpreter/CIFactory.cpp post-install: for e in $$(cd ${STAGEDIR}${PREFIX}/llvm50_cern-root/bin && ls *); do \ ${RLN} ${STAGEDIR}${PREFIX}/llvm50_cern-root/bin/$${e} ${STAGEDIR}${PREFIX}/bin/$${e}; \ done ${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake for m in cling llvm llvm-c clang; do \ ${RLN} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/include/$${m} ${STAGEDIR}${PREFIX}/include/$${m}; \ done for m in cling llvm clang; do \ ${RLN} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/lib/cmake/$${m} ${STAGEDIR}${PREFIX}/lib/cmake/$${m}; \ done for l in $$(cd ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/lib && ls *.so* *.a); do \ ${RLN} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/lib/$${l} ${STAGEDIR}${PREFIX}/lib/$${l}; \ done .include Index: head/math/yacas/Makefile =================================================================== --- head/math/yacas/Makefile (revision 513800) +++ head/math/yacas/Makefile (revision 513801) @@ -1,45 +1,45 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= yacas PORTVERSION= 1.7.0 PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= math MAINTAINER= gahr@FreeBSD.org COMMENT= Yet Another Computer Algebra System LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= bash:shells/bash \ -BUILD_DEPENDS= gtest-config:devel/googletest +BUILD_DEPENDS= googletest>0:devel/googletest CMAKE_ARGS= -DENABLE_DOCS:BOOL=OFF \ -DENABLE_CYACAS_CONSOLE:BOOL=ON \ -DENABLE_CYACAS_KERNEL:BOOL=OFF \ -DENABLE_CYACAS_GUI:BOOL=OFF \ -DENABLE_JYACAS:BOOL=OFF \ -DENABLE_CYACAS_UNIT_TESTS:BOOL=ON \ -DENABLE_CYACAS_BENCHMARKS:BOOL=OFF TEST_TARGET= test USES= cmake compiler:c++17-lang USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= grzegorzmazur PLIST_SUB= SHLIB_VERSION=${PORTVERSION:S/.//}.0 post-patch: # Can't use USES=shebangfix here, cause the path appears several # times in the file. @${REINPLACE_CMD} -e 's| /bin/bash| ${LOCALBASE}/bin/bash|g' \ ${WRKSRC}/tests/test-yacas @${REINPLACE_CMD} -e '/^install/s|^|#|' \ ${WRKSRC}/tests/CMakeLists.txt .include Index: head/net-im/mtxclient/Makefile =================================================================== --- head/net-im/mtxclient/Makefile (revision 513800) +++ head/net-im/mtxclient/Makefile (revision 513801) @@ -1,41 +1,41 @@ # $FreeBSD$ PORTNAME= mtxclient DISTVERSIONPREFIX= v DISTVERSION= 0.2.1 PORTREVISION= 4 CATEGORIES= net-im MAINTAINER= adridg@FreeBSD.org COMMENT= Client API library for the Matrix protocol LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nlohmann-json>=3:devel/nlohmann-json \ spdlog>=1.3:devel/spdlog \ - gtest-config:devel/googletest + googletest>0:devel/googletest LIB_DEPENDS= libsodium.so:security/libsodium \ libboost_date_time.so:devel/boost-libs \ libboost_chrono.so:devel/boost-libs \ libboost_iostreams.so:devel/boost-libs \ libboost_random.so:devel/boost-libs \ libboost_regex.so:devel/boost-libs \ libboost_system.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \ libolm.so:security/olm USES= cmake compiler:c++11-lang pkgconfig \ localbase:ldflags tar:xz USE_GITHUB= yes GH_ACCOUNT= Nheko-Reborn # 71 files use #include , which needs to be # elsewhere; an alternative would be to bung in -I${LOCALBASE}/include/nlohmann post-patch: ${FIND} ${WRKSRC} -type f -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} \ 's+include +include +' .include Index: head/science/libkml/Makefile =================================================================== --- head/science/libkml/Makefile (revision 513800) +++ head/science/libkml/Makefile (revision 513801) @@ -1,41 +1,41 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= libkml PORTVERSION= 1.3.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org COMMENT= Reference implementation of OGC KML 2.2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= boost-libs>=1.44.0:devel/boost-libs \ googletest>=1.7.0:devel/googletest \ minizip>=1.2.8:archivers/minizip LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libexpat.so:textproc/expat2 \ libgtest.so:devel/googletest \ libminizip.so:archivers/minizip \ liburiparser.so:net/uriparser OPTIONS_DEFINE= EXAMPLES USES= cmake compiler:c11 pathfix CMAKE_OFF= WITH_JAVA WITH_PYTHON WITH_SWIG USE_CXXSTD= gnu++98 USE_LDCONFIG= yes USE_GITHUB= yes EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES INSTALL_EXAMPLES EXAMPLES_CMAKE_ON= -DKML_EXAMPLES_DIR=${EXAMPLESDIR} EXAMPLES_LIB_DEPENDS= libcurl.so:ftp/curl post-patch-EXAMPLES-on: @${REINPLACE_CMD} -e 's|DESTINATION examples/|DESTINATION $${KML_EXAMPLES_DIR}/|' ${WRKSRC}/examples/*/CMakeLists.txt .include Index: head/security/certificate-transparency/Makefile =================================================================== --- head/security/certificate-transparency/Makefile (revision 513800) +++ head/security/certificate-transparency/Makefile (revision 513801) @@ -1,48 +1,48 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 38 +PORTREVISION= 39 CATEGORIES= security MAINTAINER= ports@FreeBSD.org COMMENT= Open framework for monitoring and auditing SSL certificates LICENSE= APACHE20 LIB_DEPENDS?= libevent.so:devel/libevent \ libevhtp.so:www/libevhtp \ libgtest.so:devel/googletest \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libgmock.so:devel/googlemock \ libicuuc.so:devel/icu \ libjson-c.so:devel/json-c \ libleveldb.so:databases/leveldb \ libobjecthash.so:devel/objecthash \ libprotobuf.so:devel/protobuf \ libsqlite3.so:databases/sqlite3 \ libtcmalloc.so:devel/google-perftools USES= autoreconf compiler:c++11-lib gmake pkgconfig ssl GNU_CONFIGURE= yes CONFIGURE_ENV+= "CFLAGS+=-I${LOCALBASE}/include CXXFLAGS+=-lgtest CXXFLAGS+=-lgmock" MAKE_FLAGS+= "V=1" USE_GITHUB= yes GH_ACCOUNT= google GH_TAGNAME= 28478cb CPPFLAGS+= "-I${LOCALBASE}/include" CPPFLAGS+= "-I${LOCALBASE}/include/evhtp" LDFLAGS+= "-L${LOCALBASE}/lib" .include .if ${SSL_DEFAULT} == base BROKEN_FreeBSD_12= could not find the OpenSSL libraries BROKEN_FreeBSD_13= could not find the OpenSSL libraries .endif .include