Index: head/devel/thrift/Makefile =================================================================== --- head/devel/thrift/Makefile (revision 399915) +++ head/devel/thrift/Makefile (revision 399916) @@ -1,67 +1,68 @@ # Created by: Sergey Skvortsov # $FreeBSD$ PORTNAME= thrift PORTVERSION= ${THRIFT_PORTVERSION} # get these from bsd.thrift.mk. any upgrade needs to check ALL dependencies PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= APACHE/thrift/${PORTVERSION} MAINTAINER= komarov@valerka.net COMMENT= Framework for scalable cross-language services development LICENSE= APACHE20 BROKEN_sparc64= does not compile on ${ARCH} USES= autoreconf gmake libtool pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFIGURE_ENV+= ${MAKE_ENV} # 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. CONFIGURE_ARGS+= \ --without-c_glib \ --without-cpp \ --without-qt4 \ --without-csharp \ --without-erlang \ --without-haskell \ --without-java \ --without-perl \ --without-php \ --without-php_extension \ --without-python \ - --without-ruby + --without-ruby \ + --without-go PLIST_FILES= bin/thrift .include .include "bsd.thrift.mk" PLIST_SUB+= PORTVERSION="${PORTVERSION}" 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 Index: head/devel/thrift/bsd.thrift.mk =================================================================== --- head/devel/thrift/bsd.thrift.mk (revision 399915) +++ head/devel/thrift/bsd.thrift.mk (revision 399916) @@ -1,13 +1,13 @@ # # $FreeBSD$ # # to use: # in your makefile, set: # PORTVERSION= ${THRIFT_PORTVERSION} # see $PORTSDIR/devel/thrift for examples -THRIFT_PORTVERSION= 0.9.1 +THRIFT_PORTVERSION= 0.9.3 THRIFT_PORTREVISION= 1 CONFIGURE_ARGS+= \ --without-tests Index: head/devel/thrift/distinfo =================================================================== --- head/devel/thrift/distinfo (revision 399915) +++ head/devel/thrift/distinfo (revision 399916) @@ -1,2 +1,2 @@ -SHA256 (thrift-0.9.1.tar.gz) = ac175080c8cac567b0331e394f23ac306472c071628396db2850cb00c41b0017 -SIZE (thrift-0.9.1.tar.gz) = 3402353 +SHA256 (thrift-0.9.3.tar.gz) = b0740a070ac09adde04d43e852ce4c320564a292f26521c46b78e0641564969e +SIZE (thrift-0.9.3.tar.gz) = 8897936 Index: head/devel/thrift-c_glib/Makefile =================================================================== --- head/devel/thrift-c_glib/Makefile (revision 399915) +++ head/devel/thrift-c_glib/Makefile (revision 399916) @@ -1,48 +1,49 @@ # Created by: Valery Komarov # $FreeBSD$ PORTNAME= thrift PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= APACHE/thrift/${PORTVERSION DISTNAME= thrift-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= C glib interface to Thrift PKGNAMESUFFIX= -c_glib BUILDIR= ${WRKDIR}/${DISTNAME}/lib/c_glib LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20 DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo USES= autoreconf pkgconfig gmake libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip .include "../thrift/bsd.thrift.mk" CONFIGURE_ARGS+= \ --with-c_glib \ --without-cpp \ --without-qt4 \ --without-csharp \ --without-erlang \ --without-haskell \ --without-java \ --without-perl \ --without-php \ --without-php_extension \ --without-python \ - --without-ruby + --without-ruby \ + --without-go post-patch: @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/c_glib/Makefile.am .include Index: head/devel/thrift-c_glib/pkg-plist =================================================================== --- head/devel/thrift-c_glib/pkg-plist (revision 399915) +++ head/devel/thrift-c_glib/pkg-plist (revision 399916) @@ -1,25 +1,28 @@ @comment bin/thrift include/thrift/c_glib/config.h +include/thrift/c_glib/processor/thrift_dispatch_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_protocol.h include/thrift/c_glib/protocol/thrift_protocol_factory.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_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_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_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_transport.h include/thrift/c_glib/transport/thrift_transport_factory.h lib/libthrift_c_glib.a lib/libthrift_c_glib.so lib/libthrift_c_glib.so.0 lib/libthrift_c_glib.so.0.0.0 libdata/pkgconfig/thrift_c_glib.pc Index: head/devel/thrift-cpp/Makefile =================================================================== --- head/devel/thrift-cpp/Makefile (revision 399915) +++ head/devel/thrift-cpp/Makefile (revision 399916) @@ -1,66 +1,66 @@ # Created by: Valery Komarov # $FreeBSD$ PORTNAME= thrift PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel PKGNAMESUFFIX= -cpp MASTER_SITES= APACHE/thrift/${PORTVERSION} DISTNAME= thrift-${PORTVERSION} MAINTAINER= komarov@valerka.net COMMENT= C++ interface to Thrift DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libevent.so:${PORTSDIR}/devel/libevent2 USES= autoreconf pkgconfig gmake compiler libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes PLIST_SUB= PORTVERSION="${THRIFT_PORTVERSION}" -BUILD_WRKSRC= ${WRKSRC}/lib/cpp -INSTALL_WRKSRC= ${WRKSRC}/lib/cpp OPTIONS_DEFINE= QT4 QT4_CONFIGURE_WITH= qt4 QT4_USE= QT4=network,moc_build,qmake_build,rcc_build,uic_build OPTIONS_SUB= yes CONFIGURE_ARGS+= \ --without-c_glib \ --with-cpp \ --without-csharp \ --without-erlang \ --without-haskell \ --without-java \ --without-perl \ --without-php \ --without-php_extension \ --without-python \ - --without-ruby + --without-ruby \ + --without-go .include .if ${COMPILER_TYPE} == clang USE_CXXSTD= c++11 .endif post-patch: @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am 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 -.if ${PORT_OPTIONS:MQT4} + +post-install-QT4-on: ${LN} -sf libthriftqt-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftqt.so.0 -.endif .include "../thrift/bsd.thrift.mk" .include Index: head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc =================================================================== --- head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc (revision 399915) +++ head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc (revision 399916) @@ -1,11 +1,11 @@ ---- ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig 2013-08-15 18:04:29.000000000 +0400 -+++ ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc 2013-10-16 01:15:53.000000000 +0400 -@@ -23,7 +23,7 @@ - #include +--- lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig 2015-10-13 19:19:23 UTC ++++ lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc +@@ -24,6 +24,8 @@ #include -- -+#include - namespace apache { namespace thrift { namespace protocol { - ++#include ++ + namespace apache { + namespace thrift { + namespace protocol { Index: head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h =================================================================== --- head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h (revision 399915) +++ head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h (revision 399916) @@ -1,12 +1,12 @@ ---- ./lib/cpp/src/thrift/server/TNonblockingServer.h.orig 2013-08-15 18:04:29.000000000 +0400 -+++ ./lib/cpp/src/thrift/server/TNonblockingServer.h 2013-10-16 01:15:53.000000000 +0400 -@@ -38,7 +38,8 @@ - #include - #endif - #include -- +--- lib/cpp/src/thrift/server/TNonblockingServer.h.orig 2015-10-13 19:19:36 UTC ++++ lib/cpp/src/thrift/server/TNonblockingServer.h +@@ -41,6 +41,9 @@ + #include + #include + +#include +#include - - - namespace apache { namespace thrift { namespace server { ++ + namespace apache { + namespace thrift { + namespace server { Index: head/devel/thrift-cpp/pkg-plist =================================================================== --- head/devel/thrift-cpp/pkg-plist (revision 399915) +++ head/devel/thrift-cpp/pkg-plist (revision 399916) @@ -1,97 +1,101 @@ +@comment bin/thrift include/thrift/TApplicationException.h include/thrift/TDispatchProcessor.h include/thrift/TLogging.h +include/thrift/TOutput.h include/thrift/TProcessor.h -include/thrift/TReflectionLocal.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/BoostThreadFactory.h include/thrift/concurrency/Exception.h include/thrift/concurrency/FunctionRunner.h include/thrift/concurrency/Monitor.h include/thrift/concurrency/Mutex.h include/thrift/concurrency/PlatformThreadFactory.h include/thrift/concurrency/PosixThreadFactory.h include/thrift/concurrency/StdMonitor.cpp include/thrift/concurrency/StdMutex.cpp include/thrift/concurrency/StdThreadFactory.cpp include/thrift/concurrency/StdThreadFactory.h include/thrift/concurrency/Thread.h include/thrift/concurrency/ThreadManager.h include/thrift/concurrency/TimerManager.h include/thrift/concurrency/Util.h include/thrift/config.h include/thrift/cxxfunctional.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/TDenseProtocol.h include/thrift/protocol/TJSONProtocol.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/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/transport/PlatformSocket.h include/thrift/transport/TBufferTransports.h include/thrift/transport/TFDTransport.h include/thrift/transport/TFileTransport.h include/thrift/transport/THttpClient.h include/thrift/transport/THttpServer.h include/thrift/transport/THttpTransport.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/TTransport.h include/thrift/transport/TTransportException.h include/thrift/transport/TTransportUtils.h include/thrift/transport/TVirtualTransport.h include/thrift/transport/TZlibTransport.h -lib/libthrift-0.9.1.so +lib/libthrift-0.9.3.so lib/libthrift.a lib/libthrift.so lib/libthrift.so.0 lib/libthriftnb-%%PORTVERSION%%.so lib/libthriftnb.a lib/libthriftnb.so lib/libthriftnb.so.0 %%QT4%%lib/libthriftqt-%%PORTVERSION%%.so %%QT4%%lib/libthriftqt.a %%QT4%%lib/libthriftqt.so %%QT4%%lib/libthriftqt.so.0 -lib/libthriftz-0.9.1.so +lib/libthriftz-0.9.3.so lib/libthriftz.a lib/libthriftz.so lib/libthriftz.so.0 libdata/pkgconfig/thrift-nb.pc %%QT4%%libdata/pkgconfig/thrift-qt.pc libdata/pkgconfig/thrift-z.pc libdata/pkgconfig/thrift.pc