From 118f931690dffadec32a885340ccf85530642c9e Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Fri, 2 May 2003 15:49:02 +0000
Subject: . Add $FreeBSD$ . Put the MD JNI headers in include/freebsd _not_
 include/bsd.  This   brings the 1.4 port in line with 1.1, 1.2 and 1.3, and
 arguably inline   with Solaris and Linux.

Not-objected-to by:	phantom
---
 java/jdk14/files/patch-common::Defs-bsd.gmk | 12 ++++++++++++
 java/jdk15/files/patch-common::Defs-bsd.gmk | 12 ++++++++++++
 java/jdk16/files/patch-common::Defs-bsd.gmk | 12 ++++++++++++
 3 files changed, 36 insertions(+)

(limited to 'java')

diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk
index fbeca94149d8..3a0209795bfd 100644
--- a/java/jdk14/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk14/files/patch-common::Defs-bsd.gmk
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Mar  7 01:38:41 2003
 +++ ../../j2se/make/common/Defs-bsd.gmk	Fri Mar  7 01:38:01 2003
 @@ -155,7 +155,7 @@
@@ -9,3 +11,13 @@
  # Allow the user to override the default value...
  ifdef ALT_DEVTOOLS_PATH
  DEVTOOLS_PATH = $(subst //,/,$(ALT_DEVTOOLS_PATH)/)
+@@ -194,7 +194,8 @@
+ endif # PLATFORM_SRC
+ 
+ # platform specific include files
+-PLATFORM_INCLUDE  = $(INCLUDEDIR)/$(PLATFORM)
++TRUE_PLATFORM_INCLUDE := $(shell $(ECHO) $(TRUE_PLATFORM) | $(TR) "[:upper:]" "[:lower:]")
++PLATFORM_INCLUDE  = $(INCLUDEDIR)/$(TRUE_PLATFORM_INCLUDE)
+ 
+ #
+ # Default BOOTDIR
diff --git a/java/jdk15/files/patch-common::Defs-bsd.gmk b/java/jdk15/files/patch-common::Defs-bsd.gmk
index fbeca94149d8..3a0209795bfd 100644
--- a/java/jdk15/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-common::Defs-bsd.gmk
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Mar  7 01:38:41 2003
 +++ ../../j2se/make/common/Defs-bsd.gmk	Fri Mar  7 01:38:01 2003
 @@ -155,7 +155,7 @@
@@ -9,3 +11,13 @@
  # Allow the user to override the default value...
  ifdef ALT_DEVTOOLS_PATH
  DEVTOOLS_PATH = $(subst //,/,$(ALT_DEVTOOLS_PATH)/)
+@@ -194,7 +194,8 @@
+ endif # PLATFORM_SRC
+ 
+ # platform specific include files
+-PLATFORM_INCLUDE  = $(INCLUDEDIR)/$(PLATFORM)
++TRUE_PLATFORM_INCLUDE := $(shell $(ECHO) $(TRUE_PLATFORM) | $(TR) "[:upper:]" "[:lower:]")
++PLATFORM_INCLUDE  = $(INCLUDEDIR)/$(TRUE_PLATFORM_INCLUDE)
+ 
+ #
+ # Default BOOTDIR
diff --git a/java/jdk16/files/patch-common::Defs-bsd.gmk b/java/jdk16/files/patch-common::Defs-bsd.gmk
index fbeca94149d8..3a0209795bfd 100644
--- a/java/jdk16/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk16/files/patch-common::Defs-bsd.gmk
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Mar  7 01:38:41 2003
 +++ ../../j2se/make/common/Defs-bsd.gmk	Fri Mar  7 01:38:01 2003
 @@ -155,7 +155,7 @@
@@ -9,3 +11,13 @@
  # Allow the user to override the default value...
  ifdef ALT_DEVTOOLS_PATH
  DEVTOOLS_PATH = $(subst //,/,$(ALT_DEVTOOLS_PATH)/)
+@@ -194,7 +194,8 @@
+ endif # PLATFORM_SRC
+ 
+ # platform specific include files
+-PLATFORM_INCLUDE  = $(INCLUDEDIR)/$(PLATFORM)
++TRUE_PLATFORM_INCLUDE := $(shell $(ECHO) $(TRUE_PLATFORM) | $(TR) "[:upper:]" "[:lower:]")
++PLATFORM_INCLUDE  = $(INCLUDEDIR)/$(TRUE_PLATFORM_INCLUDE)
+ 
+ #
+ # Default BOOTDIR
-- 
cgit v1.2.3