svn commit: r477983 - in head/net-mgmt/riemann: . files

[Dave Cottlehuber]

Author: dch
Date: Fri Aug 24 22:06:12 2018
New Revision: 477983
URL: https://svnweb.freebsd.org/changeset/ports/477983

Log:
  net-mgmt/riemann: update 0.2.13 to 0.3.1
  
  - include fixes from romain@ for config file locations and remove IPv4
    stack specificity
  - amend LICENSE details for all jarfile components
  
  PR:		227426
  Submitted by:	romain
  Approved by:	jrm (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16888

Modified:
  head/net-mgmt/riemann/Makefile
  head/net-mgmt/riemann/distinfo
  head/net-mgmt/riemann/files/riemann.in

Modified: head/net-mgmt/riemann/Makefile
==============================================================================
--- head/net-mgmt/riemann/Makefile	Fri Aug 24 22:01:26 2018	(r477982)
+++ head/net-mgmt/riemann/Makefile	Fri Aug 24 22:06:12 2018	(r477983)
@@ -1,15 +1,16 @@
-# Created by: Dave Cottlehuber <dch at skunkwerks.at>
+# Created by: Dave Cottlehuber <dch at 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 at skunkwerks.at
+MAINTAINER=	dch at 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
@@ -33,7 +34,7 @@ do-install:
 		${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

Modified: head/net-mgmt/riemann/distinfo
==============================================================================
--- head/net-mgmt/riemann/distinfo	Fri Aug 24 22:01:26 2018	(r477982)
+++ head/net-mgmt/riemann/distinfo	Fri Aug 24 22:06:12 2018	(r477983)
@@ -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

Modified: head/net-mgmt/riemann/files/riemann.in
==============================================================================
--- head/net-mgmt/riemann/files/riemann.in	Fri Aug 24 22:01:26 2018	(r477982)
+++ head/net-mgmt/riemann/files/riemann.in	Fri Aug 24 22:06:12 2018	(r477983)
@@ -32,7 +32,7 @@ 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"}
@@ -45,7 +45,6 @@ load_rc_config $name
         -Xmx${riemann_max_mem} \
         -Xss256k \
         -Djava.awt.headless=true \
-        -Djava.net.preferIPv4Stack=true \
         -XX:+AggressiveOpts \
         -XX:+CMSClassUnloadingEnabled \
         -XX:+CMSParallelRemarkEnabled \