git: 634a471f8fd4 - main - net/activemq: Update 5.18.3 => 6.2.0, improve port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sun, 01 Feb 2026 21:07:44 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=634a471f8fd4ad17b077b7f6b6ab5cc744471790

commit 634a471f8fd4ad17b077b7f6b6ab5cc744471790
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-02-01 20:54:39 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-02-01 21:07:31 +0000

    net/activemq: Update 5.18.3 => 6.2.0, improve port
    
    Release Notes:
    https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&version=12354379
    https://activemq.apache.org/components/classic/download/classic-06-02-00
    
    Improve port:
    - Replace PORTVERSION with DISTVERSION.
    - Set JAVA_VERSION to supported LTS versions:
      https://activemq.apache.org/components/classic/download/
    - Parametrize activemq with PORTNAME.
    - Optimize do-install: merge REINPLACE_CMD, MKDIR, split long lines.
    - Improve rc script - use JAVA_HOME.
    
    PR:             292549
    Approved by:    James Elstone <james@elstone.net> (maintainer, timeout 2 weeks)
---
 net/activemq/Makefile          | 32 +++++++++++++++++---------------
 net/activemq/distinfo          |  6 +++---
 net/activemq/files/activemq.in |  4 ++--
 net/activemq/pkg-plist         |  1 -
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index cbc07df8e7fb..cc0720b6dc97 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	activemq
-PORTVERSION=	5.18.3
+DISTVERSION=	6.2.0
 CATEGORIES=	net java
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
-DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	-bin.tar.gz
+MASTER_SITES=	APACHE/${PORTNAME}/${DISTVERSION}
+DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-bin
 
 MAINTAINER=	james@elstone.net
 COMMENT=	Messaging and Integration Patterns provider
@@ -14,14 +13,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe java
 CPE_VENDOR=	apache
-#JAVA_VERSION=	18
-USE_RC_SUBR=	activemq
+JAVA_VERSION=	21 17
+USE_RC_SUBR=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
-USERS=		activemq
-GROUPS=		activemq
+WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${DISTVERSION}
+
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
 
 PORTDATA=	*
 PORTDOCS=	*
@@ -30,23 +32,23 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
-	@${REINPLACE_CMD} -i '' -e 's|$\{sys:activemq.data\}\/audit.log|\$\{sys:activemq.logs\}\/audit.log|g' ${WRKSRC}/conf/log4j2.properties
-	@${REINPLACE_CMD} -i '' -e 's|$\{sys:activemq.data\}\/activemq.log|\$\{sys:activemq.logs\}\/activemq.log|g' ${WRKSRC}/conf/log4j2.properties
-	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${REINPLACE_CMD} -i '' -e 's|$${sys:activemq.data}/audit.log|$${sys:activemq.logs}/audit.log|g; \
+			s|$${sys:activemq.data}/activemq.log|$${sys:activemq.logs}/activemq.log|g' \
+		${WRKSRC}/conf/log4j2.properties
+	${MKDIR} ${STAGEDIR}${ETCDIR} \
+		 ${STAGEDIR}${DATADIR}/bin \
+		 ${STAGEDIR}/var/db/${PORTNAME}
 	cd ${WRKSRC}/conf && for f in *; do \
 		${INSTALL_DATA} ${WRKSRC}/conf/$$f ${STAGEDIR}${ETCDIR}/$$f.sample; \
 	done
-	@${MKDIR} ${STAGEDIR}${DATADIR}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/activemq* ${STAGEDIR}${DATADIR}/bin
 	${RLN} ${STAGEDIR}${DATADIR}/bin/activemq ${STAGEDIR}${PREFIX}/bin
 	${RLN} ${STAGEDIR}${DATADIR}/bin/activemq-diag ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/bin/activemq.jar ${WRKSRC}/bin/wrapper.jar \
 		${STAGEDIR}${DATADIR}/bin
-	@${MKDIR} ${STAGEDIR}/var/db/activemq
 	${RLN} ${STAGEDIR}/var/db/activemq ${STAGEDIR}${DATADIR}/data
 	${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/conf
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "lib webapps webapps-demo" \
-		${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "lib webapps webapps-demo" ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
diff --git a/net/activemq/distinfo b/net/activemq/distinfo
index e654dc2c42de..21ee8153761f 100644
--- a/net/activemq/distinfo
+++ b/net/activemq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698944036
-SHA256 (apache-activemq-5.18.3-bin.tar.gz) = 943381aa6d340707de6c42eadbf7b41b7fdf93df604156d972d50c4da783544f
-SIZE (apache-activemq-5.18.3-bin.tar.gz) = 49549502
+TIMESTAMP = 1768686868
+SHA256 (apache-activemq-6.2.0-bin.tar.gz) = 277bbfa792d140f809bd02a6e3fd53819554b857ad5a522d716a14a67f63c698
+SIZE (apache-activemq-6.2.0-bin.tar.gz) = 54538349
diff --git a/net/activemq/files/activemq.in b/net/activemq/files/activemq.in
index 10a7d237e5bc..ba87b5ecb2a4 100644
--- a/net/activemq/files/activemq.in
+++ b/net/activemq/files/activemq.in
@@ -30,7 +30,7 @@
 #               Set the timeout in seconds to shutdown.
 #
 # activemq_java_home (path): Set the path to the jvm to use.
-#		Set to openJDK18 by default.
+#		Set to %%JAVA_HOME%%/bin/java by default.
 #
 # activemq_debug_precmd (bool): Give java command line that
 #		will be run, when started for debugging outside
@@ -63,7 +63,7 @@ load_rc_config $name
 : ${activemq_javargs:='-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties -Dcom.sun.management.jmxremote'}
 : ${activemq_stop_timeout:="10"}
 : ${activemq_hostname:=`/bin/hostname`}
-: ${activemq_java_home:='%%LOCALBASE%%/openjdk18/bin/java'}
+: ${activemq_java_home:='%%JAVA_HOME%%/bin/java'}
 : ${activemq_debug_precmd:=NO}
 : ${activemq_audit_log:=YES}
 
diff --git a/net/activemq/pkg-plist b/net/activemq/pkg-plist
index c6f32e2235f2..b2bd885da5d6 100644
--- a/net/activemq/pkg-plist
+++ b/net/activemq/pkg-plist
@@ -9,7 +9,6 @@ bin/activemq-diag
 @sample %%ETCDIR%%/credentials.properties.sample
 @sample %%ETCDIR%%/groups.properties.sample
 @sample %%ETCDIR%%/java.security.sample
-@sample %%ETCDIR%%/jetty-realm.properties.sample
 @sample %%ETCDIR%%/jetty.xml.sample
 @sample %%ETCDIR%%/jmx.access.sample
 @sample %%ETCDIR%%/jmx.password.sample