Index: branches/2015Q2/sysutils/logstash-forwarder/Makefile
===================================================================
--- branches/2015Q2/sysutils/logstash-forwarder/Makefile	(revision 390519)
+++ branches/2015Q2/sysutils/logstash-forwarder/Makefile	(revision 390520)
@@ -1,28 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	logstash-forwarder
-PORTVERSION=	0.3.1.20150121
+PORTVERSION=	0.4.0.20150507
 CATEGORIES=	sysutils
 
 MAINTAINER=	cheffo@freebsd-bg.org
 COMMENT=	Collect logs locally in preparation for processing elsewhere!
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elasticsearch
-GH_PROJECT=	logstash-forwarder
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	9c69a36
+GH_TAGNAME=	3b718f0
 
 USE_RC_SUBR=	logstash-forwarder
 SUB_FILES=	pkg-message
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/logstash-forwarder.conf.example ${STAGEDIR}${PREFIX}/etc/logstash-forwarder.conf.example
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../lang/go/files/bsd.go.mk"
 .include <bsd.port.post.mk>
Index: branches/2015Q2/sysutils/logstash-forwarder/distinfo
===================================================================
--- branches/2015Q2/sysutils/logstash-forwarder/distinfo	(revision 390519)
+++ branches/2015Q2/sysutils/logstash-forwarder/distinfo	(revision 390520)
@@ -1,2 +1,2 @@
-SHA256 (logstash-forwarder-0.3.1.20150121.tar.gz) = 73c04db743cfe3d438004cb8775f78d2fb8bcae710fbfa78c19be326e141df28
-SIZE (logstash-forwarder-0.3.1.20150121.tar.gz) = 42008
+SHA256 (elasticsearch-logstash-forwarder-0.4.0.20150507-3b718f0_GH0.tar.gz) = 2ac52a05b5e737dd2c2b80fbf967cd3e1e45e59a1a840e71ab29fdf0a59298ea
+SIZE (elasticsearch-logstash-forwarder-0.4.0.20150507-3b718f0_GH0.tar.gz) = 30476
Index: branches/2015Q2/sysutils/logstash-forwarder/files/patch-fileinfo_freebsd.go
===================================================================
--- branches/2015Q2/sysutils/logstash-forwarder/files/patch-fileinfo_freebsd.go	(revision 390519)
+++ branches/2015Q2/sysutils/logstash-forwarder/files/patch-fileinfo_freebsd.go	(revision 390520)
@@ -1,14 +1,14 @@
---- fileinfo_freebsd.go.orig	1970-01-01 02:00:00.000000000 +0200
-+++ fileinfo_freebsd.go		2014-08-15 15:55:47.824555519 +0300
+--- fileinfo_freebsd.go.orig	2015-06-23 08:32:46 UTC
++++ fileinfo_freebsd.go
 @@ -0,0 +1,11 @@
 +package main
 +
 +import (
 +  "os"
 +  "syscall"
 +)
 +
 +func file_ids(info *os.FileInfo) (uint32, uint32) {
 +  fstat := (*(info)).Sys().(*syscall.Stat_t)
 +  return fstat.Ino, fstat.Dev
 +}
Index: branches/2015Q2/sysutils/logstash-forwarder/files/patch-filestate_freebsd.go
===================================================================
--- branches/2015Q2/sysutils/logstash-forwarder/files/patch-filestate_freebsd.go	(revision 390519)
+++ branches/2015Q2/sysutils/logstash-forwarder/files/patch-filestate_freebsd.go	(revision 390520)
@@ -1,11 +1,11 @@
---- filestate_freebsd.go.orig    1970-01-01 02:00:00.000000000 +0200
-+++ filestate_freebsd.go     2014-08-15 15:56:07.164481962 +0300
+--- filestate_freebsd.go.orig	2015-06-23 08:32:46 UTC
++++ filestate_freebsd.go
 @@ -0,0 +1,8 @@
 +package main
 +
 +type FileState struct {
 +  Source *string `json:"source,omitempty"`
 +  Offset int64 `json:"offset,omitempty"`
 +  Inode uint32 `json:"inode,omitempty"`
 +  Device uint32 `json:"device,omitempty"`
 +}
Index: branches/2015Q2
===================================================================
--- branches/2015Q2	(revision 390519)
+++ branches/2015Q2	(revision 390520)

Property changes on: branches/2015Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r390518