From owner-dev-commits-ports-all@freebsd.org Sun Jun 20 01:43:45 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B7C16459F8; Sun, 20 Jun 2021 01:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G6wRj42cLz3jHR; Sun, 20 Jun 2021 01:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72E782123D; Sun, 20 Jun 2021 01:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15K1hjKW004502; Sun, 20 Jun 2021 01:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15K1hjT4004501; Sun, 20 Jun 2021 01:43:45 GMT (envelope-from git) Date: Sun, 20 Jun 2021 01:43:45 GMT Message-Id: <202106200143.15K1hjT4004501@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: e6b2043343db - main - devel/jenkins: Misc fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6b2043343db17fe92b5747a7ca03c1cac3cc159 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2021 01:43:45 -0000 The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6b2043343db17fe92b5747a7ca03c1cac3cc159 commit e6b2043343db17fe92b5747a7ca03c1cac3cc159 Author: Li-Wen Hsu AuthorDate: 2021-06-20 01:43:31 +0000 Commit: Li-Wen Hsu 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