Date: Wed, 17 Oct 2012 05:37:30 GMT From: Valery Komarov <komarov@valerka.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172806: [MAINTAINER UPDATE] devel/thrift Message-ID: <201210170537.q9H5bU09058893@red.freebsd.org> Resent-Message-ID: <201210170540.q9H5e1lm050055@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172806
>Category: ports
>Synopsis: [MAINTAINER UPDATE] 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: Wed Oct 17 05:40:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Valery Komarov
>Release: FreeBSD 9-STABLE amd64
>Organization:
>Environment:
>Description:
Upgrade to version 0.9.0
Ports devel/thrift, devel/fb30, devel/php5-thrift, devel/node-thrift, devel/rubygem-thrift.txt must be commit together
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/devel/thrift/Makefile thrift/Makefile
--- /usr/ports/devel/thrift/Makefile 2012-03-13 18:30:51.000000000 +0400
+++ thrift/Makefile 2012-10-16 13:56:35.770819693 +0400
@@ -35,8 +35,8 @@
--enable-shared --enable-static --with-zlib
CONFIGURE_ENV+= ${MAKE_ENV}
-OPTIONS= GLIB "Building C (GLib) Library" off
-
+OPTIONS= GLIB "Building C (GLib) Library" off \
+ QT "Building Qt Library" off
# For Perl support, use devel/p5-Thrift.
# For Python support, use devel/py-thrift.
# For Ruby support, use devel/rubygem-thrift.
@@ -68,6 +68,16 @@
PLIST_SUB+= GLIB="@comment "
.endif
+.if !defined(WITHOUT_QT)
+ CONFIGURE_ARGS+= --with-qt4
+ USE_QT4= network moc_build qmake_build rcc_build uic_build
+ PLIST_SUB+= QT=""
+ WITH_QT= true
+.else
+ CONFIGURE_ARGS+= --without-qt4
+ PLIST_SUB+= QT="@comment "
+.endif
+
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
diff -ruN /usr/ports/devel/thrift/bsd.thrift.mk thrift/bsd.thrift.mk
--- /usr/ports/devel/thrift/bsd.thrift.mk 2012-01-06 05:02:56.000000000 +0400
+++ thrift/bsd.thrift.mk 2012-10-16 13:06:45.183818380 +0400
@@ -5,4 +5,4 @@
# in your makefile, set:
# PORTVERSION= ${THRIFT_PORTVERSION}
# see $PORTSDIR/devel/thrift for examples
-THRIFT_PORTVERSION= 0.8.0
+THRIFT_PORTVERSION= 0.9.0
diff -ruN /usr/ports/devel/thrift/distinfo thrift/distinfo
--- /usr/ports/devel/thrift/distinfo 2012-03-13 18:30:51.000000000 +0400
+++ thrift/distinfo 2012-10-16 13:07:01.422818218 +0400
@@ -1,2 +1,2 @@
-SHA256 (thrift-0.8.0.tar.gz) = 5e280097d88400f5e2db75595a04e1981538e48869cd6915bb9c4831605f0793
-SIZE (thrift-0.8.0.tar.gz) = 2336261
+SHA256 (thrift-0.9.0.tar.gz) = 71d129c49a2616069d9e7a93268cdba59518f77b3c41e763e09537cb3f3f0aac
+SIZE (thrift-0.9.0.tar.gz) = 2794605
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 1970-01-01 03:00:00.000000000 +0300
+++ thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_framed_transport.h 2012-10-16 16:42:42.057818117 +0400
@@ -0,0 +1,10 @@
+--- ./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 1970-01-01 03:00:00.000000000 +0300
+++ thrift/files/patch-lib__c_glib__src__thrift__transport__thrift_socket.h 2012-10-16 16:42:42.059818473 +0400
@@ -0,0 +1,11 @@
+--- ./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__c_glib__src__transport__thrift_framed_transport.h thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h
--- /usr/ports/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h 2012-01-06 05:02:56.000000000 +0400
+++ thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,10 +0,0 @@
---- ./lib/c_glib/src/transport/thrift_framed_transport.h.orig 2011-11-26 23:00:36.000000000 +0400
-+++ ./lib/c_glib/src/transport/thrift_framed_transport.h 2011-12-25 15:09:17.000000000 +0400
-@@ -22,6 +22,7 @@
-
- #include <glib.h>
- #include <glib-object.h>
-+#include <netinet/in.h>
-
- #include "transport/thrift_transport.h"
-
diff -ruN /usr/ports/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h
--- /usr/ports/devel/thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h 2012-01-06 05:02:56.000000000 +0400
+++ thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./lib/c_glib/src/transport/thrift_socket.h.orig 2011-11-26 23:00:36.000000000 +0400
-+++ ./lib/c_glib/src/transport/thrift_socket.h 2011-12-25 15:09:17.000000000 +0400
-@@ -21,6 +21,8 @@
- #define _THRIFT_SOCKET_H
-
- #include <glib-object.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-
- #include "transport/thrift_transport.h"
-
diff -ruN /usr/ports/devel/thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc
--- /usr/ports/devel/thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc 2012-01-06 05:02:56.000000000 +0400
+++ thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- ./lib/cpp/src/protocol/TBinaryProtocol.tcc.orig 2011-11-26 23:00:40.000000000 +0400
-+++ ./lib/cpp/src/protocol/TBinaryProtocol.tcc 2011-12-08 23:53:23.000000000 +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__server__TNonblockingServer.h thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h
--- /usr/ports/devel/thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h 2012-01-06 05:02:56.000000000 +0400
+++ thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h 1970-01-01 03:00:00.000000000 +0300
@@ -1,12 +0,0 @@
---- ./lib/cpp/src/server/TNonblockingServer.h.orig 2011-11-26 23:00:40.000000000 +0400
-+++ ./lib/cpp/src/server/TNonblockingServer.h 2011-12-25 15:09:17.000000000 +0400
-@@ -35,6 +35,9 @@
- #endif
- #include <event.h>
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+
- namespace apache { namespace thrift { namespace server {
-
- using apache::thrift::transport::TMemoryBuffer;
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 1970-01-01 03:00:00.000000000 +0300
+++ thrift/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc 2012-10-16 16:42:42.056819406 +0400
@@ -0,0 +1,11 @@
+--- ./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 1970-01-01 03:00:00.000000000 +0300
+++ thrift/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h 2012-10-16 16:42:42.054818771 +0400
@@ -0,0 +1,12 @@
+--- ./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 2012-03-13 18:30:51.000000000 +0400
+++ thrift/pkg-plist 2012-10-16 14:04:29.466818263 +0400
@@ -1,11 +1,13 @@
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
@@ -41,6 +43,8 @@
%%GLIB%%include/thrift/protocol/thrift_binary_protocol_factory.h
%%GLIB%%include/thrift/protocol/thrift_protocol.h
%%GLIB%%include/thrift/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
@@ -57,6 +61,8 @@
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
@@ -92,17 +98,24 @@
lib/libthriftnb.so
lib/libthriftnb.so.0
lib/libthriftnb-%%PORTVERSION%%.so
+%%QT%%lib/libthriftqt-%%PORTVERSION%%.so
+%%QT%%lib/libthriftqt.a
+%%QT%%lib/libthriftqt.la
+%%QT%%lib/libthriftqt.so
+lib/libthriftz-%%PORTVERSION%%.so
lib/libthriftz.a
lib/libthriftz.la
lib/libthriftz.so
lib/libthriftz.so.0
-lib/libthriftz-%%PORTVERSION%%.so
+%%QT%%libdata/ldconfig/qt4-network
libdata/pkgconfig/thrift-nb.pc
+%%QT%%libdata/pkgconfig/thrift-qt.pc
libdata/pkgconfig/thrift-z.pc
libdata/pkgconfig/thrift.pc
%%GLIB%%libdata/pkgconfig/thrift_c_glib.pc
@dirrm include/thrift/transport
@dirrm include/thrift/server
+@dirrm include/thrift/qt
@dirrm include/thrift/protocol
@dirrm include/thrift/processor
@dirrm include/thrift/concurrency
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210170537.q9H5bU09058893>