diff options
| author | Dave Cottlehuber <dch@FreeBSD.org> | 2018-08-24 22:06:12 +0000 |
|---|---|---|
| committer | Dave Cottlehuber <dch@FreeBSD.org> | 2018-08-24 22:06:12 +0000 |
| commit | a45e7473b60925bf587384b4a6008cb509a0977d (patch) | |
| tree | 5c9fb4c46814ce1143dc33c149a2c5d50b540b90 /net-mgmt/riemann | |
| parent | 8dceac0b600c9c11647f182c3e4df7fa6a3d61b1 (diff) | |
| download | ports-a45e7473b60925bf587384b4a6008cb509a0977d.tar.gz ports-a45e7473b60925bf587384b4a6008cb509a0977d.zip | |
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
Notes
Notes:
svn path=/head/; revision=477983
Diffstat (limited to 'net-mgmt/riemann')
| -rw-r--r-- | net-mgmt/riemann/Makefile | 11 | ||||
| -rw-r--r-- | net-mgmt/riemann/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/riemann/files/riemann.in | 3 |
3 files changed, 10 insertions, 10 deletions
diff --git a/net-mgmt/riemann/Makefile b/net-mgmt/riemann/Makefile index a128d6a7bcef..ac2a80f4aa33 100644 --- a/net-mgmt/riemann/Makefile +++ b/net-mgmt/riemann/Makefile @@ -1,15 +1,16 @@ -# 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 @@ -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 diff --git a/net-mgmt/riemann/distinfo b/net-mgmt/riemann/distinfo index d55245bcd996..15d8ad9858e2 100644 --- a/net-mgmt/riemann/distinfo +++ b/net-mgmt/riemann/distinfo @@ -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 diff --git a/net-mgmt/riemann/files/riemann.in b/net-mgmt/riemann/files/riemann.in index 861fff308a5a..e48f4bbe4d45 100644 --- a/net-mgmt/riemann/files/riemann.in +++ b/net-mgmt/riemann/files/riemann.in @@ -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 \ |