Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Feb 2012 16:14:14 +0800 (CST)
From:      Stephon Chen <stephon@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jnlin@csie.nctu.edu.tw
Subject:   ports/164704: [PATCH] net/scribe: [SUMMARIZE CHANGES]
Message-ID:  <201202020814.q128EEDW008830@aqua>
Resent-Message-ID: <201202020820.q128KAu3035979@freefall.freebsd.org>

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

>Number:         164704
>Category:       ports
>Synopsis:       [PATCH] net/scribe: [SUMMARIZE CHANGES]
>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:   Thu Feb 02 08:20:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Stephon Chen
>Release:        FreeBSD 8.2-RELEASE-p3 amd64
>Organization:
PIXNET
>Environment:
System: FreeBSD aqua 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:45:57 UTC 2011
>Description:
Fix the problem of Log::Scribe::Dispatch error

Removed file(s):
- files/patch-global_header.mk

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

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- scribe-2.2.2011.07.27_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/scribe/Makefile /nfs/home/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/Makefile
--- /usr/ports/net/scribe/Makefile	2012-01-12 17:25:04.000000000 +0800
+++ /nfs/home/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/Makefile	2012-01-24 11:24:50.000000000 +0800
@@ -6,6 +6,7 @@
 
 PORTNAME=	scribe
 DISTVERSION=	2.2.2011.07.27
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/facebook/scribe/tarball/${GITVERSION}/
 DISTNAME=	facebook-scribe-${GITVERSION}
@@ -21,7 +22,7 @@
 		p5-Thrift>0:${PORTSDIR}/devel/p5-Thrift \
 		${PYTHON_SITELIBDIR}/thrift/__init__.py:${PORTSDIR}/devel/py-thrift
 
-GITVERSION=	6600084
+GITVERSION=	63e4824
 FETCH_ARGS=	-pRr
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
@@ -37,12 +38,12 @@
 USE_PYTHON=	yes
 USE_RC_SUBR=	${PORTNAME}
 
-post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local/scribe|${LOCALBASE}/etc|' ${WRKSRC}/src/env_default.h
+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}/src/gen-perl/ ${PREFIX}/${SITE_PERL_REL}
+	${CP} -R ${WRKSRC}/gen-perl/ ${PREFIX}/${SITE_PERL_REL}
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 
diff -ruN --exclude=CVS /usr/ports/net/scribe/distinfo /nfs/home/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/distinfo
--- /usr/ports/net/scribe/distinfo	2012-01-12 17:25:04.000000000 +0800
+++ /nfs/home/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/distinfo	2012-01-23 21:12:00.000000000 +0800
@@ -1,2 +1,2 @@
-SHA256 (facebook-scribe-6600084.tar.gz) = a10b7d360bc2946d50d30b4e8e8fd0b1ba8338a45ac040b2373435d9d7ab21f5
-SIZE (facebook-scribe-6600084.tar.gz) = 97096
+SHA256 (facebook-scribe-63e4824.tar.gz) = e4fd56649e35b8ff508d8f915cd29bd15b888c301043a7d930acf83b9ee5aa2f
+SIZE (facebook-scribe-63e4824.tar.gz) = 97107
diff -ruN --exclude=CVS /usr/ports/net/scribe/files/patch-global_header.mk /nfs/home/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/files/patch-global_header.mk
--- /usr/ports/net/scribe/files/patch-global_header.mk	2012-01-12 17:25:04.000000000 +0800
+++ /nfs/home/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/files/patch-global_header.mk	1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
---- ./global_header.mk.orig	2011-06-27 09:59:22.000000000 +0400
-+++ ./global_header.mk	2011-10-19 18:00:32.000000000 +0400
-@@ -4,7 +4,7 @@
- #endef
- 
- define thrift_template
--XTARGET := $(shell perl -e '@val = split("\/","$(2)"); $$last = pop(@val);split("\\.",$$last);print "$(1)/"."gen-cpp/"."@_[0]"."_types.cpp\n"' )
-+XTARGET := $(shell perl -e '@val = split("\/","$(2)");$$last = pop(@val);@fields = split("\\.",$$last);print "$(1)/gen-cpp/@fields[0]_types.cpp\n"')
- 
- ifneq ($$(XBUILT_SOURCES),) 
-     XBUILT_SOURCES := $$(XBUILT_SOURCES) $$(XTARGET)
diff -ruN --exclude=CVS /usr/ports/net/scribe/pkg-plist /nfs/home/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/pkg-plist
--- /usr/ports/net/scribe/pkg-plist	2012-01-12 17:25:04.000000000 +0800
+++ /nfs/home/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/pkg-plist	2012-01-24 11:24:20.000000000 +0800
@@ -1,7 +1,6 @@
 bin/scribed
 lib/libdynamicbucketupdater.a
 lib/libscribe.a
-%%SITE_PERL%%/Scribe/Thrift/BucketStoreMapping.pm
 %%SITE_PERL%%/Scribe/Thrift/Constants.pm
 %%SITE_PERL%%/Scribe/Thrift/Types.pm
 %%SITE_PERL%%/Scribe/Thrift/scribe.pm
--- scribe-2.2.2011.07.27_1.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?201202020814.q128EEDW008830>