ocaml-ppx_derivers-git 20190404-2

2 files changed, 11 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ed59d5f87b8..3687cc6cd442 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 # Generated by mksrcinfo v8
-# Sat Oct 19 11:40:11 UTC 2019
+# Sat Oct 19 13:09:04 UTC 2019
 pkgbase = ocaml-ppx_derivers-git
 	pkgdesc = deriving plugin registry
 	pkgver = 20190404
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ocaml-ppx/ppx_derivers
 	arch = x86_64
 	license = BSD
 	makedepends = ocamlbuild
 	makedepends = ocaml-findlib
+	makedepends = dune
 	provides = ocaml-ppx_derivers
 	source = ocaml-ppx_derivers-git::git://github.com/ocaml-ppx/ppx_derivers.git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 140805e74d0b..ccd9ea4c8ce0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
 
 pkgname=ocaml-ppx_derivers-git
 pkgver=20190404
-pkgrel=1
+pkgrel=2
 pkgdesc="deriving plugin registry"
 arch=('x86_64')
 url='https://github.com/ocaml-ppx/ppx_derivers'
 license=('BSD')
 provides=('ocaml-ppx_derivers')
-makedepends=('ocamlbuild' 'ocaml-findlib')
+conflicts=('ocaml-ppx_derivers')
+makedepends=('ocamlbuild' 'ocaml-findlib' 'dune')
 source=("${pkgname}::git://github.com/ocaml-ppx/ppx_derivers.git")
 md5sums=('SKIP')
 
@@ -20,18 +21,14 @@ pkgver() {
 build() {
   cd "$pkgname"
 
-  make
+  dune build
 }
 
 package() {
-  set -e
-  destdir="$pkgdir/$(ocamlfind printconf destdir)"
-
   cd "$pkgname"
 
-  mkdir -p "$destdir/ppx_derivers"
-  export DESTDIR="$destdir/"
-  export OCAMLFIND_DESTDIR="$destdir/"
-  jbuilder build @install
-  jbuilder install -p ppx_derivers --prefix="${destdir}"
+  install -dm755 "${pkgdir}$(ocamlfind -printconf destdir)" "${pkgdir}/usr/share"
+  dune install --prefix "${pkgdir}/usr" --libdir "${pkgdir}$(ocamlfind -printconf destdir)"
+  mv "${pkgdir}/usr/doc" "${pkgdir}/usr/share/"
+  install -Dm644 "LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
 }