Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Apr 2026 02:24:55 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8f41140a8cc4 - main - net/activemq: Update 6.2.0 => 6.2.4, take maintainership
Message-ID:  <69dc53f7.425e1.5b189bd3@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8f41140a8cc479a9c574d06fa314b25051174d95

commit 8f41140a8cc479a9c574d06fa314b25051174d95
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-04-13 02:17:25 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-04-13 02:17:25 +0000

    net/activemq: Update 6.2.0 => 6.2.4, take maintainership
    
    Release Notes:
    https://activemq.apache.org/components/classic/download/classic-06-02-01
    https://activemq.apache.org/components/classic/download/classic-06-02-02
    https://activemq.apache.org/components/classic/download/classic-06-02-03
    https://activemq.apache.org/components/classic/download/classic-06-02-04
    
    Improve port:
    - Adjust JAVA_VERSION.
    - Add substitution instead of hardcoded USER and GROUP in rc script.
    
    PR:             294136
    Approved by:    blanket (3rd in a row maintainer timeout during last 2.5 years)
    Sponsored by:   UNIS Labs
    MFH:            2026Q2
---
 net/activemq/Makefile          | 14 +++++++++-----
 net/activemq/distinfo          |  6 +++---
 net/activemq/files/activemq.in |  8 ++++----
 net/activemq/pkg-plist         |  4 ++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index b65b3619a5f4..0b1bf662ee30 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	activemq
-DISTVERSION=	6.2.0
-PORTREVISION=	3
+DISTVERSION=	6.2.4
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${DISTVERSION}
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-bin
 
-MAINTAINER=	james@elstone.net
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Messaging and Integration Patterns provider
 WWW=		https://activemq.apache.org
 
@@ -14,18 +13,23 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe java
 CPE_VENDOR=	apache
-JAVA_VERSION=	21 17
+JAVA_VERSION=	17+
 USE_RC_SUBR=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-SUB_LIST=	JAVA_HOME=${JAVA_HOME}
+SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
+		AMQUSER=${USERS:[1]} \
+		AMQGROUP=${GROUPS:[1]}
 
 WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${DISTVERSION}
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
+PLIST_SUB=	AMQUSER=${USERS:[1]} \
+		AMQGROUP=${GROUPS:[1]}
+
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/net/activemq/distinfo b/net/activemq/distinfo
index 21ee8153761f..e0b922e03338 100644
--- a/net/activemq/distinfo
+++ b/net/activemq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1768686868
-SHA256 (apache-activemq-6.2.0-bin.tar.gz) = 277bbfa792d140f809bd02a6e3fd53819554b857ad5a522d716a14a67f63c698
-SIZE (apache-activemq-6.2.0-bin.tar.gz) = 54538349
+TIMESTAMP = 1775775775
+SHA256 (apache-activemq-6.2.4-bin.tar.gz) = fe3bf23bc70343aeba8bc279dd25cf4b95b2066379199c0ae9355a0f15f12613
+SIZE (apache-activemq-6.2.4-bin.tar.gz) = 55100958
diff --git a/net/activemq/files/activemq.in b/net/activemq/files/activemq.in
index ba87b5ecb2a4..1110d26c9020 100644
--- a/net/activemq/files/activemq.in
+++ b/net/activemq/files/activemq.in
@@ -11,10 +11,10 @@
 # activemq_enable (bool):   Set to NO by default.
 #               Set it to YES to enable activemq.
 #
-# activemq_user (username): Set to activemq by default.
+# activemq_user (username): Set to %%AMQUSER%% by default.
 #               Set it to required username.
 #
-# activemq_group (group):   Set to activemq by default.
+# activemq_group (group):   Set to %%AMQGROUP%% by default.
 #               Set it to required group.
 #
 # activemq_classpath (path):   Set to %%DATADIR%% by default.
@@ -53,8 +53,8 @@ load_rc_config $name
 
 # Set defaults
 : ${activemq_enable:=NO}
-: ${activemq_user:=activemq}
-: ${activemq_group:=activemq}
+: ${activemq_user:=%%AMQUSER%%}
+: ${activemq_group:=%%AMQGROUP%%}
 : ${activemq_classpath:=%%ETCDIR%%}
 : ${activemq_conf:=%%ETCDIR%%}
 : ${activemq_data:=/var/db/activemq}
diff --git a/net/activemq/pkg-plist b/net/activemq/pkg-plist
index b2bd885da5d6..0926c7b27b6f 100644
--- a/net/activemq/pkg-plist
+++ b/net/activemq/pkg-plist
@@ -1,7 +1,7 @@
 bin/activemq
 bin/activemq-diag
-@owner activemq
-@group activemq
+@owner %%AMQUSER%%
+@group %%AMQGROUP%%
 @sample %%ETCDIR%%/activemq.xml.sample
 @sample %%ETCDIR%%/broker.ks.sample
 @sample %%ETCDIR%%/broker.ts.sample


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69dc53f7.425e1.5b189bd3>