Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 May 2013 23:38:57 +0800 (CST)
From:      Gea-Suan Lin <gslin@gslin.org>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        gslin@gslin.org, jnlin@csie.nctu.edu.tw
Subject:   ports/178973: [PATCH] net/scribe: Use USE_GITHUB framework to fetch file, and install two scripts
Message-ID:  <20130525153857.BCA057E81B@colo-p.gslin.org>
Resent-Message-ID: <201305251540.r4PFe0cW090308@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         178973
>Category:       ports
>Synopsis:       [PATCH] net/scribe: Use USE_GITHUB framework to fetch file, and install two scripts
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 25 15:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Gea-Suan Lin
>Release:        FreeBSD 9.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD colo-p.gslin.org 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue Dec  4 06:55:39
>Description:
- Use USE_GITHUB framework to fetch file, and thus avoid FETCH_ARGS hack.
- Install scribe_cat & scribe_ctrl these two scripts.

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

Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- scribe-2.2.2012.01.07_3.patch begins here ---
diff -ruN /usr/ports/net/scribe/Makefile ./Makefile
--- /usr/ports/net/scribe/Makefile	2013-01-31 22:01:30.000000000 +0800
+++ ./Makefile	2013-05-25 23:36:35.000000000 +0800
@@ -2,11 +2,10 @@
 # $FreeBSD: ports/net/scribe/Makefile,v 1.15 2013/01/31 14:01:30 svnexp Exp $
 
 PORTNAME=	scribe
-DISTVERSION=	2.2.2012.01.07
-PORTREVISION=	2
+PORTVERSION=	2.2.2012.01.07
+PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/facebook/scribe/tarball/${GITVERSION}/
-DISTNAME=	facebook-scribe-${GITVERSION}
+MASTER_SITES=	GH
 
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	Aggregating log data streamed in real time
@@ -19,8 +18,10 @@
 		p5-Thrift>0:${PORTSDIR}/devel/p5-Thrift \
 		${PYTHON_SITELIBDIR}/thrift/__init__.py:${PORTSDIR}/devel/py-thrift
 
-GITVERSION=	63e4824
-FETCH_ARGS=	-pRr
+GH_ACCOUNT=	facebook
+GH_COMMIT=	63e4824
+GH_TAGNAME=	${GH_COMMIT}
+USE_GITHUB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 ACLOCAL_ARGS=	-I ./aclocal
@@ -35,6 +36,11 @@
 USE_PYTHON=	yes
 USE_RC_SUBR=	${PORTNAME}
 
+.include <bsd.port.pre.mk>
+
+post-patch:
+	${REINPLACE_CMD} -e "s@/usr/bin/python@/usr/bin/env python@" ${WRKSRC}/examples/scribe_cat
+
 post-build:
 	${LOCALBASE}/bin/thrift -o ${WRKSRC} -I ${LOCALBASE}/share --gen "perl" ${WRKSRC}/if/scribe.thrift
 
@@ -43,5 +49,7 @@
 	${CP} -R ${WRKSRC}/gen-perl/ ${PREFIX}/${SITE_PERL_REL}
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${LN} -s ${EXAMPLESDIR}/scribe_cat ${PREFIX}/bin/
+	${LN} -s ${EXAMPLESDIR}/scribe_ctrl ${PREFIX}/bin/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/net/scribe/distinfo ./distinfo
--- /usr/ports/net/scribe/distinfo	2012-02-06 00:15:40.000000000 +0800
+++ ./distinfo	2013-05-25 23:36:42.000000000 +0800
@@ -1,2 +1,2 @@
-SHA256 (facebook-scribe-63e4824.tar.gz) = e4fd56649e35b8ff508d8f915cd29bd15b888c301043a7d930acf83b9ee5aa2f
-SIZE (facebook-scribe-63e4824.tar.gz) = 97107
+SHA256 (scribe-2.2.2012.01.07.tar.gz) = e4fd56649e35b8ff508d8f915cd29bd15b888c301043a7d930acf83b9ee5aa2f
+SIZE (scribe-2.2.2012.01.07.tar.gz) = 97107
diff -ruN /usr/ports/net/scribe/pkg-descr ./pkg-descr
--- /usr/ports/net/scribe/pkg-descr	2010-08-03 04:55:31.000000000 +0800
+++ ./pkg-descr	2013-05-25 23:32:48.000000000 +0800
@@ -3,4 +3,4 @@
 extensible without client-side modification, and robust to failure of
 the network or any specific machine.
 
-WWW:	http://github.com/facebook/scribe
+WWW: http://github.com/facebook/scribe
diff -ruN /usr/ports/net/scribe/pkg-plist ./pkg-plist
--- /usr/ports/net/scribe/pkg-plist	2012-02-06 00:15:40.000000000 +0800
+++ ./pkg-plist	2013-05-25 21:34:10.000000000 +0800
@@ -1,3 +1,5 @@
+bin/scribe_cat
+bin/scribe_ctrl
 bin/scribed
 lib/libdynamicbucketupdater.a
 lib/libscribe.a
--- scribe-2.2.2012.01.07_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130525153857.BCA057E81B>