From b3d87498336603d93a822bcc7018ce0d11a2e92c Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio" Date: Fri, 1 Sep 2017 00:07:48 +0000 Subject: [PATCH] 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) --- net-mgmt/riemann/Makefile | 51 +++++++++---------------------- net-mgmt/riemann/distinfo | 6 ++-- net-mgmt/riemann/files/riemann.in | 33 ++++++++++---------- net-mgmt/riemann/pkg-plist | 4 +-- 4 files changed, 37 insertions(+), 57 deletions(-) diff --git a/net-mgmt/riemann/Makefile b/net-mgmt/riemann/Makefile index acc26ec3552f..a128d6a7bcef 100644 --- a/net-mgmt/riemann/Makefile +++ b/net-mgmt/riemann/Makefile @@ -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= ${PORTNAME} - -RIEMANN_LOGDIR= /var/log/${PORTNAME}/ -RIEMANN_PIDFILE= /var/run/${PORTNAME}.pid +USE_RC_SUBR= riemann 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 diff --git a/net-mgmt/riemann/distinfo b/net-mgmt/riemann/distinfo index a774705f9109..d55245bcd996 100644 --- a/net-mgmt/riemann/distinfo +++ b/net-mgmt/riemann/distinfo @@ -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 diff --git a/net-mgmt/riemann/files/riemann.in b/net-mgmt/riemann/files/riemann.in index 437c5d1f2203..861fff308a5a 100644 --- a/net-mgmt/riemann/files/riemann.in +++ b/net-mgmt/riemann/files/riemann.in @@ -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%%" -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}" +pidfile="/var/run/riemann.pid" +start_precmd="install -o ${riemann_user} /dev/null ${pidfile}" -riemann_prestart() -{ - install -o ${riemann_user} /dev/null ${pidfile} -} -start_precmd="${name}_prestart" +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 diff --git a/net-mgmt/riemann/pkg-plist b/net-mgmt/riemann/pkg-plist index a9fd6e23292e..27fb500906ce 100644 --- a/net-mgmt/riemann/pkg-plist +++ b/net-mgmt/riemann/pkg-plist @@ -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