adding fix for https://bugs.square-r00t.net/index.php?do=details&task_id=47

2 files changed, 9 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe60e79b25f0..f266dafedc58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Sun Aug 12 04:38:48 UTC 2018
 pkgbase = nmtree
 	pkgdesc = NetBSD's mtree (supports legacy mtree spec, newer specs, etc.)
-	pkgver = 20171109
-	pkgrel = 4
+	pkgver = 20200403
+	pkgrel = 1
 	url = https://www.netbsd.org/
-	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = bmake
@@ -19,6 +16,7 @@ pkgbase = nmtree
 	source = maj_min.patch
 	source = license.sig
 	source = maj_min.patch.sig
+	validpgpkeys = 748231EBCBD808A14F5E85D28C004C2F93481F6B
 	sha512sums = 78f634baef190d4a52187e69344e50ae9544c95bd6243ebb22af727092edbb61c021ec38de1a85e38b08cb046b71bdbf6cc869af2d9a6365cb93c92e342dfe96
 	sha512sums = 57daf0457877c5cfa0c9cddf3840d489e36de449cab417ee6a7197dc71a6fbc818900bbc133042bd4519ffa712b446e7791993e6ff1a67473a4c360ec3e35212
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9bf625bc5235..c7054c6783b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # A HUGE THANKS to @yan12125 on GitHub (https://github.com/archiecobbs/mtree-port/issues/11#issuecomment-343127667)
 #  This is basically the PKGBUILD he wrote, all credit goes to him. Buy him a beer.
 pkgname=nmtree
-pkgver=20171109
-pkgrel=4
+pkgver=20200403
+pkgrel=1
 pkgdesc="NetBSD's mtree (supports legacy mtree spec, newer specs, etc.)"
-arch=( 'i686' 'x86_64' )
+arch=('x86_64')
 url="https://www.netbsd.org/"
 license=( 'custom' )
 makedepends=( 'bmake' 'cvs' 'libnbcompat' )
@@ -59,6 +59,9 @@ prepare() {
 }
 
 build() {
+  # https://bugs.square-r00t.net/index.php?do=details&task_id=47
+  MAKEFLAGS=$(echo ${MAKEFLAGS} | sed -re 's/(^|\s+)(-l[0-9]+)/\1/g')
+
   cd "${srcdir}/${_cvsmod}-build"
 
   ./configure --prefix=/usr --sbindir=/usr/bin LIBS="-lnbcompat"