From owner-svn-ports-all@freebsd.org Fri Sep 1 00:07:50 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65E74E0CD99; Fri, 1 Sep 2017 00:07:50 +0000 (UTC) (envelope-from dbaio@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 mx1.freebsd.org (Postfix) with ESMTPS id 401716DF1F; Fri, 1 Sep 2017 00:07:50 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8107n3e095796; Fri, 1 Sep 2017 00:07:49 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8107mkM095792; Fri, 1 Sep 2017 00:07:48 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201709010007.v8107mkM095792@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Fri, 1 Sep 2017 00:07:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449053 - in head/net-mgmt/riemann: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in head/net-mgmt/riemann: . files X-SVN-Commit-Revision: 449053 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2017 00:07:50 -0000 Author: dbaio Date: Fri Sep 1 00:07:48 2017 New Revision: 449053 URL: https://svnweb.freebsd.org/changeset/ports/449053 Log: net-mgmt/riemann: Update 0.2.14 Bump lowest JAVA_VERSION to 1.8+ missed from the last release and simplify port because it's not a master port. PR: 221436 Submitted by: Dave Cottlehuber (maintainer) Modified: head/net-mgmt/riemann/Makefile head/net-mgmt/riemann/distinfo head/net-mgmt/riemann/files/riemann.in head/net-mgmt/riemann/pkg-plist Modified: head/net-mgmt/riemann/Makefile ============================================================================== --- head/net-mgmt/riemann/Makefile Thu Aug 31 20:38:11 2017 (r449052) +++ head/net-mgmt/riemann/Makefile Fri Sep 1 00:07:48 2017 (r449053) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= riemann -PORTVERSION= 0.2.12 -PORTREVISION= 1 +PORTVERSION= 0.2.14 CATEGORIES= net-mgmt java MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ @@ -16,47 +15,27 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes USE_JAVA= yes -JAVA_VERSION= 1.7+ +JAVA_VERSION= 1.8+ -SUB_LIST= JAVA_HOME=${JAVA_HOME} \ - RIEMANN_USER=${RIEMANN_USER} \ - RIEMANN_GROUP=${RIEMANN_GROUP} \ - RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \ - RIEMANN_LOGDIR=${RIEMANN_LOGDIR} +SUB_LIST= JAVA_HOME=${JAVA_HOME} -PLIST_SUB= JAVA_HOME=${JAVA_HOME} \ - RIEMANN_USER=${RIEMANN_USER} \ - RIEMANN_GROUP=${RIEMANN_GROUP} \ - RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \ - RIEMANN_LOGDIR=${RIEMANN_LOGDIR} +PLIST_SUB= JAVA_HOME=${JAVA_HOME} -RIEMANN_USER?= ${PORTNAME} -RIEMANN_GROUP?= ${PORTNAME} +USERS= riemann +GROUPS= riemann -.if ${RIEMANN_USER} == "${PORTNAME}" -USERS= ${PORTNAME} -.endif -.if ${RIEMANN_GROUP} == "${PORTNAME}" -GROUPS= ${PORTNAME} -.endif +USE_RC_SUBR= riemann -USE_RC_SUBR= ${PORTNAME} - -RIEMANN_LOGDIR= /var/log/${PORTNAME}/ -RIEMANN_PIDFILE= /var/run/${PORTNAME}.pid - do-install: - ${MKDIR} \ - ${STAGEDIR}${JAVAJARDIR} \ + ${MKDIR} ${STAGEDIR}${JAVAJARDIR} \ ${STAGEDIR}${ETCDIR} \ ${STAGEDIR}${ETCDIR}/conf.d \ - ${STAGEDIR}${RIEMANN_LOGDIR} - ${INSTALL_DATA} \ - ${WRKSRC}/lib/${PORTNAME}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - ${SED} -i -e "s:riemann.log:${RIEMANN_LOGDIR}${PORTNAME}.log:g" \ - ${WRKSRC}/etc/${PORTNAME}.config - ${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.config \ - ${STAGEDIR}${ETCDIR}/${PORTNAME}.config.sample + ${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" \ + ${WRKSRC}/etc/riemann.config + ${INSTALL_DATA} ${WRKSRC}/etc/riemann.config \ + ${STAGEDIR}${ETCDIR}/riemann.config.sample .include Modified: head/net-mgmt/riemann/distinfo ============================================================================== --- head/net-mgmt/riemann/distinfo Thu Aug 31 20:38:11 2017 (r449052) +++ head/net-mgmt/riemann/distinfo Fri Sep 1 00:07:48 2017 (r449053) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484592882 -SHA256 (riemann-0.2.12.tar.bz2) = 79f21fb2ac90a3d55e7cfa4a1eb14d1bdcdb1266ba6052bb72e6e500467ca7f4 -SIZE (riemann-0.2.12.tar.bz2) = 41672027 +TIMESTAMP = 1501697423 +SHA256 (riemann-0.2.14.tar.bz2) = 165ee73ad10f5d187d559da1db8f99e151bba8c3bb1d774eb465ced23476fbce +SIZE (riemann-0.2.14.tar.bz2) = 81960540 Modified: head/net-mgmt/riemann/files/riemann.in ============================================================================== --- head/net-mgmt/riemann/files/riemann.in Thu Aug 31 20:38:11 2017 (r449052) +++ head/net-mgmt/riemann/files/riemann.in Fri Sep 1 00:07:48 2017 (r449053) @@ -30,9 +30,9 @@ rcvar=riemann_enable load_rc_config $name : ${riemann_enable="NO"} -: ${riemann_user:="%%RIEMANN_USER%%"} -: ${riemann_group:="%%RIEMANN_GROUP%%"} -: ${riemann_config:="%%PREFIX%%/etc/riemann/riemann.config.sample"} +: ${riemann_user:="riemann"} +: ${riemann_group:="riemann"} +: ${riemann_config:="%%ETCDIR%%/riemann/riemann.config"} : ${riemann_jarfile:="%%JAVAJARDIR%%/riemann.jar"} : ${riemann_java_home:="%%JAVA_HOME%%"} : ${riemann_min_mem:="256m"} @@ -40,7 +40,7 @@ load_rc_config $name : ${riemann_java_classpath:=${riemann_jarfile}} : ${riemann_java_opts:=" -server \ -cp ${riemann_java_classpath} \ - -Dapp=${name} \ + -Dapp=riemann \ -Xms${riemann_min_mem} \ -Xmx${riemann_max_mem} \ -Xss256k \ @@ -58,19 +58,20 @@ load_rc_config $name -XX:+UseParNewGC \ -XX:CMSInitiatingOccupancyFraction=75 "} -pidfile="%%RIEMANN_PIDFILE%%" +pidfile="/var/run/riemann.pid" +start_precmd="install -o ${riemann_user} /dev/null ${pidfile}" + command="/usr/sbin/daemon" -command_args="-f -t ${name} -c -r -P ${pidfile} \ - ${riemann_java_home}/bin/java \ - ${riemann_java_opts} \ - riemann.bin start ${riemann_config}" -required_files="${java_cmd} ${riemann_config}" +command_args=" \ + -c \ + -t riemann \ + -r \ + -P ${pidfile} \ + ${riemann_java_home}/bin/java \ + ${riemann_java_opts} \ + riemann.bin start ${riemann_config}" -riemann_prestart() -{ - install -o ${riemann_user} /dev/null ${pidfile} -} -start_precmd="${name}_prestart" +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 Modified: head/net-mgmt/riemann/pkg-plist ============================================================================== --- head/net-mgmt/riemann/pkg-plist Thu Aug 31 20:38:11 2017 (r449052) +++ head/net-mgmt/riemann/pkg-plist Fri Sep 1 00:07:48 2017 (r449053) @@ -1,4 +1,4 @@ %%JAVAJARDIR%%/riemann.jar @sample %%ETCDIR%%/riemann.config.sample -@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_LOGDIR%% -@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%ETCDIR%%/conf.d +@dir(riemann,riemann,0750) /var/log/riemann +@dir(riemann,riemann,0750) %%ETCDIR%%/conf.d