Update to 7u60.

java/openjdk7/Makefile

@@ -3,7 +3,6 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
@@ -37,8 +36,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=	55
-PORT_BUILD_NUMBER=	13
+PORT_MINOR_VERSION=	60
+PORT_BUILD_NUMBER=	19
 JDK_MAJOR_VERSION=	7
 JDK_MINOR_VERSION=	40
 JDK_BUILD_NUMBER=	43

java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile

@@ -1,28 +0,0 @@
---- jdk/make/sun/splashscreen/Makefile	2013-09-06 14:27:41.000000000 -0400
-+++ jdk/make/sun/splashscreen/Makefile	2014-04-30 00:10:52.000000000 -0400
-@@ -61,6 +61,12 @@
- 
- CFLAGS += -DSPLASHSCREEN
- 
-+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-+ifneq ($(SYSTEM_ZLIB),true)
-+  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-+endif
-+
- ifeq ($(PLATFORM), macosx)
-   CFLAGS += -DWITH_MACOSX
- 
-@@ -121,11 +127,7 @@
-   CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
-   CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
- endif
--CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
--CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
--ifneq ($(SYSTEM_ZLIB),true)
--  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
--else
-+ifeq ($(SYSTEM_ZLIB),true)
-   OTHER_CFLAGS += $(ZLIB_CFLAGS)
-   OTHER_LDLIBS += $(ZLIB_LIBS)
- endif

java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c

@@ -1,38 +0,0 @@
---- jdk/src/solaris/bin/java_md_solinux.c
-+++ jdk/src/solaris/bin/java_md_solinux.c
-@@ -899,8 +899,9 @@
-  * onwards the filename returned in DL_info structure from dladdr is
-  * an absolute pathname so technically realpath isn't required.
-  * On Linux we read the executable name from /proc/self/exe.
-- * As a fallback, and for platforms other than Solaris and Linux,
-- * we use FindExecName to compute the executable name.
-+ * On FreeBSD we read the executable name from /proc/curproc/file.
-+ * As a fallback, and for platforms other than Solaris, Linux, and
-+ * FreeBSD, we use FindExecName to compute the executable name.
-  */
- const char*
- SetExecname(char **argv)
-@@ -927,9 +928,13 @@
-             }
-         }
-     }
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD__)
-     {
-+#if defined(__FreeBSD__)
-+        const char* self = "/proc/curproc/file";
-+#else
-         const char* self = "/proc/self/exe";
-+#endif
-         char buf[PATH_MAX+1];
-         int len = readlink(self, buf, PATH_MAX);
-         if (len >= 0) {
-@@ -937,7 +942,7 @@
-             exec_path = JLI_StringDup(buf);
-         }
-     }
--#else /* !__solaris__ && !__linux__ */
-+#else /* !__solaris__ && !__linux__ && !__FreeBSD__ */
-     {
-         /* Not implemented */
-     }