git: 14cdcc93ba15 - main - www/jetty9: Note CONFLICTS with www/jetty10

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Ryan Steinmetz <zi_at_FreeBSD.org>
Date: Mon, 24 Oct 2022 14:46:52 UTC

The branch main has been updated by zi:

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

commit 14cdcc93ba152520eb0bf0eba3c1f83fc38d8f3f
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2022-10-24 14:46:40 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2022-10-24 14:46:40 +0000

    www/jetty9: Note CONFLICTS with www/jetty10
---
 www/jetty9/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/jetty9/Makefile b/www/jetty9/Makefile
index b5400c2ebc76..da5f0d05051a 100644
--- a/www/jetty9/Makefile
+++ b/www/jetty9/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		cpe shebangfix
 FLAVORS=	openjdk8 openjdk9 openjdk10 openjdk11
 
-CONFLICTS=	jetty-8.*
+CONFLICTS=	jetty-8.* jetty-10.*
 
 JDVDATE=	v20220914
 USE_JAVA=	yes