git: 3baa989dbb4c - main - www/jetty9: Update to 9.4.49, add FLAVORS
Date: Mon, 24 Oct 2022 14:36:21 UTC
The branch main has been updated by zi:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3baa989dbb4c63dc93bf9a21566e4e5366503a93
commit 3baa989dbb4c63dc93bf9a21566e4e5366503a93
Author: Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2022-10-24 14:35:41 +0000
Commit: Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2022-10-24 14:36:19 +0000
www/jetty9: Update to 9.4.49, add FLAVORS
---
www/jetty9/Makefile | 18 ++++++++++++++----
www/jetty9/distinfo | 6 +++---
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/www/jetty9/Makefile b/www/jetty9/Makefile
index 688514470ff8..b5400c2ebc76 100644
--- a/www/jetty9/Makefile
+++ b/www/jetty9/Makefile
@@ -1,8 +1,8 @@
PORTNAME= jetty
-PORTVERSION= 9.4.48
+PORTVERSION= 9.4.49
CATEGORIES= www java
MASTER_SITES= https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${PORTVERSION}.${JDVDATE}/
-PKGNAMESUFFIX= 9
+PKGNAMESUFFIX= 9-${FLAVOR:U}
DISTNAME= jetty-distribution-${PORTVERSION}.${JDVDATE}
MAINTAINER= ports@FreeBSD.org
@@ -16,16 +16,16 @@ LICENSE_FILE= ${WRKSRC}/license-eplv10-aslv20.html
RUN_DEPENDS= bash:shells/bash
USES= cpe shebangfix
+FLAVORS= openjdk8 openjdk9 openjdk10 openjdk11
CONFLICTS= jetty-8.*
-JDVDATE= v20220622
+JDVDATE= v20220914
USE_JAVA= yes
NO_ARCH= yes
CPE_VENDOR= eclipse
SHEBANG_FILES= bin/jetty.sh
NO_BUILD= yes
-JAVA_VERSION= 8+
JAVA_VENDOR= openjdk
USE_RC_SUBR= ${PORTNAME}
@@ -54,6 +54,16 @@ PLIST_SUB= \
PORTVERSION=${PORTVERSION} \
JDVDATE=${JDVDATE}
+.if ${FLAVOR:U} == openjdk8
+JAVA_VERSION= 8+
+.elif ${FLAVOR:U} == openjdk9
+JAVA_VERSION= 9+
+.elif ${FLAVOR:U} == openjdk10
+JAVA_VERSION= 10+
+.elif ${FLAVOR:U} == openjdk11
+JAVA_VERSION= 11+
+.endif
+
do-install:
${MKDIR} ${STAGEDIR}${APP_HOME}
${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/www/jetty9/distinfo b/www/jetty9/distinfo
index a6eaa4c8f64f..e7b1bd960281 100644
--- a/www/jetty9/distinfo
+++ b/www/jetty9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662996441
-SHA256 (jetty-distribution-9.4.48.v20220622.tar.gz) = 50d6eccd349d2e671bfea710cee833911287eb706fe1d39503eab76fc6fc1a0c
-SIZE (jetty-distribution-9.4.48.v20220622.tar.gz) = 19058994
+TIMESTAMP = 1666621231
+SHA256 (jetty-distribution-9.4.49.v20220914.tar.gz) = a8c9e372f16e56fa0967ef36de72aebeeea8477ca123638420f7e866b39513fd
+SIZE (jetty-distribution-9.4.49.v20220914.tar.gz) = 19061782