cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

. Update to Build 117.

Browse Source 
. Temporarily disable a previous openjdk7 install as a bootstrap since the
  previous version won't compile this one.
This commit is contained in:
Greg Lewis 2010-11-08 08:14:04 +00:00
parent 73eef9dd78
commit 92b914da21
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=264230
4 changed files with 2547 additions and 1944 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
java/openjdk7/Makefile
View File

@ -7,12 +7,19 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER}
PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk7/promoted/b${JDK_BUILD_NUMBER}/ \
https://jaxp.dev.java.net/files/documents/913/152561/:jaxp \
https://jax-ws.dev.java.net/files/documents/4202/152532/:jaxws \
https://jax-ws.dev.java.net/files/documents/4202/152336/:jaf \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,}
DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
${JAXPFILE}:jaxp \
${JAXWSFILE}:jaxws \
${JAFFILE}:jaf \
${ANT_DISTFILE}${EXTRACT_SUFX}:ant
EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
${ANT_DISTFILE}${EXTRACT_SUFX}
MAINTAINER= glewis@FreeBSD.org
COMMENT= Java Development Kit 7
@ -26,8 +33,8 @@ MAKE_JOBS_UNSAFE= YES
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 0
JDK_BUILD_NUMBER= 100
JDK_BUILD_DATE= 09_jul_2010
JDK_BUILD_NUMBER= 117
JDK_BUILD_DATE= 04_nov_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
@ -41,6 +48,10 @@ USE_ICONV= YES
USE_XORG+= x11 xext xi xrender xt xtst
MAKE_JOBS_UNSAFE= yes
JAXPFILE= jaxp-1_4_4.zip
JAXWSFILE= jdk7-jaxws2_2-2010_08_19.zip
JAFFILE= jdk7-jaf-2010_08_19.zip
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip \
@ -67,6 +78,7 @@ MAKE_ENV+= LANG="C" \
ALT_X11_PATH="${LOCALBASE}" \
ALT_PKG_PATH="${LOCALBASE}" \
ALT_PACKAGE_PATH="${LOCALBASE}" \
ALT_DROPS_DIR="${DISTDIR}" \
ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \
X11DIR="${LOCALBASE}" \
LOCALDIR="${LOCALBASE}" \
@ -86,8 +98,7 @@ BUILD_JOBS_NUMBER= `${SYSCTL} -n kern.smp.cpus`
MAKE_ENV+= HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER}
.endif
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \
${LOCALBASE}/openjdk6 \
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk6 \
${LOCALBASE}/jdk1.6.0 \
${LOCALBASE}/diablo-jdk1.6.0

12
java/openjdk7/distinfo
View File

@ -1,6 +1,10 @@
MD5 (openjdk-7-ea-src-b100-09_jul_2010.zip) = 658f5f92126100d6df275b28f1ab830a
SHA256 (openjdk-7-ea-src-b100-09_jul_2010.zip) = 06a91883accc747e69a5d6b432b8215ebb18c7c15d64431a7fe5f5c088437cb2
SIZE (openjdk-7-ea-src-b100-09_jul_2010.zip) = 96065451
MD5 (apache-ant-1.7.1-bin.zip) = f64c979dd593324fd1e58eea4d991522
SHA256 (openjdk-7-ea-src-b117-04_nov_2010.zip) = 966f623c13152980773eac0a04b00e5d7b20a20adab1b7865cd8c847726cbeb3
SIZE (openjdk-7-ea-src-b117-04_nov_2010.zip) = 85420789
SHA256 (jaxp-1_4_4.zip) = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
SIZE (jaxp-1_4_4.zip) = 5972577
SHA256 (jdk7-jaxws2_2-2010_08_19.zip) = b8877aafbb15a348babcaee4ee372fb3e2ea0282f8fe93d306272fd24d7847de
SIZE (jdk7-jaxws2_2-2010_08_19.zip) = 5893692
SHA256 (jdk7-jaf-2010_08_19.zip) = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
SIZE (jdk7-jaf-2010_08_19.zip) = 70613
SHA256 (apache-ant-1.7.1-bin.zip) = 879a6ae22ae022a944a43f6dea21acfdec0acb30175e743664536f89626c0281
SIZE (apache-ant-1.7.1-bin.zip) = 11657986

4447
java/openjdk7/files/patch-set
View File

File diff suppressed because it is too large Load Diff

11
java/openjdk7/files/patch-zzz-nio-kqueue
View File

@ -313,7 +313,7 @@
}
--- jdk/src/solaris/classes/sun/nio/ch/KqueueSelectorImpl.java (revision 0)
+++ jdk/src/solaris/classes/sun/nio/ch/KqueueSelectorImpl.java (revision 16)
@@ -0,0 +1,204 @@
@@ -0,0 +1,203 @@
+/*
+ * scratched by davidxu@freebsd.org
+ */
@ -362,10 +362,9 @@
+ */
+ KqueueSelectorImpl(SelectorProvider sp) {
+ super(sp);
+ int[] fdes = new int[2];
+ IOUtil.initPipe(fdes, false);
+ fd0 = fdes[0];
+ fd1 = fdes[1];
+ long pipeFds = IOUtil.makePipe(false);
+ fd0 = (int) (pipeFds >>> 32);
+ fd1 = (int) pipeFds;
+ kqueueWrapper = new KqueueArrayWrapper();
+ totalChannels = 1;
+ kqueueWrapper.initInterrupt(fd0, fd1);
@ -458,7 +457,7 @@
+ selectedKeys = null;
+
+ // Deregister channels
+ Iterator i = keys.iterator();
+ Iterator<SelectionKey> i = keys.iterator();
+ while (i.hasNext()) {
+ SelectionKeyImpl ski = (SelectionKeyImpl)i.next();
+ deregister(ski);