From owner-svn-ports-all@freebsd.org Sun Mar 22 03:18:43 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 122B4275269; Sun, 22 Mar 2020 03:18:43 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48lN5G63Khz49s8; Sun, 22 Mar 2020 03:18:42 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C77BE1EFA2; Sun, 22 Mar 2020 03:18:42 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02M3Ig0J035478; Sun, 22 Mar 2020 03:18:42 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02M3IfCR035474; Sun, 22 Mar 2020 03:18:41 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202003220318.02M3IfCR035474@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 22 Mar 2020 03:18:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528892 - in head/net/activemq: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/net/activemq: . files X-SVN-Commit-Revision: 528892 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 03:18:43 -0000 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 -@owner %%MQUSER%% -@group %%MQGROUP%% +@owner activemq +@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 -@dir(,,0750) %%MQDB%% +@dir(,,0750) /var/db/activemq @group @owner