svn commit: r528892 - in head/net/activemq: . files
Tobias Kortkamp
tobik at FreeBSD.org
Sun Mar 22 03:18:43 UTC 2020
Author: tobik
Date: Sun Mar 22 03:18:41 2020
New Revision: 528892
URL: https://svnweb.freebsd.org/changeset/ports/528892
Log:
net/activemq: Update to 5.15.12
Clean up the port a little and drop build time configuration knobs
MQDB, MQUSER, MQGROUP. All of these have runtime equivalents that
can be set in rc.conf instead.
Changes: https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12346500&styleName=&projectId=12311210
Modified:
head/net/activemq/Makefile
head/net/activemq/distinfo
head/net/activemq/files/activemq.in
head/net/activemq/pkg-plist
Modified: head/net/activemq/Makefile
==============================================================================
--- head/net/activemq/Makefile Sun Mar 22 02:33:55 2020 (r528891)
+++ head/net/activemq/Makefile Sun Mar 22 03:18:41 2020 (r528892)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= activemq
-PORTVERSION= 5.15.11
+PORTVERSION= 5.15.12
CATEGORIES= net java
MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}
DISTNAME= apache-${PORTNAME}-${PORTVERSION}
@@ -16,44 +16,34 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cpe
CPE_VENDOR= apache
USE_JAVA= yes
+USE_RC_SUBR= activemq
NO_ARCH= yes
NO_BUILD= yes
-MQDB?= /var/db/activemq
-MQUSER?= activemq
-MQGROUP?= ${MQUSER}
-USERS= ${MQUSER}
-GROUPS= ${MQGROUP}
+USERS= activemq
+GROUPS= activemq
-ALL_TARGET= ${PORTNAME}
-USE_RC_SUBR= ${PORTNAME}
-
PORTDATA= *
PORTDOCS= *
PORTEXAMPLES= *
-SUB_LIST= MQUSER="${MQUSER}" \
- MQGROUP="${MQGROUP}" \
- MQDB="${MQDB}"
-PLIST_SUB= MQUSER="${MQUSER}" \
- MQGROUP="${MQGROUP}" \
- MQDB="${MQDB}"
-
OPTIONS_DEFINE= DOCS EXAMPLES
do-install:
- @${MKDIR} ${STAGEDIR}${DATADIR}/bin ${STAGEDIR}${ETCDIR} ${STAGEDIR}${MQDB}
${RM} ${WRKSRC}/conf/log4j.properties.orig
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
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
- ${RLN} ${STAGEDIR}${MQDB} ${STAGEDIR}${DATADIR}/data
+ @${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}
Modified: head/net/activemq/distinfo
==============================================================================
--- head/net/activemq/distinfo Sun Mar 22 02:33:55 2020 (r528891)
+++ head/net/activemq/distinfo Sun Mar 22 03:18:41 2020 (r528892)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574756913
-SHA256 (apache-activemq-5.15.11-bin.tar.gz) = d72b59a9fa8199ae0de6326e05e0f3136deaee4bbd8de269e6193a8ae012b089
-SIZE (apache-activemq-5.15.11-bin.tar.gz) = 62230168
+TIMESTAMP = 1584845071
+SHA256 (apache-activemq-5.15.12-bin.tar.gz) = 415fbe3ef85e83b92dfbb1b14c4018b87b9a6a03d918984ec679e39ff2096193
+SIZE (apache-activemq-5.15.12-bin.tar.gz) = 62666908
Modified: head/net/activemq/files/activemq.in
==============================================================================
--- head/net/activemq/files/activemq.in Sun Mar 22 02:33:55 2020 (r528891)
+++ head/net/activemq/files/activemq.in Sun Mar 22 03:18:41 2020 (r528892)
@@ -35,17 +35,16 @@ load_rc_config $name
# Set defaults
: ${activemq_enable:=NO}
-: ${activemq_user:=%%MQUSER%%}
-: ${activemq_group:=%%MQGROUP%%}
+: ${activemq_user:=activemq}
+: ${activemq_group:=activemq}
: ${activemq_classpath:=%%ETCDIR%%}
: ${activemq_conf:=%%ETCDIR%%}
-: ${activemq_data:=%%MQDB%%}
+: ${activemq_data:=/var/db/activemq}
: ${activemq_logs:=/var/log/activemq}
: ${activemq_home:=%%DATADIR%%}
: ${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`}
-
pidfile=/var/run/${name}.pid
Modified: head/net/activemq/pkg-plist
==============================================================================
--- head/net/activemq/pkg-plist Sun Mar 22 02:33:55 2020 (r528891)
+++ head/net/activemq/pkg-plist Sun Mar 22 03:18:41 2020 (r528892)
@@ -1,7 +1,7 @@
bin/activemq
bin/activemq-diag
- at owner %%MQUSER%%
- at group %%MQGROUP%%
+ at owner activemq
+ at group activemq
@sample %%ETCDIR%%/activemq.xml.sample
@sample %%ETCDIR%%/broker-localhost.cert.sample
@sample %%ETCDIR%%/broker.ks.sample
@@ -20,6 +20,6 @@ bin/activemq-diag
@sample %%ETCDIR%%/logging.properties.sample
@sample %%ETCDIR%%/login.config.sample
@sample %%ETCDIR%%/users.properties.sample
- at dir(,,0750) %%MQDB%%
+ at dir(,,0750) /var/db/activemq
@group
@owner
More information about the svn-ports-all
mailing list