From owner-svn-ports-all@FreeBSD.ORG Sun Jun 22 05:06:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 781B0EB3; Sun, 22 Jun 2014 05:06:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5462524AF; Sun, 22 Jun 2014 05:06:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5M56NRA018666; Sun, 22 Jun 2014 05:06:23 GMT (envelope-from milki@svn.freebsd.org) Received: (from milki@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5M56NaL018662; Sun, 22 Jun 2014 05:06:23 GMT (envelope-from milki@svn.freebsd.org) Message-Id: <201406220506.s5M56NaL018662@svn.freebsd.org> From: Jonathan Chu Date: Sun, 22 Jun 2014 05:06:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358766 - in head/net: openmq openmq-client X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2014 05:06:24 -0000 Author: milki Date: Sun Jun 22 05:06:22 2014 New Revision: 358766 URL: http://svnweb.freebsd.org/changeset/ports/358766 QAT: https://qat.redports.org/buildarchive/r358766/ Log: Update net/openmq and net/openmq-client to 4.5.2.p.1 - StageDir support - Added DOCS and EXAMPLES options Changelog: https://mq.java.net/4.5.2.html PR: 190828 Submitted by: hsn@sendmail.cz Approved by: swills (mentor) Modified: head/net/openmq-client/Makefile head/net/openmq/Makefile head/net/openmq/distinfo head/net/openmq/pkg-descr Modified: head/net/openmq-client/Makefile ============================================================================== --- head/net/openmq-client/Makefile Sun Jun 22 04:13:26 2014 (r358765) +++ head/net/openmq-client/Makefile Sun Jun 22 05:06:22 2014 (r358766) @@ -11,5 +11,4 @@ PKGDEINSTALL= unused_in_the_slave_port CLIENT_COMMENT= (Client) -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/net/openmq/Makefile ============================================================================== --- head/net/openmq/Makefile Sun Jun 22 04:13:26 2014 (r358765) +++ head/net/openmq/Makefile Sun Jun 22 05:06:22 2014 (r358766) @@ -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 @@ COMMENT= Open Message Queue - Java Messa 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 @@ USE_RC_SUBR= imq 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,22 @@ pre-install: ${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} - @${ECHO_CMD} "@dirrm %%DOCSDIR%%" >> ${PLIST} -.endif + + @cd ${WRKSRC}/dist/mq && ${FIND} javadoc -type f -print | \ + ${SED} -e "/^javadoc/s//%%PORTDOCS%%%%DOCSDIR%%/" >> ${PLIST} + @cd ${WRKSRC}/dist/mq && ${FIND} -d javadoc -mindepth 1 -type d -print | \ + ${SED} -e "/^javadoc/s//%%PORTDOCS%%@dirrm %%DOCSDIR%%/" >> ${PLIST} + @${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST} + + @cd ${WRKSRC}/dist/mq && ${FIND} examples -type f -print | \ + ${SED} -e "/^examples/s//%%PORTEXAMPLES%%%%EXAMPLESDIR%%/" >> ${PLIST} + @cd ${WRKSRC}/dist/mq && ${FIND} -d examples -mindepth 1 -type d -print | \ + ${SED} -e "/^examples/s//%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/" >> ${PLIST} + @${ECHO_CMD} "%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry imq" >> ${PLIST} .else @${ECHO_CMD} "%%JAVAJARDIR%%/jms.jar" > ${PLIST} @@ -89,34 +95,29 @@ pre-install: 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 Modified: head/net/openmq/distinfo ============================================================================== --- head/net/openmq/distinfo Sun Jun 22 04:13:26 2014 (r358765) +++ head/net/openmq/distinfo Sun Jun 22 05:06:22 2014 (r358766) @@ -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 Modified: head/net/openmq/pkg-descr ============================================================================== --- head/net/openmq/pkg-descr Sun Jun 22 04:13:26 2014 (r358765) +++ head/net/openmq/pkg-descr Sun Jun 22 05:06:22 2014 (r358766) @@ -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/