Index: branches/2014Q4/devel/jenkins/Makefile
===================================================================
--- branches/2014Q4/devel/jenkins/Makefile	(revision 371806)
+++ branches/2014Q4/devel/jenkins/Makefile	(revision 371807)
@@ -1,52 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
 PORTVERSION=	1.583
 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/2014Q4/devel/jenkins-lts/Makefile
===================================================================
--- branches/2014Q4/devel/jenkins-lts/Makefile	(revision 371806)
+++ branches/2014Q4/devel/jenkins-lts/Makefile	(revision 371807)
@@ -1,50 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
 PORTVERSION=	1.565.2
 PORTREVISION=	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
 JAVA_VERSION=	1.6+
 
 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
 
 PLIST_FILES=	%%DATADIR%%/${DISTNAME}${EXTRACT_SUFX}
 PLIST_DIRS=	%%DATADIR%%
 PLIST_DIRSTRY=	jenkins
 SUB_LIST+=	JENKINS_HOME=${JENKINS_HOME} JENKINS_USER=${JENKINS_USER} JENKINS_GROUP=${JENKINS_GROUP} JAVA_HOME=${JAVA_HOME} JENKINS_LOG_FILE=${JENKINS_LOG_FILE}
 
 .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/2014Q4
===================================================================
--- branches/2014Q4	(revision 371806)
+++ branches/2014Q4	(revision 371807)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r371803