From 3b617119c76ced5d47a597cbff998b294a8d14ca Mon Sep 17 00:00:00 2001
From: Dominik Honnef <dominik@honnef.co>
Date: Mon, 4 May 2015 13:39:15 +0200
Subject: [PATCH] build-style/go: support building multiple packages

---
 Manual.md                            |  4 ++--
 common/build-style/go.sh             | 10 ++++------
 common/environment/build-style/go.sh |  1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Manual.md b/Manual.md
index 9406b5fd05a..c607a5656cd 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1005,8 +1005,8 @@ The following variables influence how Go packages are built:
   distfile, as it would be used with `go get`. For example, GitHub's
   `hub` program has the import path `github.com/github/hub`. This
   variable is required.
-- `go_package`: The import path of the package that should be built.
-  Defaults to `go_import_path`.
+- `go_package`: A space-separated list of import paths of the packages
+  that should be built. Defaults to `go_import_path`.
 - `go_get`: If set to yes, the package specified via `go_import_path`
   will be downloaded with `go get`. Otherwise, a distfile has to be
   provided. This option should only be used with `-git` (or similar)
diff --git a/common/build-style/go.sh b/common/build-style/go.sh
index e5887f8d077..2f89352243b 100644
--- a/common/build-style/go.sh
+++ b/common/build-style/go.sh
@@ -10,13 +10,11 @@ do_build() {
 	fi
 
 	go_package=${go_package:-$go_import_path}
-	cd "${GOPATH}/src/${go_package}"
-	go get -d "${go_package}"
-	go build -x "${go_package}"
+	go get -x ${go_package}
 }
 
 do_install() {
-	go_package=${go_package:-$go_import_path}
-	cd "${GOPATH}/src/${go_package}"
-	vbin ${pkgname}
+	for f in "${GOBIN}"/*; do
+		vbin "$f"
+	done
 }
diff --git a/common/environment/build-style/go.sh b/common/environment/build-style/go.sh
index ba05061ed14..9342f39fd14 100644
--- a/common/environment/build-style/go.sh
+++ b/common/environment/build-style/go.sh
@@ -12,3 +12,4 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 export GOPATH="${wrksrc}/_build-${pkgname}-xbps"
+export GOBIN="${wrksrc}/_build-${pkgname}-xbps-bin"