113.24.00-1: New version

3 files changed, 58 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03ee405b7e12..08a41de157dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
+# Generated by mksrcinfo v8
+# Sat Feb  6 01:25:00 UTC 2016
 pkgbase = ocaml-sexplib
 	pkgdesc = Library for serializing OCaml values to and from S-expressions
-	pkgver = 113.00.00
+	pkgver = 113.24.00
 	pkgrel = 1
 	url = https://github.com/janestreet/sexplib
 	arch = i686
 	arch = x86_64
 	license = Apache
 	makedepends = ocaml-findlib
+	makedepends = opam
 	depends = ocaml>=4.02.1
 	options = !strip
-	source = https://ocaml.janestreet.com/ocaml-core/113.00/files/sexplib-113.00.00.tar.gz
-	md5sums = 642c795001cc3df4631e678852c806c8
+	source = https://ocaml.janestreet.com/ocaml-core/113.24/files/sexplib-113.24.00.tar.gz
+	source = libdir.patch
+	md5sums = f4f1e679187842c22db482dec5e11f36
+	md5sums = 7f0a951f1ac87385272ea7a6dd58762a
 
 pkgname = ocaml-sexplib
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d7b23c93894..aaae02461458 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,29 +6,35 @@
 # Contributor: Sylvester Johansson <scj(at)archlinux(dot)us>
 
 pkgname=ocaml-sexplib
-pkgver=113.00.00
+pkgver=113.24.00
 pkgrel=1
 pkgdesc="Library for serializing OCaml values to and from S-expressions"
 arch=('i686' 'x86_64')
 license=('Apache')
 depends=('ocaml>=4.02.1')
-makedepends=('ocaml-findlib')
+makedepends=('ocaml-findlib' 'opam')
 options=('!strip')
 url="https://github.com/janestreet/sexplib"
-source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz")
-md5sums=('642c795001cc3df4631e678852c806c8')
+source=("https://ocaml.janestreet.com/ocaml-core/$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/${pkgname#ocaml-}-${pkgver}.tar.gz"
+        "libdir.patch")
+md5sums=('f4f1e679187842c22db482dec5e11f36'
+         '7f0a951f1ac87385272ea7a6dd58762a')
+
+prepare() {
+  cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
+
+  patch -Np1 < "${srcdir}/libdir.patch"
+}
 
 build() {
   cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
 
-  ./configure --prefix /usr --destdir $pkgdir
+  ./configure --prefix /usr
   make
 }
 
 package(){
   cd "${srcdir}/${pkgname#ocaml-}-${pkgver}"
 
-  export OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)"
-  mkdir -p "${OCAMLFIND_DESTDIR}"
-  make install
+  make install LIBDIR="${pkgdir}$(ocamlc -where)"
 }
diff --git a/libdir.patch b/libdir.patch
new file mode 100644
index 000000000000..6284fcd558b0
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,36 @@
+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
+