diff options
| author | glewis <glewis@FreeBSD.org> | 2010-01-18 10:09:03 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2010-01-18 10:09:03 +0800 |
| commit | febde821efd8d27c8dc3ef2e8e3f7769a2e48255 (patch) | |
| tree | 843e3633dfe8960df83cd2d58cd9020f80b53157 | |
| parent | 7f932f351589c3d146b1cf4e765ce9f32c4906ef (diff) | |
| download | freebsd-ports-gnome-febde821efd8d27c8dc3ef2e8e3f7769a2e48255.tar.gz freebsd-ports-gnome-febde821efd8d27c8dc3ef2e8e3f7769a2e48255.tar.zst freebsd-ports-gnome-febde821efd8d27c8dc3ef2e8e3f7769a2e48255.zip | |
. Use a downloaded version of ant rather than relying on the ant port
to avoid a circular dependency.
This is a modified version of the submitted patch, any errors are likely
mine.
Submitted by: ale@
| -rw-r--r-- | java/openjdk7/Makefile | 15 | ||||
| -rw-r--r-- | java/openjdk7/distinfo | 3 |
2 files changed, 14 insertions, 4 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 3fcdaea0f6f9..bc052268fb63 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -8,8 +8,10 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER} CATEGORIES= java devel -MASTER_SITES= http://download.java.net/openjdk/jdk7/promoted/b${JDK_BUILD_NUMBER}/ -DISTNAME= ${PORTNAME}-${JDK_MAJOR_VERSION}-ea-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} +MASTER_SITES= http://download.java.net/openjdk/jdk7/promoted/b${JDK_BUILD_NUMBER}/ \ + ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} +DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ + ${ANT_DISTFILE}${EXTRACT_SUFX}:ant MAINTAINER= glewis@FreeBSD.org COMMENT= Java Development Kit 7 @@ -22,6 +24,12 @@ JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 0 JDK_BUILD_NUMBER= 79 JDK_BUILD_DATE= 14_jan_2010 +JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}-ea-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} + +# Use our own version of ant to avoid circular dependencies +ANT_VERSION= 1.7.1 +ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin + LATEST_LINK= openjdk7 USE_GMAKE= YES @@ -29,7 +37,6 @@ USE_ICONV= YES USE_XORG+= x11 xext xi xrender xt xtst LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip BUILD_DEPENDS+= ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client @@ -54,7 +61,7 @@ MAKE_ENV+= LANG="C" \ ALT_X11_PATH="${LOCALBASE}" \ ALT_PKG_PATH="${LOCALBASE}" \ ALT_PACKAGE_PATH="${LOCALBASE}" \ - ANT_HOME="${LOCALBASE}" \ + ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \ X11DIR="${LOCALBASE}" \ LOCALDIR="${LOCALBASE}" \ NO_DOCS="true" \ diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo index 45aae210c89d..391358eb9f05 100644 --- a/java/openjdk7/distinfo +++ b/java/openjdk7/distinfo @@ -1,3 +1,6 @@ MD5 (openjdk-7-ea-src-b79-14_jan_2010.zip) = 17702f4d38c2dd73da4158f8c460a54e SHA256 (openjdk-7-ea-src-b79-14_jan_2010.zip) = 60e6bcdd1c7d4289476b3b984ac431687f47f60222aca7638b1145f3977d56f7 SIZE (openjdk-7-ea-src-b79-14_jan_2010.zip) = 94539151 +MD5 (apache-ant-1.7.1-bin.zip) = f64c979dd593324fd1e58eea4d991522 +SHA256 (apache-ant-1.7.1-bin.zip) = 879a6ae22ae022a944a43f6dea21acfdec0acb30175e743664536f89626c0281 +SIZE (apache-ant-1.7.1-bin.zip) = 11657986 |