sync PKGBUILD with go package guidelines

- Add age-keygen binary, fix pkgver detection (from caleb).
- Add .gitignore

3 files changed, 29 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2ccd9b57d82..5311c0a98bbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = age-git
-	pkgdesc = A simple and secure encryption based on UNIX-style composability.
-	pkgver = r5.0940f18
-	pkgrel = 2
+	pkgdesc = A simple, modern and secure file encryption tool
+	pkgver = v1.0.0.beta2.r35.gc9a35c0
+	pkgrel = 1
 	url = https://github.com/FiloSottile/age
 	arch = i686
 	arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = age-git
 	license = custom: BSD
 	makedepends = go-pie
 	makedepends = git
+	depends = glibc
 	provides = age
 	source = age::git+https://github.com/FiloSottile/age
 	sha256sums = SKIP
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e4f9ba3007cf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.SRCINFO
+!PKGBUILD
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 00e354448d62..816485772f9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,38 @@
-# Maintainer: KingofToasters <dev at sgregoratto dot me>
+# Maintainer: Stephen Gregoratto <dev@sgregoratto.me>
 pkgname=age-git
-pkgver=r5.0940f18
-pkgrel=2
-pkgdesc="A simple and secure encryption based on UNIX-style composability."
+pkgver=v1.0.0.beta2.r35.gc9a35c0
+pkgrel=1
+pkgdesc="A simple, modern and secure file encryption tool"
 url="https://github.com/FiloSottile/age"
 license=('custom: BSD')
 provides=('age')
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+depends=('glibc')
 makedepends=('go-pie' 'git')
 source=("${pkgname%-git}::git+$url")
 sha256sums=('SKIP')
 
+prepare(){
+  cd "${pkgname%-git}"
+  mkdir -p build/
+}
+
 pkgver() {
   cd "${pkgname%-git}"
   ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
   )
 }
 
 build() {
-  cd "${pkgname%-git}/cmd/age"
-  go build \
-    -trimpath \
-    -ldflags "-extldflags $LDFLAGS" \
-    -o "${pkgname%-git}" .
+  cd "${pkgname%-git}"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  go build -o build ./cmd/...
 }
 
 check() {
@@ -33,6 +41,7 @@ check() {
 }
 
 package() {
-  install -Dm755 "${pkgname%-git}/cmd/age/age" "${pkgdir}/usr/bin/${pkgname%-git}"
-  install -Dm644 "${pkgname%-git}/LICENSE" "$pkgdir/usr/share/licenses/${pkgname}/LICENCE"
+  install -Dm755 "${pkgname%-git}/build/age" "$pkgdir/usr/bin/age"
+  install -Dm755 "${pkgname%-git}/build/age-keygen" "$pkgdir/usr/bin/age-keygen"
+  install -Dm644 "${pkgname%-git}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENCE"
 }