[arch-commits] Commit in cppo/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Thursday, October 11, 2018 @ 18:40:57
  Author: archange
Revision: 392641

upgpkg: cppo 1.6.5-1

Fix FS#60325

Workaround dune changes

Modified:
  cppo/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-11 17:28:53 UTC (rev 392640)
+++ PKGBUILD	2018-10-11 18:40:57 UTC (rev 392641)
@@ -1,7 +1,7 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org>
 
 pkgname=cppo
-pkgver=1.6.4
+pkgver=1.6.5
 pkgrel=1
 pkgdesc="C-style preprocessor for OCaml"
 arch=('x86_64')
@@ -8,9 +8,9 @@
 url="https://github.com/mjambon/cppo"
 license=('BSD')
 depends=('glibc')
-makedepends=('ocamlbuild' 'dune')
+makedepends=('ocamlbuild' 'dune') # 'opam')
 source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('470a5225a5d3b06ced29581250562ef84b7a8bc6b9a632c96443391a443bab49')
+sha256sums=('0ebfe3261037a14c9f53b1deb2772af45fda2317b3b17746f2a640034b1b75b6')
 
 build() {
     cd ${pkgname}-${pkgver}
@@ -17,15 +17,15 @@
     make
 }
 
+check() {
+    cd ${pkgname}-${pkgver}
+    make check
+}
+
 package() {
     cd ${pkgname}-${pkgver}
-
-    # Initialize OPAM
-    export OPAMROOT="${srcdir}"/opam
-    opam init -n
-
     # Work around the install command
-    make OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)" install
-    install -Dm755 "${srcdir}"/opam/system/bin/cppo -t "${pkgdir}"/usr/bin
-    install -Dm644 "${srcdir}"/opam/system/doc/${pkgname}/LICENSE.md -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+    dune install --prefix="${pkgdir}"/usr/ --libdir="${pkgdir}$(ocamlfind printconf destdir)"
+    install -Dm644 LICENSE.md -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+    rm -r "${pkgdir}"/usr/doc
 }