Bug#11765489 CMAKE BUILD ON MAC OS X DOES NOT DETERMINE CPU TYPE

Don't use CMAKE_OSX_ARCHITECTURES to determine DEFAULT_MACHINE
if it is not defined.

If we're 64bit, then use "x86_64" rather than "x86"

cmake/package_name.cmake

-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -83,12 +83,20 @@ IF(NOT VERSION)
         MATH(EXPR VER  "${VER} -4")
         SET(DEFAULT_PLATFORM "osx10.${VER}")
       ENDIF()
-      LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
-      IF(LEN GREATER 1)
-        SET(DEFAULT_MACHINE "universal")
+
+      IF(CMAKE_OSX_ARCHITECTURES)
+        LIST(LENGTH CMAKE_OSX_ARCHITECTURES LEN)
+        IF(LEN GREATER 1)
+          SET(DEFAULT_MACHINE "universal")
+        ELSE()
+          SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        ENDIF()
       ELSE()
-        SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
+        IF(64BIT)
+          SET(DEFAULT_MACHINE "x86_64")
+        ENDIF()
       ENDIF()
+
       IF(DEFAULT_MACHINE MATCHES "i386")
         SET(DEFAULT_MACHINE "x86")
       ENDIF()