Attachment #120333 for bug #163131

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




# Date created:	   27 September 2007
# Whom:		   Sergey Skvortsov <skv@protey.ru>
#
# $FreeBSD: ports/devel/thrift/Makefile,v 1.22 2011/08/11 22:37:13 skv Exp $
#

PORTNAME=	thrift
PORTVERSION=	0.8.0
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	APACHE
MASTER_SITE_SUBDIR=	/thrift/${PORTVERSION}

MAINTAINER=	komarov@valerka.net
COMMENT=	Framework for scalable cross-language services development

LICENSE=	ASL

		--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

    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


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

Lines 1-2 Link Here

(-)./thrift/distinfo (-2 / +2 lines)
1	SHA256 (thrift-0.7.0.tar.gz) = ca830156f6f1f94e77823eb5db6ff8f532ed5ccb9e913df83d0c3d6c4ddb9009	1	SHA256 (thrift-0.8.0.tar.gz) = 5e280097d88400f5e2db75595a04e1981538e48869cd6915bb9c4831605f0793
2	SIZE (thrift-0.7.0.tar.gz) = 2248326	2	SIZE (thrift-0.8.0.tar.gz) = 2336261

Lines 1-5 Link Here

(-)./thrift/files/patch-lib__c_glib__src__transport__thrift_framed_transport.h (-2 / +2 lines)
1	--- ./lib/c_glib/src/transport/thrift_framed_transport.h.orig 2011-08-11 17:18:58.000000000 +0400	1	--- ./lib/c_glib/src/transport/thrift_framed_transport.h.orig 2011-11-26 23:00:36.000000000 +0400
2	+++ ./lib/c_glib/src/transport/thrift_framed_transport.h 2011-08-26 12:00:03.000000000 +0400	2	+++ ./lib/c_glib/src/transport/thrift_framed_transport.h 2011-12-08 23:52:32.000000000 +0400
3	@@ -22,6 +22,7 @@	3	@@ -22,6 +22,7 @@
4		4
5	#include <glib.h>	5	#include <glib.h>

Lines 1-5 Link Here

(-)./thrift/files/patch-lib__c_glib__src__transport__thrift_socket.h (-2 / +2 lines)
1	--- ./lib/c_glib/src/transport/thrift_socket.h.orig 2011-08-11 17:18:58.000000000 +0400	1	--- ./lib/c_glib/src/transport/thrift_socket.h.orig 2011-11-26 23:00:36.000000000 +0400
2	+++ ./lib/c_glib/src/transport/thrift_socket.h 2011-08-26 11:58:33.000000000 +0400	2	+++ ./lib/c_glib/src/transport/thrift_socket.h 2011-12-08 23:52:32.000000000 +0400
3	@@ -21,6 +21,8 @@	3	@@ -21,6 +21,8 @@
4	#define _THRIFT_SOCKET_H	4	#define _THRIFT_SOCKET_H
5		5




--- ./lib/cpp/Makefile.am.orig	2011-11-26 23:00:42.000000000 +0400
+++ ./lib/cpp/Makefile.am	2011-12-08 23:52:32.000000000 +0400
@@ -23,11 +23,11 @@
 SUBDIRS += test
 endif
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir=${prefix}/libdata/pkgconfig
 
 lib_LTLIBRARIES = libthrift.la
 pkgconfig_DATA = thrift.pc
-libthrift_la_LDFLAGS = -release $(VERSION) $(BOOST_LDFLAGS)
+libthrift_la_LDFLAGS = -version-info 0 $(BOOST_LDFLAGS)
 
 ## We only build the extra libraries if we have the dependencies,
 ## but we install all of the headers unconditionally.
@@ -99,8 +99,8 @@
 libthriftz_la_CPPFLAGS  = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
 libthriftnb_la_CXXFLAGS = $(AM_CXXFLAGS)
 libthriftz_la_CXXFLAGS  = $(AM_CXXFLAGS)
-libthriftnb_la_LDFLAGS  = -release $(VERSION) $(BOOST_LDFLAGS)
-libthriftz_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS)
+libthriftnb_la_LDFLAGS  = -version-info 0 $(BOOST_LDFLAGS)
+libthriftz_la_LDFLAGS   = -version-info 0 $(BOOST_LDFLAGS)
 
 include_thriftdir = $(includedir)/thrift
 include_thrift_HEADERS = \

