diff options
| author | Greg Larkin <glarkin@FreeBSD.org> | 2010-03-03 19:18:14 +0000 |
|---|---|---|
| committer | Greg Larkin <glarkin@FreeBSD.org> | 2010-03-03 19:18:14 +0000 |
| commit | a69fec766372e8dc4561ff9fcdc7aa7af6ef1a52 (patch) | |
| tree | 43bdd71fee1a67fbce219070403410b0ff4711aa | |
| parent | Update from 0.8.33 to 0.8.34. (diff) | |
- Various bootstrap jar files were downloaded as part of the build
phase. Prevent that from happening and move the jar fetching to the
distfile fetch phase, so checksums are recorded properly and pointyhat
builds will work.
Reported by: pointyhat (via erwin)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=250540
| -rw-r--r-- | net/openmq/Makefile | 26 | ||||
| -rw-r--r-- | net/openmq/distinfo | 9 |
2 files changed, 31 insertions, 4 deletions
diff --git a/net/openmq/Makefile b/net/openmq/Makefile index 00109552549c..b1e579a968f3 100644 --- a/net/openmq/Makefile +++ b/net/openmq/Makefile @@ -9,13 +9,20 @@ PORTNAME= openmq PORTVERSION= 4.4.u1.b7 PORTEPOCH= 1 CATEGORIES= net java -MASTER_SITES= http://download.java.net/mq/open-mq/4.4u1/b7-final/ -DISTNAME= openmq4_4-source +MASTER_SITES= http://download.java.net/mq/open-mq/4.4u1/b7-final/ \ + http://download.java.net/maven/2/javax/javaee-api/6.0-SNAPSHOT/: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 +DISTFILES= ${SRCDIST} ${BOOTJARS} +EXTRACT_ONLY= ${SRCDIST} MAINTAINER= hsn@sendmail.cz COMMENT= Open Message Queue - Java Message Service Broker ${CLIENT_COMMENT} -BUILD_DEPENDS= wget:${PORTSDIR}/ftp/wget +SRCDIST= openmq4_4-source.zip +BOOTJARS= javaee-api-6.0-SNAPSHOT.jar:2 \ + grizzly-nio-framework-1.9.18a.jar:3 \ + jhall-2.0.jar:4 USE_ZIP= yes USE_JAVA= yes @@ -26,13 +33,24 @@ WRKSRC= ${WRKDIR}/mq PLIST= ${WRKDIR}/pkg-plist USE_ANT= yes -ALL_TARGET= bootstrap all .ifndef IMQ_CLIENT USE_RC_SUBR= imq .else SUB_FILES= pkg-message .endif +# 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. +pre-build: + @${MKDIR} ${WRKSRC}/extlib + @${CP} ${DISTDIR}/javaee-api-6.0-SNAPSHOT.jar \ + ${WRKSRC}/extlib/javaee-api-6.0.jar + @${CP} ${DISTDIR}/grizzly-nio-framework-1.9.18a.jar \ + ${WRKSRC}/extlib/grizzly.jar + @${CP} ${DISTDIR}/jhall-2.0.jar \ + ${WRKSRC}/extlib/jhall.jar + post-build: @${RM} ${WRKSRC}/dist/mq/bin/*.exe @cd ${WRKSRC}/dist/mq/etc && \ diff --git a/net/openmq/distinfo b/net/openmq/distinfo index 811021929a1c..f42dfc415ca7 100644 --- a/net/openmq/distinfo +++ b/net/openmq/distinfo @@ -1,3 +1,12 @@ MD5 (openmq4_4-source.zip) = 64b7421782675fbf94c038012e950a6d SHA256 (openmq4_4-source.zip) = 56e3c5e2c53cee12076f4974236c7f72a5069bb7034b633747c3721d42d57346 SIZE (openmq4_4-source.zip) = 6892740 +MD5 (javaee-api-6.0-SNAPSHOT.jar) = ca7757897353c5c48c368dace0a6ac41 +SHA256 (javaee-api-6.0-SNAPSHOT.jar) = 3e8123a4cfb8e282df0727928ec3321a77ebc6814b5ea98082597f25eed849a1 +SIZE (javaee-api-6.0-SNAPSHOT.jar) = 975565 +MD5 (grizzly-nio-framework-1.9.18a.jar) = 571cbb14cd445bb868a2614a21716a20 +SHA256 (grizzly-nio-framework-1.9.18a.jar) = 7613172e7f3b6012f3cb6f7f25c3e562742e8ac6490062938015e6d60c22e2e9 +SIZE (grizzly-nio-framework-1.9.18a.jar) = 676447 +MD5 (jhall-2.0.jar) = 3701ef7da65fd8796d72986763e3f780 +SHA256 (jhall-2.0.jar) = fb3b0b6dd649954fc01bdb8480e04d532a147b4200bc87853b0b7ed13b8c0864 +SIZE (jhall-2.0.jar) = 557529 |