Date: Sunday, October 21, 2018 @ 19:23:25 Author: archange Revision: 398290
upgpkg: merlin 3.2.2-1 Modified: merlin/trunk/PKGBUILD ----------+ PKGBUILD | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-21 18:58:44 UTC (rev 398289) +++ PKGBUILD 2018-10-21 19:23:25 UTC (rev 398290) @@ -1,7 +1,7 @@ # Maintainer: Bruno Pagani <[email protected]> pkgname=merlin -pkgver=3.1.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="Context sensitive completion for OCaml in Vim and Emacs" arch=('x86_64') @@ -9,17 +9,13 @@ license=('MIT') options=('!strip') depends=('glibc') -makedepends=('ocaml-findlib' 'ocaml-yojson' 'emacs') +makedepends=('ocaml-findlib' 'ocaml-yojson' 'dune') source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/v${pkgver}.tar.gz") -sha256sums=('5deb4e3d9f1eaf283e17ec7dca2f17ce768a229e1da0170844d99860f84b8bc6') +sha256sums=('689ae38e2f50e7b02d257d502cb55e26b425b4ecb2108af9df7d769632694b17') build() { cd ${pkgname}-${pkgver} - ./configure \ - --prefix "/usr" \ - --vimdir "/usr/share/vim/vimfiles" \ - --enable-compiled-emacs-mode - make + make build } check() { @@ -29,7 +25,13 @@ package() { cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - + # Work around install command + dune install --prefix="${pkgdir}"/usr/ --libdir="${pkgdir}$(ocamlfind printconf destdir)" install -Dm644 LICENSE_MIT.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.txt + # Fix path + install -d "${pkgdir}"/usr/share/vim + mv "${pkgdir}"/usr/share/{merlin/vim,vim/vimfiles} + rmdir "${pkgdir}"/usr/share/merlin + # Remove useless files + rm -r "${pkgdir}"/usr/doc }
