3 files changed, 21 insertions, 18 deletions

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index a261c28d8868..9f517edb539b 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	activemq
-PORTVERSION=	5.4.1
+PORTVERSION=	5.4.2
 CATEGORIES=	net java
 MASTER_SITES=	http://www.sai.msu.su/apache/${MASTER_SITE_SUBDIR}/ \
 		${MASTER_SITE_APACHE}/${MASTER_SITE_SUBDIR}/
@@ -19,6 +19,7 @@ COMMENT=	Messaging and Integration Patterns provider
 NO_BUILD=	yes
 
 USE_JAVA=	yes
+LICENSE=	ASL
 JAVA_VERSION=	1.5+
 MQDATA=		${PREFIX}/lib/${PORTNAME}
 MQDB=		${PREFIX}/${PORTNAME}
diff --git a/net/activemq/distinfo b/net/activemq/distinfo
index 7f768fd3a353..2e2091637cb6 100644
--- a/net/activemq/distinfo
+++ b/net/activemq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-activemq-5.4.1-bin.tar.gz) = 58783bd3cf3b9e3f38798922f765e6b225facd4748eb4284ec225a0a054cba77
-SIZE (apache-activemq-5.4.1-bin.tar.gz) = 45425692
+SHA256 (apache-activemq-5.4.2-bin.tar.gz) = 515000ef9f9734270465dbdd16852b39e4ec25f50da5927bd7f6fd3438a48716
+SIZE (apache-activemq-5.4.2-bin.tar.gz) = 45690056
diff --git a/net/activemq/pkg-plist b/net/activemq/pkg-plist
index 678801e04e55..39f00c162194 100644
--- a/net/activemq/pkg-plist
+++ b/net/activemq/pkg-plist
@@ -6,12 +6,12 @@ lib/activemq/conf
 lib/activemq/data
 lib/activemq/example
 lib/activemq/lib/activation-1.1.jar
-lib/activemq/lib/activemq-camel-5.4.1.jar
-lib/activemq/lib/activemq-console-5.4.1.jar
-lib/activemq/lib/activemq-core-5.4.1.jar
-lib/activemq/lib/activemq-jaas-5.4.1.jar
+lib/activemq/lib/activemq-camel-5.4.2.jar
+lib/activemq/lib/activemq-console-5.4.2.jar
+lib/activemq/lib/activemq-core-5.4.2.jar
+lib/activemq/lib/activemq-jaas-5.4.2.jar
 lib/activemq/lib/activemq-protobuf-1.1.jar
-lib/activemq/lib/activemq-web-5.4.1.jar
+lib/activemq/lib/activemq-web-5.4.2.jar
 lib/activemq/lib/camel-core-2.4.0.jar
 lib/activemq/lib/camel-jetty-2.4.0.jar
 lib/activemq/lib/camel-jms-2.4.0.jar
@@ -22,14 +22,14 @@ lib/activemq/lib/geronimo-jms_1.1_spec-1.1.1.jar
 lib/activemq/lib/geronimo-jta_1.0.1B_spec-1.0.1.jar
 lib/activemq/lib/jaxb-api-2.1.jar
 lib/activemq/lib/jaxb-impl-2.1.6.jar
-lib/activemq/lib/kahadb-5.4.1.jar
+lib/activemq/lib/kahadb-5.4.2.jar
 lib/activemq/lib/optional/activeio-core-3.1.2.jar
-lib/activemq/lib/optional/activemq-jmdns_1.0-5.4.1.jar
-lib/activemq/lib/optional/activemq-optional-5.4.1.jar
-lib/activemq/lib/optional/activemq-pool-5.4.1.jar
-lib/activemq/lib/optional/activemq-rar-5.4.1.rar
-lib/activemq/lib/optional/activemq-spring-5.4.1.jar
-lib/activemq/lib/optional/activemq-xmpp-5.4.1.jar
+lib/activemq/lib/optional/activemq-jmdns_1.0-5.4.2.jar
+lib/activemq/lib/optional/activemq-optional-5.4.2.jar
+lib/activemq/lib/optional/activemq-pool-5.4.2.jar
+lib/activemq/lib/optional/activemq-rar-5.4.2.rar
+lib/activemq/lib/optional/activemq-spring-5.4.2.jar
+lib/activemq/lib/optional/activemq-xmpp-5.4.2.jar
 lib/activemq/lib/optional/commons-beanutils-1.6.1.jar
 lib/activemq/lib/optional/commons-codec-1.2.jar
 lib/activemq/lib/optional/commons-collections-3.2.1.jar
@@ -57,16 +57,16 @@ lib/activemq/lib/optional/stax2-api-3.0.1.jar
 lib/activemq/lib/optional/velocity-1.6.2.jar
 lib/activemq/lib/optional/woodstox-core-asl-4.0.7.jar
 lib/activemq/lib/optional/xbean-spring-3.7.jar
-lib/activemq/lib/optional/xmlpull-1.1.3.4d_b4_min.jar
 lib/activemq/lib/optional/xstream-1.3.1.jar
+lib/activemq/lib/optional/xpp3-1.1.4c.jar
 lib/activemq/lib/stax-1.2.0.jar
 lib/activemq/lib/stax-api-1.0.1.jar
 lib/activemq/lib/web/commons-management-1.0.jar
 lib/activemq/lib/web/core-3.1.1.jar
 lib/activemq/lib/web/geronimo-servlet_2.5_spec-1.2.jar
 lib/activemq/lib/web/jdom-1.0.jar
-lib/activemq/lib/web/jetty-all-server-7.0.1.v20091125.jar
-lib/activemq/lib/web/jetty-websocket-7.0.1.v20091125.jar
+lib/activemq/lib/web/jetty-all-server-7.1.6.v20100715.jar
+lib/activemq/lib/web/jetty-websocket-7.1.6.v20100715.jar
 lib/activemq/lib/web/jsp-2.1-glassfish-2.1.v20100127.jar
 lib/activemq/lib/web/jsp-api-2.1-glassfish-2.1.v20100127.jar
 lib/activemq/lib/web/rome-0.8.jar
@@ -440,6 +440,8 @@ lib/activemq/webapps/styles/type-settings.css
 %%ETCDIR%%/credentials.properties
 %%ETCDIR%%/jetty-realm.properties
 %%ETCDIR%%/jetty.xml
+%%ETCDIR%%/jmx.access
+%%ETCDIR%%/jmx.password
 %%ETCDIR%%/log4j.properties
 %%ETCDIR%%/logging.properties
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs