- Sync w/ FreeBSD ports.

- Some misc fixes such as add about three missing files, need to bump and etc.
- Reset $FreeBSD$, it was not supposed to be include in this commit as I want
  to keep it seperate, but I accidented ran the script. Ah well.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7696 df743ca5-7f9a-e211-a948-0013205c9059

19 files changed, 19 insertions, 19 deletions

diff --git a/java/jdk15/files/patch-control::common::Defs-bsd.gmk b/java/jdk15/files/patch-control::common::Defs-bsd.gmk
index 2690cb8cd..e5701664b 100644
--- a/java/jdk15/files/patch-control::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-control::common::Defs-bsd.gmk
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-control::common::Defs-bsd.gmk,v 1.2 2005/01/20 08:41:13 phantom Exp $
+$FreeBSD$
 
 --- ../../control/make/common/Defs-bsd.gmk.orig	Thu Jan 13 02:01:40 2005
 +++ ../../control/make/common/Defs-bsd.gmk	Thu Jan 13 02:01:54 2005
diff --git a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
index c15ed4cb1..a864ac0ef 100644
--- a/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-deploy::common::Defs-bsd.gmk,v 1.4 2006/04/07 03:27:34 glewis Exp $
+$FreeBSD$
 
 --- ../../deploy/make/plugin/common/Defs-bsd.gmk.orig	Tue Mar 28 22:20:28 2006
 +++ ../../deploy/make/plugin/common/Defs-bsd.gmk	Tue Mar 28 22:20:45 2006
diff --git a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
index 3eee15710..78d8d2588 100644
--- a/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
+++ b/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-deploy::jcomponent::CPluginVM_OP.cpp,v 1.1 2006/07/18 23:23:02 glewis Exp $
+$FreeBSD$
 
 --- ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp.orig	Tue Oct 19 15:04:42 2004
 +++ ../../deploy/src/plugin/share/jcomponent/CPluginVM_OP.cpp	Thu Jul  6 17:09:36 2006
diff --git a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
index f49e18e89..fd5b16551 100644
--- a/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
+++ b/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-deploy::jvm_exec::java_vm.c,v 1.1 2006/07/18 23:23:02 glewis Exp $
+$FreeBSD$
 
 --- ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c.orig	Thu Jul  6 17:10:12 2006
 +++ ../../deploy/src/plugin/solaris/jvm_exec/java_vm.c	Thu Jul  6 17:10:12 2006
diff --git a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
index 6ae176a01..6a44c9ce8 100644
--- a/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
+++ b/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-deploy::nscore::JavaVM5.cpp,v 1.1 2006/07/18 23:23:02 glewis Exp $
+$FreeBSD$
 
 --- ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp.orig	Thu Jun 15 18:08:03 2006
 +++ ../../deploy/src/plugin/solaris/nscore/JavaVM5.cpp	Thu Jul  6 17:10:37 2006
diff --git a/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp b/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp
index 7db9d325f..866fd9ace 100644
--- a/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp
+++ b/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-hotspot::vm::globals_bsd_amd64.hpp,v 1.1 2006/06/16 21:26:38 glewis Exp $
+$FreeBSD$
 
 --- ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp.orig	Thu Jun 15 17:58:02 2006
 +++ ../../hotspot/src/os_cpu/bsd_amd64/vm/globals_bsd_amd64.hpp	Thu Jun 15 17:59:02 2006
diff --git a/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp b/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp
index 143bbc3de..794d795d0 100644
--- a/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp
+++ b/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-hotspot::vm::thread_bsd.inline.hpp,v 1.1 2006/06/16 21:29:53 glewis Exp $
+$FreeBSD$
 
 --- ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp.orig	Thu Jun 15 17:58:02 2006
 +++ ../../hotspot/src/os/bsd/vm/thread_bsd.inline.hpp	Thu Jun 15 17:59:19 2006
diff --git a/java/jdk15/files/patch-j2se::awt::canvas.c b/java/jdk15/files/patch-j2se::awt::canvas.c
index 3891153c3..cf69af4aa 100644
--- a/java/jdk15/files/patch-j2se::awt::canvas.c
+++ b/java/jdk15/files/patch-j2se::awt::canvas.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::awt::canvas.c,v 1.1 2006/04/25 20:10:19 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/src/solaris/native/sun/awt/canvas.c	10 Jan 2005 15:09:40 -0000	1.2
 +++ ../../j2se/src/solaris/native/sun/awt/canvas.c	19 Apr 2006 22:21:51 -0000
diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
index c3db15f3c..5fe62075f 100644
--- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk,v 1.2 2005/09/20 20:00:08 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/make/common/Defs-bsd.gmk.orig	Thu Jan 13 02:03:20 2005
 +++ ../../j2se/make/common/Defs-bsd.gmk	Thu Jan 13 02:03:38 2005
diff --git a/java/jdk15/files/patch-j2se::font::t1.c b/java/jdk15/files/patch-j2se::font::t1.c
index 80e2aa17e..7cb654bf7 100644
--- a/java/jdk15/files/patch-j2se::font::t1.c
+++ b/java/jdk15/files/patch-j2se::font::t1.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::font::t1.c,v 1.1 2006/08/01 18:38:25 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/src/share/native/sun/font/t2k/t1.c.orig	Tue Oct 19 15:00:39 2004
 +++ ../../j2se/src/share/native/sun/font/t2k/t1.c	Tue Jul 18 21:42:18 2006
