Fri May 18 00:02:20 UTC 2012

3 files changed, 37 insertions, 22 deletions

diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 16f3154b8..ab6e73e97 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 70575 2012-05-11 22:56:57Z remy $
+# $Id: PKGBUILD 70799 2012-05-16 17:49:57Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Rémy Oudompheng  <remy@archlinux.org>
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
-# Contributor: Christian Himpel <chressie at gmail dot com>
+# Contributor: Christian Himpel <chressie@gmail.com>
 # Contributor: Mike Rosset <mike.rosset@gmail.com>
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
 pkgver=1.0.1
-pkgrel=3
+pkgrel=5
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('x86_64' 'i686')
@@ -19,22 +20,27 @@ depends=('perl' 'gawk')
 makedepends=('inetutils')
 options=('!strip' '!emptydirs')
 install=go.install
-source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz")
-sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6')
+source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
+        "$pkgname.sh")
+sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6'
+          '0e8c7edc9d788be3518367bf04bdb5ff8b6bbdcf')
 
 build() {
   cd "$srcdir/$pkgname"
+
   export GOROOT_FINAL="/usr/lib/go"
   export GOOS=linux
 
-  cd src && bash make.bash 
+  cd src && bash make.bash
 }
 
 check() {
-  # TestSimpleMulticastListener will fail in standard chroot.
   cd "$srcdir/$pkgname"
+
   export GOROOT="$srcdir/$pkgname"
   export PATH="$srcdir/$pkgname/bin:$PATH"
+
+  # TestSimpleMulticastListener will fail in standard chroot.
   cd src && bash run.bash --no-rebuild || true
 }
 
@@ -59,28 +65,31 @@ package() {
     install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f"
   done
 
-  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/go/src}}
 
-  cp -r doc misc -t $pkgdir/usr/share/go
-  ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc
-  cp -r --preserve=timestamps bin $pkgdir/usr
-  cp -r --preserve=timestamps pkg $pkgdir/usr/lib/go
-  cp -r --preserve=timestamps $GOROOT/src/pkg $pkgdir/usr/lib/go/src/ 
-  cp -r --preserve=timestamps $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd
-  cp -r --preserve=timestamps $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/ 
-  cp -r --preserve=timestamps $GOROOT/lib $pkgdir/usr/lib/go/ 
+  cp -r doc misc -t "$pkgdir/usr/share/go"
+  ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc"
+  cp -r --preserve=timestamps bin "$pkgdir/usr"
+  cp -r --preserve=timestamps pkg "$pkgdir/usr/lib/go"
+  cp -r --preserve=timestamps $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/"
+  cp -r --preserve=timestamps $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd"
+  cp -r --preserve=timestamps $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/"
+  cp -r --preserve=timestamps $GOROOT/lib "$pkgdir/usr/lib/go/"
 
-  install -Dm644 src/Make.* $pkgdir/usr/lib/go/src
+  install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src"
 
   # 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
+  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
+    "$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
+    "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h"
+
+  # For packages that source /etc/profile.d/go.sh
+  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
 
   rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin"
 }
diff --git a/community/go/go.install b/community/go/go.install
index decdeccf5..25b9690ac 100644
--- a/community/go/go.install
+++ b/community/go/go.install
@@ -14,6 +14,12 @@ post_upgrade() {
   # setting the appropriate environment variables.
   #
   ln -sf /usr/bin /usr/lib/go/bin
+
+  # Friendly message to the user
+  echo "Example use of the \"go\" tool as a user:"
+  echo "    mkdir ~/go"
+  echo "    export GOPATH=~/go"
+  echo "    go get website.com/user/module"
 }
 
 post_install() {
diff --git a/community/go/go.sh b/community/go/go.sh
index 8393dc8d2..a0109ba97 100755..100644
--- a/community/go/go.sh
+++ b/community/go/go.sh
@@ -1 +1 @@
-export GOROOT=/usr/lib/go
+export GOPATH=/usr/lib/go/site