7 files changed, 46 insertions, 61 deletions

diff --git a/java/jdk16/files/patch-hotspot-makefiles-gcc.make b/java/jdk16/files/patch-hotspot-makefiles-gcc.make
index dffd0786f340..41247e05879a 100644
--- a/java/jdk16/files/patch-hotspot-makefiles-gcc.make
+++ b/java/jdk16/files/patch-hotspot-makefiles-gcc.make
@@ -1,13 +1,13 @@
 $FreeBSD$
 
---- ../../hotspot/build/bsd/makefiles/gcc.make.orig	Sun Jul 29 23:03:30 2007
-+++ ../../hotspot/build/bsd/makefiles/gcc.make	Sun Jul 29 23:03:30 2007
-@@ -39,7 +39,7 @@
- CFLAGS += $(VM_PICFLAG)
- CFLAGS += -fno-rtti
+--- ../../hotspot/build/bsd/makefiles/gcc.make.orig	Tue Feb 12 22:24:15 2008
++++ ../../hotspot/build/bsd/makefiles/gcc.make	Tue Feb 12 22:24:28 2008
+@@ -46,7 +46,7 @@
  CFLAGS += -fno-exceptions
+ 
+ ifneq (Darwin, $(UNAME.s))
 -CFLAGS += -pthread
 +CFLAGS += ${PTHREAD_LIBS}
- CFLAGS += -fcheck-new
+ endif
  
- ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
+ CFLAGS += -fcheck-new
diff --git a/java/jdk16/files/patch-hotspot-makefiles-jsig.make b/java/jdk16/files/patch-hotspot-makefiles-jsig.make
index e867a892ad7c..2a180c07d472 100644
--- a/java/jdk16/files/patch-hotspot-makefiles-jsig.make
+++ b/java/jdk16/files/patch-hotspot-makefiles-jsig.make
@@ -1,13 +1,13 @@
 $FreeBSD$
 
---- ../../hotspot/build/bsd/makefiles/jsig.make.orig	Sun Jul 29 23:03:30 2007
-+++ ../../hotspot/build/bsd/makefiles/jsig.make	Sun Jul 29 23:03:30 2007
-@@ -22,7 +22,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
+--- ../../hotspot/build/bsd/makefiles/jsig.make.orig	Sat Feb 16 09:16:41 2008
++++ ../../hotspot/build/bsd/makefiles/jsig.make	Sat Feb 16 09:17:01 2008
+@@ -30,7 +30,7 @@
+ LFLAGS_JSIG += -D_GNU_SOURCE
  
--LFLAGS_JSIG += -D_GNU_SOURCE -pthread
-+LFLAGS_JSIG += -D_GNU_SOURCE ${PTHREAD_LIBS}
+ ifneq (Darwin, $(UNAME.s))
+-  LFLAGS_JSIG += -pthread
++  LFLAGS_JSIG += ${PTHREAD_LIBS}
+ endif
  
  $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
- 	@echo Making signal interposition lib...
diff --git a/java/jdk16/files/patch-hotspot-makefiles-vm.make b/java/jdk16/files/patch-hotspot-makefiles-vm.make
index 2c62ca19efef..2926c6c91b18 100644
--- a/java/jdk16/files/patch-hotspot-makefiles-vm.make
+++ b/java/jdk16/files/patch-hotspot-makefiles-vm.make
@@ -1,13 +1,13 @@
 $FreeBSD$
 
---- ../../hotspot/build/bsd/makefiles/vm.make.orig	Sun Jul 29 23:03:30 2007
-+++ ../../hotspot/build/bsd/makefiles/vm.make	Sun Jul 29 23:03:30 2007
-@@ -67,7 +67,7 @@
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
+--- ../../hotspot/build/bsd/makefiles/vm.make.orig	Sat Feb 16 10:44:36 2008
++++ ../../hotspot/build/bsd/makefiles/vm.make	Sat Feb 16 10:45:02 2008
+@@ -70,7 +70,7 @@
+ LIBS += -lm
  
--LIBS += -lm -pthread
-+LIBS += -lm ${PTHREAD_LIBS}
+ ifneq (Darwin, $(UNAME.s))
+-LIBS += -pthread
++LIBS += ${PTHREAD_LIBS}
+ endif
  
  # By default, link the *.o into the library, not the executable.
- LINK_INTO$(LINK_INTO) = LIBJVM
diff --git a/java/jdk16/files/patch-j2se-instrument-Makefile b/java/jdk16/files/patch-j2se-instrument-Makefile
index a72bd3b0c16c..634f541dbfbe 100644
--- a/java/jdk16/files/patch-j2se-instrument-Makefile
+++ b/java/jdk16/files/patch-j2se-instrument-Makefile
@@ -1,13 +1,13 @@
 $FreeBSD$
 
