git » go-1.20.git » commit 75a43fe

Fixed FS#29303

author Alexander Rødseth
2012-04-06 10:12:50 UTC
committer Alexander Rødseth
2012-04-06 10:12:50 UTC
parent 63b4d584d3a8a0bb736431a6e9f9410cf09b1b90

Fixed FS#29303

PKGBUILD +22 -14
go.install +2 -2

diff --git a/PKGBUILD b/PKGBUILD
index 92bfbb8..c6759c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,25 @@
 # Contributor: Andres Perera <andres87p gmail>
 # Contributor: Matthew Bauer <mjbauer95@gmail.com>
 # Contributor: Christian Himpel <chressie at gmail dot com>
-# Contributor: Mike "str1ngs" Rosset
+# Contributor: Mike Rosset <mike.rosset@gmail.com>
+# Contributor: Daniel YC Lin <dlin.tw@gmail.com>
 
 pkgname=go
 pkgver=1
-pkgrel=4
+pkgrel=5
 epoch=2
 pkgdesc='Google Go compiler and tools (release version)'
 arch=('x86_64' 'i686')
 url="http://golang.org/"
 license=('custom')
-depends=('perl' 'ed' 'gawk')
-makedepends=('mercurial' 'inetutils')
+depends=('perl' 'ed' 'gawk' 'mercurial')
+makedepends=('inetutils')
 options=('!strip' '!emptydirs')
 install=go.install
 source=("$pkgname"
         "$pkgname.sh")
-md5sums=('c14a33c0d138f9cd19264a8dd0b809a7'
-         'e7087d190fd519db3be5adb3a51194cc')
+sha1sums=('655754d95688294b0cf2334a1155432884f92859'
+          'a760c32cbad5a013f384a086efb3b8b8fd88794f')
 
 build() {
   _hgroot="https://go.googlecode.com/hg/"
@@ -57,16 +58,23 @@ build() {
 package() {
   cd "$srcdir/release-build"
 
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/go/LICENSE
-  install -Dm644 misc/bash/go $pkgdir/etc/bash_completion.d/go
+  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
+    "$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
+    "$pkgdir/usr/share/emacs/site-lisp/go-mode.el"
+  install -Dm644 misc/zsh/go \
+    "$pkgdir/usr/share/zsh/site-functions/_go"
+
+  for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \
+    ftplugin/go/fmt.vim ftplugin/go/godoc.vim ftplugin/go/import.vim \
+    syntax/go.vim syntax/godoc.vim plugin/godoc.vim;
+  do
+    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}}
 
diff --git a/go.install b/go.install
index 9a87b9d..f248ac2 100644
--- a/go.install
+++ b/go.install
@@ -1,10 +1,10 @@
 post_upgrade() {
   # Backup any previous /usr/lib/go/bin directory
-  if [ -e /usr/lib/go/bin ]; then
+  if [ -d /usr/lib/go/bin ]; then
     mv /usr/lib/go/bin /usr/lib/go/bin.pacnew
   fi
 
-  # Point /usr/lib/go/bin to /usr/bin
+  # Point /usr/lib/go/bin to /usr/bin instead
   #
   # This is to make go get code.google.com/p/go-tour/gotour and
   # then running the gotour executable work out of the box.