From owner-svn-ports-head@freebsd.org Fri Aug 24 22:06:14 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FC6410951F3; Fri, 24 Aug 2018 22:06:14 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CAC6778F44; Fri, 24 Aug 2018 22:06:13 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8D4B16F76; Fri, 24 Aug 2018 22:06:13 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7OM6DL8032059; Fri, 24 Aug 2018 22:06:13 GMT (envelope-from dch@FreeBSD.org) Received: (from dch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7OM6DMq032056; Fri, 24 Aug 2018 22:06:13 GMT (envelope-from dch@FreeBSD.org) Message-Id: <201808242206.w7OM6DMq032056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org using -f From: Dave Cottlehuber Date: Fri, 24 Aug 2018 22:06:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477983 - in head/net-mgmt/riemann: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dch X-SVN-Commit-Paths: in head/net-mgmt/riemann: . files X-SVN-Commit-Revision: 477983 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Aug 2018 22:06:14 -0000 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 +# Created by: Dave Cottlehuber # $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 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 \