6 files changed, 120 insertions, 90 deletions

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index 9f517edb539b..8b7c182e5ab2 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	activemq
-PORTVERSION=	5.4.2
+PORTVERSION=	5.5.0
 CATEGORIES=	net java
 MASTER_SITES=	http://www.sai.msu.su/apache/${MASTER_SITE_SUBDIR}/ \
 		${MASTER_SITE_APACHE}/${MASTER_SITE_SUBDIR}/
@@ -26,19 +26,46 @@ MQDB=		${PREFIX}/${PORTNAME}
 DATADIR=	${MQDATA}
 MQUSER=		activemq
 MQGROUP=	${MQUSER}
+USERS=		${MQUSER}
+GROUPS=		${MQGROUP}
 
 ALL_TARGET=	${PORTNAME}
 USE_RC_SUBR=	${PORTNAME}
 
 PORTDOCS=	LICENSE NOTICE README.txt WebConsole-README.txt user-guide.html
+ETC_FILES=	activemq-command.xml \
+		activemq-demo.xml \
+		activemq-dynamic-network-broker1.xml \
+		activemq-dynamic-network-broker2.xml \
+		activemq-jdbc.xml \
+		activemq-scalability.xml \
+		activemq-security.xml \
+		activemq-specjms.xml \
+		activemq-static-network-broker1.xml \
+		activemq-static-network-broker2.xml \
+		activemq-stomp.xml \
+		activemq-throughput.xml \
+		activemq.xml \
+		broker-localhost.cert \
+		broker.ks \
+		broker.ts \
+		camel.xml \
+		client.ks \
+		client.ts \
+		credentials-enc.properties \
+		credentials.properties \
+		jetty-realm.properties \
+		jetty.xml \
+		jmx.access \
+		jmx.password \
+		log4j.properties \
+		logging.properties
 
 WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
+SUB_FILES=	pkg-install pkg-deinstall
+SUB_LIST=	ETC_FILES="${ETC_FILES}"
 
 do-install:
-.for f in linux-x86-32 linux-x86-64 macosx
-	@${RM} -fr ${WRKSRC}/bin/${f}
-.endfor
-
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR}/
@@ -47,10 +74,12 @@ do-install:
 .endfor
 .endif
 
-post-install:
 	@${MKDIR} ${MQDATA} ${MQDB} ${MQDATA}/bin ${ETCDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} example ${EXAMPLESDIR}/
-	@cd ${WRKSRC}/conf && ${INSTALL_DATA} * ${ETCDIR}/
+
+.for f in ${ETC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${ETCDIR}/${f}.sample
+.endfor
 
 .for f in ${PORTNAME} ${PORTNAME}-admin
 	@cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} ${f} ${MQDATA}/bin
@@ -65,7 +94,9 @@ post-install:
 	@${LN} -sf ${MQDB} ${MQDATA}/data
 	@${LN} -sf ${ETCDIR} ${MQDATA}/conf
 	@${LN} -sf ${EXAMPLESDIR}/example ${MQDATA}/example
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CHOWN} -Rh ${MQUSER}:${MQGROUP} ${MQDB} ${ETCDIR} ${EXAMPLES} ${MQDATA}
 
+post-install:
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
 .include <bsd.port.mk>