---- ../../j2se/make/java/instrument/Makefile.orig	Fri Oct 26 09:20:07 2007
-+++ ../../j2se/make/java/instrument/Makefile	Fri Oct 26 09:25:39 2007
-@@ -109,7 +109,7 @@
-   ifeq ($(OS_VENDOR), NetBSD)
-     ICONV_DIR = /usr/pkg
-   else
+--- ../../j2se/make/java/instrument/Makefile.orig	Sat Feb 16 11:02:12 2008
++++ ../../j2se/make/java/instrument/Makefile	Sat Feb 16 11:02:38 2008
+@@ -112,7 +112,7 @@
+ 
+ ifeq ($(PLATFORM), bsd)
+   ifneq ($(OS_VENDOR), NetBSD)
 -    ICONV_DIR = /usr/local
 +    ICONV_DIR = ${LOCALBASE}
+     CPPFLAGS += -I$(ICONV_DIR)/include
+     OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv
    endif
-   CPPFLAGS += -I$(ICONV_DIR)/include
-   OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv
diff --git a/java/jdk16/files/patch-j2se-java-localegen.sh b/java/jdk16/files/patch-j2se-java-localegen.sh
deleted file mode 100644
index fbc6351c4f84..000000000000
--- a/java/jdk16/files/patch-j2se-java-localegen.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/make/java/java/localegen.sh.orig	2008-01-06 16:38:14.000000000 +0100
-+++ ../../j2se/make/java/java/localegen.sh	2008-01-06 16:51:26.000000000 +0100
-@@ -22,7 +22,7 @@
- localelist=
- getlocalelist() {
-     localelist=""
--    localelist=`$NAWK -F$1_ '{print $2}' $2 | sort`
-+    localelist=`$SED -e 'y/ /\n/' -e 's/\\\n//g' $2 | $NAWK -F$1_ '{print \$2}' | sort`
- }
- 
- sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" " 
-
-
diff --git a/java/jdk16/files/patch-j2se-npt-Makefile b/java/jdk16/files/patch-j2se-npt-Makefile
index 183dfb31050f..ea36eef02fb3 100644
--- a/java/jdk16/files/patch-j2se-npt-Makefile
+++ b/java/jdk16/files/patch-j2se-npt-Makefile
@@ -1,13 +1,13 @@
 $FreeBSD$
 
---- ../../j2se/make/java/npt/Makefile.orig	Fri Oct 26 10:22:56 2007
-+++ ../../j2se/make/java/npt/Makefile	Fri Oct 26 10:27:55 2007
-@@ -72,7 +72,7 @@
-   ifeq ($(OS_VENDOR), NetBSD)
-     ICONV_DIR = /usr/pkg
-   else
+--- ../../j2se/make/java/npt/Makefile.orig	Sat Feb 16 11:29:58 2008
++++ ../../j2se/make/java/npt/Makefile	Sat Feb 16 11:30:15 2008
+@@ -70,7 +70,7 @@
+ # Add location of iconv headers
+ ifeq ($(PLATFORM), bsd)
+   ifneq ($(OS_VENDOR), NetBSD)
 -    ICONV_DIR = /usr/local
 +    ICONV_DIR = ${LOCALBASE}
+     CPPFLAGS += -I$(ICONV_DIR)/include
+     OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv
    endif
-   CPPFLAGS += -I$(ICONV_DIR)/include
-   OTHER_LDLIBS += -L$(ICONV_DIR)/lib -liconv
diff --git a/java/jdk16/files/patch-j2se-splashscreen-Makefile b/java/jdk16/files/patch-j2se-splashscreen-Makefile
index ec629682d5ae..8f340e32798e 100644
--- a/java/jdk16/files/patch-j2se-splashscreen-Makefile
+++ b/java/jdk16/files/patch-j2se-splashscreen-Makefile
@@ -1,13 +1,13 @@
 $FreeBSD$
 
---- ../../j2se/make/sun/splashscreen/Makefile.orig	Fri Oct 26 10:33:27 2007
-+++ ../../j2se/make/sun/splashscreen/Makefile	Fri Oct 26 10:35:59 2007
-@@ -49,7 +49,7 @@
-     ifeq ($(OS_VENDOR), NetBSD)
-       ICONV_DIR = /usr/pkg
-     else
+--- ../../j2se/make/sun/splashscreen/Makefile.orig	Sat Feb 16 11:45:24 2008
++++ ../../j2se/make/sun/splashscreen/Makefile	Sat Feb 16 11:45:37 2008
+@@ -47,7 +47,7 @@
+   CFLAGS += -DWITH_X11
+   ifeq ($(PLATFORM), bsd)
+     ifneq ($(OS_VENDOR), NetBSD)
 -      ICONV_DIR = /usr/local
 +      ICONV_DIR = ${LOCALBASE}
+       ICONV_LIB = -L$(ICONV_DIR)/lib -liconv
      endif
      CPPFLAGS += -I$(OPENWIN_HOME)/include \
-                 -I$(OPENWIN_HOME)/include/X11/extensions \