Mon May 7 00:01:27 UTC 2012

2 files changed, 22 insertions, 29 deletions

diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index ff3cd3f8f..4be7ea328 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69644 2012-04-20 22:36:38Z tdziedzic $
+# $Id: PKGBUILD 70381 2012-05-05 13:14:13Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andres Perera <andres87p gmail>
@@ -8,43 +8,28 @@
 # Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
-pkgver=1
-pkgrel=6
+pkgver=1.0.1
+pkgrel=1
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('x86_64' 'i686')
 url="http://golang.org/"
 license=('custom')
-depends=('perl' 'ed' 'gawk' 'mercurial')
+depends=('perl' 'ed' 'gawk')
 makedepends=('inetutils')
 options=('!strip' '!emptydirs')
 install=go.install
-source=("$pkgname"
+source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz"
+        "$pkgname.run"
         "$pkgname.sh")
-sha1sums=('655754d95688294b0cf2334a1155432884f92859'
+sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6'
+          '655754d95688294b0cf2334a1155432884f92859'
           'a760c32cbad5a013f384a086efb3b8b8fd88794f')
 
 build() {
-  _hgroot="https://go.googlecode.com/hg/"
-  _hgrepo="release"
-
-  cd "$srcdir"
-
-  msg "Connecting to Mercurial server...."
-  if [[ -d $_hgrepo ]] ; then
-    cd $_hgrepo
-    hg pull -u
-    msg "The local files are updated."
-  else
-    hg clone $_hgroot $_hgrepo
-  fi
-  msg "Mercurial checkout done or server timeout"
-
-  rm -rf "$srcdir/$_hgrepo-build"
-  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
-  cd "$srcdir/$_hgrepo-build"
-
-  export GOROOT="$srcdir/$_hgrepo-build"
+  cd "$srcdir/$pkgname"
+
+  export GOROOT="$srcdir/$pkgname"
   export GOOS_FINAL="/usr/lib/go"
   export GOOS=linux
   export GOBIN="$GOROOT/bin"
@@ -52,12 +37,12 @@ build() {
 
   mkdir -p "$GOROOT/bin"
   cd "$GOROOT/src"
-  hg update release-branch.go$pkgver
+
   . ./make.bash 
 }
 
 package() {
-  cd "$srcdir/release-build"
+  cd "$srcdir/$pkgname"
 
   install -Dm644 LICENSE \
     "$pkgdir/usr/share/licenses/go/LICENSE"
@@ -103,7 +88,7 @@ package() {
   install $srcdir/go.sh $pkgdir/etc/profile.d/
 
   mv "$pkgdir/usr/bin/go" "$pkgdir/usr/bin/go.elf"
-  install -Dm755 "$srcdir/go" "$pkgdir/usr/bin/go"
+  install -Dm755 "$srcdir/go.run" "$pkgdir/usr/bin/go"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/go/go.run b/community/go/go.run
new file mode 100644
index 000000000..2f68ce8ff
--- /dev/null
+++ b/community/go/go.run
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [[ -z $GOROOT ]]; then
+    export GOROOT=/usr/lib/go
+fi
+if [[ -z $GOROOT_FINAL ]]; then
+    export GOROOT_FINAL=$GOROOT
+fi
+/usr/bin/go.elf "$@"