Index: branches/2017Q2/devel/jenkins-lts/Makefile =================================================================== --- branches/2017Q2/devel/jenkins-lts/Makefile (revision 439545) +++ branches/2017Q2/devel/jenkins-lts/Makefile (revision 439546) @@ -1,56 +1,56 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 2.32.2 +PORTVERSION= 2.46.2 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts DISTNAME= jenkins EXTRACT_SUFX= .war DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} EXTRACT_ONLY= MAINTAINER= swills@FreeBSD.org COMMENT= Open-source continuous integration server LICENSE= MIT CONFLICTS= jenkins-[0-9]* USE_JAVA= yes NO_BUILD= yes USE_RC_SUBR= jenkins USES+= cpe CPE_VENDOR= cloudbees CPE_EDITION= lts JENKINS_HOME?= ${PREFIX}/jenkins JENKINS_USER?= jenkins JENKINS_GROUP?= jenkins JENKINS_LOG_FILE?= /var/log/jenkins.log .if ${JENKINS_USER} == "jenkins" USERS= jenkins .endif .if ${JENKINS_GROUP} == "jenkins" GROUPS= jenkins .endif SUB_LIST+= JENKINS_HOME=${JENKINS_HOME} \ JENKINS_USER=${JENKINS_USER} \ JENKINS_GROUP=${JENKINS_GROUP} \ JAVA_HOME=${JAVA_HOME} \ JENKINS_LOG_FILE=${JENKINS_LOG_FILE} PLIST_SUB+= JENKINS_USER=${JENKINS_USER} \ JENKINS_GROUP=${JENKINS_GROUP} .include do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${JENKINS_HOME} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ ${STAGEDIR}${DATADIR} .include Index: branches/2017Q2/devel/jenkins-lts/distinfo =================================================================== --- branches/2017Q2/devel/jenkins-lts/distinfo (revision 439545) +++ branches/2017Q2/devel/jenkins-lts/distinfo (revision 439546) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485968129 -SHA256 (jenkins/2.32.2/jenkins.war) = 73b216449cb5eacd4fe5a6ee2e089245705e5815b448e315fbc8b6de7809e55f -SIZE (jenkins/2.32.2/jenkins.war) = 69874457 +TIMESTAMP = 1493264528 +SHA256 (jenkins/2.46.2/jenkins.war) = aa7f243a4c84d3d6cfb99a218950b8f7b926af7aa2570b0e1707279d464472c7 +SIZE (jenkins/2.46.2/jenkins.war) = 70342163 Index: branches/2017Q2/devel/jenkins-lts/files/jenkins.in =================================================================== --- branches/2017Q2/devel/jenkins-lts/files/jenkins.in (revision 439545) +++ branches/2017Q2/devel/jenkins-lts/files/jenkins.in (revision 439546) @@ -1,86 +1,86 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: jenkins # REQUIRE: LOGIN # KEYWORD: shutdown # # Configuration settings for jenkins in /etc/rc.conf: # # jenkins_enable (bool): # Set to "NO" by default. # Set it to "YES" to enable jenkins # # jenkins_args (str): # Extra arguments passed to start command # # jenkins_home (str) # Set to "%%JENKINS_HOME%%" by default. # Set the JENKINS_HOME variable for jenkins process # # jenkins_java_home (str): # Set to "%%JAVA_HOME%%" by default. # Set the Java virtual machine to run jenkins # # jenkins_java_opts (str): # Set to "" by default. # Java VM args to use. # # jenkins_user (str): # Set to "%%JENKINS_USER%%" by default. # User to run jenkins as. # # jenkins_group (str): # Set to "%%JENKINS_GROUP%%" by default. # Group for data file ownership. # # jenkins_log_file (str): # Set to "%%JENKINS_LOG_FILE%%" by default. # Log file location. # . /etc/rc.subr name="jenkins" rcvar=jenkins_enable load_rc_config "${name}" : ${jenkins_enable="NO"} : ${jenkins_home="%%JENKINS_HOME%%"} : ${jenkins_args="--webroot=${jenkins_home}/war --httpPort=8180 --prefix=/jenkins"} : ${jenkins_java_home="%%JAVA_HOME%%"} : ${jenkins_user="%%JENKINS_USER%%"} : ${jenkins_group="%%JENKINS_GROUP%%"} : ${jenkins_log_file="%%JENKINS_LOG_FILE%%"} pidfile="/var/run/jenkins/jenkins.pid" command="/usr/sbin/daemon" java_cmd="${jenkins_java_home}/bin/java" procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} -DJENKINS_HOME=${jenkins_home} ${jenkins_java_opts} -jar %%DATADIR%%/jenkins.war ${jenkins_args} > ${jenkins_log_file} 2>&1" +command_args="-p ${pidfile} ${java_cmd} -DJENKINS_HOME=${jenkins_home} ${jenkins_java_opts} -jar %%DATADIR%%/jenkins.war ${jenkins_args} >> ${jenkins_log_file} 2>&1" required_files="${java_cmd}" start_precmd="jenkins_prestart" start_cmd="jenkins_start" jenkins_prestart() { if [ ! -f "${jenkins_log_file}" ]; then touch "${jenkins_log_file}" chown "${jenkins_user}:${jenkins_group}" "${jenkins_log_file}" chmod 640 "${jenkins_log_file}" fi if [ ! -d "/var/run/jenkins" ]; then install -d -o "${jenkins_user}" -g "${jenkins_group}" -m 750 "/var/run/jenkins" fi } jenkins_start() { check_startmsgs && echo "Starting ${name}." su -l ${jenkins_user} -c "exec ${command} ${command_args} ${rc_arg}" } run_rc_command "$1" Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 439545) +++ branches/2017Q2 (revision 439546) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r437645,439501