svn commit: r411851 - in head/net/activemq: . files

[Tom Judge]

Author: tj
Date: Fri Mar 25 15:29:56 2016
New Revision: 411851
URL: https://svnweb.freebsd.org/changeset/ports/411851

Log:
  Update to 5.13.2
  
  Changes: http://activemq.apache.org/activemq-5132-release.html
  
  Fix stop/status in rc script.
  
  PR:	207881

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	Fri Mar 25 15:28:02 2016	(r411850)
+++ head/net/activemq/Makefile	Fri Mar 25 15:29:56 2016	(r411851)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	activemq
-PORTVERSION=	5.13.0
+PORTVERSION=	5.13.2
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
@@ -24,8 +24,8 @@ MQUSER?=	activemq
 MQGROUP?=	${MQUSER}
 USERS=		${MQUSER}
 GROUPS=		${MQGROUP}
-CAMELVERSION=	2.16.1
-SPRINGVERSION=	4.1.8
+CAMELVERSION=	2.16.2
+SPRINGVERSION=	4.1.9
 JETTYVERSION=	9.2.13.v20150730
 LVDBVERSION=	0.6
 LVDBJNIVERSION=	1.8

Modified: head/net/activemq/distinfo
==============================================================================
--- head/net/activemq/distinfo	Fri Mar 25 15:28:02 2016	(r411850)
+++ head/net/activemq/distinfo	Fri Mar 25 15:29:56 2016	(r411851)
@@ -1,2 +1,2 @@
-SHA256 (apache-activemq-5.13.0-bin.tar.gz) = 6b460256a56c6e2c9e2575e90f6514c5239ec06e89ac9e8694b30bb5abbc7a8c
-SIZE (apache-activemq-5.13.0-bin.tar.gz) = 53613208
+SHA256 (apache-activemq-5.13.2-bin.tar.gz) = be178babf4a22f8774480ab30705030b944f880e8c133ef2eee324ee90b72f6f
+SIZE (apache-activemq-5.13.2-bin.tar.gz) = 53675823

Modified: head/net/activemq/files/activemq.in
==============================================================================
--- head/net/activemq/files/activemq.in	Fri Mar 25 15:28:02 2016	(r411850)
+++ head/net/activemq/files/activemq.in	Fri Mar 25 15:29:56 2016	(r411851)
@@ -120,7 +120,7 @@ activemq_check_pidfile() {
 		debug "pid file ($_pidfile): no pid in file."
 		return
 	fi
-	if [ -n "`%%LOCALBASE%%/bin/jps -l | grep -e "^$_pid $jar_file\$"`" ]; then
+	if [ -n "`/usr/bin/su -m $activemq_user -c '%%LOCALBASE%%/bin/jps -l' | grep -e "^$_pid $jar_file\$"`" ]; then
 		echo -n $_pid
 	fi
 }

Modified: head/net/activemq/pkg-plist
==============================================================================
--- head/net/activemq/pkg-plist	Fri Mar 25 15:28:02 2016	(r411850)
+++ head/net/activemq/pkg-plist	Fri Mar 25 15:29:56 2016	(r411851)
@@ -70,7 +70,7 @@
 %%DATADIR%%/lib/optional/org.apache.servicemix.bundles.josql-1.5_5.jar
 %%DATADIR%%/lib/optional/org.linkedin.util-core-1.4.0.jar
 %%DATADIR%%/lib/optional/org.linkedin.zookeeper-impl-1.4.0.jar
-%%DATADIR%%/lib/optional/proton-j-0.11.0.jar
+%%DATADIR%%/lib/optional/proton-j-0.12.0.jar
 %%DATADIR%%/lib/optional/scala-library-2.11.0.jar
 %%DATADIR%%/lib/optional/shiro-core-1.2.4.jar
 %%DATADIR%%/lib/optional/shiro-spring-1.2.4.jar
@@ -99,14 +99,14 @@
 %%DATADIR%%/lib/web/geronimo-annotation_1.0_spec-1.1.1.jar
 %%DATADIR%%/lib/web/jdom-1.0.jar
 %%DATADIR%%/lib/web/jetty-all-%%JETTYVERSION%%.jar
-%%DATADIR%%/lib/web/jolokia-core-1.3.2.jar
+%%DATADIR%%/lib/web/jolokia-core-1.3.3.jar
 %%DATADIR%%/lib/web/json-simple-1.1.1.jar
 %%DATADIR%%/lib/web/org.eclipse.jdt.core-3.8.2.v20130121.jar
 %%DATADIR%%/lib/web/rome-1.0.jar
 %%DATADIR%%/lib/web/spring-web-%%SPRINGVERSION%%.RELEASE.jar
 %%DATADIR%%/lib/web/spring-webmvc-%%SPRINGVERSION%%.RELEASE.jar
-%%DATADIR%%/lib/web/taglibs-standard-impl-1.2.1.jar
-%%DATADIR%%/lib/web/taglibs-standard-spec-1.2.1.jar
+%%DATADIR%%/lib/web/taglibs-standard-impl-1.2.3.jar
+%%DATADIR%%/lib/web/taglibs-standard-spec-1.2.3.jar
 %%DATADIR%%/lib/web/tomcat-servlet-api-8.0.24.jar
 %%DATADIR%%/lib/web/tomcat-websocket-api-8.0.24.jar
 %%DATADIR%%/webapps-demo/demo/META-INF/LICENSE
@@ -299,6 +299,7 @@
 %%DATADIR%%/webapps/admin/xml/queues.jsp
 %%DATADIR%%/webapps/admin/xml/subscribers.jsp
 %%DATADIR%%/webapps/admin/xml/topics.jsp
+%%DATADIR%%/webapps/api/WEB-INF/classes/jolokia-access.xml
 %%DATADIR%%/webapps/api/WEB-INF/web.xml
 %%DATADIR%%/webapps/favicon.ico
 %%DATADIR%%/webapps/fileserver/META-INF/LICENSE