From owner-dev-commits-ports-main@freebsd.org Sun Jun 20 01:43:46 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 BB996645B47; Sun, 20 Jun 2021 01:43:46 +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 4G6wRk4wL9z3hkm; Sun, 20 Jun 2021 01:43:46 +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 908182135D; Sun, 20 Jun 2021 01:43:46 +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 15K1hkcK004531; Sun, 20 Jun 2021 01:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15K1hkFD004530; Sun, 20 Jun 2021 01:43:46 GMT (envelope-from git) Date: Sun, 20 Jun 2021 01:43:46 GMT Message-Id: <202106200143.15K1hkFD004530@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: 27725078fe02 - main - devel/jenkins-lts: Sync with devel/jenkins 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: 27725078fe02920ac60dc050f75b103fe528a53a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2021 01:43:46 -0000 The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=27725078fe02920ac60dc050f75b103fe528a53a commit 27725078fe02920ac60dc050f75b103fe528a53a Author: Li-Wen Hsu AuthorDate: 2021-06-20 01:43:37 +0000 Commit: Li-Wen Hsu 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