ports/142412: [PATCH] java/jdk15 Fix build

[Rob Farmer]

>Number:         142412
>Category:       ports
>Synopsis:       [PATCH] java/jdk15 Fix build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 07 06:40:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD peridot.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r201657: Wed Jan 6 09:49:06 PST 2010 robert at peridot.predatorlabs.net:/usr/obj/usr/src/sys/PERIDOT i386
>Description:
Fix build. Based off http://blogs.sun.com/navi/entry/try_this_at_home_building
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN jdk15.old/Makefile jdk15/Makefile
--- jdk15.old/Makefile	2010-01-06 18:33:13.000000000 -0800
+++ jdk15/Makefile	2010-01-06 18:45:33.000000000 -0800
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${JDK_UPDATE_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://download.java.net/tiger/
diff -ruN jdk15.old/files/patch-deploy-src-javaws-share-native-launchFile.c jdk15/files/patch-deploy-src-javaws-share-native-launchFile.c
--- jdk15.old/files/patch-deploy-src-javaws-share-native-launchFile.c	1969-12-31 16:00:00.000000000 -0800
+++ jdk15/files/patch-deploy-src-javaws-share-native-launchFile.c	2010-01-06 18:43:07.000000000 -0800
@@ -0,0 +1,11 @@
+--- ../../deploy/src/javaws/share/native/launchFile.c.orig	2010-01-06 17:36:42.000000000 -0800
++++ ../../deploy/src/javaws/share/native/launchFile.c	2010-01-06 17:39:39.000000000 -0800
+@@ -63,7 +63,7 @@
+ static char **securePropertyKeys = NULL;
+ static int securePropertiesCount = -1;
+ 
+-static int isSecureProperty(char *key) {
++int isSecureProperty(char *key) {
+     int i;
+     extern int isDefaultSecureProperty(char *key);
+ 
diff -ruN jdk15.old/files/patch-deploy-src-javaws-share-native-xmlparser.c jdk15/files/patch-deploy-src-javaws-share-native-xmlparser.c
--- jdk15.old/files/patch-deploy-src-javaws-share-native-xmlparser.c	1969-12-31 16:00:00.000000000 -0800
+++ jdk15/files/patch-deploy-src-javaws-share-native-xmlparser.c	2010-01-06 18:43:07.000000000 -0800
@@ -0,0 +1,11 @@
+--- ../../deploy/src/javaws/share/native/xmlparser.c.orig	2010-01-06 17:37:06.000000000 -0800
++++ ../../deploy/src/javaws/share/native/xmlparser.c	2010-01-06 17:39:59.000000000 -0800
+@@ -50,7 +50,7 @@
+  *                               10   | bits  6-11
+  *                               10   | bits  0-5
+  */
+-static void RemoveNonAsciiUTF8FromBuffer(char *buf) {
++void RemoveNonAsciiUTF8FromBuffer(char *buf) {
+     char* p;
+     char* q;
+     char c;
diff -ruN jdk15.old/files/patch-j2se-src-solaris-bin-java_md.c jdk15/files/patch-j2se-src-solaris-bin-java_md.c
--- jdk15.old/files/patch-j2se-src-solaris-bin-java_md.c	1969-12-31 16:00:00.000000000 -0800
+++ jdk15/files/patch-j2se-src-solaris-bin-java_md.c	2010-01-06 18:43:07.000000000 -0800
@@ -0,0 +1,11 @@
+--- ../../j2se/src/solaris/bin/java_md.c.orig	2010-01-06 17:46:45.000000000 -0800
++++ ../../j2se/src/solaris/bin/java_md.c	2010-01-06 17:48:27.000000000 -0800
+@@ -1137,7 +1137,7 @@
+       " movq    %r11, %rbx");
+ #else
+   /* EBX is a callee-saved register */
+-  asm(" pushl   %ebx");
++  asm(" pushl   ");
+   /* Need ESI for storing through arguments */
+   asm(" pushl   %esi");
+   asm(" movl    8(%ebp), %eax   \n"
diff -ruN jdk15.old/files/patch-j2se-src-solaris-hpi-native_threads-src-interrupt_md.c jdk15/files/patch-j2se-src-solaris-hpi-native_threads-src-interrupt_md.c
--- jdk15.old/files/patch-j2se-src-solaris-hpi-native_threads-src-interrupt_md.c	1969-12-31 16:00:00.000000000 -0800
+++ jdk15/files/patch-j2se-src-solaris-hpi-native_threads-src-interrupt_md.c	2010-01-06 18:43:07.000000000 -0800
@@ -0,0 +1,11 @@
+--- ../../j2se/src/solaris/hpi/native_threads/src/interrupt_md.c.orig	2010-01-06 17:35:29.000000000 -0800
++++ ../../j2se/src/solaris/hpi/native_threads/src/interrupt_md.c	2010-01-06 17:38:58.000000000 -0800
+@@ -110,7 +110,7 @@
+ }
+ 
+ #ifndef HAVE_SIGIGNORE
+-static int							
++int							
+ sigignore(int sig)		
+ {				
+     struct sigaction action;


>Release-Note:
>Audit-Trail:
>Unformatted: