diff --git a/testing/ocaml-xml-light/APKBUILD b/testing/ocaml-xml-light/APKBUILD index 2435316709bd1d56ab06c4e4c84a23d8509eb79e..c79f93e14a3844409b915ba30784ae0e62837914 100644 --- a/testing/ocaml-xml-light/APKBUILD +++ b/testing/ocaml-xml-light/APKBUILD @@ -2,16 +2,16 @@ # Maintainer: Fernando Casas Schossow <casasfernando@outlook.com> pkgname=ocaml-xml-light _pkgname=xml-light -pkgver=2.4 -pkgrel=4 +pkgver=2.5 +pkgrel=0 pkgdesc="Minimal XML parser and printer for OCaml" url="https://github.com/ncannasse/xml-light" arch="all !riscv64" # limited by ocaml aport license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" -makedepends="ocaml ocaml-findlib-dev ocaml-ocamldoc gawk" -subpackages="$pkgname-dev $pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/ncannasse/xml-light/archive/$pkgver.tar.gz - Makefile-explicit-target-fix.patch" +depends_dev="$pkgname=$pkgver-r$pkgrel" +makedepends="dune ocaml" +subpackages="$pkgname-dev" +source="$_pkgname-$pkgver.tar.bz2::https://github.com/ncannasse/xml-light/releases/download/$pkgver/xml-light-$pkgver.tbz" builddir="$srcdir/$_pkgname-$pkgver" # 32-bit archs @@ -20,30 +20,17 @@ case "$CARCH" in esac build() { - make all - make doc - make opt + dune build --release --verbose } check() { - ./test.exe <<EOF -<abc><123/></abc> - -EOF - ./test_opt.exe <<EOF -<abc><123/></abc> - -EOF + dune runtest --build-dir=.testenv } package() { - export DESTDIR="$pkgdir" - export OCAMLFIND_DESTDIR="$DESTDIR/usr/lib/ocaml" - mkdir -p "$OCAMLFIND_DESTDIR" "$OCAMLFIND_DESTDIR/stublibs" - rm -f test.cmi - make install_ocamlfind - install -D -m644 README "$pkgdir/usr/share/licenses/$pkgname/README" - install -D -m644 -t "$pkgdir/usr/share/doc/$pkgname/html/" doc/* + dune install \ + --destdir="$pkgdir" \ + --docdir=/.omit } dev() { @@ -84,6 +71,5 @@ scan_python3_dependency() { } sha512sums=" -029068c6eb48cd1223438dc0f86e1c5e6fd0412d160ea4d79928eec5e5f5843af46260d7240e4260851e9580e7f92d578c764c63c8e0acab348637455493ef02 ocaml-xml-light-2.4.tar.gz -6fd6d9131cb652df96c7fd7b68e9161a6e9a0c08fedfd2e2ee00a474d3d249ce16d4a8631a02ca36e158d8c61ff8fb0fe440b5e620eb64f865b23dcfd433e476 Makefile-explicit-target-fix.patch +fec6b83f8342a37bdad0fc745032f1faa57b359365ab53c2376fb031613a83a3139766f2d646a9b9b8d67da25252f2499a03de4caaef7bd8738f9b183ef84b6e xml-light-2.5.tar.bz2 " diff --git a/testing/ocaml-xml-light/Makefile-explicit-target-fix.patch b/testing/ocaml-xml-light/Makefile-explicit-target-fix.patch deleted file mode 100644 index ebf09faa0410c7a10eed719f7743d95e9bb961d3..0000000000000000000000000000000000000000 --- a/testing/ocaml-xml-light/Makefile-explicit-target-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -78,6 +78,8 @@ - - xml.cmi: - -+xml_parser.mli: -+ - xmlParser.cmi: dtd.cmi xml.cmi - - xml_lexer.cmi: dtd.cmi