diff -ru ../../../cvshead/pkgsrc/bootstrap//bootstrap ./bootstrap
--- ../../../cvshead/pkgsrc/bootstrap//bootstrap        Mon Nov 20 16:21:37 2006
+++ ./bootstrap Fri Nov 24 17:06:47 2006
@@ -140,6 +140,15 @@
                abi=32
                fi
                ;;
+       SunOS)
+               # Search the compiler default 32/64
+               unset abi
+               lp64_def=`${CC:-gcc}  -E - -dM -# </dev/null 2>&1 | egrep 'sparcv9|__x86_64__'`
+               #lp64_def=`${CC:-gcc} -E - -dM </dev/null 2>/dev/null | grep __LP64__`
+               if [ ! -z "$lp64_def" ] ; then
+                       abi=64
+               fi
+               ;;
        esac
 }
 
@@ -450,8 +459,17 @@
        need_sed=yes
        set_opsys=no
        whoamiprog=/usr/ucb/whoami
-       machine_arch=`uname -p | sed -e 's/i86pc/i386/'`
-       check_compiler=yes
+       get_abi "SunOS"
+       if [ "X${abi}" = "X64" ] ; then
+               machine_arch=`uname -p | sed -e 's/i86pc/x86_64/' |sed -e 's/i386/x86_64/' |sed -e 's/sparc/sparc64/'`
+               bmakexargs="MACHINE_ARCH=$machine_arch"
+       else
+               machine_arch=`uname -p | sed -e 's/i86pc/i386/'`
+               check_compiler=yes
+       fi
+       echo "ABI = $abi"
+       echo "MACHINE_ARCH=$machine_arch"
+
        ;;
 AIX)
        root_group=system