. Update to 7u25.

. Unbreak the port by committing the other half of the patch-set split.

java/openjdk7/Makefile

@@ -40,8 +40,8 @@ DEBUG_DESC=		Enable extra debugging info
 POLICY_DESC=		Install the Unlimited Strength Policy Files
 TZUPDATE_DESC=		Update the time zone data
 
-PORT_MINOR_VERSION=	21
-PORT_BUILD_NUMBER=	11
+PORT_MINOR_VERSION=	25
+PORT_BUILD_NUMBER=	15
 JDK_MAJOR_VERSION=	7
 JDK_MINOR_VERSION=	6
 JDK_BUILD_NUMBER=	24
@@ -62,6 +62,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 RUN_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 
+USE_DOS2UNIX=	jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
+
 OPENJDK_OSARCH=	bsd-${ARCH:S/i386/i586/}
 INSTALLDIR=	${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}
 
@@ -104,6 +106,19 @@ BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk7 \
 		${LOCALBASE}/openjdk6 \
 		${LOCALBASE}/bootstrap-openjdk
 
+SECURITY_ICONS= security-icon-bw16.png \
+		security-icon-bw24.png \
+		security-icon-bw32.png \
+		security-icon-bw48.png \
+		security-icon-interim16.png \
+		security-icon-interim24.png \
+		security-icon-interim32.png \
+		security-icon-interim48.png \
+		security-icon-yellow16.png \
+		security-icon-yellow24.png \
+		security-icon-yellow32.png \
+		security-icon-yellow48.png
+
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MDEBUG)
@@ -132,6 +147,14 @@ PATCH_DEPENDS+=	gpatch:${PORTSDIR}/devel/patch
 PATCH=		gpatch
 .endif
 
+post-extract:
+	# Move icons to their new home.
+	@${MKDIR} ${WRKSRC}/jdk/src/share/classes/sun/awt/resources
+.for icon in ${SECURITY_ICONS}
+	@${MV} ${WRKSRC}/jdk/src/solaris/classes/sun/awt/X11/${icon} \
+		${WRKSRC}/jdk/src/share/classes/sun/awt/resources/
+.endfor
+
 post-patch:
 	@${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
 		${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp