git: 3166f9b4ba36 - main - java/javamail: remove java from run dependencies

The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3166f9b4ba3622ba64b9882deb2f64fda6410cb9

commit 3166f9b4ba3622ba64b9882deb2f64fda6410cb9
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2025-12-04 11:25:13 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2025-12-11 08:52:58 +0000

    java/javamail: remove java from run dependencies
    
    As javamail is a library and not an application itself it should not
    have a run-dependency on Java. It doesn't run on its own.
    It will always use the java version of the application that uses javamail.
    
    Use source and target arguments compatible with jdk21.
    
    If not using openjdk8 bring back the Java Activation Framework. In
    openjdk8 these classes were included in the core packages. In later
    JDK versions it was removed again.
    
    PR:     291388
---
 java/javamail/Makefile                     | 18 +++++++++++++++---
 java/javamail/distinfo                     |  4 +++-
 java/javamail/files/patch-build.properties |  4 ++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index 39d424b0dc1a..0f995668d1ed 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -1,8 +1,11 @@
 PORTNAME=	javamail
 DISTVERSIONPREFIX=	${PORTNAME:tu}-
 DISTVERSION=	1_6_2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java mail
+MASTER_SITES=	https://github.com/jakartaee/jaf-api/releases/download/1.2.1/:jaf
+DISTFILES=	jakarta.activation.jar:jaf
+EXTRACT_ONLY=	javaee-javamail-JAVAMAIL-1_6_2_GH0.tar.gz
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Reference Implementation of JSR 919
@@ -13,11 +16,10 @@ LICENSE_COMB=	dual
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		cpe java:ant,run
+USES=		cpe java:ant
 USE_GITHUB=	yes
 GH_ACCOUNT=	javaee
 CPE_VENDOR=	sun
-JAVA_VERSION=	8
 
 NO_ARCH=	yes
 
@@ -32,9 +34,19 @@ PORTEXAMPLES=	*
 ALL_TARGET=	all docs
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION} != 8
+PLIST_FILES+=	%%JAVAJARDIR%%/jakarta.activation.jar
+MAKE_ARGS+=	-Dactivation.jar=${DISTDIR}/jakarta.activation.jar
+.endif
+
 do-install:
 	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}..."
 	@${INSTALL_DATA} ${WRKSRC}/target/release/mail.jar ${STAGEDIR}${JAVAJARDIR}/
+.if ${JAVA_PORT_VERSION} != 8
+	@${INSTALL_DATA} ${DISTDIR}/jakarta.activation.jar ${STAGEDIR}${JAVAJARDIR}/
+.endif
 	@${ECHO_MSG} " [ DONE ]"
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
diff --git a/java/javamail/distinfo b/java/javamail/distinfo
index 109c3bbbe657..d901a636fc0e 100644
--- a/java/javamail/distinfo
+++ b/java/javamail/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1569853775
+TIMESTAMP = 1764885494
+SHA256 (jakarta.activation.jar) = d84d4ba8b55cdb7fdcbb885e6939386367433f56f5ab8cfdc302a7c3587fa92b
+SIZE (jakarta.activation.jar) = 65690
 SHA256 (javaee-javamail-JAVAMAIL-1_6_2_GH0.tar.gz) = 870e17293628437a03ae03404f51105c1ab8f682594cb18e005cb99e15d01d24
 SIZE (javaee-javamail-JAVAMAIL-1_6_2_GH0.tar.gz) = 1107140
diff --git a/java/javamail/files/patch-build.properties b/java/javamail/files/patch-build.properties
index 0398eb3d0fd8..b775415f8fad 100644
--- a/java/javamail/files/patch-build.properties
+++ b/java/javamail/files/patch-build.properties
@@ -15,8 +15,8 @@
  javac.deprecation=off
 -javac.source=1.5
 -javac.target=1.5
-+javac.source=7
-+javac.target=7
++javac.source=8
++javac.target=8
  
  ### Use ant.verbose=-verbose for debugging ant targets
  ant.verbose=