1 files changed, 38 insertions, 48 deletions

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index 23352450b731..5f2ff174d5d1 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	activemq
-PORTVERSION=	5.8.0
+PORTVERSION=	5.9.0
 CATEGORIES=	net java
 MASTER_SITES=	http://www.sai.msu.su/apache/${MASTER_SITE_SUBDIR}/ \
 		${MASTER_SITE_APACHE}/${MASTER_SITE_SUBDIR}/
@@ -11,10 +11,10 @@ DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Messaging and Integration Patterns provider
 
-NO_BUILD=	yes
+LICENSE=	AL2
 
+NO_BUILD=	yes
 USE_JAVA=	yes
-LICENSE=	AL2
 JAVA_VERSION=	1.7+
 MQDATA=		${PREFIX}/lib/${PORTNAME}
 MQDB?=		/var/db/activemq
@@ -23,41 +23,34 @@ MQUSER?=	activemq
 MQGROUP?=	${MQUSER}
 USERS=		${MQUSER}
 GROUPS=		${MQGROUP}
-CAMELVERSION=	2.10.3
-SPRINGVERSION=	3.1.3
-JETTYVERSION=	7.6.7.v20120910
-LVDBVERSION=	0.5
-LVDBJNIVERSION=	1.5
+CAMELVERSION=	2.12.1
+SPRINGVERSION=	3.2.4
+JETTYVERSION=	7.6.9.v20130131
+LVDBVERSION=	0.6
+LVDBJNIVERSION=	1.7
 
 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 \
-		camel.xml \
+DOC_FILES=	LICENSE NOTICE README.txt
+ETC_FILES=	activemq.xml \
+		broker-localhost.cert \
+		broker.ks \
+		broker.ts \
+		client.ks \
+		client.ts \
 		credentials-enc.properties \
 		credentials.properties \
+		groups.properties \
 		jetty-realm.properties \
 		jetty.xml \
 		jmx.access \
 		jmx.password \
 		log4j.properties \
-		logging.properties
-
+		logging.properties \
+		login.config \
+		users.properties
 WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
-SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST=	ETC_FILES="${ETC_FILES}" \
 		MQUSER="${MQUSER}" \
 		MQGROUP="${MQGROUP}" \
@@ -71,45 +64,42 @@ PLIST_SUB=	MQUSER="${MQUSER}" \
 		JETTYVERSION="${JETTYVERSION}" \
 		LVDBVERSION="${LVDBVERSION}" \
 		LVDBJNIVERSION="${LVDBJNIVERSION}"
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR}/
-.for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
+.for f in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 
-	@${MKDIR} ${MQDATA} ${MQDB} ${MQDATA}/bin ${ETCDIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} example ${EXAMPLESDIR}/
+	@${MKDIR} ${STAGEDIR}${MQDATA} ${STAGEDIR}${MQDATA}/bin ${STAGEDIR}${ETCDIR}
+	@${MKDIR} ${STAGEDIR}${MQDB}
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+.endif
 
 .for f in ${ETC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${ETCDIR}/${f}.sample
+	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 
 .for f in ${PORTNAME} ${PORTNAME}-admin diag
-	@cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} ${f} ${MQDATA}/bin
+	@cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} ${f} ${STAGEDIR}${MQDATA}/bin
 .endfor
 
-	@cd ${WRKSRC}/bin && ${INSTALL_DATA} activemq.jar ${MQDATA}/bin
-	@cd ${WRKSRC}/bin && ${INSTALL_DATA} wrapper.jar ${MQDATA}/bin
+	@cd ${WRKSRC}/bin && ${INSTALL_DATA} activemq.jar ${STAGEDIR}${MQDATA}/bin
+	@cd ${WRKSRC}/bin && ${INSTALL_DATA} wrapper.jar ${STAGEDIR}${MQDATA}/bin
 
 .for f in webapps webapps-demo lib
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${MQDATA}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${MQDATA}
 .endfor
 
-	@${LN} -sf ${MQDB} ${MQDATA}/data
-	@${LN} -sf ${ETCDIR} ${MQDATA}/conf
-	@${LN} -sf ${EXAMPLESDIR}/example ${MQDATA}/example
-	@${CHOWN} -Rh ${MQUSER}:${MQGROUP} ${MQDB} ${ETCDIR} ${EXAMPLES} \
-		${MQDATA}
-
-post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	${INSTALL} -d -o ${MQUSER} -g ${MQGROUP} ${MQDB}
+	@${LN} -sf ${MQDB} ${STAGEDIR}${MQDATA}/data
+	@${LN} -sf ${ETCDIR} ${STAGEDIR}${MQDATA}/conf
+	@${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${MQDATA}/examples
+	@${LN} -sf ${DOCSDIR} ${STAGEDIR}${MQDATA}/docs
 
 .include <bsd.port.mk>