- Unbreak

- Update to 2011.07.27 snapshot

PR:		ports/163150
Submitted by:	Valery Komaorv <komarov@valerka.net>
Approved by:	maintainer

8 files changed, 62 insertions, 153 deletions

diff --git a/net/scribe/Makefile b/net/scribe/Makefile
index bda8eeeae3b5..ea2ac33d4e25 100644
--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@@ -5,10 +5,10 @@
 #
 
 PORTNAME=	scribe
-PORTVERSION=	2.2
-PORTREVISION=	3
+DISTVERSION=	2.2.2011.07.27
 CATEGORIES=	net
-MASTER_SITES=	http://cloud.github.com/downloads/facebook/scribe/
+MASTER_SITES=	https://github.com/facebook/scribe/tarball/${GITVERSION}/
+DISTNAME=	facebook-scribe-${GITVERSION}
 
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	Aggregating log data streamed in real time
@@ -21,7 +21,9 @@ 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
 
-BROKEN=		does not compile
+GITVERSION=	6600084
+FETCH_ARGS=	-pRr
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 ACLOCAL_ARGS=	-I ./aclocal
 AUTOMAKE_ARGS=	-a
@@ -35,19 +37,12 @@ USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_RC_SUBR=	${PORTNAME}
 
-post-extract:
-	${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
-
 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
-	cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/scribe.pm.patch
-
 post-install:
 	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/Scribe/Thrift
-	${CP} ${WRKSRC}/gen-perl/*.pm ${PREFIX}/${SITE_PERL_REL}/Scribe/Thrift
+	${CP} -R ${WRKSRC}/src/gen-perl/ ${PREFIX}/${SITE_PERL_REL}
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 
diff --git a/net/scribe/distinfo b/net/scribe/distinfo
index ca79d440abb3..bd20af63818b 100644
--- a/net/scribe/distinfo
+++ b/net/scribe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scribe-2.2.tar.gz) = 960f92a1eeef64eaeb7465976c7e16e64dbc67fc61aa041072f23eb0915e4505
-SIZE (scribe-2.2.tar.gz) = 71223
+SHA256 (facebook-scribe-6600084.tar.gz) = a10b7d360bc2946d50d30b4e8e8fd0b1ba8338a45ac040b2373435d9d7ab21f5
+SIZE (facebook-scribe-6600084.tar.gz) = 97096
diff --git a/net/scribe/files/patch-global_header.mk b/net/scribe/files/patch-global_header.mk
new file mode 100644
index 000000000000..4a81e2ad56d6
--- /dev/null
+++ b/net/scribe/files/patch-global_header.mk
@@ -0,0 +1,11 @@
+--- ./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/files/patch-if__bucketupdater.thrift b/net/scribe/files/patch-if__bucketupdater.thrift
new file mode 100644
index 000000000000..4dc169b0cc1f
--- /dev/null
+++ b/net/scribe/files/patch-if__bucketupdater.thrift
@@ -0,0 +1,10 @@
+--- ./if/bucketupdater.thrift.orig	2011-06-27 09:59:22.000000000 +0400
++++ ./if/bucketupdater.thrift	2011-10-19 18:33:32.000000000 +0400
+@@ -19,6 +19,7 @@
+ 
+ namespace cpp scribe.thrift
+ namespace java com.facebook.infrastructure.service
++namespace perl Scribe.Thrift
+ 
+ // BucketStoreMapping service exception
+ exception BucketStoreMappingException {
diff --git a/net/scribe/files/patch-src__Makefile.am b/net/scribe/files/patch-src__Makefile.am
new file mode 100644
index 000000000000..c3124c386e74
--- /dev/null
+++ b/net/scribe/files/patch-src__Makefile.am
@@ -0,0 +1,11 @@
+--- ./src/Makefile.am.orig	2011-06-27 09:59:22.000000000 +0400
++++ ./src/Makefile.am	2011-10-19 18:00:32.000000000 +0400
+@@ -34,7 +34,7 @@
+ #
+ THRIFT = $(thrift_home)/bin/thrift
+ THRIFT_INCLUDES = -I $(fb303_home)/share/
+-THRIFT_OPTS = $(THRIFT_INCLUDES) --gen cpp:pure_enums --gen py --gen php --gen java
++THRIFT_OPTS = $(THRIFT_INCLUDES) --gen cpp:pure_enums --gen py --gen php --gen java --gen perl
+ 
+ # User defined conditionals and conditonal statements set up in configure.ac.
+ # FACEBOOK set in configure.ac
diff --git a/net/scribe/files/scribe.in b/net/scribe/files/scribe.in
index ff8151b745f7..696d9f6d3e11 100644
--- a/net/scribe/files/scribe.in
+++ b/net/scribe/files/scribe.in
@@ -20,7 +20,7 @@ stop_postcmd=scribe_cleanup
 scribe_start()
 {
     echo "Starting ${name}."
-    /usr/sbin/daemon -cf -p ${pidfile} ${command} ${scribe_flags}
+    /usr/sbin/daemon -cf -p ${pidfile} ${command} ${scribe_flags} 2>>/var/log/scribe.log
 }
 
 scribe_cleanup() {
diff --git a/net/scribe/files/scribe.pm.patch b/net/scribe/files/scribe.pm.patch
deleted file mode 100644
index 954be9876f3f..000000000000
--- a/net/scribe/files/scribe.pm.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- gen-perl/scribe.pm.orig	2010-07-14 18:52:03.000000000 +0800
-+++ gen-perl/scribe.pm	2010-07-14 18:49:30.000000000 +0800
-@@ -8,14 +8,14 @@
- use warnings;
- use Thrift;
- 
--use Types;
-+use Scribe::Thrift::Types;
- use Facebook::FB303::FacebookService;
- 
- # HELPER FUNCTIONS AND STRUCTURES
- 
--package scribe_Log_args;
-+package Scribe::Thrift::scribe_Log_args;
- use base qw(Class::Accessor);
--scribe_Log_args->mk_accessors( qw( messages ) );
-+Scribe::Thrift::scribe_Log_args->mk_accessors( qw( messages ) );
- 
- sub new {
-   my $classname = shift;
-@@ -99,9 +99,9 @@
-   return $xfer;
- }
- 
--package scribe_Log_result;
-+package Scribe::Thrift::scribe_Log_result;
- use base qw(Class::Accessor);
--scribe_Log_result->mk_accessors( qw( success ) );
-+Scribe::Thrift::scribe_Log_result->mk_accessors( qw( success ) );
- 
- sub new {
-   my $classname = shift;
-@@ -163,7 +163,7 @@
-   return $xfer;
- }
- 
--package scribeIf;
-+package Scribe::Thrift::scribeIf;
- 
- use strict;
- use base qw(Facebook::FB303::FacebookServiceIf);
-@@ -175,7 +175,7 @@
-   die 'implement interface';
- }
- 
--package scribeRest;
-+package Scribe::Thrift::scribeRest;
- 
- use strict;
- use base qw(Facebook::FB303::FacebookServiceRest);
-@@ -187,10 +187,10 @@
-   return $self->{impl}->Log($messages);
- }
- 
--package scribeClient;
-+package Scribe::Thrift::scribeClient;
- 
- use base qw(Facebook::FB303::FacebookServiceClient);
--use base qw(scribeIf);
-+use base qw(Scribe::Thrift::scribeIf);
- sub new {
-   my ($classname, $input, $output) = @_;
-   my $self      = {};
-@@ -211,7 +211,7 @@
-   my $messages = shift;
- 
-   $self->{output}->writeMessageBegin('Log', TMessageType::CALL, $self->{seqid});
--  my $args = new scribe_Log_args();
-+  my $args = new Scribe::Thrift::scribe_Log_args();
-   $args->{messages} = $messages;
-   $args->write($self->{output});
-   $self->{output}->writeMessageEnd();
-@@ -232,7 +232,7 @@
-     $self->{input}->readMessageEnd();
-     die $x;
-   }
--  my $result = new scribe_Log_result();
-+  my $result = new Scribe::Thrift::scribe_Log_result();
-   $result->read($self->{input});
-   $self->{input}->readMessageEnd();
- 
-@@ -241,7 +241,7 @@
-   }
-   die "Log failed: unknown result";
- }
--package scribeProcessor;
-+package Scribe::Thrift::scribeProcessor;
- 
- use strict;
- use base qw(Facebook::FB303::FacebookServiceProcessor);
---- gen-perl/Constants.pm.orig	2010-07-14 18:52:03.000000000 +0800
-+++ gen-perl/Constants.pm	2010-07-14 18:49:30.000000000 +0800
-@@ -3,7 +3,7 @@
- #
- # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- #
--package Constants;
-+package Scribe::Thrift::Constants;
- require 5.6.0;
- use strict;
- use warnings;
---- gen-perl/Types.pm.orig	2010-07-14 18:52:03.000000000 +0800
-+++ gen-perl/Types.pm	2010-07-14 18:49:30.000000000 +0800
-@@ -8,12 +8,12 @@
- use warnings;
- use Thrift;
- 
--package ResultCode;
-+package Scribe::Thrift::ResultCode;
- use constant OK => 0;
- use constant TRY_LATER => 1;
--package LogEntry;
-+package Scribe::Thrift::LogEntry;
- use base qw(Class::Accessor);
--LogEntry->mk_accessors( qw( category message ) );
-+Scribe::Thrift::LogEntry->mk_accessors( qw( category message ) );
- 
- sub new {
-   my $classname = shift;
diff --git a/net/scribe/pkg-plist b/net/scribe/pkg-plist
index 50f92ffa2c69..04d94e3f2764 100644
--- a/net/scribe/pkg-plist
+++ b/net/scribe/pkg-plist
@@ -1,13 +1,11 @@
-@comment $FreeBSD$
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/example1.conf
-%%EXAMPLESDIR%%/example2central.conf
-%%EXAMPLESDIR%%/example2client.conf
-%%EXAMPLESDIR%%/hdfs_example.conf
-%%EXAMPLESDIR%%/hdfs_example2.conf
-%%EXAMPLESDIR%%/scribe_cat
-%%EXAMPLESDIR%%/scribe_ctrl
-%%PYTHON_SITELIBDIR%%/scribe-2.0-%%PYTHON_VERSION_SHORTNAME%%.egg-info
+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
+%%PYTHON_SITELIBDIR%%/scribe-2.0-py2.7.egg-info
 %%PYTHON_SITELIBDIR%%/scribe/__init__.py
 %%PYTHON_SITELIBDIR%%/scribe/__init__.pyc
 %%PYTHON_SITELIBDIR%%/scribe/constants.py
@@ -16,12 +14,15 @@
 %%PYTHON_SITELIBDIR%%/scribe/scribe.pyc
 %%PYTHON_SITELIBDIR%%/scribe/ttypes.py
 %%PYTHON_SITELIBDIR%%/scribe/ttypes.pyc
-%%SITE_PERL%%/Scribe/Thrift/Constants.pm
-%%SITE_PERL%%/Scribe/Thrift/Types.pm
-%%SITE_PERL%%/Scribe/Thrift/scribe.pm
-bin/scribed
-lib/libscribe.a
-@dirrmtry %%SITE_PERL%%/Scribe/Thrift
-@dirrmtry %%SITE_PERL%%/Scribe
-@dirrmtry %%PYTHON_SITELIBDIR%%/scribe
-@dirrmtry %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2central.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2client.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdfs_example.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hdfs_example2.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scribe_cat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scribe_ctrl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/scribe
+@dirrm %%SITE_PERL%%/Scribe/Thrift
+@dirrm %%SITE_PERL%%/Scribe