[arch-commits] Commit in merlin/repos/community-x86_64 (PKGBUILD PKGBUILD)

[Bruno Pagani]

    Date: Saturday, March 16, 2019 @ 23:43:32
  Author: archange
Revision: 442272

archrelease: copy trunk to community-x86_64

Added:
  merlin/repos/community-x86_64/PKGBUILD
    (from rev 442271, merlin/trunk/PKGBUILD)
Deleted:
  merlin/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |   77 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 40 insertions(+), 37 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-16 23:43:24 UTC (rev 442271)
+++ PKGBUILD	2019-03-16 23:43:32 UTC (rev 442272)
@@ -1,37 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=merlin
-pkgver=3.2.2
-pkgrel=1
-pkgdesc="Context sensitive completion for OCaml in Vim and Emacs"
-arch=('x86_64')
-url="https://github.com/ocaml/merlin"
-license=('MIT')
-options=('!strip')
-depends=('glibc')
-makedepends=('ocaml-findlib' 'ocaml-yojson' 'dune')
-source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('689ae38e2f50e7b02d257d502cb55e26b425b4ecb2108af9df7d769632694b17')
-
-build() {
-    cd ${pkgname}-${pkgver}
-    make build
-}
-
-check() {
-    cd ${pkgname}-${pkgver}
-    make test || warning "Tests failed"
-}
-
-package() {
-    cd ${pkgname}-${pkgver}
-    # 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
-}

Copied: merlin/repos/community-x86_64/PKGBUILD (from rev 442271, merlin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-16 23:43:32 UTC (rev 442272)
@@ -0,0 +1,40 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=merlin
+pkgver=3.2.2
+pkgrel=2
+pkgdesc="Context sensitive completion for OCaml in Vim and Emacs"
+arch=('x86_64')
+url="https://github.com/ocaml/merlin"
+license=('MIT')
+options=('!strip')
+depends=('glibc' 'ocaml-findlib')
+makedepends=('ocaml-yojson' 'dune')
+source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/v${pkgver}.tar.gz")
+sha256sums=('689ae38e2f50e7b02d257d502cb55e26b425b4ecb2108af9df7d769632694b17')
+
+build() {
+    cd ${pkgname}-${pkgver}
+    make build
+}
+
+check() {
+    cd ${pkgname}-${pkgver}
+    make test || warning "Tests failed"
+}
+
+package() {
+    cd ${pkgname}-${pkgver}
+    
+    DESTDIR="${pkgdir}" dune install --prefix=/usr
+
+    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,lib}
+}