Attachment 185316 Details for Bug 221436 – v2 valid svn diff

[patch] v2 valid svn diff

riemann.diff (text/plain), 3.83 KB, created by Dave Cottlehuber on 2017-08-12 12:08:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2017-08-12 12:08:20 UTC

Size: 3.83 KB

patch

obsolete

>Index: net-mgmt/riemann/Makefile
>===================================================================
>--- net-mgmt/riemann/Makefile	(revision 447818)
>+++ net-mgmt/riemann/Makefile	(working copy)
>@@ -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,18 +15,18 @@
> 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_PIDDIR=${RIEMANN_PIDDIR} \
> 		RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
> 
> PLIST_SUB=	JAVA_HOME=${JAVA_HOME} \
> 		RIEMANN_USER=${RIEMANN_USER} \
> 		RIEMANN_GROUP=${RIEMANN_GROUP} \
>-		RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
>+		RIEMANN_PIDDIR=${RIEMANN_PIDDIR} \
> 		RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
> 
> RIEMANN_USER?=	${PORTNAME}
>@@ -43,7 +42,7 @@
> USE_RC_SUBR=	${PORTNAME}
> 
> RIEMANN_LOGDIR=	/var/log/${PORTNAME}/
>-RIEMANN_PIDFILE=	/var/run/${PORTNAME}.pid
>+RIEMANN_PIDDIR=	/var/run/${PORTNAME}/
> 
> do-install:
> 	${MKDIR} \
>@@ -50,6 +49,7 @@
> 		${STAGEDIR}${JAVAJARDIR} \
> 		${STAGEDIR}${ETCDIR} \
> 		${STAGEDIR}${ETCDIR}/conf.d \
>+		${STAGEDIR}${RIEMANN_PIDDIR} \
> 		${STAGEDIR}${RIEMANN_LOGDIR}
> 	${INSTALL_DATA} \
> 				${WRKSRC}/lib/${PORTNAME}.jar \
>Index: net-mgmt/riemann/distinfo
>===================================================================
>--- net-mgmt/riemann/distinfo	(revision 447818)
>+++ net-mgmt/riemann/distinfo	(working copy)
>@@ -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
>Index: net-mgmt/riemann/files/riemann.in
>===================================================================
>--- net-mgmt/riemann/files/riemann.in	(revision 447818)
>+++ net-mgmt/riemann/files/riemann.in	(working copy)
>@@ -32,12 +32,13 @@
> : ${riemann_enable="NO"}
> : ${riemann_user:="%%RIEMANN_USER%%"}
> : ${riemann_group:="%%RIEMANN_GROUP%%"}
>-: ${riemann_config:="%%PREFIX%%/etc/riemann/riemann.config.sample"}
>+: ${riemann_config:="%%ETCDIR%%/riemann/riemann.config"}
> : ${riemann_jarfile:="%%JAVAJARDIR%%/riemann.jar"}
> : ${riemann_java_home:="%%JAVA_HOME%%"}
> : ${riemann_min_mem:="256m"}
> : ${riemann_max_mem:="1g"}
> : ${riemann_java_classpath:=${riemann_jarfile}}
>+: ${riemann_run_dir:="/var/run/${name}"}
> : ${riemann_java_opts:=" -server \
> 	-cp ${riemann_java_classpath} \
>         -Dapp=${name} \
>@@ -58,12 +59,19 @@
>         -XX:+UseParNewGC \
>         -XX:CMSInitiatingOccupancyFraction=75 "}
> 
>-pidfile="%%RIEMANN_PIDFILE%%"
>+app_pidfile="${riemann_run_dir}/${name}.pid"
>+pidfile="${riemann_run_dir}/daemon.pid"
> 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}"
>+
>+command_args=" \
>+	-c \
>+	-t ${name} \
>+	-r \
>+	-p ${app_pidfile} \
>+	-P ${pidfile} \
>+	${riemann_java_home}/bin/java \
>+	${riemann_java_opts} \
>+	riemann.bin start ${riemann_config}"
> required_files="${java_cmd} ${riemann_config}"
> 
> riemann_prestart()
>Index: net-mgmt/riemann/pkg-plist
>===================================================================
>--- net-mgmt/riemann/pkg-plist	(revision 447818)
>+++ net-mgmt/riemann/pkg-plist	(working copy)
>@@ -1,4 +1,5 @@
> %%JAVAJARDIR%%/riemann.jar
> @sample %%ETCDIR%%/riemann.config.sample
> @dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_LOGDIR%%
>+@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_PIDDIR%%
> @dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%ETCDIR%%/conf.d

Flags:

dch: maintainer-approval+

Actions: View | Diff

Attachments on bug 221436: 185314 | 185316 | 185953 | 185965