Index: branches/2017Q1/sysutils/rubygem-fluentd/Makefile
===================================================================
--- branches/2017Q1/sysutils/rubygem-fluentd/Makefile	(revision 430755)
+++ branches/2017Q1/sysutils/rubygem-fluentd/Makefile	(revision 430756)
@@ -1,38 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	fluentd
 PORTVERSION=	0.12.14
+PORTREVISION=	1
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Fluent event collector
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
 	rubygem-msgpack>=0.5.11:devel/rubygem-msgpack \
 	rubygem-json>=1.4.3:devel/rubygem-json \
 	rubygem-yajl-ruby>=1.0:devel/rubygem-yajl-ruby \
 	rubygem-cool.io>=1.2.2:devel/rubygem-cool.io \
 	rubygem-http_parser.rb>=0.5.1:net/rubygem-http_parser.rb \
 	rubygem-sigdump>=0.2.2:devel/rubygem-sigdump \
 	rubygem-tzinfo>=1.0.0:devel/rubygem-tzinfo
 
 USE_RUBY=	yes
 PLIST_FILES=	bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \
 		"@sample etc/fluentd/fluent.conf.sample"
 PLIST_DIRS=	etc/fluentd/plugin
 USES=		gem
 USE_RC_SUBR=	fluentd
 USERS=		fluentd
 GROUPS=		fluentd
 SUB_LIST+=	USER=${USERS} GROUP=${GROUPS} RUBY=${RUBY}
 NO_ARCH=	YES
 NO_LATEST_LINK=	YES
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fluentd/plugin
 	${CP} ${WRKSRC}/fluent.conf.sample ${STAGEDIR}${PREFIX}/etc/fluentd/
 
 .include <bsd.port.mk>
Index: branches/2017Q1/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample
===================================================================
--- branches/2017Q1/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample	(revision 430755)
+++ branches/2017Q1/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample	(revision 430756)
@@ -1,103 +1,103 @@
---- ./fluent.conf.sample.orig	2014-08-25 20:24:21 UTC
-+++ ./fluent.conf.sample
+--- fluent.conf.sample.orig	2017-01-06 21:42:28 UTC
++++ fluent.conf.sample
 @@ -0,0 +1,100 @@
 +
 +## built-in TCP input
 +## $ echo <json> | fluent-cat <tag>
 +<source>
 +  type forward
 +</source>
 +
 +## built-in UNIX socket input
 +#<source>
 +#  type unix
 +#</source>
 +
 +# HTTP input
 +# http://localhost:8888/<tag>?json=<json>
 +<source>
 +  type http
 +  port 8888
 +</source>
 +
 +## File input
 +## read apache logs with tag=apache.access
 +#<source>
 +#  type tail
 +#  format apache
 +#  path /var/log/httpd-access.log
 +#  tag apache.access
 +#</source>
 +
 +# Listen HTTP for monitoring
 +# http://localhost:24220/api/plugins
 +# http://localhost:24220/api/plugins?type=TYPE
 +# http://localhost:24220/api/plugins?tag=MYTAG
 +<source>
 +  type monitor_agent
 +  port 24220
 +</source>
 +
 +# Listen DRb for debug
 +<source>
 +  type debug_agent
 +  bind 127.0.0.1
 +  port 24230
 +</source>
 +
 +
 +## match tag=apache.access and write to file
 +#<match apache.access>
 +#  type file
 +#  path /var/log/fluent/access
 +#</match>
 +
 +## match tag=debug.** and dump to console
 +<match debug.**>
 +  type stdout
 +</match>
 +
 +# match tag=system.** and forward to another fluent server
 +<match system.**>
 +  type forward
 +  <server>
 +    host 192.168.0.11
 +  </server>
 +  <secondary>
 +    <server>
 +      host 192.168.0.12
 +    </server>
 +  </secondary>
 +</match>
 +
 +## match tag=myapp.** and forward and write to file
 +#<match myapp.**>
 +#  type copy
 +#  <store>
 +#    type forward
 +#    buffer_type file
 +#    buffer_path /var/log/fluent/myapp-forward
 +#    retry_limit 50
 +#    flush_interval 10s
 +#    <server>
 +#      host 192.168.0.13
 +#    </server>
 +#  </store>
 +#  <store>
 +#    type file
 +#    path /var/log/fluent/myapp
 +#  </store>
 +#</match>
 +
 +## match fluent's internal events
 +#<match fluent.**>
 +#  type null
 +#</match>
 +
 +## match not matched logs and write to file
 +#<match **>
 +#  type file
 +#  path /var/log/fluent/else
 +#  compress gz
 +#</match>
 +
Index: branches/2017Q1/sysutils/rubygem-fluentd/files/patch-fluentd.gemspec
===================================================================
--- branches/2017Q1/sysutils/rubygem-fluentd/files/patch-fluentd.gemspec	(nonexistent)
+++ branches/2017Q1/sysutils/rubygem-fluentd/files/patch-fluentd.gemspec	(revision 430756)
@@ -0,0 +1,10 @@
+--- fluentd.gemspec.orig	2017-01-06 21:42:38 UTC
++++ fluentd.gemspec
+@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<sigdump>.freeze, ["~> 0.2.2"])
+       s.add_runtime_dependency(%q<tzinfo>.freeze, [">= 1.0.0"])
+       s.add_runtime_dependency(%q<tzinfo-data>.freeze, [">= 1.0.0"])
+-      s.add_runtime_dependency(%q<string-scrub>.freeze, [">= 0.0.3"])
+       s.add_development_dependency(%q<rake>.freeze, [">= 0.9.2"])
+       s.add_development_dependency(%q<flexmock>.freeze, [">= 0"])
+       s.add_development_dependency(%q<parallel_tests>.freeze, [">= 0.15.3"])

Property changes on: branches/2017Q1/sysutils/rubygem-fluentd/files/patch-fluentd.gemspec
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 430755)
+++ branches/2017Q1	(revision 430756)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r430755