Attachment 120334 Details for Bug 163131 – thrift.txt

thrift.txt

thrift.txt (text/plain), 5.23 KB, created by komarov on 2011-12-28 19:12:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: komarov

Created: 2011-12-28 19:12:53 UTC

Size: 5.23 KB

patch

obsolete

>diff -ruN ./thrift.orig/Makefile ./thrift/Makefile
>--- ./thrift.orig/Makefile	2011-12-08 20:53:32.000000000 +0400
>+++ ./thrift/Makefile	2011-12-26 00:46:26.000000000 +0400
>@@ -2,11 +2,11 @@
> # Date created:	   27 September 2007
> # Whom:		   Sergey Skvortsov <skv@protey.ru>
> #
>-# $FreeBSD: ports/devel/thrift/Makefile,v 1.26 2011/12/08 16:53:32 scheidell Exp $
>+# $FreeBSD: ports/devel/thrift/Makefile,v 1.22 2011/08/11 22:37:13 skv Exp $
> #
> 
> PORTNAME=	thrift
>-PORTVERSION=	0.7.0
>+PORTVERSION=	0.8.0
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	APACHE
>@@ -55,6 +55,8 @@
> 		--without-python \
> 		--without-ruby
> 
>+.include <bsd.port.pre.mk>
>+
> .if !defined(WITHOUT_GLIB)
>     CONFIGURE_ARGS+=	--with-c_glib
>     LIB_DEPENDS+=	glib-2.0:${PORTSDIR}/devel/glib20
>@@ -65,8 +67,6 @@
>     PLIST_SUB+=	WITH_GLIB="@comment "
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
> .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
> BROKEN=		Does not compile on ia64, powerpc, or sparc64
> .endif
>@@ -76,9 +76,6 @@
> 
> pre-configure:
> 	@${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am
>-	${CHMOD} 774 ${WRKSRC}/configure
>-	${CHMOD} 774 ${WRKSRC}/install-sh
>-	${CHMOD} 774 ${WRKSRC}/lib/php/src/ext/thrift_protocol/build/shtool
> 
> post-install:
> 	@${LN} -sf ${PREFIX}/lib/libthrift.so.0 ${PREFIX}/lib/libthrift.so
>diff -ruN ./thrift.orig/distinfo ./thrift/distinfo
>--- ./thrift.orig/distinfo	2011-12-08 15:02:04.000000000 +0400
>+++ ./thrift/distinfo	2011-12-08 20:51:24.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (thrift-0.7.0.tar.gz) = ca830156f6f1f94e77823eb5db6ff8f532ed5ccb9e913df83d0c3d6c4ddb9009
>-SIZE (thrift-0.7.0.tar.gz) = 2248326
>+SHA256 (thrift-0.8.0.tar.gz) = 5e280097d88400f5e2db75595a04e1981538e48869cd6915bb9c4831605f0793
>+SIZE (thrift-0.8.0.tar.gz) = 2336261
>diff -ruN ./thrift.orig/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h ./thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h
>--- ./thrift.orig/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h	2011-12-08 15:02:04.000000000 +0400
>+++ ./thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h	2011-12-25 15:11:53.000000000 +0400
>@@ -1,5 +1,5 @@
>---- ./lib/c_glib/src/transport/thrift_framed_transport.h.orig	2011-08-11 17:18:58.000000000 +0400
>-+++ ./lib/c_glib/src/transport/thrift_framed_transport.h	2011-08-26 12:00:03.000000000 +0400
>+--- ./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>
>diff -ruN ./thrift.orig/files/patch-lib__c_glib__src__transport__thrift_socket.h ./thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h
>--- ./thrift.orig/files/patch-lib__c_glib__src__transport__thrift_socket.h	2011-12-08 15:02:04.000000000 +0400
>+++ ./thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h	2011-12-25 15:11:53.000000000 +0400
>@@ -1,5 +1,5 @@
>---- ./lib/c_glib/src/transport/thrift_socket.h.orig	2011-08-11 17:18:58.000000000 +0400
>-+++ ./lib/c_glib/src/transport/thrift_socket.h	2011-08-26 11:58:33.000000000 +0400
>+--- ./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
>  
>diff -ruN ./thrift.orig/files/patch-lib__cpp__src__server__TNonblockingServer.h ./thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h
>--- ./thrift.orig/files/patch-lib__cpp__src__server__TNonblockingServer.h	2011-12-08 15:02:04.000000000 +0400
>+++ ./thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h	2011-12-25 15:11:53.000000000 +0400
>@@ -1,7 +1,7 @@
>---- ./lib/cpp/src/server/TNonblockingServer.h.orig	2011-08-11 17:18:59.000000000 +0400
>-+++ ./lib/cpp/src/server/TNonblockingServer.h	2011-08-26 11:47:01.000000000 +0400
>-@@ -33,6 +33,9 @@
>- #include <unistd.h>
>+--- ./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>
>diff -ruN ./thrift.orig/pkg-plist ./thrift/pkg-plist
>--- ./thrift.orig/pkg-plist	2011-12-08 15:02:04.000000000 +0400
>+++ ./thrift/pkg-plist	2011-12-25 15:30:44.000000000 +0400
>@@ -10,10 +10,12 @@
> 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
>@@ -92,11 +94,10 @@
> lib/libthriftz.la
> lib/libthriftz.so
> lib/libthriftz.so.0
>-%%WITH_GLIB%%lib/pkgconfig/thrift_c_glib.pc
>-@dirrmtry %%WITH_GLIB%%lib/pkgconfig
> libdata/pkgconfig/thrift-nb.pc
> libdata/pkgconfig/thrift-z.pc
> libdata/pkgconfig/thrift.pc
>+%%WITH_GLIB%%libdata/pkgconfig/thrift_c_glib.pc
> @dirrm include/thrift/transport
> @dirrm include/thrift/server
> @dirrm include/thrift/protocol

Actions: View

Attachments on bug 163131: 120333 | 120334