Date: Thu, 15 Sep 2011 14:16:29 +0800 (CST) From: Stephon Chen <stephon@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jnlin@csie.nctu.edu.tw Subject: ports/160746: [PATCH] net/scribe: [Fix compile error with thrift 0.6.1] Message-ID: <201109150616.p8F6GTUG048143@worker7> Resent-Message-ID: <201109150640.p8F6e6EA020306@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160746 >Category: ports >Synopsis: [PATCH] net/scribe: [Fix compile error with thrift 0.6.1] >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 Sep 15 06:40:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Charlie & >Release: FreeBSD 8.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD blah 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011 >Description: Fix the problem of compiling error while using thrift 0.6.1. Because the trunk version of scribe works correctly, thus use the trunk version to overwrite the original one. Added file(s): - scribe-2.2_20110915.tbz Removed file(s): - files/scribe.pm.patch Port maintainer (jnlin@csie.nctu.edu.tw) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- scribe-2.2_20110915.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/scribe/Makefile /.amd_mnt/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/Makefile --- /usr/ports/net/scribe/Makefile 2011-05-19 09:32:18.000000000 +0800 +++ /.amd_mnt/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/Makefile 2011-09-15 13:52:05.656887000 +0800 @@ -6,9 +6,9 @@ PORTNAME= scribe PORTVERSION= 2.2 -PORTREVISION= 3 +PORTREVISION= 20110915 CATEGORIES= net -MASTER_SITES= http://cloud.github.com/downloads/facebook/scribe/ +MASTER_SITES= https://s3.amazonaws.com/patches.pixnet.tw/ MAINTAINER= jnlin@csie.nctu.edu.tw COMMENT= Aggregating log data streamed in real time @@ -41,11 +41,10 @@ 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} ${WRKSRC}/gen-perl/Scribe/Thrift/*.pm ${PREFIX}/${SITE_PERL_REL}/Scribe/Thrift ${MKDIR} ${EXAMPLESDIR} ${CP} ${WRKSRC}/examples/* ${EXAMPLESDIR} diff -ruN --exclude=CVS /usr/ports/net/scribe/distinfo /.amd_mnt/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/distinfo --- /usr/ports/net/scribe/distinfo 2011-03-20 20:52:55.000000000 +0800 +++ /.amd_mnt/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/distinfo 2011-09-15 13:55:04.655903000 +0800 @@ -1,2 +1,2 @@ -SHA256 (scribe-2.2.tar.gz) = 960f92a1eeef64eaeb7465976c7e16e64dbc67fc61aa041072f23eb0915e4505 -SIZE (scribe-2.2.tar.gz) = 71223 +SHA256 (scribe-2.2.tar.gz) = 387a4be02ce0507a03b18727f2179a57b46dd6795fb462603cd1e00c86700cf2 +SIZE (scribe-2.2.tar.gz) = 96525 diff -ruN --exclude=CVS /usr/ports/net/scribe/files/scribe.pm.patch /.amd_mnt/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/files/scribe.pm.patch --- /usr/ports/net/scribe/files/scribe.pm.patch 2010-08-03 04:55:31.000000000 +0800 +++ /.amd_mnt/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/files/scribe.pm.patch 1970-01-01 08:00:00.000000000 +0800 @@ -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; Files /usr/ports/net/scribe/scribe-2.2_20110915.tbz and /.amd_mnt/10.4.1.1/vol/home/admin/stephon/ports/net/scribe/scribe-2.2_20110915.tbz differ --- scribe-2.2_20110915.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?201109150616.p8F6GTUG048143>