Attachment #162095 for bug #203767

View | Details | Raw Unified | Return to bug 203767
Collapse All | Expand All

Lines 43-49 Link Here

(-)thrift/Makefile (-1 / +2 lines)
43	--without-php \	43	--without-php \
44	--without-php_extension \	44	--without-php_extension \
45	--without-python \	45	--without-python \
46	--without-ruby	46	--without-ruby \
		47	--without-go
47		48
48	PLIST_FILES= bin/thrift	49	PLIST_FILES= bin/thrift
49		50

Lines 5-11 Link Here

(-)thrift/bsd.thrift.mk (-1 / +1 lines)
5	# in your makefile, set:	5	# in your makefile, set:
6	# PORTVERSION= ${THRIFT_PORTVERSION}	6	# PORTVERSION= ${THRIFT_PORTVERSION}
7	# see $PORTSDIR/devel/thrift for examples	7	# see $PORTSDIR/devel/thrift for examples
8	THRIFT_PORTVERSION= 0.9.1	8	THRIFT_PORTVERSION= 0.9.3
9	THRIFT_PORTREVISION= 1	9	THRIFT_PORTREVISION= 1
10		10
11	CONFIGURE_ARGS+= \	11	CONFIGURE_ARGS+= \

Lines 1-2 Link Here

(-)thrift/distinfo (-2 / +2 lines)
1	SHA256 (thrift-0.9.1.tar.gz) = ac175080c8cac567b0331e394f23ac306472c071628396db2850cb00c41b0017	1	SHA256 (thrift-0.9.3.tar.gz) = b0740a070ac09adde04d43e852ce4c320564a292f26521c46b78e0641564969e
2	SIZE (thrift-0.9.1.tar.gz) = 3402353	2	SIZE (thrift-0.9.3.tar.gz) = 8897936

Lines 40-46 Link Here

(-)thrift-c_glib/Makefile (-1 / +2 lines)
40	--without-php \	40	--without-php \
41	--without-php_extension \	41	--without-php_extension \
42	--without-python \	42	--without-python \
43	--without-ruby	43	--without-ruby \
		44	--without-go
44		45
45	post-patch:	46	post-patch:
46	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/c_glib/Makefile.am	47	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/c_glib/Makefile.am




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

		--without-php \
		--without-php_extension \
		--without-python \
		--without-ruby \
                --without-go

.include <bsd.port.pre.mk>





--- 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 <thrift/protocol/TBinaryProtocol.h>
 
 #include <limits>
 
