diff options
| author | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2012-02-05 16:15:40 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2012-02-05 16:15:40 +0000 |
| commit | 6aefd17e9956fb0674245f649abd95c36302b2fa (patch) | |
| tree | 17938c187718aec9eea247d3da1c367e5cf6496b /net/scribe | |
| parent | 5e49aefa6ef1cca5367bf1280a4e5d25984aa757 (diff) | |
| download | ports-6aefd17e9956fb0674245f649abd95c36302b2fa.tar.gz ports-6aefd17e9956fb0674245f649abd95c36302b2fa.zip | |
- Update to 2.2.2012.01.07 snapshot
- Fix the problem of Log::Scribe::Dispatch error
PR: ports/164704
Submitted by: Stephon Chen <stephon@gmail.com>
Approved by: maintainer via irc
Notes
Notes:
svn path=/head/; revision=290440
Diffstat (limited to 'net/scribe')
| -rw-r--r-- | net/scribe/Makefile | 10 | ||||
| -rw-r--r-- | net/scribe/distinfo | 4 | ||||
| -rw-r--r-- | net/scribe/files/patch-global_header.mk | 11 | ||||
| -rw-r--r-- | net/scribe/pkg-plist | 1 |
4 files changed, 7 insertions, 19 deletions
diff --git a/net/scribe/Makefile b/net/scribe/Makefile index ea2ac33d4e25..33e47033242d 100644 --- a/net/scribe/Makefile +++ b/net/scribe/Makefile @@ -5,7 +5,7 @@ # PORTNAME= scribe -DISTVERSION= 2.2.2011.07.27 +DISTVERSION= 2.2.2012.01.07 CATEGORIES= net MASTER_SITES= https://github.com/facebook/scribe/tarball/${GITVERSION}/ DISTNAME= facebook-scribe-${GITVERSION} @@ -21,7 +21,7 @@ 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 -GITVERSION= 6600084 +GITVERSION= 63e4824 FETCH_ARGS= -pRr WRKSRC= ${WRKDIR}/${DISTNAME} @@ -37,12 +37,12 @@ USE_GMAKE= yes 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 --git a/net/scribe/distinfo b/net/scribe/distinfo index bd20af63818b..88badfb37cfb 100644 --- a/net/scribe/distinfo +++ b/net/scribe/distinfo @@ -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 --git a/net/scribe/files/patch-global_header.mk b/net/scribe/files/patch-global_header.mk deleted file mode 100644 index 4a81e2ad56d6..000000000000 --- a/net/scribe/files/patch-global_header.mk +++ /dev/null @@ -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 --git a/net/scribe/pkg-plist b/net/scribe/pkg-plist index 04d94e3f2764..d70e6b36c0f5 100644 --- a/net/scribe/pkg-plist +++ b/net/scribe/pkg-plist @@ -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 |