jdk: Path corrections (utils & cups)

[Kurt Miller]

The following diff cleans up paths for utils defined Def-utils.gmk
as well as setting the correct default cups headers path for Apple.

I have tested it on OpenBSD and FreeBSD but I don't have OS X on
x86 to do a test build. However, I carefully checked the paths on
my Lepoard/ppc laptop to ensure they are correct for Apple too.

- Set DEVTOOLS_PATH to $(PACKAGE_PATH)/bin/ which is the correct
  location for tools that don't come preinstalled with the platform.
- Set _CUPS_HEADERS_PATH correctly for Apple which comes
  with cups.
- Set up full paths to utils defined in Defs-utils.gmk
  for bsd with exceptions for OS_VENDOR differences.

diff -r 52c015181055 make/common/shared/Defs-bsd.gmk
--- a/make/common/shared/Defs-bsd.gmk	Sat Jan 10 22:13:03 2009 -0500
+++ b/make/common/shared/Defs-bsd.gmk	Sun Jan 11 21:30:19 2009 -0500
@@ -107,7 +107,7 @@
 ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
   DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
 else
-  DEVTOOLS_PATH =/usr/bin/
+  DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
 endif
 
 # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
@@ -121,7 +121,11 @@
 BUILD_HEADLESS = true
 LIBM=-lm
 
-_CUPS_HEADERS_PATH=$(PACKAGE_PATH)/include
+ifeq ($(OS_VENDOR), Apple)
+  _CUPS_HEADERS_PATH=/usr/include
+else
+  _CUPS_HEADERS_PATH=$(PACKAGE_PATH)/include
+endif
 
 # Import JDK images allow for partial builds, components not built are
 #    imported (or copied from) these import areas when needed.
diff -r 52c015181055 make/common/shared/Defs-utils.gmk
--- a/make/common/shared/Defs-utils.gmk	Sat Jan 10 22:13:03 2009 -0500
+++ b/make/common/shared/Defs-utils.gmk	Sun Jan 11 21:30:19 2009 -0500
@@ -64,6 +64,13 @@
   UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
   UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
   UTILS_CCS_BIN_PATH=$(UNIXCOMMAND_PATH)
+  UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
+endif
+
+ifeq ($(PLATFORM),bsd)
+  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
+  UTILS_USR_BIN_PATH=$(USRBIN_PATH)
+  UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
   UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
 endif
 
@@ -202,6 +209,32 @@
 endif
 
 # BSD specific
-ifeq ($(SYSTEM_UNAME),Darwin)
-  NAWK = $(USRBIN_PATH)awk
+ifeq ($(PLATFORM),bsd)
+  BASENAME     = $(UTILS_USR_BIN_PATH)basename
+  EGREP        = $(UTILS_USR_BIN_PATH)egrep
+  EXPR         = $(UTILS_COMMAND_PATH)expr
+  FMT          = $(UTILS_USR_BIN_PATH)fmt
+  GREP         = $(UTILS_USR_BIN_PATH)grep
+  GUNZIP       = $(UTILS_USR_BIN_PATH)gunzip
+  ID           = $(UTILS_USR_BIN_PATH)id
+  MSGFMT       = $(UTILS_DEVTOOL_PATH)msgfmt
+  SED          = $(UTILS_USR_BIN_PATH)sed
+  SORT         = $(UTILS_USR_BIN_PATH)sort
+  TEST         = $(UTILS_COMMAND_PATH)test
+  TOUCH        = $(UTILS_USR_BIN_PATH)touch
+  TRUE         = $(UTILS_USR_BIN_PATH)true
+  UNAME        = $(UTILS_USR_BIN_PATH)uname
+  # BSD OS_VENDOR specific
+  ifeq ($(OS_VENDOR), Apple)
+    NAWK       = $(UTILS_USR_BIN_PATH)awk
+    UNZIP      = $(UTILS_USR_BIN_PATH)unzip
+    UNZIPSFX   = $(UTILS_USR_BIN_PATH)unzipsfx
+    ZIP        = $(UTILS_USR_BIN_PATH)zip
+  else
+    UNZIP      = $(UTILS_DEVTOOL_PATH)unzip
+  endif
+  ifneq ($(OS_VENDOR), OpenBSD)
+    CPIO       = $(UTILS_USR_BIN_PATH)cpio
+    TAR        = $(UTILS_USR_BIN_PATH)tar
+  endif
 endif