Line 0 Link Here

(-)./thrift/files/patch-lib__cpp__src__protocol__TBinaryProtocol.tcc (+11 lines)
	1	--- ./lib/cpp/src/protocol/TBinaryProtocol.tcc.orig 2011-11-26 23:00:40.000000000 +0400
	2	+++ ./lib/cpp/src/protocol/TBinaryProtocol.tcc 2011-12-08 23:53:23.000000000 +0400
	3	@@ -23,7 +23,7 @@
	4	#include "TBinaryProtocol.h"
	5
	6	#include <limits>
	7	-
	8	+#include <netinet/in.h>
	9
	10	namespace apache { namespace thrift { namespace protocol {
	11

Lines 1-7 Link Here

(-)./thrift/files/patch-lib__cpp__src__server__TNonblockingServer.h (-4 / +4 lines)
1	--- ./lib/cpp/src/server/TNonblockingServer.h.orig 2011-08-11 17:18:59.000000000 +0400	1	--- ./lib/cpp/src/server/TNonblockingServer.h.orig 2011-11-26 23:00:40.000000000 +0400
2	+++ ./lib/cpp/src/server/TNonblockingServer.h 2011-08-26 11:47:01.000000000 +0400	2	+++ ./lib/cpp/src/server/TNonblockingServer.h 2011-12-08 23:52:32.000000000 +0400
3	@@ -33,6 +33,9 @@	3	@@ -35,6 +35,9 @@
4	#include <unistd.h>	4	#endif
5	#include <event.h>	5	#include <event.h>
6		6
7	+#include <sys/types.h>	7	+#include <sys/types.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

Return to bug 163131

Lines 2-18 Link Here

(-)./thrift/Makefile (-9 / +5 lines)
2	# Date created: 27 September 2007	2	# Date created: 27 September 2007
3	# Whom: Sergey Skvortsov <skv@protey.ru>	3	# Whom: Sergey Skvortsov <skv@protey.ru>
4	#	4	#
5	# $FreeBSD: ports/devel/thrift/Makefile,v 1.25 2011/12/08 11:02:04 scheidell Exp $	5	# $FreeBSD: ports/devel/thrift/Makefile,v 1.22 2011/08/11 22:37:13 skv Exp $
6	#	6	#
7		7
8	PORTNAME= thrift	8	PORTNAME= thrift
9	PORTVERSION= 0.7.0	9	PORTVERSION= 0.8.0
10	PORTEPOCH= 1
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= APACHE	11	MASTER_SITES= APACHE
13	MASTER_SITE_SUBDIR= /thrift/${PORTVERSION}	12	MASTER_SITE_SUBDIR= /thrift/${PORTVERSION}
14		13
15	MAINTAINER= skv@FreeBSD.org	14	MAINTAINER= komarov@valerka.net
16	COMMENT= Framework for scalable cross-language services development	15	COMMENT= Framework for scalable cross-language services development
17		16
18	LICENSE= ASL	17	LICENSE= ASL
Lines 55-60 Link Here
55	--without-python \	54	--without-python \
56	--without-ruby	55	--without-ruby
57		56
		57	.include <bsd.port.pre.mk>
		58
58	.if !defined(WITHOUT_GLIB)	59	.if !defined(WITHOUT_GLIB)
59	CONFIGURE_ARGS+= --with-c_glib	60	CONFIGURE_ARGS+= --with-c_glib
60	LIB_DEPENDS+= glib-2.0:${PORTSDIR}/devel/glib20	61	LIB_DEPENDS+= glib-2.0:${PORTSDIR}/devel/glib20
Lines 65-72 Link Here
65	PLIST_SUB+= WITH_GLIB="@comment "	66	PLIST_SUB+= WITH_GLIB="@comment "
66	.endif	67	.endif
67		68
68	.include <bsd.port.pre.mk>
69
70	.if ${ARCH} == "ia64" \|\| ${ARCH} == "powerpc" \|\| ${ARCH} == "sparc64"	69	.if ${ARCH} == "ia64" \|\| ${ARCH} == "powerpc" \|\| ${ARCH} == "sparc64"
71	BROKEN= Does not compile on ia64, powerpc, or sparc64	70	BROKEN= Does not compile on ia64, powerpc, or sparc64
72	.endif	71	.endif
Lines 76-84 Link Here
76		75
77	pre-configure:	76	pre-configure:
78	@${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am	77	@${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am
79	${CHMOD} 774 ${WRKSRC}/configure
80	${CHMOD} 774 ${WRKSRC}/install-sh
81	${CHMOD} 774 ${WRKSRC}/lib/php/src/ext/thrift_protocol/build/shtool
82		78
83	post-install:	79	post-install:
84	@${LN} -sf ${PREFIX}/lib/libthrift.so.0 ${PREFIX}/lib/libthrift.so	80	@${LN} -sf ${PREFIX}/lib/libthrift.so.0 ${PREFIX}/lib/libthrift.so

Line 0 Link Here

(-)./thrift/files/patch-lib__cpp__Makefile.am (+27 lines)
	1	--- ./lib/cpp/Makefile.am.orig 2011-11-26 23:00:42.000000000 +0400
	2	+++ ./lib/cpp/Makefile.am 2011-12-08 23:52:32.000000000 +0400
	3	@@ -23,11 +23,11 @@
	4	SUBDIRS += test
	5	endif
	6
	7	-pkgconfigdir = $(libdir)/pkgconfig
	8	+pkgconfigdir=${prefix}/libdata/pkgconfig
	9
	10	lib_LTLIBRARIES = libthrift.la
	11	pkgconfig_DATA = thrift.pc
	12	-libthrift_la_LDFLAGS = -release $(VERSION) $(BOOST_LDFLAGS)
	13	+libthrift_la_LDFLAGS = -version-info 0 $(BOOST_LDFLAGS)
	14
	15	## We only build the extra libraries if we have the dependencies,
	16	## but we install all of the headers unconditionally.
	17	@@ -99,8 +99,8 @@
	18	libthriftz_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
	19	libthriftnb_la_CXXFLAGS = $(AM_CXXFLAGS)
	20	libthriftz_la_CXXFLAGS = $(AM_CXXFLAGS)
	21	-libthriftnb_la_LDFLAGS = -release $(VERSION) $(BOOST_LDFLAGS)
	22	-libthriftz_la_LDFLAGS = -release $(VERSION) $(BOOST_LDFLAGS)
	23	+libthriftnb_la_LDFLAGS = -version-info 0 $(BOOST_LDFLAGS)
	24	+libthriftz_la_LDFLAGS = -version-info 0 $(BOOST_LDFLAGS)
	25
	26	include_thriftdir = $(includedir)/thrift
	27	include_thrift_HEADERS = \

Lines 10-19 Link Here

(-)./thrift/pkg-plist (+2 lines)
10	include/thrift/async/TAsyncProtocolProcessor.h	10	include/thrift/async/TAsyncProtocolProcessor.h
11	include/thrift/async/TEvhttpClientChannel.h	11	include/thrift/async/TEvhttpClientChannel.h
12	include/thrift/async/TEvhttpServer.h	12	include/thrift/async/TEvhttpServer.h
		13	include/thrift/concurrency/BoostThreadFactory.h
13	include/thrift/concurrency/Exception.h	14	include/thrift/concurrency/Exception.h
14	include/thrift/concurrency/FunctionRunner.h	15	include/thrift/concurrency/FunctionRunner.h
15	include/thrift/concurrency/Monitor.h	16	include/thrift/concurrency/Monitor.h
16	include/thrift/concurrency/Mutex.h	17	include/thrift/concurrency/Mutex.h
		18	include/thrift/concurrency/PlatformThreadFactory.h
17	include/thrift/concurrency/PosixThreadFactory.h	19	include/thrift/concurrency/PosixThreadFactory.h
18	include/thrift/concurrency/Thread.h	20	include/thrift/concurrency/Thread.h
19	include/thrift/concurrency/ThreadManager.h	21	include/thrift/concurrency/ThreadManager.h