Attachment #137489 for bug #183056

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





PORTNAME=	fb303
PORTVERSION=	${THRIFT_PORTVERSION}
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	devel
MASTER_SITES=	APACHE


LICENSE=	AL2

LIB_DEPENDS=	thrift:${PORTSDIR}/devel/thrift-cpp
BUILD_DEPENDS=	thrift:${PORTSDIR}/devel/thrift

ACLOCAL_ARGS=	-I ./aclocal
AUTOMAKE_ARGS=	-a
CONFIGURE_ARGS=	PY_PREFIX="${PREFIX}"
USE_AUTOTOOLS=	autoconf autoheader:env aclocal automake

USES=		gmake perl5 compiler
USE_PERL5=	run
USE_PYTHON=	yes
WRKSRC=		${WRKDIR}/${DISTNAME}/contrib/fb303

PLIST_SUB+=	PORTVERSION="${PORTVERSION}" PYTHON_VER="${PYTHON_VER}"

CONFIGURE_ARGS+=	--without-php

NO_STAGE=	yes

.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang
USE_CXXSTD=	c++11
EXTRA_PATCHES+=	${FILESDIR}/extra_patch-cpp__Makefile.am
.endif

post-build:
	(cd ${WRKSRC} && ${LOCALBASE}/bin/thrift --gen perl ${WRKSRC}/if/fb303.thrift)


Lines 1-2 Link Here

(-)fb303/distinfo (-2 / +2 lines)
1	SHA256 (thrift-0.9.0.tar.gz) = 71d129c49a2616069d9e7a93268cdba59518f77b3c41e763e09537cb3f3f0aac	1	SHA256 (thrift-0.9.1.tar.gz) = ac175080c8cac567b0331e394f23ac306472c071628396db2850cb00c41b0017
2	SIZE (thrift-0.9.0.tar.gz) = 2794605	2	SIZE (thrift-0.9.1.tar.gz) = 3402353

Line 0 Link Here

(-)fb303/files/extra_patch-cpp__Makefile.am (+11 lines)
	1	--- ./cpp/Makefile.am.orig 2013-08-15 18:04:29.000000000 +0400
	2	+++ ./cpp/Makefile.am 2013-10-17 19:36:43.000000000 +0400
	3	@@ -37,7 +37,7 @@
	4	# USE flags AM_CXXFLAGS, AM_CFLAGS, AM_CPPFLAGS, AM_LDFLAGS, LDADD in this section.
	5
	6	AM_CPPFLAGS = -I..
	7	-AM_CPPFLAGS += -Igen-cpp
	8	+AM_CPPFLAGS += -Igen-cpp -std=c++11
	9	AM_CPPFLAGS += -I$(thrift_home)/include/thrift
	10	AM_CPPFLAGS += $(BOOST_CPPFLAGS)
	11	AM_CPPFLAGS += $(FB_CPPFLAGS) $(DEBUG_CPPFLAGS)




--- ./cpp/FacebookBase.cpp.orig	2013-08-15 18:04:29.000000000 +0400
+++ ./cpp/FacebookBase.cpp	2013-10-17 19:36:22.000000000 +0400
@@ -27,7 +27,7 @@
   aliveSince_ = (int64_t) time(NULL);
 }
 
-inline void FacebookBase::getName(std::string& _return) {
+void FacebookBase::getName(std::string& _return) {
   _return = name_;
 }
 
@@ -118,7 +118,7 @@
   return rv;
 }
 
