1 files changed, 36 insertions, 68 deletions

diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index aaace4227b54..56b50b88b639 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -2,106 +2,74 @@
 
 PORTNAME=	activemq
 PORTVERSION=	5.14.4
+PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
-DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
+DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
+EXTRACT_SUFX=	-bin.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Messaging and Integration Patterns provider
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES+=		cpe
+USES=		cpe
 CPE_VENDOR=	apache
-NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
-MQDATA=		${PREFIX}/lib/${PORTNAME}
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
 MQDB?=		/var/db/activemq
-DATADIR=	${MQDATA}
 MQUSER?=	activemq
 MQGROUP?=	${MQUSER}
 USERS=		${MQUSER}
 GROUPS=		${MQGROUP}
-CAMELVERSION=	2.16.3
-SPRINGVERSION=	4.1.9
-JETTYVERSION=	9.2.13.v20150730
-LVDBVERSION=	0.6
-LVDBJNIVERSION=	1.8
 
 ALL_TARGET=	${PORTNAME}
 USE_RC_SUBR=	${PORTNAME}
 
-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 \
-		login.config \
-		users.properties
-WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${PORTVERSION}
-SUB_LIST=	ETC_FILES="${ETC_FILES}" \
-		MQUSER="${MQUSER}" \
+PORTDATA=	*
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+SUB_LIST=	MQUSER="${MQUSER}" \
 		MQGROUP="${MQGROUP}" \
 		MQDB="${MQDB}"
 PLIST_SUB=	MQUSER="${MQUSER}" \
 		MQGROUP="${MQGROUP}" \
-		MQDB="${MQDB}" \
-		PORTVERSION="${PORTVERSION}" \
-		CAMELVERSION="${CAMELVERSION}" \
-		SPRINGVERSION="${SPRINGVERSION}" \
-		JETTYVERSION="${JETTYVERSION}" \
-		LVDBVERSION="${LVDBVERSION}" \
-		LVDBJNIVERSION="${LVDBJNIVERSION}"
+		MQDB="${MQDB}"
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
-	 @${REINPLACE_CMD} -e 's|activemq.base}/data|activemq.logs}|g' ${WRKSRC}/conf/log4j.properties
-
+	@${REINPLACE_CMD} -i '' -e 's|activemq.base}/data|activemq.logs}|g' \
+		${WRKSRC}/conf/log4j.properties
+	       
 do-install:
-	@${MKDIR} ${STAGEDIR}${MQDATA} ${STAGEDIR}${MQDATA}/bin ${STAGEDIR}${ETCDIR}
-
-.for f in ${ETC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
-.endfor
-
-.for f in ${PORTNAME} ${PORTNAME}-diag
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${MQDATA}/bin
-.endfor
-
-	${INSTALL_DATA} ${WRKSRC}/bin/activemq.jar ${STAGEDIR}${MQDATA}/bin
-	${INSTALL_DATA} ${WRKSRC}/bin/wrapper.jar ${STAGEDIR}${MQDATA}/bin
-
-.for f in webapps webapps-demo lib
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${MQDATA})
-.endfor
-
-	@${LN} -sf ${MQDB} ${STAGEDIR}${MQDATA}/data
-	@${LN} -sf ${ETCDIR} ${STAGEDIR}${MQDATA}/conf
+	@${MKDIR} ${STAGEDIR}${DATADIR}/bin ${STAGEDIR}${ETCDIR} ${STAGEDIR}${MQDB}
+	cd ${WRKSRC}/conf && for f in *; do \
+		${INSTALL_DATA} ${WRKSRC}/conf/$$f ${STAGEDIR}${ETCDIR}/$$f.sample; \
+	done
+	${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
+	${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/conf
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "lib webapps webapps-demo" \
+		${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/)
-.for f in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
-.endfor
-	@${LN} -sf ${DOCSDIR} ${STAGEDIR}${MQDATA}/docs
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
+	${RLN} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}/docs
 
 do-install-EXAMPLES-on:
-	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-	@${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${MQDATA}/examples
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	${RLN} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
 .include <bsd.port.mk>