- Upgrade to 0.12.14 and preserve stable 0.10.61 as rubygem-fluentd010.

8 files changed, 212 insertions, 8 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index d5c5490..fe05d7f 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -849,6 +849,7 @@
     SUBDIR += rubygem-fluent-plugin-file-alternative
     SUBDIR += rubygem-fluent-plugin-tail-asis
     SUBDIR += rubygem-fluentd
+    SUBDIR += rubygem-fluentd010
     SUBDIR += rubygem-fssm
     SUBDIR += rubygem-god
     SUBDIR += rubygem-guard
diff --git a/sysutils/rubygem-fluentd/Makefile b/sysutils/rubygem-fluentd/Makefile
index 56d89d3..bafe8bb 100644
--- a/sysutils/rubygem-fluentd/Makefile
+++ b/sysutils/rubygem-fluentd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fluentd
-PORTVERSION=	0.10.61
+PORTVERSION=	0.12.14
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
@@ -11,12 +11,13 @@ COMMENT=	Fluent event collector
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	rubygem-cool.io>=1.1.1:${PORTSDIR}/devel/rubygem-cool.io \
-	rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \
+	rubygem-msgpack>=0.5.11:${PORTSDIR}/devel/rubygem-msgpack \
 	rubygem-json>=1.4.3:${PORTSDIR}/devel/rubygem-json \
-	rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack \
+	rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby \
+	rubygem-cool.io>=1.2.2:${PORTSDIR}/devel/rubygem-cool.io \
+	rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \
 	rubygem-sigdump>=0.2.2:${PORTSDIR}/devel/rubygem-sigdump \
-	rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+	rubygem-tzinfo>=1.0.0:${PORTSDIR}/devel/rubygem-tzinfo
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
@@ -29,9 +30,16 @@ USERS=		fluentd
 GROUPS=		fluentd
 SUB_LIST+=	USER=${USERS} GROUP=${GROUPS} RUBY=${RUBY}
 NO_ARCH=	YES
+NO_LATEST_LINK=	YES
+
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} == 2.0
+RUN_DEPENDS+=	rubygem-string-scrub>=0.0.3:${PORTSDIR}/textproc/rubygem-string-scrub
+.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fluentd/plugin
 	${CP} ${WRKSRC}/fluent.conf.sample ${STAGEDIR}${PREFIX}/etc/fluentd/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/rubygem-fluentd/distinfo b/sysutils/rubygem-fluentd/distinfo
index 5004e75..6d615a0 100644
--- a/sysutils/rubygem-fluentd/distinfo
+++ b/sysutils/rubygem-fluentd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/fluentd-0.10.61.gem) = fc139cfe712a2288750553582601159de968d6269a38d46c5e72be573a8c77ad
-SIZE (rubygem/fluentd-0.10.61.gem) = 124416
+SHA256 (rubygem/fluentd-0.12.14.gem) = f941eb3fb233330b933773d72123e03547b8229c650e96a3eb1b536bc3b327b2
+SIZE (rubygem/fluentd-0.12.14.gem) = 157184
diff --git a/sysutils/rubygem-fluentd010/Makefile b/sysutils/rubygem-fluentd010/Makefile
new file mode 100644
index 0000000..d1aa9f9
--- /dev/null
+++ b/sysutils/rubygem-fluentd010/Makefile
@@ -0,0 +1,38 @@
+# $FreeBSD$
+
+PORTNAME=	fluentd
+PORTVERSION=	0.10.61
+CATEGORIES=	sysutils rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	010
+
+MAINTAINER=	kuriyama@FreeBSD.org
+COMMENT=	Fluent event collector
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	\
+	rubygem-cool.io>=1.1.1:${PORTSDIR}/devel/rubygem-cool.io \
+	rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \
+	rubygem-json>=1.4.3:${PORTSDIR}/devel/rubygem-json \
+	rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack \
+	rubygem-sigdump>=0.2.2:${PORTSDIR}/devel/rubygem-sigdump \
+	rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	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
+RUBYGEM_AUTOPLIST=	yes
+USE_RC_SUBR=	fluentd
+USERS=		fluentd
+GROUPS=		fluentd
+SUB_LIST+=	USER=${USERS} GROUP=${GROUPS} RUBY=${RUBY}
+NO_ARCH=	YES
+
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fluentd/plugin
+	${CP} ${WRKSRC}/fluent.conf.sample ${STAGEDIR}${PREFIX}/etc/fluentd/
+
+.include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluentd010/distinfo b/sysutils/rubygem-fluentd010/distinfo
new file mode 100644
index 0000000..5004e75
--- /dev/null
+++ b/sysutils/rubygem-fluentd010/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/fluentd-0.10.61.gem) = fc139cfe712a2288750553582601159de968d6269a38d46c5e72be573a8c77ad
+SIZE (rubygem/fluentd-0.10.61.gem) = 124416
diff --git a/sysutils/rubygem-fluentd010/files/fluentd.in b/sysutils/rubygem-fluentd010/files/fluentd.in
new file mode 100644
index 0000000..11a62b6
--- /dev/null
+++ b/sysutils/rubygem-fluentd010/files/fluentd.in
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: fluentd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# fluentd_enable (bool):	Set to NO by default.
+# 		  		Set it to YES to enable fluentd.
+# fluentd_config (path):	Set to %%PREFIX%%/etc/fluentd/fluent.conf
+# 		  		by default.
+# fluentd_flags (str):          Set to "" by default.
+
+. /etc/rc.subr
+
+name=fluentd
+rcvar=fluentd_enable
+extra_commands="init"
+
+load_rc_config $name
+
+: ${fluentd_enable:="NO"}
+: ${fluentd_config="%%PREFIX%%/etc/fluentd/fluent.conf"}
+: ${fluentd_dir="%%PREFIX%%/etc/fluentd"}
+: ${fluentd_user="%%USER%%"}
+: ${fluentd_group="%%GROUP%%"}
+: ${fluentd_flags:=""}
+
+start_precmd="fluentd_start_precmd"
+
+command=%%PREFIX%%/bin/${name}
+pidfile=/var/run/${name}/${name}.pid
+command_interpreter=%%RUBY%%
+
+command_args="-d $pidfile -c $fluentd_config"
+
+fluentd_start_precmd()
+{
+    install -d -o ${fluentd_user} -g ${fluentd_group} -m 775 ${fluentd_dir}
+    install -d -o ${fluentd_user} -g ${fluentd_group} -m 775 /var/run/fluentd
+}
+
+run_rc_command "$1"
diff --git a/sysutils/rubygem-fluentd010/files/patch-fluent.conf.sample b/sysutils/rubygem-fluentd010/files/patch-fluent.conf.sample
new file mode 100644
index 0000000..108810e
--- /dev/null
+++ b/sysutils/rubygem-fluentd010/files/patch-fluent.conf.sample
@@ -0,0 +1,103 @@
+--- ./fluent.conf.sample.orig	2014-08-25 20:24:21 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>
++
diff --git a/sysutils/rubygem-fluentd010/pkg-descr b/sysutils/rubygem-fluentd010/pkg-descr
new file mode 100644
index 0000000..925fe6d
--- /dev/null
+++ b/sysutils/rubygem-fluentd010/pkg-descr
@@ -0,0 +1,5 @@
+Fluentd is a log collector daemon written in Ruby.  Fluentd receives
+logs as JSON streams, buffers them, and sends them to other systems
+like MySQL, MongoDB, or even other instances of Fluentd.
+
+WWW: http://fluentd.org/