From b8b68e01c864b3584bc98b072b6f3f02da9311ee Mon Sep 17 00:00:00 2001
From: wg <wg@FreeBSD.org>
Date: Sat, 2 Nov 2013 22:37:52 +0000
Subject: net/scribe: fix build

- Fix build with automake [1]
- USES gmake perl5
- Allow staging
- Convert lib depends to new format

PR:		ports/182597 [1]
Submitted by:	Stephon Chen <stephon gmail.com>
Approved by:	maintainer
---
 net/scribe/Makefile                 | 21 +++++++++------------
 net/scribe/files/patch-configure.ac | 10 ++++++++++
 2 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 net/scribe/files/patch-configure.ac

diff --git a/net/scribe/Makefile b/net/scribe/Makefile
index 7df1d1f4fe9b..23d624291384 100644
--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scribe
 DISTVERSION=	2.2.2012.01.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/facebook/scribe/tarball/${GITVERSION}/
 DISTNAME=	facebook-scribe-${GITVERSION}
@@ -12,9 +12,9 @@ MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	Aggregating log data streamed in real time
 
 BUILD_DEPENDS=	fb303>0:${PORTSDIR}/devel/fb303
-LIB_DEPENDS=	boost_system:${PORTSDIR}/devel/boost-libs \
-		event:${PORTSDIR}/devel/libevent \
-		thrift:${PORTSDIR}/devel/thrift
+LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
+		libevent.so:${PORTSDIR}/devel/libevent \
+		libthrift.so:${PORTSDIR}/devel/thrift
 RUN_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Thrift>0:${PORTSDIR}/devel/p5-Thrift \
 		${PYTHON_SITELIBDIR}/thrift/__init__.py:${PORTSDIR}/devel/py-thrift
@@ -28,21 +28,18 @@ AUTOMAKE_ARGS=	-a
 CONFIGURE_ARGS=	--with-boost-filesystem=boost_filesystem \
 		--with-boost-system=boost_system \
 		PY_PREFIX="${PREFIX}"
-PLIST_SUB+=	PYTHON_VERSION_SHORTNAME="${PYTHON_VERSION_SHORTNAME}"
-PYTHON_VERSION_SHORTNAME=	${PYTHON_VERSION:S/thon//}
 USE_AUTOTOOLS=	aclocal automake autoconf
-USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_RC_SUBR=	${PORTNAME}
+USES=		gmake perl5
 
-NO_STAGE=	yes
 post-build:
 	${LOCALBASE}/bin/thrift -o ${WRKSRC} -I ${LOCALBASE}/share --gen "perl" ${WRKSRC}/if/scribe.thrift
 
 post-install:
-	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/Scribe/Thrift
-	${CP} -R ${WRKSRC}/gen-perl/ ${PREFIX}/${SITE_PERL_REL}
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Scribe/Thrift
+	cd ${WRKSRC}/gen-perl && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net/scribe/files/patch-configure.ac b/net/scribe/files/patch-configure.ac
new file mode 100644
index 000000000000..d92c10293350
--- /dev/null
+++ b/net/scribe/files/patch-configure.ac
@@ -0,0 +1,10 @@
+--- configure.ac.orig   2013-10-03 17:44:40.410915000 +0800
++++ configure.ac        2013-10-03 17:44:49.128744000 +0800
+@@ -10,7 +10,6 @@
+ AC_PREREQ(2.52)
+ AC_INIT([scribe], [1.5.0])
+ AC_CONFIG_MACRO_DIR([aclocal])
+-AM_INIT_AUTOMAKE([foreign -Wall])
+ # To install locally
+ FB_INITIALIZE([localinstall])
+ AC_PREFIX_DEFAULT([/usr/local])
-- 
cgit