Index: head/databases/clickhouse/Makefile =================================================================== --- head/databases/clickhouse/Makefile (revision 478606) +++ head/databases/clickhouse/Makefile (revision 478607) @@ -1,115 +1,115 @@ # Created by: proler@gmail.com # $FreeBSD$ PORTNAME= clickhouse PORTVERSION= 18.1.0 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -stable -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MAINTAINER= proler@gmail.com COMMENT= ClickHouse is a column-oriented database management system LICENSE= APACHE20 BROKEN_FreeBSD_10= Builds but does not work 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 \ libdouble-conversion>=0:devel/libdouble-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 \ librdkafka.so:net/librdkafka \ libgtest.so:devel/googletest #TODO: libcpuid.so:sysutils/libcpuid \ USES= compiler:c++14-lang cmake iconv mysql ssl readline shebangfix USE_LDCONFIG= yes CMAKE_ARGS= -DUNBUNDLED=1 \ -DUSE_STATIC_LIBRARIES=0 \ -DNO_WERROR=1 \ -DENABLE_TESTS=0 \ -DCXX11_ABI= \ -DCOMPILER_FLAGS="-DLZ4_DISABLE_DEPRECATE_WARNINGS=1" USE_GITHUB= yes GH_ACCOUNT= yandex GH_PROJECT= ClickHouse USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= dbms/tests/performance/create_benchmark_page.py \ dbms/tests/external_dictionaries/generate_and_test.py \ dbms/tests/external_dictionaries/http_server.py \ dbms/tests/clickhouse-test USERS= clickhouse GROUPS= clickhouse SOVERSION= ${PORTVERSION} PLIST_SUB= SOVERSION=${SOVERSION} OPTIONS_DEFINE= TEST OPTIONS_DEFAULT= TEST OPTIONS_SUB= yes TEST_DESC= Install script clickhouse-test and test queries data TEST_USES= python perl5 TEST_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 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 BUILD_DEPENDS+= clang50:devel/llvm50 CC= clang50 CXX= clang++50 .endif 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* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/clickhouse-test/external_dictionaries/dictionary_library/*.so ${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 .include Index: head/devel/android-tools-adb/files/patch-gtest-1.8.1 =================================================================== --- head/devel/android-tools-adb/files/patch-gtest-1.8.1 (nonexistent) +++ head/devel/android-tools-adb/files/patch-gtest-1.8.1 (revision 478607) @@ -0,0 +1,55 @@ +bugreport_test.cpp:77:20: error: no member named 'tr1' in namespace 'std' + ::std::tr1::get<0>(args)->OnStdout(output_.c_str(), output_.size()); + ~~~~~~~^ +bugreport_test.cpp:77:37: error: member reference type 'const testing::ActionInterface::ArgumentTuple' (aka 'const tuple') is not a pointer; did you mean to use '.'? + ::std::tr1::get<0>(args)->OnStdout(output_.c_str(), output_.size()); + ~~~~~~^~ + . +bugreport_test.cpp:77:39: error: no member named 'OnStdout' in 'std::__1::tuple' + ::std::tr1::get<0>(args)->OnStdout(output_.c_str(), output_.size()); + ~~~~~~ ^ +bugreport_test.cpp:80:20: error: no member named 'tr1' in namespace 'std' + ::std::tr1::get<0>(args)->OnStderr(output_.c_str(), output_.size()); + ~~~~~~~^ +bugreport_test.cpp:80:37: error: member reference type 'const testing::ActionInterface::ArgumentTuple' (aka 'const tuple') is not a pointer; did you mean to use '.'? + ::std::tr1::get<0>(args)->OnStderr(output_.c_str(), output_.size()); + ~~~~~~^~ + . +bugreport_test.cpp:80:39: error: no member named 'OnStderr' in 'std::__1::tuple' + ::std::tr1::get<0>(args)->OnStderr(output_.c_str(), output_.size()); + ~~~~~~ ^ +bugreport_test.cpp:108:29: error: no member named 'tr1' in namespace 'std' + int status = ::std::tr1::get<0>(args)->Done(status_); + ~~~~~~~^ +bugreport_test.cpp:108:46: error: member reference type 'const testing::ActionInterface::ArgumentTuple' (aka 'const tuple') is not a pointer; did you mean to use '.'? + int status = ::std::tr1::get<0>(args)->Done(status_); + ~~~~~~^~ + . +bugreport_test.cpp:108:48: error: no member named 'Done' in 'std::__1::tuple' + int status = ::std::tr1::get<0>(args)->Done(status_); + ~~~~~~ ^ + +--- adb/bugreport_test.cpp.orig 2016-09-28 18:07:09 UTC ++++ adb/bugreport_test.cpp +@@ -74,10 +74,10 @@ class OnStandardStreamsCallbackAction : public ActionI + } + virtual Result Perform(const ArgumentTuple& args) { + if (type_ == kStreamStdout) { +- ::std::tr1::get<0>(args)->OnStdout(output_.c_str(), output_.size()); ++ std::get<0>(args)->OnStdout(output_.c_str(), output_.size()); + } + if (type_ == kStreamStderr) { +- ::std::tr1::get<0>(args)->OnStderr(output_.c_str(), output_.size()); ++ std::get<0>(args)->OnStderr(output_.c_str(), output_.size()); + } + } + +@@ -105,7 +105,7 @@ class CallbackDoneAction : public ActionInterface(args)->Done(status_); ++ int status = std::get<0>(args)->Done(status_); + return status; + } + Property changes on: head/devel/android-tools-adb/files/patch-gtest-1.8.1 ___________________________________________________________________ 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/devel/googlemock/Makefile =================================================================== --- head/devel/googlemock/Makefile (revision 478606) +++ head/devel/googlemock/Makefile (revision 478607) @@ -1,45 +1,44 @@ # Created by: Cheng-Lung Sung # $FreeBSD$ PORTNAME= googlemock DISTVERSIONPREFIX= release- -DISTVERSION= 1.8.0-712 -DISTVERSIONSUFFIX= -g9bda90b +DISTVERSION= 1.8.1 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 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 USE_LDCONFIG= yes 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 post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock_doctor.py ${STAGEDIR}${PREFIX}/bin .include Index: head/devel/googlemock/distinfo =================================================================== --- head/devel/googlemock/distinfo (revision 478606) +++ head/devel/googlemock/distinfo (revision 478607) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520457288 -SHA256 (google-googletest-release-1.8.0-712-g9bda90b_GH0.tar.gz) = edddf29136d95c595ce7596ddf7aa1b402f6a6254e634b45f29116d7aaf9f937 -SIZE (google-googletest-release-1.8.0-712-g9bda90b_GH0.tar.gz) = 966266 +TIMESTAMP = 1535728917 +SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c +SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298 Index: head/devel/googletest/Makefile =================================================================== --- head/devel/googletest/Makefile (revision 478606) +++ head/devel/googletest/Makefile (revision 478607) @@ -1,37 +1,36 @@ # Created by: Cheng-Lung Sung # $FreeBSD$ PORTNAME= googletest DISTVERSIONPREFIX= release- -DISTVERSION= 1.8.0-712 -DISTVERSIONSUFFIX= -g9bda90b +DISTVERSION= 1.8.1 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 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 USE_LDCONFIG= yes post-patch: # enable vendor make install again (revert 661758e) @${REINPLACE_CMD} -E 's/install-(exec|data)-local/&-dummy/' \ ${WRKSRC}/Makefile.am post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gtest-config ${STAGEDIR}${PREFIX}/bin .include Index: head/devel/googletest/distinfo =================================================================== --- head/devel/googletest/distinfo (revision 478606) +++ head/devel/googletest/distinfo (revision 478607) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520457288 -SHA256 (google-googletest-release-1.8.0-712-g9bda90b_GH0.tar.gz) = edddf29136d95c595ce7596ddf7aa1b402f6a6254e634b45f29116d7aaf9f937 -SIZE (google-googletest-release-1.8.0-712-g9bda90b_GH0.tar.gz) = 966266 +TIMESTAMP = 1535728917 +SHA256 (google-googletest-release-1.8.1_GH0.tar.gz) = 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c +SIZE (google-googletest-release-1.8.1_GH0.tar.gz) = 992298 Index: head/devel/googletest/files/patch-bsd-defines =================================================================== --- head/devel/googletest/files/patch-bsd-defines (revision 478606) +++ head/devel/googletest/files/patch-bsd-defines (revision 478607) @@ -1,196 +1,197 @@ o Add DragonFly and GNU/kFreeBSD support o Implement GetThreadCount() for BSDs o Work around StreamingListenerTest with GCC 4.2 --- 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 2017-09-23 23:21:02 UTC +--- include/gtest/internal/gtest-port.h.orig 2018-08-31 15:21:57 UTC +++ include/gtest/internal/gtest-port.h -@@ -121,7 +121,9 @@ +@@ -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 -@@ -803,7 +806,8 @@ using ::std::tuple_size; - (GTEST_OS_MAC && !GTEST_OS_IOS) || \ - (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ +@@ -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_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || GTEST_OS_NETBSD || \ -+ GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD) + 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 -@@ -835,7 +839,8 @@ using ::std::tuple_size; +@@ -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/gtest-port_test.cc.orig 2017-09-23 23:21:02 UTC -+++ test/gtest-port_test.cc -@@ -304,7 +304,8 @@ TEST(FormatCompilerIndependentFileLocationTest, Format +--- 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 -+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_DRAGONFLY || \ -+ GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD +-#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(); --- test/gtest_unittest.cc.orig 2017-09-23 23:21:02 UTC +++ test/gtest_unittest.cc @@ -118,6 +118,7 @@ TEST_F(StreamingListenerTest, OnTestIterationEnd) { EXPECT_EQ("event=TestIterationEnd&passed=1&elapsed_time=0ms\n", *output()); } +#if GTEST_LANG_CXX11 // workaround breakage with GCC 4.2 TEST_F(StreamingListenerTest, OnTestCaseStart) { *output() = ""; streamer_.OnTestCaseStart(TestCase("FooTest", "Bar", NULL, NULL)); @@ -129,6 +130,7 @@ TEST_F(StreamingListenerTest, OnTestCaseEnd) { streamer_.OnTestCaseEnd(TestCase("FooTest", "Bar", NULL, NULL)); EXPECT_EQ("event=TestCaseEnd&passed=1&elapsed_time=0ms\n", *output()); } +#endif TEST_F(StreamingListenerTest, OnTestStart) { *output() = ""; Index: head/emulators/dolphin-emu/Makefile =================================================================== --- head/emulators/dolphin-emu/Makefile (revision 478606) +++ head/emulators/dolphin-emu/Makefile (revision 478607) @@ -1,83 +1,83 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= dolphin-emu PORTVERSION= 5.0 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org COMMENT= Gamecube and Wii Emulator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt # Notes on dependencies: # - keep enet from Externals as Dolphin's version diverges # - xxhash and SOIL are not (yet?) in ports and built from Externals # - skip ALSA (emulated), ao (buggy) and bluez support LIB_DEPENDS= libpulse.so:audio/pulseaudio \ libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libportaudio.so:audio/portaudio \ liblzo2.so:archivers/lzo2 \ libpng.so:graphics/png \ libSoundTouch.so:audio/soundtouch \ libsfml-system.so:devel/sfml \ libminiupnpc.so:net/miniupnpc \ libmbedtls.so:security/mbedtls \ libcurl.so:ftp/curl \ libgtest.so:devel/googletest LLD_UNSAFE= yes USES= cmake compiler:c++11-lib iconv openal pkgconfig USE_GITHUB= yes GH_PROJECT= dolphin USE_GL= gl glew glu USE_GNOME= atk cairo glib20 gdkpixbuf2 gtk20 pango USE_SDL= sdl2 USE_WX= 3.0+ USE_XORG= ice sm x11 xext xi xrandr CMAKE_ARGS+= -DTRY_X11:BOOL=ON \ -DUSE_UPNP:BOOL=ON \ -DDISABLE_WX:BOOL=OFF \ -DUSE_SHARED_GTEST:BOOL=ON \ -DENABLE_PCH:BOOL=OFF \ -DCMAKE_REQUIRED_INCLUDES:PATH="${LOCALBASE}/include" \ -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON # XXX Bypass git check (and set a dummy -unused- revision) CMAKE_ARGS+= -DDOLPHIN_WC_BRANCH:STRING="stable" \ -DDOLPHIN_WC_REVISION:STRING="1" OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CMAKE_ON= -DDISABLE_NLS:BOOL=OFF NLS_CMAKE_OFF= -DDISABLE_NLS:BOOL=ON .include # JIT-enabled binaries are amd64 only .if ${ARCH} != "amd64" CMAKE_ARGS+= -DENABLE_GENERIC:BOOL=ON .endif # When building with GCC, needs GCC 4.9+ .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 49 USE_GCC= yes # Enable std::stoul() CXXFLAGS+= -D_GLIBCXX_USE_C99 # Enable log2f(), exp2f() and roundf() CXXFLAGS+= -D_GLIBCXX_USE_C99_MATH_TR1 # Turn on extra long double versions of math functions, needed for cmath CXXFLAGS+= -D__ISO_C_VISIBLE=1999 -D_DECLARE_C99_LDBL_MATH .endif .include Index: head/lang/cling/Makefile =================================================================== --- head/lang/cling/Makefile (revision 478606) +++ head/lang/cling/Makefile (revision 478607) @@ -1,74 +1,75 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME= cling DISTVERSION= 0.5-2018-08-13 +PORTREVISION= 1 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:outsource 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/science/libkml/Makefile =================================================================== --- head/science/libkml/Makefile (revision 478606) +++ head/science/libkml/Makefile (revision 478607) @@ -1,42 +1,42 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= libkml PORTVERSION= 1.3.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= science MAINTAINER= sunpoet@FreeBSD.org COMMENT= Reference implementation of OGC KML 2.2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to compile: iomem_simple.h: redefinition of typedef 'open_file_func' 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 CMAKE_OFF= WITH_JAVA WITH_PYTHON WITH_SWIG USE_CXXSTD= gnu++98 USE_LDCONFIG= yes USES= cmake pathfix 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 478606) +++ head/security/certificate-transparency/Makefile (revision 478607) @@ -1,40 +1,40 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 26 +PORTREVISION= 27 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 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