+#include <netinet/in.h>
+
 namespace apache {
 namespace thrift {
 namespace protocol {




--- 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 <event2/event_compat.h>
 #include <event2/event_struct.h>
 
-
+#include <sys/types.h>
+#include <sys/socket.h>
+
 namespace apache {
 namespace thrift {
 namespace server {




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/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/transport/TTransportUtils.h
include/thrift/transport/TVirtualTransport.h
include/thrift/transport/TZlibTransport.h
lib/libthrift-0.9.3.so
lib/libthrift.a
lib/libthrift.so
lib/libthrift.so.0

%%QT4%%lib/libthriftqt.a
%%QT4%%lib/libthriftqt.so
%%QT4%%lib/libthriftqt.so.0
lib/libthriftz-0.9.3.so
lib/libthriftz.a
lib/libthriftz.so
lib/libthriftz.so.0

Return to bug 203767

Lines 23-30 Link Here

(-)thrift-cpp/Makefile (-3 / +2 lines)
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24	MAKE_JOBS_UNSAFE= yes	24	MAKE_JOBS_UNSAFE= yes
25	PLIST_SUB= PORTVERSION="${THRIFT_PORTVERSION}"	25	PLIST_SUB= PORTVERSION="${THRIFT_PORTVERSION}"
26	BUILD_WRKSRC= ${WRKSRC}/lib/cpp
27	INSTALL_WRKSRC= ${WRKSRC}/lib/cpp
28		26
29	OPTIONS_DEFINE= QT4	27	OPTIONS_DEFINE= QT4
30	QT4_CONFIGURE_WITH= qt4	28	QT4_CONFIGURE_WITH= qt4
Lines 43-49 Link Here
43	--without-php \	41	--without-php \
44	--without-php_extension \	42	--without-php_extension \
45	--without-python \	43	--without-python \
46	--without-ruby	44	--without-ruby \
		45	--without-go
47		46
48	.include <bsd.port.pre.mk>	47	.include <bsd.port.pre.mk>
49		48

Lines 1-11 Link Here

(-)thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc (-8 / +8 lines)
1	--- ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig 2013-08-15 18:04:29.000000000 +0400	1	--- lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig 2015-10-13 19:19:23 UTC
2	+++ ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc 2013-10-16 01:15:53.000000000 +0400	2	+++ lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
3	@@ -23,7 +23,7 @@	3	@@ -24,6 +24,8 @@
4	#include <thrift/protocol/TBinaryProtocol.h>
5		4
6	#include <limits>	5	#include <limits>
7	-	6
8	+#include <netinet/in.h>	7	+#include <netinet/in.h>
9		8	+
10	namespace apache { namespace thrift { namespace protocol {	9	namespace apache {
11		10	namespace thrift {
		11	namespace protocol {

Lines 1-12 Link Here

(-)thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h (-10 / +10 lines)
1	--- ./lib/cpp/src/thrift/server/TNonblockingServer.h.orig 2013-08-15 18:04:29.000000000 +0400	1	--- lib/cpp/src/thrift/server/TNonblockingServer.h.orig 2015-10-13 19:19:36 UTC
2	+++ ./lib/cpp/src/thrift/server/TNonblockingServer.h 2013-10-16 01:15:53.000000000 +0400	2	+++ lib/cpp/src/thrift/server/TNonblockingServer.h
3	@@ -38,7 +38,8 @@	3	@@ -41,6 +41,9 @@
4	#include <unistd.h>	4	#include <event2/event_compat.h>
5	#endif	5	#include <event2/event_struct.h>
6	#include <event.h>	6
7	-
8	+#include <sys/types.h>	7	+#include <sys/types.h>
9	+#include <sys/socket.h>	8	+#include <sys/socket.h>
10		9	+
11		10	namespace apache {
12	namespace apache { namespace thrift { namespace server {	11	namespace thrift {
		12	namespace server {

Lines 2-8 Link Here

(-)thrift-cpp/pkg-plist (-4 / +2 lines)
2	include/thrift/TDispatchProcessor.h	2	include/thrift/TDispatchProcessor.h
3	include/thrift/TLogging.h	3	include/thrift/TLogging.h
4	include/thrift/TProcessor.h	4	include/thrift/TProcessor.h
5	include/thrift/TReflectionLocal.h
6	include/thrift/Thrift.h	5	include/thrift/Thrift.h
7	include/thrift/async/TAsyncBufferProcessor.h	6	include/thrift/async/TAsyncBufferProcessor.h
8	include/thrift/async/TAsyncChannel.h	7	include/thrift/async/TAsyncChannel.h
Lines 37-43 Link Here
37	include/thrift/protocol/TCompactProtocol.h	36	include/thrift/protocol/TCompactProtocol.h
38	include/thrift/protocol/TCompactProtocol.tcc	37	include/thrift/protocol/TCompactProtocol.tcc
39	include/thrift/protocol/TDebugProtocol.h	38	include/thrift/protocol/TDebugProtocol.h
40	include/thrift/protocol/TDenseProtocol.h
41	include/thrift/protocol/TJSONProtocol.h	39	include/thrift/protocol/TJSONProtocol.h
42	include/thrift/protocol/TMultiplexedProtocol.h	40	include/thrift/protocol/TMultiplexedProtocol.h
43	include/thrift/protocol/TProtocol.h	41	include/thrift/protocol/TProtocol.h
Lines 75-81 Link Here
75	include/thrift/transport/TTransportUtils.h	73	include/thrift/transport/TTransportUtils.h
76	include/thrift/transport/TVirtualTransport.h	74	include/thrift/transport/TVirtualTransport.h
77	include/thrift/transport/TZlibTransport.h	75	include/thrift/transport/TZlibTransport.h
78	lib/libthrift-0.9.1.so	76	lib/libthrift-0.9.3.so
79	lib/libthrift.a	77	lib/libthrift.a
80	lib/libthrift.so	78	lib/libthrift.so
81	lib/libthrift.so.0	79	lib/libthrift.so.0
Lines 87-93 Link Here
87	%%QT4%%lib/libthriftqt.a	85	%%QT4%%lib/libthriftqt.a
88	%%QT4%%lib/libthriftqt.so	86	%%QT4%%lib/libthriftqt.so
89	%%QT4%%lib/libthriftqt.so.0	87	%%QT4%%lib/libthriftqt.so.0
90	lib/libthriftz-0.9.1.so	88	lib/libthriftz-0.9.3.so
91	lib/libthriftz.a	89	lib/libthriftz.a
92	lib/libthriftz.so	90	lib/libthriftz.so
93	lib/libthriftz.so.0	91	lib/libthriftz.so.0