Index: net/openmq-client/Makefile =================================================================== --- net/openmq-client/Makefile +++ net/openmq-client/Makefile @@ -11,5 +11,4 @@ CLIENT_COMMENT= (Client) -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: net/openmq/Makefile =================================================================== --- net/openmq/Makefile +++ net/openmq/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= openmq -PORTVERSION= 4.5.1.b.3 +PORTVERSION= 4.5.2.p.1 PORTEPOCH= 1 CATEGORIES= net java -MASTER_SITES= http://download.java.net/mq/open-mq/4.5.1/b03-final/ \ +MASTER_SITES= http://download.java.net/mq/open-mq/4.5.2/b03/ \ http://download.java.net/maven/2/javax/javaee-api/6.0/:2 \ http://download.java.net/maven/2/com/sun/grizzly/grizzly-nio-framework/1.9.18a/:3 \ http://download.java.net/maven/2/com/sun/woodstock/dependlibs/jhall/2.0/:4 @@ -18,19 +18,23 @@ LICENSE= GPLv2 CDDL LICENSE_COMB= dual -SRCDIST= openmq4_5_1-source.zip +SRCDIST= mq4_5_2p1-source.zip BOOTJARS= javaee-api-6.0.jar:2 \ grizzly-nio-framework-1.9.18a.jar:3 \ jhall-2.0.jar:4 USES= zip USE_JAVA= yes -JAVA_VERSION= 1.6 +JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk WRKSRC= ${WRKDIR}/mq PLIST= ${WRKDIR}/pkg-plist +.ifndef IMQ_CLIENT +OPTIONS_DEFINE= DOCS EXAMPLES +.endif + USE_ANT= yes .ifndef IMQ_CLIENT USE_RC_SUBR= imq @@ -38,10 +42,11 @@ SUB_FILES= pkg-message .endif +.include + # Get the bootstrap jars in place before the build starts, because # pointyhat doesn't allow them to be downloaded by the "bootstrap" # target in the Ant file. -NO_STAGE= yes pre-build: @${MKDIR} ${WRKSRC}/extlib @${CP} ${DISTDIR}/javaee-api-6.0.jar \ @@ -63,21 +68,23 @@ ${ECHO_CMD} "imq/{}" \; > ${PLIST} @cd ${WRKSRC}/dist/mq && ${FIND} -d bin lib -type d -exec \ ${ECHO_CMD} "@dirrm imq/{}" \; >> ${PLIST} - @cd ${WRKSRC}/dist/mq/etc && ${FIND} . -depth 1 -type f -exec \ - ${ECHO_CMD} "etc/mq/{}" \; >> ${PLIST} + @cd ${WRKSRC}/dist/mq && ${FIND} etc -depth 1 -type f -print | \ + ${SED} -e "\-/-s--/mq/-" >> ${PLIST} @${ECHO_CMD} "@dirrmtry etc/mq" >> ${PLIST} -.ifndef NOPORTDOCS - @cd ${WRKSRC}/dist/mq/javadoc && ${FIND} . -type f -exec \ - ${ECHO_CMD} "%%DOCSDIR%%/{} " \; >> ${PLIST} - @cd ${WRKSRC}/dist/mq/javadoc && ${FIND} -d . -mindepth 1 -type d -exec \ - ${ECHO_CMD} "@dirrm %%DOCSDIR%%/{}" \; >> ${PLIST} - @cd ${WRKSRC}/dist/mq/examples && ${FIND} . -type f -exec \ - ${ECHO_CMD} "%%EXAMPLESDIR%%/{}" \; >> ${PLIST} - @cd ${WRKSRC}/dist/mq/examples && ${FIND} -d . -mindepth 1 -type d -exec \ - ${ECHO_CMD} "@dirrm %%EXAMPLESDIR%%/{}" \; >> ${PLIST} - @${ECHO_CMD} "@dirrm %%EXAMPLESDIR%%" >> ${PLIST} +.if ${PORT_OPTIONS:MDOCS} + @cd ${WRKSRC}/dist/mq && ${FIND} javadoc -type f -print | \ + ${SED} -e "/^javadoc/s//%%DOCSDIR%%/" >> ${PLIST} + @cd ${WRKSRC}/dist/mq && ${FIND} -d javadoc -mindepth 1 -type d -print | \ + ${SED} -e "/^javadoc/s//@dirrm %%DOCSDIR%%/" >> ${PLIST} @${ECHO_CMD} "@dirrm %%DOCSDIR%%" >> ${PLIST} .endif +.if ${PORT_OPTIONS:MEXAMPLES} + @cd ${WRKSRC}/dist/mq && ${FIND} examples -type f -print | \ + ${SED} -e "/^examples/s//%%EXAMPLESDIR%%/" >> ${PLIST} + @cd ${WRKSRC}/dist/mq && ${FIND} -d examples -mindepth 1 -type d -print | \ + ${SED} -e "/^examples/s//@dirrm %%EXAMPLESDIR%%/" >> ${PLIST} + @${ECHO_CMD} "@dirrm %%EXAMPLESDIR%%" >> ${PLIST} +.endif @${ECHO_CMD} "@dirrmtry imq" >> ${PLIST} .else @${ECHO_CMD} "%%JAVAJARDIR%%/jms.jar" > ${PLIST} @@ -89,34 +96,29 @@ do-install: .ifndef IMQ_CLIENT - @${MKDIR} ${PREFIX}/imq - @${MKDIR} ${PREFIX}/etc/mq + @${MKDIR} ${STAGEDIR}${PREFIX}/imq + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/mq @cd ${WRKSRC}/dist/mq && ${FIND} bin lib | \ - ${CPIO} --quiet -pdmu -R ${BINOWN}:${BINGRP} ${PREFIX}/imq + ${CPIO} --quiet -pdmu -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/imq @cd ${WRKSRC}/dist/mq/etc && ${FIND} . -depth 1 -type f | \ - ${CPIO} --quiet -pdmu -R ${BINOWN}:${BINGRP} ${PREFIX}/etc/mq - @${CHMOD} 640 ${PREFIX}/etc/mq/*.sample -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + ${CPIO} --quiet -pdmu -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/etc/mq + @${CHMOD} 640 ${STAGEDIR}${PREFIX}/etc/mq/*.sample +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/dist/mq/javadoc && ${FIND} . | \ - ${CPIO} --quiet -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} - @cd ${WRKSRC}/dist/mq/examples && ${FIND} . | \ - ${CPIO} --quiet -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} + ${CPIO} --quiet -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} .endif -.else - @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/imq.jar ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/jms.jar ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/fscontext.jar ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/jaxm-api.jar ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/imqxm.jar ${JAVAJARDIR} +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @cd ${WRKSRC}/dist/mq/examples && ${FIND} . | \ + ${CPIO} --quiet -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} .endif - -post-install: -.ifdef IMQ_CLIENT - @${CAT} ${PKGMESSAGE} .else - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/imq.jar ${STAGEDIR}${JAVAJARDIR} + @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/jms.jar ${STAGEDIR}${JAVAJARDIR} + @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/fscontext.jar ${STAGEDIR}${JAVAJARDIR} + @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/jaxm-api.jar ${STAGEDIR}${JAVAJARDIR} + @${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/imqxm.jar ${STAGEDIR}${JAVAJARDIR} .endif .include Index: net/openmq/distinfo =================================================================== --- net/openmq/distinfo +++ net/openmq/distinfo @@ -1,5 +1,5 @@ -SHA256 (openmq4_5_1-source.zip) = bc053f138247a65f9cccff1345d58f0aa4410b0440f5fd61eafd55ea532b6163 -SIZE (openmq4_5_1-source.zip) = 6686252 +SHA256 (mq4_5_2p1-source.zip) = ec701412e4476118d2f6cbc367884ebb589c63f2fa3decfddccf6ef0a6d00852 +SIZE (mq4_5_2p1-source.zip) = 6702660 SHA256 (javaee-api-6.0.jar) = a045eac0ff80c5c0fd29b680599f27598abff16b1e6c9df46ce962a4e0b1390e SIZE (javaee-api-6.0.jar) = 979616 SHA256 (grizzly-nio-framework-1.9.18a.jar) = 7613172e7f3b6012f3cb6f7f25c3e562742e8ac6490062938015e6d60c22e2e9 Index: net/openmq/pkg-descr =================================================================== --- net/openmq/pkg-descr +++ net/openmq/pkg-descr @@ -1,4 +1,4 @@ Open Message Queue is a complete message-oriented middle-ware platform. High quality, enterprise ready messaging. -WWW: https://mq.dev.java.net/ +WWW: https://mq.java.net/