Index: branches/2018Q2/devel/jenkins/Makefile
===================================================================
--- branches/2018Q2/devel/jenkins/Makefile	(revision 469785)
+++ branches/2018Q2/devel/jenkins/Makefile	(revision 469786)
@@ -1,55 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
-PORTVERSION=	2.113
+PORTVERSION=	2.121
 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
 JAVA_VERSION=	1.8+
 
 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/2018Q2/devel/jenkins/distinfo
===================================================================
--- branches/2018Q2/devel/jenkins/distinfo	(revision 469785)
+++ branches/2018Q2/devel/jenkins/distinfo	(revision 469786)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522421016
-SHA256 (jenkins/2.113/jenkins.war) = 3c443d9aeb178058287d12bb5b81b330e78e83ea949069b82c780257ce301390
-SIZE (jenkins/2.113/jenkins.war) = 74584533
+TIMESTAMP = 1526008976
+SHA256 (jenkins/2.121/jenkins.war) = 3b1b415d98cfa13dac7b68138d56f787f9504213da96c7d43d4e374f01a296dc
+SIZE (jenkins/2.121/jenkins.war) = 74737297
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 469785)
+++ branches/2018Q2	(revision 469786)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r469608