upgpkg: age 1.0.0.beta2-1

* Use new Go packaging guidelines
* Conform to version guidelines (separate segments)

2 files changed, 25 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b44315011f70..be6096d91bb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = age
 	pkgdesc = A simple, modern and secure file encryption tool
-	pkgver = 1.0.0beta2
+	pkgver = 1.0.0.beta2
 	pkgrel = 1
 	url = https://github.com/FiloSottile/age
 	arch = x86_64
 	license = BSD
-	makedepends = go-pie
-	source = age-1.0.0beta2.tar.gz::https://github.com/FiloSottile/age/archive/v1.0.0-beta2.tar.gz
+	makedepends = go
+	source = age-1.0.0.beta2.tar.gz::https://github.com/FiloSottile/age/archive/v1.0.0-beta2.tar.gz
 	sha256sums = ca0fcfe45415c03c637c2332231f1793bf4dbd6a03e663a71ef2b7554647d763
 
 pkgname = age
diff --git a/PKGBUILD b/PKGBUILD
index 1dc905c795c1..42c5d02aff95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,41 @@
 # Maintainer: Tharre <tharre3@gmail.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 
 pkgname=age
 _pkgver=1.0.0-beta2
-pkgver=1.0.0beta2
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc="A simple, modern and secure file encryption tool"
+pkgdesc='A simple, modern and secure file encryption tool'
 arch=('x86_64')
-url="https://github.com/FiloSottile/age"
+url="https://github.com/FiloSottile/$pkgname"
 license=('BSD')
-makedepends=('go-pie')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/FiloSottile/age/archive/v${_pkgver}.tar.gz")
+makedepends=('go')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$_pkgver.tar.gz")
 sha256sums=('ca0fcfe45415c03c637c2332231f1793bf4dbd6a03e663a71ef2b7554647d763')
 
+prepare() {
+    cd "$pkgname-$_pkgver"
+    go mod download
+}
+
 build() {
-    cd ${pkgname}-${_pkgver}
+    cd $pkgname-$_pkgver
     go build \
       -trimpath \
+      -buildmode=pie \
+      -mod=readonly \
+      -modcacherw \
       -ldflags "-extldflags $LDFLAGS" \
       -o . ./...
 }
 
-package() {
-    cd ${pkgname}-${_pkgver}
-
-    install -Dm755 age age-keygen -t "${pkgdir}/usr/bin/"
-    install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
 check() {
-    cd ${pkgname}-${_pkgver}
+    cd $pkgname-$_pkgver
     go test ./...
 }
+
+package() {
+    cd $pkgname-$_pkgver
+    install -Dm755 -t "$pkgdir/usr/bin/" age age-keygen
+    install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}/" LICENSE
+}