From 9ea410ac09767d3246384ff2cbd82d9d4d705f4e Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 26 Apr 2013 20:25:39 +0000
Subject: Update to r316538 and drop support for 7.x.

---
 java/bootstrap-openjdk/Makefile        | 11 +++++------
 java/bootstrap-openjdk/Makefile.update |  2 +-
 java/bootstrap-openjdk/distinfo.amd64  |  4 ++--
 java/bootstrap-openjdk/distinfo.i386   |  4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'java')

diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index 517a3c12a8d6..1aade4bc1663 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	${JDK_NAME}
 PORTVERSION=	${DISTVERSION_${ARCH}}
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://people.freebsd.org/~jkim/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkim
 PKGNAMEPREFIX=	bootstrap-
 DISTNAME=	${JDK_PORT}-${ARCH}-${PORTVERSION}
@@ -19,8 +18,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
 ONLY_FOR_ARCH=	amd64 i386
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
-DISTVERSION_amd64=	r306764
-DISTVERSION_i386=	r306764
+DISTVERSION_amd64=	r316538
+DISTVERSION_i386=	r316538
 
 JDK_NAME=	openjdk
 JDK_PORT=	openjdk6
@@ -35,8 +34,8 @@ INSTALLDIR=	${PREFIX}/${JDK_ROOT}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800105
-RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libz.so.4:${PORTSDIR}/misc/compat7x
+.if ${OSVERSION} >= 900010
+RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libz.so.5:${PORTSDIR}/misc/compat8x
 .endif
 
 .if ${ARCH} == "i386"
diff --git a/java/bootstrap-openjdk/Makefile.update b/java/bootstrap-openjdk/Makefile.update
index 16dd09936ff3..aa9b10df0dc5 100644
--- a/java/bootstrap-openjdk/Makefile.update
+++ b/java/bootstrap-openjdk/Makefile.update
@@ -3,7 +3,7 @@
 JDK_NAME?=	openjdk
 JDK_PORT?=	openjdk6
 JDK_ROOT?=	bootstrap-${JDK_NAME}
-TARGET_OS?=	7
+TARGET_OS?=	8
 
 .if !defined(PORTSDIR)
 .if exists(${.CURDIR}/../${JDK_PORT}/Makefile)
diff --git a/java/bootstrap-openjdk/distinfo.amd64 b/java/bootstrap-openjdk/distinfo.amd64
index 30a612fca9e1..38eea4a5797f 100644
--- a/java/bootstrap-openjdk/distinfo.amd64
+++ b/java/bootstrap-openjdk/distinfo.amd64
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-amd64-r306764.tar.xz) = decad8643a3b3563cd95fc25421f7f30fa4014fab503cc887457647b7209edb8
-SIZE (openjdk6-amd64-r306764.tar.xz) = 22044216
+SHA256 (openjdk6-amd64-r316538.tar.xz) = 36dfec9038af3d15ab2675f08ee7b7d6eccdfd9bc7e9e9dd861c515fa0e3a6e7
+SIZE (openjdk6-amd64-r316538.tar.xz) = 22158940
diff --git a/java/bootstrap-openjdk/distinfo.i386 b/java/bootstrap-openjdk/distinfo.i386
index 1881ed6c8e13..a1de76582912 100644
--- a/java/bootstrap-openjdk/distinfo.i386
+++ b/java/bootstrap-openjdk/distinfo.i386
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-i386-r306764.tar.xz) = 89c1794e9336262e86cac01c6398e544c0f5006292a1cdb9b01c528b8ec1ef17
-SIZE (openjdk6-i386-r306764.tar.xz) = 22372236
+SHA256 (openjdk6-i386-r316538.tar.xz) = 4caa6ca8a19661e6f8c50afbf846e59cc6655e6d7b76cd32e1b82827a43756a0
+SIZE (openjdk6-i386-r316538.tar.xz) = 22428812
-- 
cgit v1.2.3