ocaml-sexplib 1:0.11.0-1: New version

3 files changed, 21 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25ab5247c9c1..622dfa48c7fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 # Generated by mksrcinfo v8
-# Sun Jul 16 10:42:57 UTC 2017
+# Thu Jun 28 14:42:00 UTC 2018
 pkgbase = ocaml-sexplib
 	pkgdesc = Library for serializing OCaml values to and from S-expressions
-	pkgver = 113.33.03
+	pkgver = 0.11.0
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/janestreet/sexplib
 	arch = i686
 	arch = x86_64
 	license = Apache
-	makedepends = ocaml-findlib
-	makedepends = ocaml-js-build-tools
-	makedepends = opam
+	makedepends = dune
 	depends = ocaml
+	depends = ocaml-parsexp
+	depends = ocaml-sexplib0
+	depends = ocaml-num
 	options = !strip
-	source = https://ocaml.janestreet.com/ocaml-core/113.33/files/sexplib-113.33.03.tar.gz
-	source = libdir.patch
-	md5sums = 739af487f05e0ffd8626e9acb653b33d
-	md5sums = 7f0a951f1ac87385272ea7a6dd58762a
+	source = https://ocaml.janestreet.com/ocaml-core/v0.11/files/sexplib-v0.11.0.tar.gz
+	md5sums = 1d53d945914b6b9a380dc8923f19e9ae
 
 pkgname = ocaml-sexplib
 
diff --git a/PKGBUILD b/PKGBUILD
index f049c529c30d..6facd5f7678e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,35 +6,29 @@
 # Contributor: Sylvester Johansson <scj(at)archlinux(dot)us>
 
 pkgname=ocaml-sexplib
-pkgver=113.33.03
+pkgver=0.11.0
 pkgrel=1
+epoch=1
 pkgdesc="Library for serializing OCaml values to and from S-expressions"
 arch=('i686' 'x86_64')
 url="https://github.com/janestreet/sexplib"
 license=('Apache')
-depends=('ocaml')
-makedepends=('ocaml-findlib' 'ocaml-js-build-tools' 'opam')
+depends=('ocaml' 'ocaml-parsexp' 'ocaml-sexplib0' 'ocaml-num')
+makedepends=('dune')
 options=('!strip')
-source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz"
-        "libdir.patch")
-md5sums=('739af487f05e0ffd8626e9acb653b33d'
-         '7f0a951f1ac87385272ea7a6dd58762a')
-
-prepare() {
-  cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
-
-  patch -Np1 < "${srcdir}/libdir.patch"
-}
+source=("https://ocaml.janestreet.com/ocaml-core/v$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/sexplib-v${pkgver}.tar.gz")
+md5sums=('1d53d945914b6b9a380dc8923f19e9ae')
 
 build() {
-  cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
+  cd "${srcdir}/sexplib-v${pkgver}"
 
-  ./configure --prefix /usr
-  make
+  jbuilder build
 }
 
 package(){
-  cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
+  cd "${srcdir}/sexplib-v${pkgver}"
 
-  make install LIBDIR="${pkgdir}$(ocamlc -where)"
+  install -dm755 "${pkgdir}$(ocamlfind -printconf destdir)" "${pkgdir}/usr/share"
+  jbuilder install --prefix "${pkgdir}/usr" --libdir "${pkgdir}$(ocamlfind -printconf destdir)"
+  mv "${pkgdir}/usr/doc" "${pkgdir}/usr/share/"
 }
diff --git a/libdir.patch b/libdir.patch
deleted file mode 100644
index 6284fcd558b0..000000000000
--- a/libdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -aur package.pristine/Makefile package.new/Makefile
---- package.pristine/Makefile	2016-02-06 01:55:14.650150309 +0100
-+++ package.new/Makefile	2016-02-06 01:57:56.012174364 +0100
-@@ -29,26 +29,26 @@
- 	ocaml -I js-utils js-utils/gen_install.ml
- 
- install: $(NAME).install
--	opam-installer -i --prefix $(PREFIX) $(NAME).install
-+	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
- 
- uninstall: $(NAME).install
--	opam-installer -u --prefix $(PREFIX) $(NAME).install
-+	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
- 
- reinstall: $(NAME).install
--	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
--	opam-installer -i --prefix $(PREFIX) $(NAME).install
-+	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install &> /dev/null || true
-+	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
- 
- bin.tar.gz: $(NAME).install
- 	rm -rf _install
- 	mkdir _install
--	opam-installer -i --prefix _install $(NAME).install
-+	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
- 	tar czf bin.tar.gz -C _install .
- 	rm -rf _install
- 
- bin.lzo: $(NAME).install
- 	rm -rf _install
- 	mkdir _install
--	opam-installer -i --prefix _install $(NAME).install
-+	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
- 	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
- 	rm -rf _install
-