Date: Thu, 17 Oct 2013 13:42:15 GMT From: Valery Komarov <komarov@valerka.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/183053: [MAINTAINER] devel/thrift Message-ID: <201310171342.r9HDgFWi003268@oldred.freebsd.org> Resent-Message-ID: <201310171350.r9HDo08L098385@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183053
>Category: ports
>Synopsis: [MAINTAINER] devel/thrift
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 17 13:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Valery Komarov
>Release: FreeBSD 10.0-ALPHA2
>Organization:
>Environment:
>Description:
Upgrade to 0.9.1
libraries for c_glib and cpp moved to new ports devel/thrift-c_glib devel/thrift-cpp
ports:
devel/fb303
devel/php5-thrift
devel/py-thrift
devel/rubygem-thrift
net/scribe
devel/thrift-c_glib
devel/thrift-cpp
devel/thrift
must be committed together.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/devel/thrift/Makefile thrift/Makefile
--- /usr/ports/devel/thrift/Makefile 2013-09-20 21:17:44.000000000 +0400
+++ thrift/Makefile 2013-10-17 20:40:59.000000000 +0400
@@ -13,39 +13,31 @@
LICENSE= AL2
-LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs \
- event-1.4:${PORTSDIR}/devel/libevent
-
USE_AUTOTOOLS= autoconf autoheader:env aclocal automake libtool
ACLOCAL_ARGS= -I${WRKSRC}/aclocal
AUTOMAKE_ARGS= --foreign --add-missing --copy
-USES= pkgconfig gmake
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
+USES= pkgconfig gmake
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-CONFIGURE_ARGS= --with-boost=${LOCALBASE} --with-libevent=${LOCALBASE} \
- --enable-shared --enable-static --with-zlib
CONFIGURE_ENV+= ${MAKE_ENV}
-OPTIONS_DEFINE= GLIB QT4
-GLIB_DESC= C (GLib) Library
-
-GLIB_CONFIGURE_ENABLE= c_glib
-GLIB_LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20
-QT4_CONFIGURE_ENABLE= qt4
-OPTIONS_SUB= 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.
CONFIGURE_ARGS+= \
- --with-cpp \
+ --without-c_glib \
+ --without-cpp \
+ --without-qt4 \
--without-csharp \
--without-erlang \
--without-haskell \
@@ -57,12 +49,8 @@
--without-ruby
NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
- USE_QT4= network moc_build qmake_build rcc_build uic_build
-.endif
+.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
.include "bsd.thrift.mk"
@@ -72,17 +60,10 @@
BROKEN= Does not compile on ia64, powerpc, or sparc64
.endif
-post-patch:
- @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/cpp/Makefile.am
- @${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/c_glib/Makefile.am
-
pre-configure:
@${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am
post-install:
- @${LN} -sf ${PREFIX}/lib/libthrift-${PORTVERSION}.so ${PREFIX}/lib/libthrift.so.0
- @${LN} -sf ${PREFIX}/lib/libthriftnb-${PORTVERSION}.so ${PREFIX}/lib/libthriftnb.so.0
- @${LN} -sf ${PREFIX}/lib/libthriftz-${PORTVERSION}.so ${PREFIX}/lib/libthriftz.so.0
@${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."
diff -ruN /usr/ports/devel/thrift/bsd.thrift.mk thrift/bsd.thrift.mk
--- /usr/ports/devel/thrift/bsd.thrift.mk 2013-02-26 20:17:26.000000000 +0400
+++ thrift/bsd.thrift.mk 2013-10-17 15:45:13.000000000 +0400
@@ -5,4 +5,8 @@
# in your makefile, set:
# PORTVERSION= ${THRIFT_PORTVERSION}
# see $PORTSDIR/devel/thrift for examples
-THRIFT_PORTVERSION= 0.9.0
+THRIFT_PORTVERSION= 0.9.1
+
+CONFIGURE_ARGS+= \
+ --without-tests
+
diff -ruN /usr/ports/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_framed_transport.h thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_framed_transport.h
--- /usr/ports/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_framed_transport.h 2013-02-26 20:17:26.000000000 +0400
+++ thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_framed_transport.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,10 +0,0 @@
---- ./lib/c_glib/src/thrift/transport/thrift_framed_transport.h.orig 2012-10-12 04:58:04.000000000 +0400
-+++ ./lib/c_glib/src/thrift/transport/thrift_framed_transport.h 2012-10-16 16:40:46.811818260 +0400
-@@ -22,6 +22,7 @@
-
- #include <glib.h>
- #include <glib-object.h>
-+#include <netinet/in.h>
-
- #include <thrift/transport/thrift_transport.h>
-
diff -ruN /usr/ports/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_socket.h thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_socket.h
--- /usr/ports/devel/thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_socket.h 2013-02-26 20:17:26.000000000 +0400
+++ thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_socket.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./lib/c_glib/src/thrift/transport/thrift_socket.h.orig 2012-10-12 04:58:04.000000000 +0400
-+++ ./lib/c_glib/src/thrift/transport/thrift_socket.h 2012-10-16 16:39:22.000000000 +0400
-@@ -21,6 +21,8 @@
- #define _THRIFT_SOCKET_H
-
- #include <glib-object.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-
- #include <thrift/transport/thrift_transport.h>
-
diff -ruN /usr/ports/devel/thrift/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc thrift/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc
--- /usr/ports/devel/thrift/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc 2013-02-26 20:17:26.000000000 +0400
+++ thrift/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig 2012-10-12 04:58:06.000000000 +0400
-+++ ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc 2012-10-16 16:41:57.890819558 +0400
-@@ -23,7 +23,7 @@
- #include "TBinaryProtocol.h"
-
- #include <limits>
--
-+#include <netinet/in.h>
-
- namespace apache { namespace thrift { namespace protocol {
-
diff -ruN /usr/ports/devel/thrift/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h thrift/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h
--- /usr/ports/devel/thrift/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h 2013-02-26 20:17:26.000000000 +0400
+++ thrift/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,12 +0,0 @@
---- ./lib/cpp/src/thrift/server/TNonblockingServer.h.orig 2012-10-12 04:58:06.000000000 +0400
-+++ ./lib/cpp/src/thrift/server/TNonblockingServer.h 2012-10-16 16:42:27.884820801 +0400
-@@ -38,7 +38,8 @@
- #include <unistd.h>
- #endif
- #include <event.h>
--
-+#include <sys/types.h>
-+#include <sys/socket.h>
-
-
- namespace apache { namespace thrift { namespace server {
diff -ruN /usr/ports/devel/thrift/pkg-plist thrift/pkg-plist
--- /usr/ports/devel/thrift/pkg-plist 2013-07-31 13:17:08.000000000 +0400
+++ thrift/pkg-plist 2013-10-16 16:15:57.000000000 +0400
@@ -1,127 +1 @@
bin/thrift
-include/thrift/TApplicationException.h
-include/thrift/TDispatchProcessor.h
-include/thrift/TLogging.h
-include/thrift/TProcessor.h
-include/thrift/TReflectionLocal.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/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/Thread.h
-include/thrift/concurrency/ThreadManager.h
-include/thrift/concurrency/TimerManager.h
-include/thrift/concurrency/Util.h
-%%GLIB%%include/thrift/c_glib/config.h
-include/thrift/processor/PeekProcessor.h
-include/thrift/processor/StatsProcessor.h
-%%GLIB%%include/thrift/c_glib/processor/thrift_processor.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/TProtocol.h
-include/thrift/protocol/TProtocolException.h
-include/thrift/protocol/TProtocolTap.h
-include/thrift/protocol/TVirtualProtocol.h
-%%GLIB%%include/thrift/c_glib/protocol/thrift_binary_protocol.h
-%%GLIB%%include/thrift/c_glib/protocol/thrift_binary_protocol_factory.h
-%%GLIB%%include/thrift/c_glib/protocol/thrift_protocol.h
-%%GLIB%%include/thrift/c_glib/protocol/thrift_protocol_factory.h
-include/thrift/qt/TQIODeviceTransport.h
-include/thrift/qt/TQTcpServer.h
-include/thrift/server/TNonblockingServer.h
-include/thrift/server/TServer.h
-include/thrift/server/TSimpleServer.h
-include/thrift/server/TThreadPoolServer.h
-include/thrift/server/TThreadedServer.h
-%%GLIB%%include/thrift/c_glib/server/thrift_server.h
-%%GLIB%%include/thrift/c_glib/server/thrift_simple_server.h
-%%GLIB%%include/thrift/c_glib/thrift.h
-%%GLIB%%include/thrift/c_glib/thrift_application_exception.h
-%%GLIB%%include/thrift/c_glib/thrift_struct.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
-%%GLIB%%include/thrift/c_glib/transport/thrift_buffered_transport.h
-%%GLIB%%include/thrift/c_glib/transport/thrift_framed_transport.h
-%%GLIB%%include/thrift/c_glib/transport/thrift_memory_buffer.h
-%%GLIB%%include/thrift/c_glib/transport/thrift_server_socket.h
-%%GLIB%%include/thrift/c_glib/transport/thrift_server_transport.h
-%%GLIB%%include/thrift/c_glib/transport/thrift_socket.h
-%%GLIB%%include/thrift/c_glib/transport/thrift_transport.h
-%%GLIB%%include/thrift/c_glib/transport/thrift_transport_factory.h
-lib/libthrift.a
-lib/libthrift.la
-lib/libthrift.so
-lib/libthrift.so.0
-lib/libthrift-%%PORTVERSION%%.so
-%%GLIB%%lib/libthrift_c_glib.a
-%%GLIB%%lib/libthrift_c_glib.la
-%%GLIB%%lib/libthrift_c_glib.so
-%%GLIB%%lib/libthrift_c_glib.so.0
-lib/libthriftnb.a
-lib/libthriftnb.la
-lib/libthriftnb.so
-lib/libthriftnb.so.0
-lib/libthriftnb-%%PORTVERSION%%.so
-%%QT4%%lib/libthriftqt-%%PORTVERSION%%.so
-%%QT4%%lib/libthriftqt.a
-%%QT4%%lib/libthriftqt.la
-%%QT4%%lib/libthriftqt.so
-lib/libthriftz-%%PORTVERSION%%.so
-lib/libthriftz.a
-lib/libthriftz.la
-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
-%%GLIB%%libdata/pkgconfig/thrift_c_glib.pc
-%%GLIB%%@dirrm include/thrift/c_glib/processor
-%%GLIB%%@dirrm include/thrift/c_glib/protocol
-%%GLIB%%@dirrm include/thrift/c_glib/server
-%%GLIB%%@dirrm include/thrift/c_glib/transport
-%%GLIB%%@dirrm include/thrift/c_glib
-@dirrm include/thrift/transport
-@dirrm include/thrift/server
-@dirrm include/thrift/qt
-@dirrm include/thrift/protocol
-@dirrm include/thrift/processor
-@dirrm include/thrift/concurrency
-@dirrm include/thrift/async
-@dirrm include/thrift
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310171342.r9HDgFWi003268>