Bug 182597 - [PATCH] net/scribe: [SUMMARIZE CHANGES]
Summary: [PATCH] net/scribe: [SUMMARIZE CHANGES]
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-03 11:10 UTC by stephon
Modified: 2013-11-02 22:40 UTC (History)
1 user (show)

See Also:


Attachments
scribe-2.2.2012.01.07_3.patch (1005 bytes, patch)
2013-10-03 11:10 UTC, stephon
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description stephon 2013-10-03 11:10:02 UTC
Fix compilation error in automake 1.14,
by http://forums.freebsd.org/showthread.php?t=40903

Port maintainer (jnlin@csie.nctu.edu.tw) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-03 11:10:53 UTC
Maintainer of net/scribe,

Please note that PR ports/182597 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182597

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-03 11:10:54 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Mark Linimon freebsd_committer freebsd_triage 2013-10-04 02:00:59 UTC
State Changed
From-To: feedback->open

From misfiled PR ports/182597: 

Date: Thu, 3 Oct 2013 18:16:32 +0800 
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-11-02 22:38:00 UTC
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 <stephon gmail.com>
  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 <bsd.port.mk>

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])
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 William Grzybowski freebsd_committer freebsd_triage 2013-11-02 22:38:15 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 6 William Grzybowski freebsd_committer freebsd_triage 2013-11-02 22:38:25 UTC
State Changed
From-To: open->closed

Committed. Thanks!