Update to r333271.

svn path=/head/; revision=333530

java/bootstrap-openjdk/Makefile

@@ -18,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=	r330538
-DISTVERSION_i386=	r330538
+DISTVERSION_amd64=	r333271
+DISTVERSION_i386=	r333271
 
 JDK_NAME=	openjdk
 JDK_PORT=	openjdk6

java/bootstrap-openjdk/Makefile.update

@@ -18,7 +18,7 @@ LOCALBASE?=	/usr/local
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
 JDK_PORTDIR!=	${REALPATH} ${PORTSDIR}/java/${JDK_PORT}
-JDK_IMAGEDIR?=	${JDK_PORTDIR}/work/build/bsd-${ARCH:S/i386/i586/}/j2sdk-image
+JDK_IMAGEDIR?=	${JDK_PORTDIR}/work/stage/usr/local/${JDK_PORT}
 
 GET_REVISION=	${LOCALBASE}/bin/svnversion ${JDK_PORTDIR}
 TAR?=		/usr/bin/tar
@@ -37,6 +37,11 @@ MAKEFILE=	${.CURDIR}/Makefile
 PLIST?=		${.CURDIR}/pkg-plist
 PLIST_SUB=	ARCH="${ARCH}" JDK_ROOT="."
 
+BUILD_ARGS=	BATCH=yes
+BUILD_ARGS+=	EXTRA_PATCHES="${EXTRA_PATCHES}"
+BUILD_ARGS+=	PORT_DBDIR=/var/empty
+BUILD_ARGS+=	WITHOUT_ICEDTEA=yes
+
 .if ${ARCH} == "i386"
 PLIST_SUB+=	CLIENTVM=""
 .else
@@ -61,9 +66,10 @@ all:
 	@${ECHO} "=============================================================="
 	@${ECHO} ""
 .if !defined(NO_BUILD)
-	@${SETENV} -i PATH=${PATH} __MAKE_CONF=/dev/null \
-	    ${MAKE} -C "${JDK_PORTDIR}" BATCH=yes EXTRA_PATCHES="${EXTRA_PATCHES}" \
-	    PORT_DBDIR=/var/empty WITHOUT_ICEDTEA=yes
+	@${SETENV} -i PATH="${PATH}" __MAKE_CONF=/dev/null \
+	    ${MAKE} -C "${JDK_PORTDIR}" ${BUILD_ARGS} stage
+	@${FIND} "${JDK_IMAGEDIR}" -type f \
+	    -exec ${STRIP_CMD} -s {} \; 2> /dev/null
 .endif
 	@cd "${JDK_IMAGEDIR}" && \
 	${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | \

java/bootstrap-openjdk/distinfo.amd64

@@ -1,2 +1,2 @@
-SHA256 (openjdk6-amd64-r330538.tar.xz) = f1ba1aca887d26f3ce067c9d95e8e51294a28de643ea0d6593ed285b6cf1202b
-SIZE (openjdk6-amd64-r330538.tar.xz) = 22382548
+SHA256 (openjdk6-amd64-r333271.tar.xz) = a37ad2c34c621bccf8762eb9447945741baa67b1fc085ca3d85e110b2780fe8d
+SIZE (openjdk6-amd64-r333271.tar.xz) = 21935920

java/bootstrap-openjdk/distinfo.i386

@@ -1,2 +1,2 @@
-SHA256 (openjdk6-i386-r330538.tar.xz) = 034d986e077ba33e235647fbc86d3b9e387fe88885897ee83c3df28922c85daa
-SIZE (openjdk6-i386-r330538.tar.xz) = 22677180
+SHA256 (openjdk6-i386-r333271.tar.xz) = 1583de7df6b9f0003222b7d48176150a6ce0bb63cb1bda476a1f998e65020a3b
+SIZE (openjdk6-i386-r333271.tar.xz) = 22054372