git: e6b2043343db - main - devel/jenkins: Misc fixes

[Li-Wen Hsu]

The branch main has been updated by lwhsu:

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

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

    devel/jenkins: Misc fixes
    
    - Update MASTER_SITES
    - Pet portlint and portclippy
    
    Sponsored by:   The FreeBSD Foundation
---
 devel/jenkins/Makefile | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index a49e085b4356..adabe8cd9fa6 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	jenkins
 PORTVERSION=	2.298
 PORTREVISION=	1
 CATEGORIES=	devel java
-MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
+MASTER_SITES=	http://mirrors.jenkins.io/war/${PORTVERSION}/
 DISTNAME=	jenkins
 EXTRACT_SUFX=	.war
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
@@ -14,21 +14,18 @@ COMMENT=	Open-source continuous integration server
 LICENSE=	MIT
 
 USES=		cpe
+CPE_VENDOR=	cloudbees
+USE_JAVA=	yes
+USE_RC_SUBR=	jenkins
 
 CONFLICTS=	jenkins-lts-[0-9]*
-USE_JAVA=	yes
-JAVA_VERSION=	1.8+
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-USE_RC_SUBR=	jenkins
-
-CPE_VENDOR=	cloudbees
-
-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"
@@ -38,13 +35,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>