diff --git a/net/activemq/distinfo b/net/activemq/distinfo
index 2e2091637cb6..12e54eb09a46 100644
--- a/net/activemq/distinfo
+++ b/net/activemq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-activemq-5.4.2-bin.tar.gz) = 515000ef9f9734270465dbdd16852b39e4ec25f50da5927bd7f6fd3438a48716
-SIZE (apache-activemq-5.4.2-bin.tar.gz) = 45690056
+SHA256 (apache-activemq-5.5.0-bin.tar.gz) = f4f2362aac136adb870889e7467f50a7b81cef78366dbdaa763fc654aa5bb6e9
+SIZE (apache-activemq-5.5.0-bin.tar.gz) = 27495046
diff --git a/net/activemq/files/pkg-deinstall.in b/net/activemq/files/pkg-deinstall.in
new file mode 100644
index 000000000000..9cf88a64d8ad
--- /dev/null
+++ b/net/activemq/files/pkg-deinstall.in
@@ -0,0 +1,15 @@
+#!/bin/sh
+# $FreeBSD$
+
+ETCDIR=%%ETCDIR%%
+ETC_FILES="%%ETC_FILES%%"
+
+case $2 in
+DEINSTALL)
+	for f in ${ETC_FILES}
+	do
+		/usr/bin/cmp -s ${ETCDIR}/${f}.sample \
+			${ETCDIR}/${f} \
+			&& /bin/rm -f ${ETCDIR}/${f}
+	done
+esac
diff --git a/net/activemq/files/pkg-install.in b/net/activemq/files/pkg-install.in
new file mode 100644
index 000000000000..c6e1f794875f
--- /dev/null
+++ b/net/activemq/files/pkg-install.in
@@ -0,0 +1,15 @@
+#!/bin/sh
+# $FreeBSD$
+
+ETCDIR=%%ETCDIR%%
+ETC_FILES="%%ETC_FILES%%"
+
+case $2 in
+POST-INSTALL)
+	for f in ${ETC_FILES}
+	do
+		if [ ! -f ${ETCDIR}/${f} ]; then
+			/bin/cp ${ETCDIR}/${f}.sample ${ETCDIR}/${f}
+		fi
+	done
+esac
diff --git a/net/activemq/pkg-install b/net/activemq/pkg-install
deleted file mode 100644
index ec5c306236cc..000000000000
--- a/net/activemq/pkg-install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-        MQUSER=activemq
-        MQGROUP=${MQUSER}
-        MQUID=929
-        MQGID=${MQUID}
-
-        if ! pw group show "${MQGROUP}" > /dev/null; then
-                if pw groupadd ${MQGROUP} -g ${MQGID}; then
-                        echo "Added group \"${MQGROUP}\"."
-                else
-                        echo "Adding group \"${MQGROUP}\" failed..."
-                        exit 1
-                fi
-        fi
-
-        if ! pw user show "${MQUSER}" > /dev/null; then
-                if pw useradd ${MQUSER} -u ${MQUID} -g ${MQGROUP} -h - \
-                        -d /nonexistent -s /sbin/nologin -c "ActiveMQ Daemon"
-                then
-                        echo "Added user \"${MQUSER}\"."
-                else
-                        echo "Adding user \"${MQUSER}\" failed..."
-                        exit 1
-                fi
-        fi
-        ;;
-esac
diff --git a/net/activemq/pkg-plist b/net/activemq/pkg-plist
index 39f00c162194..14602bb73d0d 100644
--- a/net/activemq/pkg-plist
+++ b/net/activemq/pkg-plist
@@ -1,3 +1,4 @@
+@exec /bin/mkdir -p %%PREFIX%%/lib/activemq/webapps/admin/WEB-INF/jsp
 lib/activemq/bin/activemq
 lib/activemq/bin/activemq-admin
 lib/activemq/bin/run.jar
@@ -6,30 +7,13 @@ lib/activemq/conf
 lib/activemq/data
 lib/activemq/example
 lib/activemq/lib/activation-1.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.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
-lib/activemq/lib/camel-spring-2.4.0.jar
-lib/activemq/lib/commons-logging-1.1.jar
 lib/activemq/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar
 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.2.jar
 lib/activemq/lib/optional/activeio-core-3.1.2.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
@@ -39,8 +23,6 @@ lib/activemq/lib/optional/commons-lang-2.4.jar
 lib/activemq/lib/optional/commons-net-2.0.jar
 lib/activemq/lib/optional/commons-pool-1.5.4.jar
 lib/activemq/lib/optional/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
-lib/activemq/lib/optional/icu4j-4.0.1.jar
-lib/activemq/lib/optional/jasypt-1.6.jar
 lib/activemq/lib/optional/jettison-1.2.jar
 lib/activemq/lib/optional/josql-1.5.jar
 lib/activemq/lib/optional/log4j-1.2.14.jar
@@ -71,8 +53,6 @@ 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
 lib/activemq/lib/web/sitemesh-2.2.1.jar
-lib/activemq/lib/web/slf4j-api-1.5.0.jar
-lib/activemq/lib/web/slf4j-jcl-1.5.0.jar
 lib/activemq/lib/web/spring-web-3.0.3.RELEASE.jar
 lib/activemq/lib/web/spring-webmvc-3.0.3.RELEASE.jar
 lib/activemq/webapps/admin/404.html
@@ -373,8 +353,6 @@ lib/activemq/webapps/demo/test/amq_test.html
 lib/activemq/webapps/demo/test/assets/README
 lib/activemq/webapps/demo/test/assets/jsunittest.js
 lib/activemq/webapps/demo/test/assets/unittest.css
-lib/activemq/webapps/demo/test/send_subscribe.html
-lib/activemq/webapps/demo/test/subscribe_send.html
 lib/activemq/webapps/favicon.ico
 lib/activemq/webapps/fileserver/META-INF/LICENSE
 lib/activemq/webapps/fileserver/META-INF/NOTICE
@@ -387,6 +365,27 @@ lib/activemq/webapps/fileserver/index.html
 lib/activemq/webapps/index.html
 lib/activemq/webapps/styles/site.css
 lib/activemq/webapps/styles/type-settings.css
