diff options
author | J5lx | 2016-02-06 02:12:11 +0100 |
---|---|---|
committer | J5lx | 2016-02-06 02:12:11 +0100 |
commit | c6fe94b0f72104808bb137a66acff500b0be4423 (patch) | |
tree | e7adf4303a259fe779271e786234d1b702c0d554 | |
parent | 6b86f1996d83ce727b85ff5adbbb1b69b3098fb5 (diff) | |
download | aur-c6fe94b0f72104808bb137a66acff500b0be4423.tar.gz |
113.24.00-1: New version
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | libdir.patch | 36 |
3 files changed, 57 insertions, 12 deletions
@@ -1,18 +1,23 @@ +# Generated by mksrcinfo v8 +# Sat Feb 6 01:11:47 UTC 2016 pkgbase = ocaml-bin_prot pkgdesc = A binary protocol generator - pkgver = 113.00.00 + pkgver = 113.24.00 pkgrel = 1 url = https://github.com/janestreet/bin_prot arch = i686 arch = x86_64 license = Apache makedepends = ocaml-findlib + makedepends = opam depends = ocaml depends = camlp4 depends = ocaml-type_conv options = !strip - source = https://ocaml.janestreet.com/ocaml-core/113.00/files/bin_prot-113.00.00.tar.gz - md5sums = 941c9e86e409b74eeeea771a78961157 + source = https://ocaml.janestreet.com/ocaml-core/113.24/files/bin_prot-113.24.00.tar.gz + source = libdir.patch + md5sums = 135255aca999c2eb460ea578f7a93f11 + md5sums = 7f0a951f1ac87385272ea7a6dd58762a pkgname = ocaml-bin_prot @@ -1,17 +1,25 @@ # Maintainer: Jakob Gahde <j5lx@fmail.co.uk> pkgname=ocaml-bin_prot -pkgver=113.00.00 +pkgver=113.24.00 pkgrel=1 license=('Apache') arch=('i686' 'x86_64') pkgdesc="A binary protocol generator" url="https://github.com/janestreet/bin_prot" depends=('ocaml' 'camlp4' 'ocaml-type_conv') -makedepends=('ocaml-findlib') -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") +makedepends=('ocaml-findlib' 'opam') +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") options=('!strip') -md5sums=('941c9e86e409b74eeeea771a78961157') +md5sums=('135255aca999c2eb460ea578f7a93f11' + '7f0a951f1ac87385272ea7a6dd58762a') + +prepare() { + cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" + + patch -Np1 < "${srcdir}/libdir.patch" +} build() { cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" @@ -23,9 +31,5 @@ build() { package() { cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" - OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)" - mkdir -p "$OCAMLFIND_DESTDIR/stublibs" - DESTDIR="${pkgdir}" \ - OCAMLFIND_DESTDIR="$OCAMLFIND_DESTDIR" \ - make install + make install PREFIX="${pkgdir}/usr" 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 + |