working pkgbuild

3 files changed, 53 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d073e5e968c9..9c8dc6a7d63b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,20 @@
-# Generated by aurpkgs
-# Thu Nov 09 13:18:50 UTC 2017
+# Generated by mksrcinfo v8
+# Thu Nov  9 13:27:46 UTC 2017
 pkgbase = nmtree
-	pkgdesc = NetBSD's mtree (supports legacy mtree spec, etc.)
+	pkgdesc = NetBSD's mtree (supports legacy mtree spec, newer specs, etc.)
 	pkgver = 20171109
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.netbsd.org/
 	arch = i686
 	arch = x86_64
-	license = CUSTOM
-	depends = libnbcompat
-	source = http://g.rainwreck.com/index.html
-	source = index.html.sig
-	sha512sums = 2b0be4eb8ab3a9ac98aaac13c00ac283a0cf958f469367c0291aad84d771455626f54cdbfbd0d0604028471a5686939f29b4601df9efef1b08876d9be5f67516
-	sha512sums = SKIP
+	license = custom
+	makedepends = bmake
+	makedepends = cvs
+	makedepends = libnbcompat
+	provides = mtree
+	provides = mtree-git
+	conflicts = mtree
+	conflicts = mtree-git
 
 pkgname = nmtree
+
diff --git a/PKGBUILD b/PKGBUILD
index 90162d76b8dc..bbeaa56e651a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,54 @@
 validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # Bug reports can be filed at https://bugs.square-r00t.net/index.php?project=3
 # News updates for packages can be followed at https://devblog.square-r00t.net
+# 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=1
-pkgdesc="NetBSD's mtree (supports legacy mtree spec, etc.)"
+pkgrel=2
+pkgdesc="NetBSD's mtree (supports legacy mtree spec, newer specs, etc.)"
 arch=( 'i686' 'x86_64' )
 url="https://www.netbsd.org/"
-license=( 'CUSTOM' )
-depends=( 'libnbcompat' )
-makedepends=( 'libnbcompat' )
-_pkgname=nmtree
-provides=( 'mtree' 'mtree-git' )
-conflicts=( 'pkg''pkg''pkg')
+license=( 'custom' )
+makedepends=( 'bmake' 'cvs' 'libnbcompat' )
+_pkgname=mtree
+provides=('mtree' 'mtree-git')
+conflicts=('mtree' 'mtree-git')
 install=
 changelog=
 noextract=()
-source=("http://g.rainwreck.com/index.html"
-        "index.html.sig")
-sha512sums=('2b0be4eb8ab3a9ac98aaac13c00ac283a0cf958f469367c0291aad84d771455626f54cdbfbd0d0604028471a5686939f29b4601df9efef1b08876d9be5f67516'
-            'SKIP')
+# We don't use a source since we use cvs
+source=()
+sha512sums=()
+
+_cvsroot=":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"
+_cvsmod="pkgsrc/pkgtools/${_pkgname}/files"
+
+
 build() {
-        cd "${srcdir}/${_pkgname}/src"
-        make prefix=${pkgdir}/usr
+  cd "${srcdir}"
+  msg "Connecting to NetBSD CVS server...."
+
+  if [[ -d "${_cvsmod}/CVS" ]]; then
+    cd "${_cvsmod}"
+    cvs -z3 update -d
+  else
+    cvs -z3 -d "${_cvsroot}" co -D "${pkgver}" -f "${_cvsmod}"
+    cd "${_cvsmod}"
+  fi
+
+  msg "CVS checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "${srcdir}/${_cvsmod}-build"
+  cp -r "${srcdir}/${_cvsmod}" "${srcdir}/${_cvsmod}-build"
+  cd "${srcdir}/${_cvsmod}-build"
+
+  ./configure --prefix=/usr --sbindir=/usr/bin LIBS="-lnbcompat"
+
+  bmake
 }
 package() {
-        install -D -m755 ${srcdir}/${_pkgname}/src/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
-        install -D -m644 ${srcdir}/${_pkgname}/docs/README.html.en ${pkgdir}/usr/share/doc/${_pkgname}/README.html
+  cd "${srcdir}/${_cvsmod}-build"
+  bmake install DESTDIR="${pkgdir}/"
 }
diff --git a/index.html.sig b/index.html.sig
deleted file mode 100644
index bc7c8c17e5fc..000000000000
--- a/index.html.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEdIIx68vYCKFPXoXSjABML5NIH2sFAloEVacACgkQjABML5NI
-H2t5QRAAkzgRPqqckvM3k49hYz9vm7L8058mONirOVUAE+oCNp3hAt7KqcZXurwz
-Fg/YiuguA11mYjqpMQFqMWXjN5lzcfs3EdY9DvW7pTZYbJNek5LePY4QErDCZsRw
-TepDI90SUJgnFlisUTQUL7YHxu3N6iA22mCcbb/S3NgiXn/RUynkxMvlLRqIc/Vx
-QmBxEnjx2iYOqykObUTfoIOjcsWCuLxn5gTw1PGYRlTqrz9PwgH1fN1sPqofjXtM
-Y2cQuso8aaA1Z0Jj4Bygm0KWUd/Rai69zga1pFZ8Bpqa3/z/Df99EQ3uzyHZcUcL
-c7CsQ5RllMPz9Kz//LfUXyDPKXWK/42QyrGrhcJfHUEVAvl9k8jcXb4p6go7P/UZ
-myjP5USuLc+QP97ZbAZgcXrypBFnoIoFj25aeExFUh1ComNuwy6Skj6I9Lnplstr
-tZAob3ctM4W0V5l3C3OTGCmTtjfFotKASRShZ300wgd8+g492eTU9iJ+LV91+g3N
-g1ObzObbUtspZV1MjFRtraT3HgZv+0OA/49aJ6DFcouu7T7GSdKH3AZI+r1j2dxX
-CtdfTJDC81mT5FKvXWP5VufM7DboCN5xlPNH7SuKE6w1KIjjePapkNEDv/b47rXm
-/GDzitYvH+rONVWfszZFrXyexOpcCT4yvq5O+LotoiO2dxpDO8k=
-=LALf
------END PGP SIGNATURE-----