[arch-commits] Commit in merlin/repos/community-x86_64 (PKGBUILD PKGBUILD)
Bruno Pagani
archange at archlinux.org
Sun Oct 21 19:24:11 UTC 2018
Date: Sunday, October 21, 2018 @ 19:24:10
Author: archange
Revision: 398291
archrelease: copy trunk to community-x86_64
Added:
merlin/repos/community-x86_64/PKGBUILD
(from rev 398290, merlin/trunk/PKGBUILD)
Deleted:
merlin/repos/community-x86_64/PKGBUILD
----------+
PKGBUILD | 72 +++++++++++++++++++++++++++++++------------------------------
1 file changed, 37 insertions(+), 35 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-21 19:23:25 UTC (rev 398290)
+++ PKGBUILD 2018-10-21 19:24:10 UTC (rev 398291)
@@ -1,35 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=merlin
-pkgver=3.1.0
-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' 'emacs')
-source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('5deb4e3d9f1eaf283e17ec7dca2f17ce768a229e1da0170844d99860f84b8bc6')
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure \
- --prefix "/usr" \
- --vimdir "/usr/share/vim/vimfiles" \
- --enable-compiled-emacs-mode
- make
-}
-
-check() {
- cd ${pkgname}-${pkgver}
- make test || warning "Tests failed"
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 LICENSE_MIT.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.txt
-}
Copied: merlin/repos/community-x86_64/PKGBUILD (from rev 398290, merlin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-21 19:24:10 UTC (rev 398291)
@@ -0,0 +1,37 @@
+# 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
+}
More information about the arch-commits
mailing list