git » go-1.20.git » commit d0e27de

diff --git a/PKGBUILD b/PKGBUILD
index a50ef2c..272a33b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,22 @@
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
 # Contributor: Christian Himpel <chressie at gmail dot com>
+# Contributor: Mike "str1ngs" Rosset
 
 pkgname=go
 pkgver=1
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('i686' 'x86_64')
 url="http://golang.org/"
 license=('custom')
-depends=('perl' 'ed')
+depends=('perl' 'ed' 'gawk')
 makedepends=('mercurial' 'inetutils')
-options=('!strip')
+options=('!strip' '!emptydirs')
 install=$pkgname.install
 source=($pkgname.sh)
-md5sums=('67c472bfcfdb760d1d1f0a87cfe3661f')
+md5sums=('e7087d190fd519db3be5adb3a51194cc')
 
 build() {
   _hgroot="https://go.googlecode.com/hg/"
@@ -34,13 +35,13 @@ build() {
   fi
 
   msg "Mercurial checkout done or server timeout"
-  msg "Starting make..."
 
   rm -rf "$srcdir/$_hgrepo-build"
   cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
   cd "$srcdir/$_hgrepo-build"
 
   export GOROOT="$srcdir/$_hgrepo-build"
+  export GOOS_FINAL="/usr/lib/go"
   export GOOS=linux
   export GOBIN="$GOROOT/bin"
   export PATH="$GOBIN:$PATH"
@@ -56,10 +57,14 @@ package() {
 
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/go/LICENSE
   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
+  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}}
 
@@ -68,18 +73,23 @@ package() {
   ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc
   cp -r pkg $pkgdir/usr/lib/go
   cp -r $GOROOT/src/pkg $pkgdir/usr/lib/go/src/ 
+  cp -r $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd
   cp -r $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/ 
   cp -r $GOROOT/lib $pkgdir/usr/lib/go/ 
 
   install -Dm644 src/Make.* $pkgdir/usr/lib/go/src
 
-  # remove object files from target src dir
+  # Remove object files from target src dir
   find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete
   find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete
 
   # 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 -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/
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/go.sh b/go.sh
index 4aa526a..8393dc8 100644
--- a/go.sh
+++ b/go.sh
@@ -1,3 +1 @@
 export GOROOT=/usr/lib/go
-export GOOS=linux
-export GOBIN=/usr/bin