svn commit: r313183 - head/java/linux-sun-jdk17

[Greg Lewis]

Author: glewis
Date: Sat Mar  2 04:08:10 2013
New Revision: 313183
URL: http://svnweb.freebsd.org/changeset/ports/313183

Log:
  . Update to 7u15.

Modified:
  head/java/linux-sun-jdk17/Makefile
  head/java/linux-sun-jdk17/distinfo

Modified: head/java/linux-sun-jdk17/Makefile
==============================================================================
--- head/java/linux-sun-jdk17/Makefile	Sat Mar  2 03:55:25 2013	(r313182)
+++ head/java/linux-sun-jdk17/Makefile	Sat Mar  2 04:08:10 2013	(r313183)
@@ -31,7 +31,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 JDK_VERSION=		7
 JDK_INTERNAL_VERSION=	1.7.0
-JDK_UPDATE_VERSION=	13
+JDK_UPDATE_VERSION=	15
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}_${JDK_UPDATE_VERSION}
 DOWNLOAD_URL=		http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
@@ -49,11 +49,13 @@ IGNORE?=You must manually fetch the J2SE
 
 .if ${PORT_OPTIONS:MDEMO}
 DEMO_UPDATE_VERSION=	${JDK_UPDATE_VERSION}
-#DEMO_UPDATE_VERSION=	10
+.if ${DEMO_UPDATE_VERSION} != ${JDK_UPDATE_VERSION}
+DEMO_DISTNAME=	jdk-7u${DEMO_UPDATE_VERSION}-linux-i586-demos
+DEMO_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_${DEMO_UPDATE_VERSION}
+.else
 DEMO_DISTNAME=	${DISTNAME}-demos
-#DEMO_DISTNAME=	jdk-7u${DEMO_UPDATE_VERSION}-linux-i586-demos
 DEMO_WRKSRC=	${WRKSRC}
-#DEMO_WRKSRC=	${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_${DEMO_UPDATE_VERSION}
+.endif
 .if !exists(${DISTDIR}/${DEMO_DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DEMO_DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif

Modified: head/java/linux-sun-jdk17/distinfo
==============================================================================
--- head/java/linux-sun-jdk17/distinfo	Sat Mar  2 03:55:25 2013	(r313182)
+++ head/java/linux-sun-jdk17/distinfo	Sat Mar  2 04:08:10 2013	(r313183)
@@ -1,4 +1,4 @@
-SHA256 (jdk-7u13-linux-i586.tar.gz) = 644eefe01ddbb25d966502b96d6fd1c42ce90967eb166dafa2937fc008cca6c5
-SIZE (jdk-7u13-linux-i586.tar.gz) = 97489971
-SHA256 (jdk-7u13-linux-i586-demos.tar.gz) = c4a0ccbbd1424515bf9692523cf880610cb3edd38d3f273d1c0eba96b7bc424f
-SIZE (jdk-7u13-linux-i586-demos.tar.gz) = 14742225
+SHA256 (jdk-7u15-linux-i586.tar.gz) = b2f04eb9ab38820d1b1ae1b24d43da85ccd6526b1605cbeeeed265763396ba4e
+SIZE (jdk-7u15-linux-i586.tar.gz) = 97486991
+SHA256 (jdk-7u15-linux-i586-demos.tar.gz) = b95f19ebd028e27beb1ade48c7672f624c5c12f09bdc11d8ed27ba1acd1550f2
+SIZE (jdk-7u15-linux-i586-demos.tar.gz) = 14742812