--- ../orig/go/PKGBUILD	2010-08-16 03:55:09.000000000 -0700
+++ ./PKGBUILD	2010-08-16 17:17:35.621671459 -0700
@@ -6,7 +6,7 @@
 pkgname=go
 pkgver=2010_08_11
 _pkgver=2010-08-11
-pkgrel=2
+pkgrel=3
 pkgdesc='Google Go compiler and tools (release version)'
 arch=(i686 x86_64)
 url=http://golang.org/
@@ -24,8 +24,6 @@
 
   cd $srcdir
 
-  msg "Note: the build currently fails if you have an older version of go installed."
-
   msg "Connecting to Mercurial server..."
   if [ -d $hgrepo ]; then
     cd $hgrepo
@@ -59,21 +57,25 @@
   install -Dm644 misc/bash/go $pkgdir/etc/bash_completion.d/go
   install -Dm644 misc/emacs/go-mode-load.el $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el
   install -Dm644 misc/emacs/go-mode.el $pkgdir/usr/share/emacs/site-lisp/go-mode.el
+  install -Dm644 misc/vim/ftdetect/gofiletype.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/gofiletype.vim
   install -Dm644 misc/vim/syntax/go.vim $pkgdir/usr/share/vim/vimfiles/syntax/go.vim
 
-  mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}}
+  mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go/lib,lib/go/src}}
 
   cp -r bin $pkgdir/usr
   cp -r doc misc -t $pkgdir/usr/share/go
+  cp -r lib/godoc $pkgdir/usr/lib/go/lib
   cp -r pkg $pkgdir/usr/lib/go
 
+  ln -s ../../share/go/doc $pkgdir/usr/lib/go/doc
+
   install -Dm644 src/Make.{$GOARCH,common,cmd,pkg,conf} $pkgdir/usr/lib/go/src
 
   # Headers for C modules
   install -Dm644 src/pkg/runtime/runtime.h $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h
   install -Dm644 src/pkg/runtime/cgocall.h $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h
 
-  install  $srcdir/go.sh $pkgdir/etc/profile.d/ 
-  
+  install  $srcdir/go.sh $pkgdir/etc/profile.d/
+
   echo export GOARCH=$GOARCH >> $pkgdir/etc/profile.d/go.sh
 }