diff options
author | Jakob Gahde | 2018-06-28 18:33:38 +0200 |
---|---|---|
committer | Jakob Gahde | 2018-06-28 18:33:38 +0200 |
commit | 8c99774ad850cfb59d537bcffb3dafdb0fe224b3 (patch) | |
tree | 870e52f978e9df137b452d2f1b268dfaf5257f32 | |
parent | db30136cc42c1f042b1e17c62a495383b1d3cd4c (diff) | |
download | aur-8c99774ad850cfb59d537bcffb3dafdb0fe224b3.tar.gz |
ocaml-ppx_expect 1:0.11.0-1: New version
-rw-r--r-- | .SRCINFO | 27 | ||||
-rw-r--r-- | PKGBUILD | 34 | ||||
-rw-r--r-- | exedir.patch | 11 | ||||
-rw-r--r-- | libdir.patch | 36 |
4 files changed, 23 insertions, 85 deletions
@@ -1,40 +1,33 @@ # Generated by mksrcinfo v8 -# Tue Jun 6 12:23:46 UTC 2017 +# Thu Jun 28 16:33:16 UTC 2018 pkgbase = ocaml-ppx_expect pkgdesc = Cram like framework for OCaml - pkgver = 113.33.03 + pkgver = 0.11.0 pkgrel = 1 + epoch = 1 url = https://github.com/janestreet/ppx_expect arch = i686 arch = x86_64 license = Apache - makedepends = ocaml-findlib - makedepends = ocaml-js-build-tools - makedepends = opam + makedepends = dune depends = ocaml - depends = ocaml-fieldslib + depends = ocaml-base depends = ocaml-ppx_assert depends = ocaml-ppx_compare - depends = ocaml-ppx_core depends = ocaml-ppx_custom_printf - depends = ocaml-ppx_driver depends = ocaml-ppx_fields_conv depends = ocaml-ppx_here depends = ocaml-ppx_inline_test depends = ocaml-ppx_sexp_conv - depends = ocaml-ppx_tools depends = ocaml-ppx_variants_conv + depends = ocaml-stdio + depends = ocaml-migrate-parsetree + depends = ocaml-ppxlib depends = ocaml-re - depends = ocaml-sexplib - depends = ocaml-variantslib options = !strip options = !emptydirs - source = https://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_expect-113.33.03.tar.gz - source = libdir.patch - source = exedir.patch - md5sums = ceca13eb18037e611717029d16ca48d7 - md5sums = 7f0a951f1ac87385272ea7a6dd58762a - md5sums = 613b386c3d58edc66678e22d984f62c8 + source = https://ocaml.janestreet.com/ocaml-core/v0.11/files/ppx_expect-v0.11.0.tar.gz + md5sums = ee183ff3ca85954a84a54d32b8073546 pkgname = ocaml-ppx_expect @@ -1,38 +1,30 @@ # Maintainer: Jakob Gahde <j5lx@fmail.co.uk> pkgname=ocaml-ppx_expect -pkgver=113.33.03 +pkgver=0.11.0 pkgrel=1 +epoch=1 pkgdesc="Cram like framework for OCaml" arch=('i686' 'x86_64') url="https://github.com/janestreet/ppx_expect" license=('Apache') -depends=('ocaml' 'ocaml-fieldslib' 'ocaml-ppx_assert' 'ocaml-ppx_compare' 'ocaml-ppx_core' 'ocaml-ppx_custom_printf' 'ocaml-ppx_driver' 'ocaml-ppx_fields_conv' 'ocaml-ppx_here' 'ocaml-ppx_inline_test' 'ocaml-ppx_sexp_conv' 'ocaml-ppx_tools' 'ocaml-ppx_variants_conv' 'ocaml-re' 'ocaml-sexplib' 'ocaml-variantslib') -makedepends=('ocaml-findlib' 'ocaml-js-build-tools' 'opam') +depends=('ocaml' 'ocaml-base' 'ocaml-ppx_assert' 'ocaml-ppx_compare' 'ocaml-ppx_custom_printf' 'ocaml-ppx_fields_conv' 'ocaml-ppx_here' 'ocaml-ppx_inline_test' 'ocaml-ppx_sexp_conv' 'ocaml-ppx_variants_conv' 'ocaml-stdio' 'ocaml-migrate-parsetree' 'ocaml-ppxlib' 'ocaml-re') +makedepends=('dune') options=('!strip' '!emptydirs') -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" - "exedir.patch") -md5sums=('ceca13eb18037e611717029d16ca48d7' - '7f0a951f1ac87385272ea7a6dd58762a' - '613b386c3d58edc66678e22d984f62c8') - -prepare() { - cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" - - patch -Np1 < "${srcdir}/libdir.patch" - patch -Np1 < "${srcdir}/exedir.patch" -} +source=("https://ocaml.janestreet.com/ocaml-core/v$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/ppx_expect-v${pkgver}.tar.gz") +md5sums=('ee183ff3ca85954a84a54d32b8073546') build() { - cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" + cd "${srcdir}/ppx_expect-v${pkgver}" - ./configure --prefix=/usr - make + jbuilder build } package() { - cd "${srcdir}/${pkgname#ocaml-}-${pkgver}" + cd "${srcdir}/ppx_expect-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/exedir.patch b/exedir.patch deleted file mode 100644 index 207d0d2a5843..000000000000 --- a/exedir.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur package.pristine/install.ml package.new/install.ml ---- package.pristine/install.ml 2016-07-29 14:22:42.786817997 +0200 -+++ package.new/install.ml 2016-07-29 14:23:01.166683828 +0200 -@@ -12,6 +12,6 @@ - ; oasis_obj "ppx_expect_evaluator" - ; oasis_lib "ppx_expect_payload" - ; file "META" ~section:"lib" -- ; oasis_exe "ppx" ~dest:"../lib/ppx_expect/ppx" -+ ; oasis_exe "ppx" ~dest:"../lib/ocaml/ppx_expect/ppx" - ; file "_build/namespace_wrappers/ocaml_re.cmi" ~section:"lib" - ] 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 - |