svn commit: r351369 - in head/java: linux-oracle-jdk18 linux-oracle-jre18

[Jung-uk Kim]

Author: jkim
Date: Tue Apr 15 22:17:02 2014
New Revision: 351369
URL: http://svnweb.freebsd.org/changeset/ports/351369
QAT: https://qat.redports.org/buildarchive/r351369/

Log:
  Update to 8u5.

Modified:
  head/java/linux-oracle-jdk18/Makefile
  head/java/linux-oracle-jdk18/distinfo
  head/java/linux-oracle-jre18/Makefile
  head/java/linux-oracle-jre18/distinfo

Modified: head/java/linux-oracle-jdk18/Makefile
==============================================================================
--- head/java/linux-oracle-jdk18/Makefile	Tue Apr 15 22:08:01 2014	(r351368)
+++ head/java/linux-oracle-jdk18/Makefile	Tue Apr 15 22:17:02 2014	(r351369)
@@ -5,7 +5,7 @@ PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-oracle-
-DISTNAME=	jdk-${JDK_VERSION}-linux-i586
+DISTNAME=	jdk-${JDK_VERSION}u${JDK_UPDATE_VERSION}-linux-i586
 
 MAINTAINER=	java at FreeBSD.org
 COMMENT=	Oracle Java ${JDK_VERSION} Development Kit for Linux
@@ -30,8 +30,14 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 JDK_VERSION=		8
 JDK_INTERNAL_VERSION=	1.${JDK_VERSION}.0
-JDK_UPDATE_VERSION=	0
+JDK_UPDATE_VERSION=	5
+.if ${JDK_UPDATE_VERSION} == 0
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}
+.elif ${JDK_UPDATE_VERSION} <= 9
+DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_0${JDK_UPDATE_VERSION}
+.else
+DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_${JDK_UPDATE_VERSION}
+.endif
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_INTERNAL_VERSION}

Modified: head/java/linux-oracle-jdk18/distinfo
==============================================================================
--- head/java/linux-oracle-jdk18/distinfo	Tue Apr 15 22:08:01 2014	(r351368)
+++ head/java/linux-oracle-jdk18/distinfo	Tue Apr 15 22:17:02 2014	(r351369)
@@ -1,4 +1,4 @@
-SHA256 (jdk-8-linux-i586.tar.gz) = 01c1f2f7bf619b613066f191fe201d41def3b3d1b639592626c6c410f7f818d5
-SIZE (jdk-8-linux-i586.tar.gz) = 159875026
-SHA256 (jdk-8-linux-i586-demos.tar.gz) = 3de60de9d3c81ab687b178d86c8ec2bfd5f82a29f7ce912dfffa1bbeab4dcb4f
-SIZE (jdk-8-linux-i586-demos.tar.gz) = 55204261
+SHA256 (jdk-8u5-linux-i586.tar.gz) = 779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9
+SIZE (jdk-8u5-linux-i586.tar.gz) = 159910666
+SHA256 (jdk-8u5-linux-i586-demos.tar.gz) = 9e7bce701b6f9f3ed07ffba9f3208141c794bd81c6f28e62f3faadf68944b3af
+SIZE (jdk-8u5-linux-i586-demos.tar.gz) = 55210712

Modified: head/java/linux-oracle-jre18/Makefile
==============================================================================
--- head/java/linux-oracle-jre18/Makefile	Tue Apr 15 22:08:01 2014	(r351368)
+++ head/java/linux-oracle-jre18/Makefile	Tue Apr 15 22:17:02 2014	(r351369)
@@ -5,7 +5,7 @@ PORTVERSION=	${JRE_VERSION}.${JRE_UPDATE
 CATEGORIES=	java
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-oracle-
-DISTNAME=	jre-${JRE_VERSION}-linux-i586
+DISTNAME=	jre-${JRE_VERSION}u${JRE_UPDATE_VERSION}-linux-i586
 
 MAINTAINER=	java at FreeBSD.org
 COMMENT=	Oracle Java ${JRE_VERSION} Runtime Environment for Linux
@@ -27,8 +27,14 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 JRE_VERSION=		8
 JRE_INTERNAL_VERSION=	1.${JRE_VERSION}.0
-JRE_UPDATE_VERSION=	0
+JRE_UPDATE_VERSION=	5
+.if ${JRE_UPDATE_VERSION} == 0
 DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}
+.elif ${JRE_UPDATE_VERSION} <= 9
+DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}_0${JRE_UPDATE_VERSION}
+.else
+DL_JRE_VERSION=		${JRE_INTERNAL_VERSION}_${JRE_UPDATE_VERSION}
+.endif
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JRE_INTERNAL_VERSION}

Modified: head/java/linux-oracle-jre18/distinfo
==============================================================================
--- head/java/linux-oracle-jre18/distinfo	Tue Apr 15 22:08:01 2014	(r351368)
+++ head/java/linux-oracle-jre18/distinfo	Tue Apr 15 22:17:02 2014	(r351369)
@@ -1,2 +1,2 @@
-SHA256 (jre-8-linux-i586.tar.gz) = 59dbbc45a388854e8e0b8393afc4094a5a275a3c82441b63ae89a3bbd2d97bf5
-SIZE (jre-8-linux-i586.tar.gz) = 58128747
+SHA256 (jre-8u5-linux-i586.tar.gz) = 77a81e63325af682d52875e6699d5edd5f3be668025bcc99f5d9132c46b82053
+SIZE (jre-8u5-linux-i586.tar.gz) = 58156527