Index: head/net-mgmt/riemann/Makefile
===================================================================
--- head/net-mgmt/riemann/Makefile	(revision 477982)
+++ head/net-mgmt/riemann/Makefile	(revision 477983)
@@ -1,41 +1,42 @@
-# Created by: Dave Cottlehuber <dch@skunkwerks.at>
+# Created by: Dave Cottlehuber <dch@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	riemann
-PORTVERSION=	0.2.14
+PORTVERSION=	0.3.1
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
 
-MAINTAINER=	dch@skunkwerks.at
+MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Monitors distributed systems
 
-LICENSE=	EPL
+LICENSE=	EPL APACHE20 CDDL MIT BSD3CLAUSE LGPL2+ BSD2CLAUSE GPLv2+
+LICENSE_COMB=	multi
 
 USES=		tar:bzip2
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 PLIST_SUB=	JAVA_HOME=${JAVA_HOME}
 
 USERS=	riemann
 GROUPS=	riemann
 
 USE_RC_SUBR=	riemann
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR} \
 		${STAGEDIR}${ETCDIR} \
 		${STAGEDIR}${ETCDIR}/conf.d \
 		${STAGEDIR}/var/log/riemann
 	${INSTALL_DATA} ${WRKSRC}/lib/riemann.jar \
 		${STAGEDIR}${JAVAJARDIR}/riemann.jar
-	${SED} -i -e "s:riemann.log:/var/log/riemann.log:g" \
+	${SED} -i -e "s:riemann.log:/var/log/riemann/riemann.log:g" \
 		${WRKSRC}/etc/riemann.config
 	${INSTALL_DATA} ${WRKSRC}/etc/riemann.config \
 		${STAGEDIR}${ETCDIR}/riemann.config.sample
 
 .include <bsd.port.mk>
Index: head/net-mgmt/riemann/distinfo
===================================================================
--- head/net-mgmt/riemann/distinfo	(revision 477982)
+++ head/net-mgmt/riemann/distinfo	(revision 477983)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501697423
-SHA256 (riemann-0.2.14.tar.bz2) = 165ee73ad10f5d187d559da1db8f99e151bba8c3bb1d774eb465ced23476fbce
-SIZE (riemann-0.2.14.tar.bz2) = 81960540
+TIMESTAMP = 1535139098
+SHA256 (riemann-0.3.1.tar.bz2) = 54f9799922c8cbad75bbbe36c7e5ad32cf932fb61149629ee0528eb178c58351
+SIZE (riemann-0.3.1.tar.bz2) = 83862795
Index: head/net-mgmt/riemann/files/riemann.in
===================================================================
--- head/net-mgmt/riemann/files/riemann.in	(revision 477982)
+++ head/net-mgmt/riemann/files/riemann.in	(revision 477983)
@@ -1,81 +1,80 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: riemann
 # REQUIRE: LOGIN NETWORKING SERVERS
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # riemann_enable    (bool):   Set to NO by default.
 # Set it to YES to enable riemann.
 #
 # riemann_config          (string): Optional full path for riemann config file
 # riemann_user            (user):   Set to riemann by default.
 # riemann_group           (group):  Set to riemann by default.
 # riemann_jarfile         (string): Optional path to a custom jarfile.
 # riemann_java_home       (args):   Specify which JVM to use, if not default.
 # riemann_java_classpath  (args):   Specify a custom Java ClassPath.
 # riemann_min_mem         (num):    Minumum JVM heap size, 256m by default.
 # riemann_max_mem         (num):    Maximum JVM heap size, 1g by default.
 # riemann_java_opts       (args):   Additional JVM properties or arguments.
 
 . /etc/rc.subr
 
 name="riemann"
 rcvar=riemann_enable
 
 load_rc_config $name
 
 : ${riemann_enable="NO"}
 : ${riemann_user:="riemann"}
 : ${riemann_group:="riemann"}
-: ${riemann_config:="%%ETCDIR%%/riemann/riemann.config"}
+: ${riemann_config:="%%ETCDIR%%/riemann.config"}
 : ${riemann_jarfile:="%%JAVAJARDIR%%/riemann.jar"}
 : ${riemann_java_home:="%%JAVA_HOME%%"}
 : ${riemann_min_mem:="256m"}
 : ${riemann_max_mem:="1g"}
 : ${riemann_java_classpath:=${riemann_jarfile}}
 : ${riemann_java_opts:=" -server \
 	-cp ${riemann_java_classpath} \
         -Dapp=riemann \
         -Xms${riemann_min_mem} \
         -Xmx${riemann_max_mem} \
         -Xss256k \
         -Djava.awt.headless=true \
-        -Djava.net.preferIPv4Stack=true \
         -XX:+AggressiveOpts \
         -XX:+CMSClassUnloadingEnabled \
         -XX:+CMSParallelRemarkEnabled \
         -XX:+DisableExplicitGC \
         -XX:+HeapDumpOnOutOfMemoryError \
         -XX:+UseCMSInitiatingOccupancyOnly \
         -XX:+UseCompressedOops \
         -XX:+UseConcMarkSweepGC \
         -XX:+UseFastAccessorMethods \
         -XX:+UseParNewGC \
         -XX:CMSInitiatingOccupancyFraction=75 "}
 
 pidfile="/var/run/riemann.pid"
 start_precmd="install -o ${riemann_user} /dev/null ${pidfile}"
 
 command="/usr/sbin/daemon"
 command_args=" \
 	-c \
 	-t riemann \
 	-r \
 	-P ${pidfile} \
 	${riemann_java_home}/bin/java \
 	${riemann_java_opts} \
 	riemann.bin start ${riemann_config}"
 
 required_files="${java_cmd} ${riemann_config}"
 
 # support SIGHUP to reload config file using pkill. parent pid
 # is that of daemon(8) and not of riemann's JVM instance
 extra_commands="reload"
 reload_cmd="pkill -SIGHUP -U ${riemann_user} -G ${riemann_group} -f Dapp=riemann"
 
 run_rc_command "$1"