sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net-mgmt/riemann: Update 0.2.14

Browse source 
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 <dch@skunkwerks.at> (maintainer)
This commit is contained in:
Danilo G. Baio 2017-09-01 00:07:48 +00:00
parent e5cff99751
commit b3d8749833
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=449053
4 changed files with 37 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
net-mgmt/riemann/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= riemann PORTNAME= riemann
PORTVERSION= 0.2.12 PORTVERSION= 0.2.14
PORTREVISION= 1
CATEGORIES= net-mgmt java CATEGORIES= net-mgmt java
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
@ -16,47 +15,27 @@ USES= tar:bzip2
NO_BUILD= yes NO_BUILD= yes
NO_ARCH= yes NO_ARCH= yes
USE_JAVA= yes USE_JAVA= yes
JAVA_VERSION= 1.7+ JAVA_VERSION= 1.8+
SUB_LIST= JAVA_HOME=${JAVA_HOME} \ SUB_LIST= 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} \ PLIST_SUB= JAVA_HOME=${JAVA_HOME}
RIEMANN_USER=${RIEMANN_USER} \
RIEMANN_GROUP=${RIEMANN_GROUP} \
RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
RIEMANN_USER?= ${PORTNAME} USERS= riemann
RIEMANN_GROUP?= ${PORTNAME} GROUPS= riemann
.if ${RIEMANN_USER} == "${PORTNAME}" USE_RC_SUBR= riemann
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
do-install: do-install:
${MKDIR} \ ${MKDIR} ${STAGEDIR}${JAVAJARDIR} \
${STAGEDIR}${JAVAJARDIR} \
${STAGEDIR}${ETCDIR} \ ${STAGEDIR}${ETCDIR} \
${STAGEDIR}${ETCDIR}/conf.d \ ${STAGEDIR}${ETCDIR}/conf.d \
${STAGEDIR}${RIEMANN_LOGDIR} ${STAGEDIR}/var/log/riemann
${INSTALL_DATA} \ ${INSTALL_DATA} ${WRKSRC}/lib/riemann.jar \
${WRKSRC}/lib/${PORTNAME}.jar \ ${STAGEDIR}${JAVAJARDIR}/riemann.jar
${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar ${SED} -i -e "s:riemann.log:/var/log/riemann.log:g" \
${SED} -i -e "s:riemann.log:${RIEMANN_LOGDIR}${PORTNAME}.log:g" \ ${WRKSRC}/etc/riemann.config
${WRKSRC}/etc/${PORTNAME}.config ${INSTALL_DATA} ${WRKSRC}/etc/riemann.config \
${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.config \ ${STAGEDIR}${ETCDIR}/riemann.config.sample
${STAGEDIR}${ETCDIR}/${PORTNAME}.config.sample
.include <bsd.port.mk> .include <bsd.port.mk>

6
net-mgmt/riemann/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1484592882 TIMESTAMP = 1501697423
SHA256 (riemann-0.2.12.tar.bz2) = 79f21fb2ac90a3d55e7cfa4a1eb14d1bdcdb1266ba6052bb72e6e500467ca7f4 SHA256 (riemann-0.2.14.tar.bz2) = 165ee73ad10f5d187d559da1db8f99e151bba8c3bb1d774eb465ced23476fbce
SIZE (riemann-0.2.12.tar.bz2) = 41672027 SIZE (riemann-0.2.14.tar.bz2) = 81960540

33
net-mgmt/riemann/files/riemann.in
View file

@ -30,9 +30,9 @@ rcvar=riemann_enable
load_rc_config $name load_rc_config $name
: ${riemann_enable="NO"} : ${riemann_enable="NO"}
: ${riemann_user:="%%RIEMANN_USER%%"} : ${riemann_user:="riemann"}
: ${riemann_group:="%%RIEMANN_GROUP%%"} : ${riemann_group:="riemann"}
: ${riemann_config:="%%PREFIX%%/etc/riemann/riemann.config.sample"} : ${riemann_config:="%%ETCDIR%%/riemann/riemann.config"}
: ${riemann_jarfile:="%%JAVAJARDIR%%/riemann.jar"} : ${riemann_jarfile:="%%JAVAJARDIR%%/riemann.jar"}
: ${riemann_java_home:="%%JAVA_HOME%%"} : ${riemann_java_home:="%%JAVA_HOME%%"}
: ${riemann_min_mem:="256m"} : ${riemann_min_mem:="256m"}
@ -40,7 +40,7 @@ load_rc_config $name
: ${riemann_java_classpath:=${riemann_jarfile}} : ${riemann_java_classpath:=${riemann_jarfile}}
: ${riemann_java_opts:=" -server \ : ${riemann_java_opts:=" -server \
-cp ${riemann_java_classpath} \ -cp ${riemann_java_classpath} \
-Dapp=${name} \ -Dapp=riemann \
-Xms${riemann_min_mem} \ -Xms${riemann_min_mem} \
-Xmx${riemann_max_mem} \ -Xmx${riemann_max_mem} \
-Xss256k \ -Xss256k \
@ -58,19 +58,20 @@ load_rc_config $name
-XX:+UseParNewGC \ -XX:+UseParNewGC \
-XX:CMSInitiatingOccupancyFraction=75 "} -XX:CMSInitiatingOccupancyFraction=75 "}
pidfile="%%RIEMANN_PIDFILE%%" pidfile="/var/run/riemann.pid"
command="/usr/sbin/daemon" start_precmd="install -o ${riemann_user} /dev/null ${pidfile}"
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}"
riemann_prestart() command="/usr/sbin/daemon"
{ command_args=" \
install -o ${riemann_user} /dev/null ${pidfile} -c \
} -t riemann \
start_precmd="${name}_prestart" -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 # support SIGHUP to reload config file using pkill. parent pid
# is that of daemon(8) and not of riemann's JVM instance # is that of daemon(8) and not of riemann's JVM instance

4
net-mgmt/riemann/pkg-plist
View file

@ -1,4 +1,4 @@
%%JAVAJARDIR%%/riemann.jar %%JAVAJARDIR%%/riemann.jar
@sample %%ETCDIR%%/riemann.config.sample @sample %%ETCDIR%%/riemann.config.sample
@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_LOGDIR%% @dir(riemann,riemann,0750) /var/log/riemann
@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%ETCDIR%%/conf.d @dir(riemann,riemann,0750) %%ETCDIR%%/conf.d