+lib/activemq/lib/camel-core-2.7.0.jar
+lib/activemq/lib/activemq-jaas-5.5.0.jar
+lib/activemq/lib/camel-jetty-2.7.0.jar
+lib/activemq/lib/jcl-over-slf4j-1.5.11.jar
+lib/activemq/lib/activemq-web-5.5.0.jar
+lib/activemq/lib/activemq-console-5.5.0.jar
+lib/activemq/lib/activemq-rar.txt
+lib/activemq/lib/camel-spring-2.7.0.jar
+lib/activemq/lib/activemq-camel-5.5.0.jar
+lib/activemq/lib/optional/activemq-spring-5.5.0.jar
+lib/activemq/lib/optional/slf4j-log4j12-1.5.11.jar
+lib/activemq/lib/optional/activemq-optional-5.5.0.jar
+lib/activemq/lib/optional/activemq-jmdns_1.0-5.5.0.jar
+lib/activemq/lib/optional/activemq-xmpp-5.5.0.jar
+lib/activemq/lib/optional/activemq-pool-5.5.0.jar
+lib/activemq/lib/optional/jasypt-1.7.jar
+lib/activemq/lib/slf4j-api-1.5.11.jar
+lib/activemq/lib/kahadb-5.5.0.jar
+lib/activemq/lib/camel-jms-2.7.0.jar
+lib/activemq/webapps/admin/network.jsp
+lib/activemq/lib/activemq-core-5.5.0.jar
 %%EXAMPLESDIR%%/example/build.xml
 %%EXAMPLESDIR%%/example/conf/activemq.xml
 %%EXAMPLESDIR%%/example/conf/log4j.properties
@@ -417,33 +416,33 @@ lib/activemq/webapps/styles/type-settings.css
 %%EXAMPLESDIR%%/example/transactions/src/TransactionsDemo.java
 %%EXAMPLESDIR%%/example/transactions/src/Vendor.java
 %%PORTDOCS%%%%DOCSDIR%%/docs/index.html
-%%ETCDIR%%/activemq-command.xml
-%%ETCDIR%%/activemq-demo.xml
-%%ETCDIR%%/activemq-dynamic-network-broker1.xml
-%%ETCDIR%%/activemq-dynamic-network-broker2.xml
-%%ETCDIR%%/activemq-jdbc.xml
-%%ETCDIR%%/activemq-scalability.xml
-%%ETCDIR%%/activemq-security.xml
-%%ETCDIR%%/activemq-specjms.xml
-%%ETCDIR%%/activemq-static-network-broker1.xml
-%%ETCDIR%%/activemq-static-network-broker2.xml
-%%ETCDIR%%/activemq-stomp.xml
-%%ETCDIR%%/activemq-throughput.xml
-%%ETCDIR%%/activemq.xml
-%%ETCDIR%%/broker-localhost.cert
-%%ETCDIR%%/broker.ks
-%%ETCDIR%%/broker.ts
-%%ETCDIR%%/camel.xml
-%%ETCDIR%%/client.ks
-%%ETCDIR%%/client.ts
-%%ETCDIR%%/credentials-enc.properties
-%%ETCDIR%%/credentials.properties
-%%ETCDIR%%/jetty-realm.properties
-%%ETCDIR%%/jetty.xml
-%%ETCDIR%%/jmx.access
-%%ETCDIR%%/jmx.password
-%%ETCDIR%%/log4j.properties
-%%ETCDIR%%/logging.properties
+%%ETCDIR%%/activemq-command.xml.sample
+%%ETCDIR%%/activemq-demo.xml.sample
+%%ETCDIR%%/activemq-dynamic-network-broker1.xml.sample
+%%ETCDIR%%/activemq-dynamic-network-broker2.xml.sample
+%%ETCDIR%%/activemq-jdbc.xml.sample
+%%ETCDIR%%/activemq-scalability.xml.sample
+%%ETCDIR%%/activemq-security.xml.sample
+%%ETCDIR%%/activemq-specjms.xml.sample
+%%ETCDIR%%/activemq-static-network-broker1.xml.sample
+%%ETCDIR%%/activemq-static-network-broker2.xml.sample
+%%ETCDIR%%/activemq-stomp.xml.sample
+%%ETCDIR%%/activemq-throughput.xml.sample
+%%ETCDIR%%/activemq.xml.sample
+%%ETCDIR%%/broker-localhost.cert.sample
+%%ETCDIR%%/broker.ks.sample
+%%ETCDIR%%/broker.ts.sample
+%%ETCDIR%%/camel.xml.sample
+%%ETCDIR%%/client.ks.sample
+%%ETCDIR%%/client.ts.sample
+%%ETCDIR%%/credentials-enc.properties.sample
+%%ETCDIR%%/credentials.properties.sample
+%%ETCDIR%%/jetty-realm.properties.sample
+%%ETCDIR%%/jetty.xml.sample
+%%ETCDIR%%/jmx.access.sample
+%%ETCDIR%%/jmx.password.sample
+%%ETCDIR%%/log4j.properties.sample
+%%ETCDIR%%/logging.properties.sample
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 @dirrm %%EXAMPLESDIR%%/example/transactions/src
 @dirrm %%EXAMPLESDIR%%/example/transactions