Index: branches/2015Q1/devel/jenkins/Makefile
===================================================================
--- branches/2015Q1/devel/jenkins/Makefile	(revision 382363)
+++ branches/2015Q1/devel/jenkins/Makefile	(revision 382364)
@@ -1,55 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
-PORTVERSION=	1.600
+PORTVERSION=	1.606
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
 EXTRACT_SUFX=	.war
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Open-source continuous integration server
 
 LICENSE=	MIT
 
 CONFLICTS=	jenkins-lts-[0-9]*
 
 USE_JAVA=	yes
 
 NO_BUILD=	yes
 
 USE_RC_SUBR=	jenkins
 
 USES+=		cpe
 CPE_VENDOR=	cloudbees
 
 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/distinfo
===================================================================
--- branches/2015Q1/devel/jenkins/distinfo	(revision 382363)
+++ branches/2015Q1/devel/jenkins/distinfo	(revision 382364)
@@ -1,2 +1,2 @@
-SHA256 (jenkins/1.600/jenkins.war) = 9b7d9d1fd6dce1077599a31468b1ef2ebe7b849f6d2f52f943541b944d9c29f9
-SIZE (jenkins/1.600/jenkins.war) = 68808007
+SHA256 (jenkins/1.606/jenkins.war) = d950630af9be9a84a1f6b34d6bab5a0bdc4eba7cc61c81a69074dcb57a487953
+SIZE (jenkins/1.606/jenkins.war) = 69023294
Index: branches/2015Q1/devel/jenkins-lts/Makefile
===================================================================
--- branches/2015Q1/devel/jenkins-lts/Makefile	(revision 382363)
+++ branches/2015Q1/devel/jenkins-lts/Makefile	(revision 382364)
@@ -1,56 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
-PORTVERSION=	1.596.1
+PORTVERSION=	1.596.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 <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 382363)
+++ branches/2015Q1/devel/jenkins-lts/distinfo	(revision 382364)
@@ -1,2 +1,2 @@
-SHA256 (jenkins/1.596.1/jenkins.war) = 7ef24648ba0bdf7562034d467687afb2b7e7d168d65b61a2c4242bb7103351ec
-SIZE (jenkins/1.596.1/jenkins.war) = 68552101
+SHA256 (jenkins/1.596.2/jenkins.war) = 769fee082d420819f0113d5271be98004d3f3227d98c4e445f6e5f60dde6de37
+SIZE (jenkins/1.596.2/jenkins.war) = 68553541
Index: branches/2015Q1
===================================================================
--- branches/2015Q1	(revision 382363)
+++ branches/2015Q1	(revision 382364)

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