git: 27725078fe02 - main - devel/jenkins-lts: Sync with devel/jenkins

[Li-Wen Hsu]

The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=27725078fe02920ac60dc050f75b103fe528a53a

commit 27725078fe02920ac60dc050f75b103fe528a53a
Author:     Li-Wen Hsu <lwhsu at FreeBSD.org>
AuthorDate: 2021-06-20 01:43:37 +0000
Commit:     Li-Wen Hsu <lwhsu at FreeBSD.org>
CommitDate: 2021-06-20 01:43:37 +0000

    devel/jenkins-lts: Sync with devel/jenkins
    
    Sponsored by:   The FreeBSD Foundation
---
 devel/jenkins-lts/Makefile | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile
index 20021a087a01..0546c9173ad2 100644
--- a/devel/jenkins-lts/Makefile
+++ b/devel/jenkins-lts/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	jenkins
 PORTVERSION=	2.289.1
 PORTREVISION=	1
 CATEGORIES=	devel java
-MASTER_SITES=	http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/
+MASTER_SITES=	http://mirrors.jenkins.io/war-stable/${PORTVERSION}/
 PKGNAMESUFFIX=	-lts
 DISTNAME=	jenkins
 EXTRACT_SUFX=	.war
@@ -14,20 +14,20 @@ COMMENT=	Open-source continuous integration server
 
 LICENSE=	MIT
 
+USES=		cpe
+CPE_VENDOR=	cloudbees
+CPE_EDITION=	lts
+USE_JAVA=	yes
+USE_RC_SUBR=	jenkins
+
 CONFLICTS=	jenkins-[0-9]*
-USE_JAVA=	1.8+
 
+NO_ARCH=	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_HOME?=		${PREFIX}/jenkins
+JENKINS_USER?=		jenkins
+JENKINS_GROUP?=		jenkins
 JENKINS_LOG_FILE?=	/var/log/jenkins.log
 
 .if ${JENKINS_USER} == "jenkins"
@@ -37,13 +37,13 @@ USERS=	jenkins
 GROUPS=	jenkins
 .endif
 
-SUB_LIST+=	JENKINS_HOME=${JENKINS_HOME} \
-		JENKINS_USER=${JENKINS_USER} \
+SUB_LIST+=	JAVA_HOME=${JAVA_HOME} \
 		JENKINS_GROUP=${JENKINS_GROUP} \
-		JAVA_HOME=${JAVA_HOME} \
-		JENKINS_LOG_FILE=${JENKINS_LOG_FILE}
-PLIST_SUB+=	JENKINS_USER=${JENKINS_USER} \
-		JENKINS_GROUP=${JENKINS_GROUP}
+		JENKINS_HOME=${JENKINS_HOME} \
+		JENKINS_LOG_FILE=${JENKINS_LOG_FILE} \
+		JENKINS_USER=${JENKINS_USER}
+PLIST_SUB+=	JENKINS_GROUP=${JENKINS_GROUP} \
+		JENKINS_USER=${JENKINS_USER}
 
 .include <bsd.port.pre.mk>