update to v2.1.0

While at it, start building via Go modules, which means we can drop the
prepare step.

2 files changed, 7 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c726d673c6d8..89db2a336d1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xurls
 	pkgdesc = Extract urls from plain text
-	pkgver = 2.0.0
+	pkgver = 2.1.0
 	pkgrel = 1
 	url = https://github.com/mvdan/xurls
 	arch = i686
@@ -8,7 +8,7 @@ pkgbase = xurls
 	license = BSD
 	makedepends = git
 	makedepends = go
-	source = git+https://github.com/mvdan/xurls#tag=v2.0.0
+	source = git+https://github.com/mvdan/xurls#tag=v2.1.0
 	sha1sums = SKIP
 
 pkgname = xurls
diff --git a/PKGBUILD b/PKGBUILD
index 50f6b9558a95..613a7b6d268a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=xurls
 _name="${pkgname}"
-pkgver=2.0.0
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Extract urls from plain text"
 url="https://github.com/mvdan/${_name}"
@@ -12,19 +12,13 @@ makedepends=('git' 'go')
 source=("git+${url}#tag=v${pkgver}")
 sha1sums=('SKIP')
 
-prepare() {
-	cd "${srcdir}"
-	mkdir -p "src/mvdan.cc"
-	mv "${_name}" "src/mvdan.cc/${_name}"
-}
-
 build() {
-	cd "${srcdir}/src/mvdan.cc/${_name}/cmd/${_name}"
-	GOPATH="${srcdir}" go build -ldflags='-w -s'
+	cd "${srcdir}/${_name}"
+	GO111MODULES=on go build -ldflags='-w -s' ./cmd/${_name}
 }
 
 package() {
-	cd "${srcdir}/src/mvdan.cc/${_name}"
-	install -Dm755 "cmd/${_name}/${_name}" "${pkgdir}/usr/bin/${_name}"
+	cd "${srcdir}/${_name}"
+	install -Dm755 "${_name}" "${pkgdir}/usr/bin/${_name}"
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }