ocaml-bin_prot 1:0.11.0-1: New version

3 files changed, 27 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 98a1d305b412..3b7c12f96916 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,27 @@
 # Generated by mksrcinfo v8
-# Tue Jun  6 09:20:26 UTC 2017
+# Thu Jun 28 13:48:53 UTC 2018
 pkgbase = ocaml-bin_prot
 	pkgdesc = A binary protocol generator
-	pkgver = 113.33.03
+	pkgver = 0.11.0
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/janestreet/bin_prot
 	arch = i686
 	arch = x86_64
 	license = Apache
-	makedepends = ocaml-js-build-tools
-	makedepends = ocaml-findlib
-	makedepends = opam
+	makedepends = dune
 	depends = ocaml
+	depends = ocaml-base
+	depends = ocaml-ppx_compare
+	depends = ocaml-ppx_custom_printf
+	depends = ocaml-ppx_fields_conv
+	depends = ocaml-ppx_sexp_conv
+	depends = ocaml-ppx_variants_conv
+	depends = ocaml-migrate-parsetree
+	depends = ocaml-ppxlib
 	options = !strip
-	source = https://ocaml.janestreet.com/ocaml-core/113.33/files/bin_prot-113.33.03.tar.gz
-	source = libdir.patch
-	md5sums = d90c8977da36e4aafd3e0421744fd818
-	md5sums = 7f0a951f1ac87385272ea7a6dd58762a
+	source = https://ocaml.janestreet.com/ocaml-core/v0.11/files/bin_prot-v0.11.0.tar.gz
+	md5sums = 64495e0e88fe7cccba6e66b0deaef283
 
 pkgname = ocaml-bin_prot
 
diff --git a/PKGBUILD b/PKGBUILD
index 484471d9ee37..5ca278187eac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,30 @@
 # Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=ocaml-bin_prot
-pkgver=113.33.03
+pkgver=0.11.0
 pkgrel=1
+epoch=1
 pkgdesc="A binary protocol generator"
 arch=('i686' 'x86_64')
 url="https://github.com/janestreet/bin_prot"
 license=('Apache')
-depends=('ocaml')
-makedepends=('ocaml-js-build-tools' 'ocaml-findlib' 'opam')
+depends=('ocaml' 'ocaml-base' 'ocaml-ppx_compare' 'ocaml-ppx_custom_printf' 'ocaml-ppx_fields_conv' 'ocaml-ppx_sexp_conv' 'ocaml-ppx_variants_conv' 'ocaml-migrate-parsetree' 'ocaml-ppxlib')
+makedepends=('dune')
 options=('!strip')
-source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+\.[0-9]+").tar.gz"
-        "libdir.patch")
-md5sums=('d90c8977da36e4aafd3e0421744fd818'
-         '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/bin_prot-v${pkgver}.tar.gz")
+md5sums=('64495e0e88fe7cccba6e66b0deaef283')
 
 build() {
-  cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
+  cd "${srcdir}/bin_prot-v${pkgver}"
 
-  ./configure --prefix=/usr
-  make
+  jbuilder build
 }
 
 package() {
-  cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
+  cd "${srcdir}/bin_prot-v${pkgver}"
 
-  make install PREFIX="${pkgdir}/usr" 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/"
+  mv "${pkgdir}/usr/lib/ocaml/stubslibs" "${pkgdir}/usr/lib/ocaml/stublibs" # bug in opam
 }
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
-