diff --git a/devel/thrift-c_glib/Makefile b/devel/thrift-c_glib/Makefile index cc7cd7027178..88e1f46e2639 100644 --- a/devel/thrift-c_glib/Makefile +++ b/devel/thrift-c_glib/Makefile @@ -1,35 +1,36 @@ PORTNAME= thrift PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= APACHE/thrift/${PORTVERSION} DISTNAME= thrift-${PORTVERSION} +PKGNAMESUFFIX= -c_glib MAINTAINER= ports@FreeBSD.org COMMENT= C glib interface to Thrift WWW= https://thrift.apache.org/ -PKGNAMESUFFIX= -c_glib - BUILDIR= ${WRKDIR}/${DISTNAME}/lib/c_glib DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo +LIB_DEPENDS= libevent.so:devel/libevent + USES= bison cmake compiler:c++11-lang cpe gnome pathfix \ pkgconfig ssl CPE_VENDOR= apache -CMAKE_ON= BUILD_C_GLIB BUILD_SHARED_LIBS +CMAKE_ON= BUILD_C_GLIB CMAKE_OFF= BUILD_CPP BUILD_HASKELL BUILD_JAVA BUILD_JAVASCRIPT \ BUILD_NODEJS BUILD_PYTHON USE_GNOME= glib20 USE_LDCONFIG= yes .include "../thrift/bsd.thrift.mk" PLIST_SUB+= PORTVERSION="${PORTVERSION}" post-patch: @${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/compiler/cpp/Makefile.am \ ${WRKSRC}/lib/rb/ext/extconf.rb .include diff --git a/devel/thrift-c_glib/pkg-plist b/devel/thrift-c_glib/pkg-plist index c9ef9f2c9220..2ba49fd7662d 100644 --- a/devel/thrift-c_glib/pkg-plist +++ b/devel/thrift-c_glib/pkg-plist @@ -1,45 +1,43 @@ @comment bin/thrift include/thrift/config.h include/thrift/c_glib/processor/thrift_dispatch_processor.h include/thrift/c_glib/processor/thrift_multiplexed_processor.h include/thrift/c_glib/processor/thrift_processor.h include/thrift/c_glib/protocol/thrift_binary_protocol.h include/thrift/c_glib/protocol/thrift_binary_protocol_factory.h include/thrift/c_glib/protocol/thrift_compact_protocol.h include/thrift/c_glib/protocol/thrift_compact_protocol_factory.h include/thrift/c_glib/protocol/thrift_multiplexed_protocol.h include/thrift/c_glib/protocol/thrift_protocol.h include/thrift/c_glib/protocol/thrift_protocol_decorator.h include/thrift/c_glib/protocol/thrift_protocol_factory.h include/thrift/c_glib/protocol/thrift_stored_message_protocol.h include/thrift/c_glib/server/thrift_server.h include/thrift/c_glib/server/thrift_simple_server.h include/thrift/c_glib/thrift.h include/thrift/c_glib/thrift_application_exception.h include/thrift/c_glib/thrift_configuration.h include/thrift/c_glib/thrift_struct.h include/thrift/c_glib/transport/thrift_buffered_transport.h include/thrift/c_glib/transport/thrift_buffered_transport_factory.h include/thrift/c_glib/transport/thrift_fd_transport.h include/thrift/c_glib/transport/thrift_framed_transport.h include/thrift/c_glib/transport/thrift_framed_transport_factory.h include/thrift/c_glib/transport/thrift_memory_buffer.h include/thrift/c_glib/transport/thrift_platform_socket.h include/thrift/c_glib/transport/thrift_server_socket.h include/thrift/c_glib/transport/thrift_server_transport.h include/thrift/c_glib/transport/thrift_socket.h include/thrift/c_glib/transport/thrift_ssl_socket.h include/thrift/c_glib/transport/thrift_transport.h include/thrift/c_glib/transport/thrift_transport_factory.h include/thrift/c_glib/transport/thrift_zlib_transport.h include/thrift/c_glib/transport/thrift_zlib_transport_factory.h lib/libthrift_c_glib.so lib/libthrift_c_glib.so.%%PORTVERSION%% lib/libthrift_c_glib_zlib.so lib/libthrift_c_glib_zlib.so.%%PORTVERSION%% -lib/cmake/thrift/ThriftConfig.cmake -lib/cmake/thrift/ThriftConfigVersion.cmake lib/cmake/thrift/thrift_c_glibTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/thrift/thrift_c_glibTargets.cmake lib/cmake/thrift/thrift_c_glib_zlibTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/thrift/thrift_c_glib_zlibTargets.cmake diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile index 0ecfb5c497b6..054d468fd78e 100644 --- a/devel/thrift-cpp/Makefile +++ b/devel/thrift-cpp/Makefile @@ -1,48 +1,49 @@ PORTNAME= thrift PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= APACHE/thrift/${PORTVERSION} PKGNAMESUFFIX= -cpp DISTNAME= thrift-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= C++ interface to Thrift WWW= https://thrift.apache.org/ BROKEN_i386= undefined reference to 'boost::atomics::detail::lockpool::scoped_lock::scoped_lock(void const volatile*)' LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libevent.so:devel/libevent -DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo - USES= bison cmake pkgconfig compiler:c++11-lang cpe \ pathfix ssl CPE_VENDOR= apache USE_LDCONFIG= yes + +CMAKE_ON= BUILD_CPP +CMAKE_OFF= BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL BUILD_TESTING + MAKE_JOBS_UNSAFE= yes +DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo PLIST_SUB= PORTVERSION="${THRIFT_PORTVERSION}" -CMAKE_ON= BUILD_CPP BUILD_SHARED_LIBS -CMAKE_OFF= BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL .include .if ${CHOSEN_COMPILER_TYPE} == clang USE_CXXSTD= c++11 .endif .if ${SSL_DEFAULT} != base LDFLAGS+= -L${OPENSSLLIB} CFLAGS+= -I${OPENSSLINC} .endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so ${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0 ${LN} -sf libthriftnb-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftnb.so.0 ${LN} -sf libthriftz-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftz.so.0 .include "../thrift/bsd.thrift.mk" .include diff --git a/devel/thrift-cpp/pkg-plist b/devel/thrift-cpp/pkg-plist index d50af49a4d15..2af28761285a 100644 --- a/devel/thrift-cpp/pkg-plist +++ b/devel/thrift-cpp/pkg-plist @@ -1,118 +1,116 @@ @comment bin/thrift include/thrift/TApplicationException.h include/thrift/TBase.h include/thrift/TConfiguration.h include/thrift/TDispatchProcessor.h include/thrift/TLogging.h include/thrift/TNonCopyable.h include/thrift/TOutput.h include/thrift/TProcessor.h include/thrift/TToString.h include/thrift/Thrift.h include/thrift/async/TAsyncBufferProcessor.h include/thrift/async/TAsyncChannel.h include/thrift/async/TAsyncDispatchProcessor.h include/thrift/async/TAsyncProcessor.h include/thrift/async/TAsyncProtocolProcessor.h include/thrift/async/TConcurrentClientSyncInfo.h include/thrift/async/TEvhttpClientChannel.h include/thrift/async/TEvhttpServer.h include/thrift/concurrency/Exception.h include/thrift/concurrency/FunctionRunner.h include/thrift/concurrency/Monitor.h include/thrift/concurrency/Mutex.h include/thrift/concurrency/Thread.h include/thrift/concurrency/ThreadFactory.h include/thrift/concurrency/ThreadManager.h include/thrift/concurrency/TimerManager.h include/thrift/config.h include/thrift/processor/PeekProcessor.h include/thrift/processor/StatsProcessor.h include/thrift/processor/TMultiplexedProcessor.h include/thrift/protocol/TBase64Utils.h include/thrift/protocol/TBinaryProtocol.h include/thrift/protocol/TBinaryProtocol.tcc include/thrift/protocol/TCompactProtocol.h include/thrift/protocol/TCompactProtocol.tcc include/thrift/protocol/TDebugProtocol.h include/thrift/protocol/TEnum.h include/thrift/protocol/THeaderProtocol.h include/thrift/protocol/TJSONProtocol.h include/thrift/protocol/TList.h include/thrift/protocol/TMap.h include/thrift/protocol/TMultiplexedProtocol.h include/thrift/protocol/TProtocol.h include/thrift/protocol/TProtocolDecorator.h include/thrift/protocol/TProtocolException.h include/thrift/protocol/TProtocolTap.h include/thrift/protocol/TProtocolTypes.h include/thrift/protocol/TSet.h include/thrift/protocol/TVirtualProtocol.h include/thrift/qt/TQIODeviceTransport.h include/thrift/qt/TQTcpServer.h include/thrift/server/TConnectedClient.h include/thrift/server/TNonblockingServer.h include/thrift/server/TServer.h include/thrift/server/TServerFramework.h include/thrift/server/TSimpleServer.h include/thrift/server/TThreadPoolServer.h include/thrift/server/TThreadedServer.h include/thrift/thrift-config.h include/thrift/thrift_export.h include/thrift/transport/PlatformSocket.h include/thrift/transport/SocketCommon.h include/thrift/transport/TBufferTransports.h include/thrift/transport/TFDTransport.h include/thrift/transport/TFileTransport.h include/thrift/transport/THeaderTransport.h include/thrift/transport/THttpClient.h include/thrift/transport/THttpServer.h include/thrift/transport/THttpTransport.h include/thrift/transport/TNonblockingSSLServerSocket.h include/thrift/transport/TNonblockingServerSocket.h include/thrift/transport/TNonblockingServerTransport.h include/thrift/transport/TPipe.h include/thrift/transport/TPipeServer.h include/thrift/transport/TSSLServerSocket.h include/thrift/transport/TSSLSocket.h include/thrift/transport/TServerSocket.h include/thrift/transport/TServerTransport.h include/thrift/transport/TShortReadTransport.h include/thrift/transport/TSimpleFileTransport.h include/thrift/transport/TSocket.h include/thrift/transport/TSocketPool.h include/thrift/transport/TSocketUtils.h include/thrift/transport/TTransport.h include/thrift/transport/TTransportException.h include/thrift/transport/TTransportUtils.h include/thrift/transport/TVirtualTransport.h include/thrift/transport/TWebSocketServer.h include/thrift/transport/TZlibTransport.h include/thrift/windows/GetTimeOfDay.h include/thrift/windows/Operators.h include/thrift/windows/OverlappedSubmissionThread.h include/thrift/windows/SocketPair.h include/thrift/windows/Sync.h include/thrift/windows/TWinsockSingleton.h include/thrift/windows/WinFcntl.h include/thrift/windows/config.h lib/libthrift.so lib/libthrift.so.0 lib/libthrift.so.%%PORTVERSION%% lib/libthriftnb.so lib/libthriftnb.so.0 lib/libthriftnb.so.%%PORTVERSION%% lib/libthriftz.so lib/libthriftz.so.0 lib/libthriftz.so.%%PORTVERSION%% -lib/cmake/thrift/ThriftConfig.cmake -lib/cmake/thrift/ThriftConfigVersion.cmake lib/cmake/thrift/thriftTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/thrift/thriftTargets.cmake lib/cmake/thrift/thriftnbTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/thrift/thriftnbTargets.cmake lib/cmake/thrift/thriftzTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/thrift/thriftzTargets.cmake libdata/pkgconfig/thrift-nb.pc libdata/pkgconfig/thrift-z.pc libdata/pkgconfig/thrift.pc diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile index 5fe44425b4bf..2022e9fc2c87 100644 --- a/devel/thrift/Makefile +++ b/devel/thrift/Makefile @@ -1,50 +1,51 @@ PORTNAME= thrift PORTVERSION= ${THRIFT_PORTVERSION} # get these from bsd.thrift.mk. any upgrade needs to check ALL dependencies PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= APACHE/thrift/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Framework for scalable cross-language services development WWW= https://thrift.apache.org/ LICENSE= APACHE20 +LIB_DEPENDS= libevent.so:devel/libevent + USES= bison cmake compiler:c++11-lang cpe pkgconfig CPE_VENDOR= apache USE_LDCONFIG= yes # For C++ support, use devel/thrift-cpp # For C glib support, use devel/thrift-c_glib. # For Perl support, use devel/p5-Thrift. # For Python support, use devel/py-thrift. # For Ruby support, use devel/rubygem-thrift. -# For PHP support, use devel/php5-thrift. # For nodejs support, use devel/node-thrift. # Other languages are not yet supported, please feel free to contribute # using one of the leaf ports as an example. CMAKE_OFF= BUILD_CPP BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL .include .include "bsd.thrift.mk" PLIST_SUB+= PORTVERSION="${PORTVERSION}" post-patch: @${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/compiler/cpp/Makefile.am \ ${WRKSRC}/lib/rb/ext/extconf.rb pre-configure: @${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am post-install: @${ECHO_MSG} @${ECHO_MSG} "For use with C++, the same compiler as used to build this port must be used" @${ECHO_MSG} "to compile and link your generated IDL bindings." @${ECHO_MSG} @${ECHO_MSG} "Note: The Thrift white paper may be downloaded from:" @${ECHO_MSG} "http://thrift.apache.org/static/thrift-20070401.pdf" @${ECHO_MSG} .include diff --git a/devel/thrift/bsd.thrift.mk b/devel/thrift/bsd.thrift.mk index 048e2fd3bd14..b165153013fa 100644 --- a/devel/thrift/bsd.thrift.mk +++ b/devel/thrift/bsd.thrift.mk @@ -1,10 +1,30 @@ # to use: # in your makefile, set: # PORTVERSION= ${THRIFT_PORTVERSION} # see $PORTSDIR/devel/thrift for examples THRIFT_PORTVERSION= 0.16.0 +LICENSE= APACHE20 + MASTER_SITE_APACHE+= https://archive.apache.org/dist/%SUBDIR%/ CONFIGURE_ARGS+= \ --without-tests +# Make sure we install thrift compiler related files not with child packages +.if !empty(PKGNAMESUFFIX) || ${PORTNAME} != "thrift" +_USES_install+= 900:thrift-post-install +BUILD_DEPENDS+= thrift>=${PORTVERSION}:devel/thrift +RUN_DEPENDS+= thrift>=${PORTVERSION}:devel/thrift + +CMAKE_ARGS+= -DTHRIFT_COMPILER=${PREFIX}/bin/thrift +CMAKE_ON+= BUILD_SHARED_LIBS +CMAKE_OFF+= BUILD_COMPILER + +thrift-post-install: + ${RM} ${STAGEDIR}${PREFIX}/lib/cmake/thrift/FindLibevent.cmake + ${RM} ${STAGEDIR}${PREFIX}/lib/cmake/thrift/ThriftConfig.cmake + ${RM} ${STAGEDIR}${PREFIX}/lib/cmake/thrift/ThriftConfigVersion.cmake +.else +MAKE_ON+= BUILD_COMPILER +CMAKE_OFF+= BUILD_SHARED_LIB +.endif diff --git a/devel/thrift/pkg-plist b/devel/thrift/pkg-plist index 2b75cc1521be..c5f2e4117f62 100644 --- a/devel/thrift/pkg-plist +++ b/devel/thrift/pkg-plist @@ -1,3 +1,4 @@ bin/thrift +lib/cmake/thrift/FindLibevent.cmake lib/cmake/thrift/ThriftConfig.cmake lib/cmake/thrift/ThriftConfigVersion.cmake