. 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@
This commit is contained in:
Greg Lewis 2010-01-18 02:09:03 +00:00
parent 73823a3f74
commit 314299df5c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=248058
2 changed files with 14 additions and 4 deletions

View file

@ -8,8 +8,10 @@
PORTNAME= openjdk PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER} PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER}
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk7/promoted/b${JDK_BUILD_NUMBER}/ 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_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,}
DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
${ANT_DISTFILE}${EXTRACT_SUFX}:ant
MAINTAINER= glewis@FreeBSD.org MAINTAINER= glewis@FreeBSD.org
COMMENT= Java Development Kit 7 COMMENT= Java Development Kit 7
@ -22,6 +24,12 @@ JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 0 JDK_MINOR_VERSION= 0
JDK_BUILD_NUMBER= 79 JDK_BUILD_NUMBER= 79
JDK_BUILD_DATE= 14_jan_2010 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 LATEST_LINK= openjdk7
USE_GMAKE= YES USE_GMAKE= YES
@ -29,7 +37,6 @@ USE_ICONV= YES
USE_XORG+= x11 xext xi xrender xt xtst USE_XORG+= x11 xext xi xrender xt xtst
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
BUILD_DEPENDS+= ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client BUILD_DEPENDS+= ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
@ -54,7 +61,7 @@ MAKE_ENV+= LANG="C" \
ALT_X11_PATH="${LOCALBASE}" \ ALT_X11_PATH="${LOCALBASE}" \
ALT_PKG_PATH="${LOCALBASE}" \ ALT_PKG_PATH="${LOCALBASE}" \
ALT_PACKAGE_PATH="${LOCALBASE}" \ ALT_PACKAGE_PATH="${LOCALBASE}" \
ANT_HOME="${LOCALBASE}" \ ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \
X11DIR="${LOCALBASE}" \ X11DIR="${LOCALBASE}" \
LOCALDIR="${LOCALBASE}" \ LOCALDIR="${LOCALBASE}" \
NO_DOCS="true" \ NO_DOCS="true" \

View file

@ -1,3 +1,6 @@
MD5 (openjdk-7-ea-src-b79-14_jan_2010.zip) = 17702f4d38c2dd73da4158f8c460a54e MD5 (openjdk-7-ea-src-b79-14_jan_2010.zip) = 17702f4d38c2dd73da4158f8c460a54e
SHA256 (openjdk-7-ea-src-b79-14_jan_2010.zip) = 60e6bcdd1c7d4289476b3b984ac431687f47f60222aca7638b1145f3977d56f7 SHA256 (openjdk-7-ea-src-b79-14_jan_2010.zip) = 60e6bcdd1c7d4289476b3b984ac431687f47f60222aca7638b1145f3977d56f7
SIZE (openjdk-7-ea-src-b79-14_jan_2010.zip) = 94539151 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