Index: branches/2015Q1/devel/jenkins-lts/Makefile
===================================================================
--- branches/2015Q1/devel/jenkins-lts/Makefile	(revision 380206)
+++ branches/2015Q1/devel/jenkins-lts/Makefile	(revision 380207)
@@ -1,56 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
-PORTVERSION=	1.580.1
+PORTVERSION=	1.596.1
 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 <bsd.port.pre.mk>
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${JENKINS_HOME}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>
Index: branches/2015Q1/devel/jenkins-lts/distinfo
===================================================================
--- branches/2015Q1/devel/jenkins-lts/distinfo	(revision 380206)
+++ branches/2015Q1/devel/jenkins-lts/distinfo	(revision 380207)
@@ -1,2 +1,2 @@
-SHA256 (jenkins/1.580.1/jenkins.war) = 53608b7e5b89d5cc1fbdbf8588b5c0a04a664f34d403ae4bffb80016511a6cdb
-SIZE (jenkins/1.580.1/jenkins.war) = 68022189
+SHA256 (jenkins/1.596.1/jenkins.war) = 7ef24648ba0bdf7562034d467687afb2b7e7d168d65b61a2c4242bb7103351ec
+SIZE (jenkins/1.596.1/jenkins.war) = 68552101
Index: branches/2015Q1
===================================================================
--- branches/2015Q1	(revision 380206)
+++ branches/2015Q1	(revision 380207)

Property changes on: branches/2015Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r380169