diff --git a/java/jdk15/files/patch-j2se::instrument::Makefile b/java/jdk15/files/patch-j2se::instrument::Makefile
index ad378e8a2..8934bfc11 100644
--- a/java/jdk15/files/patch-j2se::instrument::Makefile
+++ b/java/jdk15/files/patch-j2se::instrument::Makefile
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::instrument::Makefile,v 1.3 2006/04/07 03:27:34 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/make/java/instrument/Makefile.orig	Thu Jan 13 02:04:44 2005
 +++ ../../j2se/make/java/instrument/Makefile	Thu Jan 13 02:05:03 2005
diff --git a/java/jdk15/files/patch-j2se::io::io_util.h b/java/jdk15/files/patch-j2se::io::io_util.h
index 7a57b60c1..0230858c0 100644
--- a/java/jdk15/files/patch-j2se::io::io_util.h
+++ b/java/jdk15/files/patch-j2se::io::io_util.h
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::io::io_util.h,v 1.1 2006/09/09 02:10:02 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/src/share/native/java/io/io_util.h	8 Nov 2004 22:27:35 -0000	1.1.1.1
 +++ ../../j2se/src/share/native/java/io/io_util.h	7 Sep 2006 19:40:19 -0000
diff --git a/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c b/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c
index d92edf05e..64f8f4ebd 100644
--- a/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c
+++ b/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::lang::ProcessEnvironment_md.c,v 1.1 2006/06/16 21:28:08 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c.orig	Tue Oct 19 15:02:09 2004
 +++ ../../j2se/src/solaris/native/java/lang/ProcessEnvironment_md.c	Thu Jun 15 17:58:34 2006
diff --git a/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c b/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
index eb2bacd82..8dea374d1 100644
--- a/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
+++ b/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::nio::ch::FileChannelImpl.c,v 1.1 2006/07/18 23:20:26 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c.orig	Fri Jul  7 10:47:18 2006
 +++ ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c	Fri Jul  7 14:48:06 2006
diff --git a/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh b/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh
index 2802a33b9..fd6137cab 100644
--- a/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh
+++ b/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh,v 1.1 2005/04/08 18:29:29 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/make/java/nio/genCharsetProvider.sh	8 Nov 2004 22:27:03 -0000	1.1.1.1
 +++ ../../j2se/make/java/nio/genCharsetProvider.sh	24 Mar 2005 16:14:52 -0000
diff --git a/java/jdk15/files/patch-j2se::xawt::XWindow.c b/java/jdk15/files/patch-j2se::xawt::XWindow.c
index 107de522b..6060511e8 100644
--- a/java/jdk15/files/patch-j2se::xawt::XWindow.c
+++ b/java/jdk15/files/patch-j2se::xawt::XWindow.c
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-j2se::xawt::XWindow.c,v 1.1 2006/04/25 20:10:19 glewis Exp $
+$FreeBSD$
 
 --- ../../j2se/src/solaris/native/sun/xawt/XWindow.c	8 Nov 2004 22:27:40 -0000	1.1.1.1
 +++ ../../j2se/src/solaris/native/sun/xawt/XWindow.c	19 Apr 2006 22:21:51 -0000
diff --git a/java/jdk15/files/patch-vm::os_bsd.cpp b/java/jdk15/files/patch-vm::os_bsd.cpp
index 6d1762d17..25bd71db8 100644
--- a/java/jdk15/files/patch-vm::os_bsd.cpp
+++ b/java/jdk15/files/patch-vm::os_bsd.cpp
@@ -1,4 +1,4 @@
-$FreeBSD: ports/java/jdk15/files/patch-vm::os_bsd.cpp,v 1.3 2005/09/20 20:00:08 glewis Exp $
+$FreeBSD$
 
 --- ../../hotspot/src/os/bsd/vm/os_bsd.cpp.orig	Tue Jan 27 17:54:28 2004
 +++ ../../hotspot/src/os/bsd/vm/os_bsd.cpp	Tue Jan 27 17:55:21 2004
diff --git a/java/jdk15/files/pkg-deinstall.in b/java/jdk15/files/pkg-deinstall.in
index e290f2a08..167d5bd28 100644
--- a/java/jdk15/files/pkg-deinstall.in
+++ b/java/jdk15/files/pkg-deinstall.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/java/jdk15/files/pkg-deinstall.in,v 1.1 2005/11/23 10:12:33 glewis Exp $
+# $FreeBSD$
 
 # Set up a standard path
 PATH=/usr/bin:/bin
diff --git a/java/jdk15/files/pkg-install.in b/java/jdk15/files/pkg-install.in
index 6f5fa178b..c5f4a70db 100644
--- a/java/jdk15/files/pkg-install.in
+++ b/java/jdk15/files/pkg-install.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/java/jdk15/files/pkg-install.in,v 1.6 2005/11/23 21:16:56 glewis Exp $
+# $FreeBSD$
 
 # System preference location
 JRE_HOME=%%JRE_HOME%%