Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Mar 2016 15:41:50 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r410897 - in head/devel: jenkins jenkins-lts
Message-ID:  <201603121541.u2CFfo1T007382@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu
Date: Sat Mar 12 15:41:50 2016
New Revision: 410897
URL: https://svnweb.freebsd.org/changeset/ports/410897

Log:
  - Register conflict with jenkins2

Modified:
  head/devel/jenkins-lts/Makefile
  head/devel/jenkins/Makefile

Modified: head/devel/jenkins-lts/Makefile
==============================================================================
--- head/devel/jenkins-lts/Makefile	Sat Mar 12 15:39:11 2016	(r410896)
+++ head/devel/jenkins-lts/Makefile	Sat Mar 12 15:41:50 2016	(r410897)
@@ -15,7 +15,7 @@ COMMENT=	Open-source continuous integrat
 
 LICENSE=	MIT
 
-CONFLICTS=	jenkins-[0-9]*
+CONFLICTS=	jenkins-[0-9]* jenkins2-[0-9]*
 USE_JAVA=	yes
 
 NO_BUILD=	yes

Modified: head/devel/jenkins/Makefile
==============================================================================
--- head/devel/jenkins/Makefile	Sat Mar 12 15:39:11 2016	(r410896)
+++ head/devel/jenkins/Makefile	Sat Mar 12 15:41:50 2016	(r410897)
@@ -14,7 +14,7 @@ COMMENT=	Open-source continuous integrat
 
 LICENSE=	MIT
 
-CONFLICTS=	jenkins-lts-[0-9]*
+CONFLICTS=	jenkins-lts-[0-9]* jenkins2-[0-9]*
 
 USE_JAVA=	yes
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603121541.u2CFfo1T007382>