- Update to 6u32.

- Add an option to install demos and samples.  Turned on by default.

java/linux-sun-jdk16/Makefile

@@ -19,6 +19,8 @@ COMMENT=	Sun Java Development Kit 1.6 for Linux
 EXTRACT_DEPENDS=${LINUX_BASE_PORT}
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
+OPTIONS=	DEMO "Install demos and samples" on
+
 NO_CDROM=	License does not allow distribution with fee
 RESTRICTED=	Redistribution of repackaged binaries not permitted
 LATEST_LINK=	linux-sun-jdk16
@@ -31,7 +33,7 @@ NO_BUILD=	yes
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 JDK_VERSION=	1.6.0
-JDK_REVISION=	31
+JDK_REVISION=	32
 DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://www.oracle.com/technetwork/java/javase/downloads/index.html
@@ -45,6 +47,16 @@ UNPACK_CMD=	${WRKSRC}/bin/unpack200
 IGNORE?=You must manually fetch the J2SE SDK self-extracting file for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
+.if defined(WITH_DEMO)
+.if !exists(${DISTDIR}/${DISTNAME}-demos.tar.gz) && !defined(PACKAGE_BUILDING)
+IGNORE?=You must manually fetch the J2SE demos and samples for the Linux platform (${DISTNAME}-demos.tar.gz) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
+.endif
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-demos.tar.gz
+PLIST_SUB+=	DEMO=""
+.else
+PLIST_SUB+=	DEMO="@comment "
+.endif
+
 pre-everything::
 	@${CAT} ${PKGMESSAGE}
 
@@ -57,6 +69,9 @@ do-extract:
 .for i in ${PACKED_JARS}
 	@${UNPACK_CMD} -r ${WRKSRC}/${i}.pack ${WRKSRC}/${i}.jar
 .endfor
+.if defined(WITH_DEMO)
+	@${TAR} -x -f ${DISTDIR}/${DISTNAME}-demos.tar.gz -C ${WRKDIR}
+.endif
 
 post-patch:
 	${REINPLACE_CMD} -i.orig -e 's:^#!/bin/bash:#!/bin/sh:' ${WRKSRC}/bin/jcontrol

java/linux-sun-jdk16/distinfo

@@ -1,2 +1,4 @@
-SHA256 (jdk-6u31-linux-i586.bin) = 60fdd4083373db919334500b8050b326d45d78703aa2d403eda48cfa5621702b
-SIZE (jdk-6u31-linux-i586.bin) = 85292206
+SHA256 (jdk-6u32-linux-i586.bin) = ab840c7de8f452b09d53ebe9477ffdb4622fa8cabbf962474d1914fde9a20f19
+SIZE (jdk-6u32-linux-i586.bin) = 71746385
+SHA256 (jdk-6u32-linux-i586-demos.tar.gz) = aa62b23fd886b22a4af51ade8eb42f97f2f143b96a1b2418413764e95e298328
+SIZE (jdk-6u32-linux-i586-demos.tar.gz) = 12074528