jdk: Path corrections (utils & cups)

[Greg Lewis]

G'day Kurt,

On Wed, Jan 14, 2009 at 12:10:51PM -0500, Kurt Miller wrote:
> Greg Lewis wrote:
> >> +  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
> > 
> > NAWK and UNZIP for Apple are the same as the default, so they don't need
> > to be overridden.
> 
> OS X doesn't have nawk but instead just awk. You are
> correct about UNZIP, I missed the path was default.

D'oh, I missed the nawk/awk difference.

> >> +    UNZIPSFX   = $(UTILS_USR_BIN_PATH)unzipsfx
> >> +    ZIP        = $(UTILS_USR_BIN_PATH)zip
> > 
> > This should be ZIPEXE based on the default variables.
> 
> Yes. Good catch, thank you.
> 
> >> +  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
> 
> The update diff is attached.

I think this and the other updated diff are fine to commit, fwiw.

> diff -r 8663c12b4c56 make/common/shared/Defs-bsd.gmk
> --- a/make/common/shared/Defs-bsd.gmk	Mon Jan 12 21:15:53 2009 -0800
> +++ b/make/common/shared/Defs-bsd.gmk	Tue Jan 13 21:42:12 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 8663c12b4c56 make/common/shared/Defs-utils.gmk
> --- a/make/common/shared/Defs-utils.gmk	Mon Jan 12 21:15:53 2009 -0800
> +++ b/make/common/shared/Defs-utils.gmk	Tue Jan 13 21:42:12 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,31 @@
>  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
> +    UNZIPSFX   = $(UTILS_USR_BIN_PATH)unzipsfx
> +    ZIPEXE     = $(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


-- 
Greg Lewis                          Email   : glewis at eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis at FreeBSD.org