-inline int64_t FacebookBase::aliveSince() {
+int64_t FacebookBase::aliveSince() {
   return aliveSince_;
 }
 

Lines 21-27 Link Here

(-)fb303/pkg-plist (-1 / +1 lines)
21	%%PYTHON_SITELIBDIR%%/fb303_scripts/__init__.pyc	21	%%PYTHON_SITELIBDIR%%/fb303_scripts/__init__.pyc
22	%%PYTHON_SITELIBDIR%%/fb303_scripts/fb303_simple_mgmt.py	22	%%PYTHON_SITELIBDIR%%/fb303_scripts/fb303_simple_mgmt.py
23	%%PYTHON_SITELIBDIR%%/fb303_scripts/fb303_simple_mgmt.pyc	23	%%PYTHON_SITELIBDIR%%/fb303_scripts/fb303_simple_mgmt.pyc
24	%%PYTHON_SITELIBDIR%%/thrift-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info	24	%%PYTHON_SITELIBDIR%%/thrift_fb303-1.0.0_dev-py%%PYTHON_VER%%.egg-info
25	%%DATADIR%%/if/fb303.thrift	25	%%DATADIR%%/if/fb303.thrift
26	@dirrm %%DATADIR%%/if	26	@dirrm %%DATADIR%%/if
27	@dirrm %%DATADIR%%	27	@dirrm %%DATADIR%%

Return to bug 183056

Lines 3-9 Link Here

(-)fb303/Makefile (-6 / +15 lines)
3		3
4	PORTNAME= fb303	4	PORTNAME= fb303
5	PORTVERSION= ${THRIFT_PORTVERSION}	5	PORTVERSION= ${THRIFT_PORTVERSION}
6	PORTREVISION= 1
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= APACHE	8	MASTER_SITES= APACHE
Lines 15-36 Link Here
15		14
16	LICENSE= AL2	15	LICENSE= AL2
17		16
18	LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \	17	LIB_DEPENDS= thrift:${PORTSDIR}/devel/thrift-cpp
19	thrift:${PORTSDIR}/devel/thrift	18	BUILD_DEPENDS= thrift:${PORTSDIR}/devel/thrift
20		19
21	ACLOCAL_ARGS= -I ./aclocal	20	ACLOCAL_ARGS= -I ./aclocal
22	AUTOMAKE_ARGS= -a	21	AUTOMAKE_ARGS= -a
23	CONFIGURE_ARGS= PY_PREFIX="${PREFIX}"	22	CONFIGURE_ARGS= PY_PREFIX="${PREFIX}"
24	USE_AUTOTOOLS= aclocal automake autoconf	23	USE_AUTOTOOLS= autoconf autoheader:env aclocal automake
25	USE_GMAKE= yes	24
26	USES= perl5	25	USES= gmake perl5 compiler
27	USE_PERL5= run	26	USE_PERL5= run
28	USE_PYTHON= yes	27	USE_PYTHON= yes
29	WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/fb303	28	WRKSRC= ${WRKDIR}/${DISTNAME}/contrib/fb303
30		29
31	PLIST_SUB+= PORTVERSION="${PORTVERSION}" PYTHON_VER="${PYTHON_VER}"	30	PLIST_SUB+= PORTVERSION="${PORTVERSION}" PYTHON_VER="${PYTHON_VER}"
32		31
		32	CONFIGURE_ARGS+= --without-php
		33
33	NO_STAGE= yes	34	NO_STAGE= yes
		35
		36	.include <bsd.port.pre.mk>
		37
		38	.if ${COMPILER_TYPE} == clang
		39	USE_CXXSTD= c++11
		40	EXTRA_PATCHES+= ${FILESDIR}/extra_patch-cpp__Makefile.am
		41	.endif
		42
34	post-build:	43	post-build:
35	(cd ${WRKSRC} && ${LOCALBASE}/bin/thrift --gen perl ${WRKSRC}/if/fb303.thrift)	44	(cd ${WRKSRC} && ${LOCALBASE}/bin/thrift --gen perl ${WRKSRC}/if/fb303.thrift)
36		45

Line 0 Link Here

(-)fb303/files/patch-cpp__FacebookBase.cpp (+20 lines)
	1	--- ./cpp/FacebookBase.cpp.orig 2013-08-15 18:04:29.000000000 +0400
	2	+++ ./cpp/FacebookBase.cpp 2013-10-17 19:36:22.000000000 +0400
	3	@@ -27,7 +27,7 @@
	4	aliveSince_ = (int64_t) time(NULL);
	5	}
	6
	7	-inline void FacebookBase::getName(std::string& _return) {
	8	+void FacebookBase::getName(std::string& _return) {
	9	_return = name_;
	10	}
	11
	12	@@ -118,7 +118,7 @@
	13	return rv;
	14	}
	15
	16	-inline int64_t FacebookBase::aliveSince() {
	17	+int64_t FacebookBase::aliveSince() {
	18	return aliveSince_;
	19	}
	20