From owner-svn-ports-all@FreeBSD.ORG Sat Nov 2 22:37:53 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 45DB4136; Sat, 2 Nov 2013 22:37:53 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 241202C63; Sat, 2 Nov 2013 22:37:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA2MbrZm074733; Sat, 2 Nov 2013 22:37:53 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2MbqA3074731; Sat, 2 Nov 2013 22:37:52 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311022237.rA2MbqA3074731@svn.freebsd.org> From: William Grzybowski Date: Sat, 2 Nov 2013 22:37:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332548 - in head/net/scribe: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Nov 2013 22:37:53 -0000 Author: wg Date: Sat Nov 2 22:37:52 2013 New Revision: 332548 URL: http://svnweb.freebsd.org/changeset/ports/332548 Log: 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 Approved by: maintainer Added: head/net/scribe/files/patch-configure.ac (contents, props changed) Modified: head/net/scribe/Makefile Modified: head/net/scribe/Makefile ============================================================================== --- head/net/scribe/Makefile Sat Nov 2 22:25:45 2013 (r332547) +++ head/net/scribe/Makefile Sat Nov 2 22:37:52 2013 (r332548) @@ -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 Added: head/net/scribe/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/scribe/files/patch-configure.ac Sat Nov 2 22:37:52 2013 (r332548) @@ -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])