[arch-commits] Commit in go/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Wednesday, November 21, 2018 @ 10:49:43
  Author: arodseth
Revision: 409263

Revert the unjust revert

Modified:
  go/trunk/PKGBUILD

----------+
 PKGBUILD |   34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-21 10:36:13 UTC (rev 409262)
+++ PKGBUILD	2018-11-21 10:49:43 UTC (rev 409263)
@@ -1,17 +1,27 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Maintainer: Pierre Neidhardt <ambrevar at gmail.com>
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: Rémy Oudompheng <remy at archlinux.org>
+# Contributor: Andres Perera <andres87p gmail>
+# Contributor: Matthew Bauer <mjbauer95 at gmail.com>
+# Contributor: Christian Himpel <chressie at gmail.com>
+# Contributor: Mike Rosset <mike.rosset at gmail.com>
+# Contributor: Daniel YC Lin <dlin.tw at gmail.com>
+# Contributor: John Luebs <jkluebs at gmail.com>
 
 pkgbase=go
 pkgname=(go go-pie)
 epoch=2
 pkgver=1.11.2
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
-url='http://golang.org/'
+url='https://golang.org/'
 license=(BSD)
 makedepends=(git go)
-source=(https://storage.googleapis.com/golang/go$pkgver.src.tar.gz
-        default-buildmode-pie.patch)
+source=("https://storage.googleapis.com/golang/go$pkgver.src.tar.gz"
+        'default-buildmode-pie.patch')
 sha256sums=('042fba357210816160341f1002440550e952eb12678f7c9e7e9d389437942550'
             '9d2f0d201d4e002d74f548cc82bd131139bab5dd62191004c71dd430fdc1666d')
 
@@ -24,10 +34,10 @@
 export GOCACHE=off
 
 prepare() {
-  cp -r $pkgbase ${pkgbase}-pie
+  cp -r $pkgbase $pkgbase-pie
 
-  cd ${pkgbase}-pie
-  patch -p1 -i "$srcdir"/default-buildmode-pie.patch
+  cd $pkgbase-pie
+  patch -p1 -i "$srcdir/default-buildmode-pie.patch"
 }
 
 build() {
@@ -68,14 +78,14 @@
   ln -sf /usr/lib/go/bin/gofmt "$pkgdir/usr/bin/gofmt"
   ln -sf /usr/share/doc/go "$pkgdir/usr/lib/go/doc"
 
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/go/LICENSE"
   install -Dm644 VERSION "$pkgdir/usr/lib/go/VERSION"
 
-  rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap"
-  rm -rf "$pkgdir/usr/lib/go/pkg/tool/*/api"
+  rm -rf "$pkgdir/usr/lib/go/pkg/bootstrap" "$pkgdir/usr/lib/go/pkg/tool/*/api"
 
   # TODO: Figure out if really needed
   rm -rf "$pkgdir"/usr/lib/go/pkg/obj/go-build/*
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$1/LICENSE"
 }
 
 package_go() {
@@ -91,3 +101,5 @@
 
   _package $pkgname
 }
+
+# vim: ts=2 sw=2 et