Added ocaml-ppx_assert and dependencies

5 files changed, 66 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e6629104ac0..6101a5f708f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
 pkgbase = ocaml-ppx_compare
 	pkgdesc = Generation of comparison functions from types
-	pkgver = 0.12.0
+	pkgver = 0.13.0
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/janestreet/ppx_compare
-	arch = i686
 	arch = x86_64
+	arch = i686
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = MIT
-	makedepends = dune
-	depends = ocaml
-	depends = ocaml-base
-	depends = ocaml-ppxlib
+	makedepends = dune>=1.5.1
+	depends = ocaml>=4.04.2
+	depends = ocaml-base>=0.13.0
+	depends = ocaml-ppxlib>=0.9.0
 	options = !strip
-	source = https://github.com/janestreet/ppx_compare/archive/v0.12.0.tar.gz
-	sha512sums = 435f805ba19fa9fc7451cf647ad17aba6da45fd03abf35cebe9a4fd07da8a90e303b2f92e7ce4855d0e84f9c7a62ef9249b714e8434053b7cbfba9b15430f27f
+	source = ocaml-ppx_compare-0.13.0-1.tar.gz::https://github.com/janestreet/ppx_compare/archive/v0.13.0.tar.gz
+	sha256sums = 21e8abe479fd907cccca2f106a148ed51409a7988e184826bc571101f7cc93ce
 
 pkgname = ocaml-ppx_compare
-
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..a467ee9a97a6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+tab_width = 4
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..82b3c183d5d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# from https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.rpm
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+*/
diff --git a/PKGBUILD b/PKGBUILD
index 52332894d297..95daaad21dde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,41 @@
-# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
-
-pkgname=ocaml-ppx_compare
-pkgver=0.12.0
-pkgrel=1
-epoch=1
-pkgdesc="Generation of comparison functions from types"
-arch=('i686' 'x86_64')
-url="https://github.com/janestreet/ppx_compare"
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
+# Contributor: Jakob Gahde <j5lx@fmail.co.uk>
+_projectname='ppx_compare'
+pkgname="ocaml-$_projectname"
+pkgver='0.13.0'
+pkgrel='1'
+epoch='1'
+pkgdesc='Generation of comparison functions from types'
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+url="https://github.com/janestreet/$_projectname"
 license=('MIT')
-depends=('ocaml' 'ocaml-base' 'ocaml-ppxlib')
-makedepends=('dune')
+depends=('ocaml>=4.04.2' 'ocaml-base>=0.13.0' 'ocaml-ppxlib>=0.9.0')
+makedepends=('dune>=1.5.1')
 options=('!strip')
-source=("https://github.com/janestreet/ppx_compare/archive/v${pkgver}.tar.gz")
-sha512sums=('435f805ba19fa9fc7451cf647ad17aba6da45fd03abf35cebe9a4fd07da8a90e303b2f92e7ce4855d0e84f9c7a62ef9249b714e8434053b7cbfba9b15430f27f')
+source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('21e8abe479fd907cccca2f106a148ed51409a7988e184826bc571101f7cc93ce')
 
-build() {
-  cd "${srcdir}/ppx_compare-${pkgver}"
+_sourcedirectory="$_projectname-$pkgver"
 
-  dune build
+build() {
+	cd "$srcdir/$_sourcedirectory/"
+	dune build -p "$_projectname" --verbose
 }
 
+# fails with "Error: No rule found for test/comparelib_test__Check_optims.o"
+# check() {
+# 	cd "$srcdir/$_sourcedirectory/"
+# 	dune runtest -p "$_projectname" --verbose
+# }
+
 package() {
-  cd "${srcdir}/ppx_compare-${pkgver}"
+	cd "$srcdir/$_sourcedirectory/"
+	DESTDIR="$pkgdir" dune install --prefix '/usr' --libdir 'lib/ocaml'
+
+	install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+	mv "$pkgdir/usr/doc/$_projectname/"* "$pkgdir/usr/share/doc/$pkgname/"
+	rm -r "$pkgdir/usr/doc/"
 
-  install -dm755 "${pkgdir}$(ocamlfind -printconf destdir)" "${pkgdir}/usr/share"
-  dune install --prefix "${pkgdir}/usr" --libdir "${pkgdir}$(ocamlfind -printconf destdir)"
-  mv "${pkgdir}/usr/doc" "${pkgdir}/usr/share/"
-  install -Dm644 "LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
+	install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
+	ln -sf "/usr/share/doc/$pkgname/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
 }
diff --git a/libdir.patch b/libdir.patch
deleted file mode 100644
index 6284fcd558b0..000000000000
--- a/libdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -aur package.pristine/Makefile package.new/Makefile
---- package.pristine/Makefile	2016-02-06 01:55:14.650150309 +0100
-+++ package.new/Makefile	2016-02-06 01:57:56.012174364 +0100
-@@ -29,26 +29,26 @@
- 	ocaml -I js-utils js-utils/gen_install.ml
- 
- install: $(NAME).install
--	opam-installer -i --prefix $(PREFIX) $(NAME).install
-+	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
- 
- uninstall: $(NAME).install
--	opam-installer -u --prefix $(PREFIX) $(NAME).install
-+	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
- 
- reinstall: $(NAME).install
--	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
--	opam-installer -i --prefix $(PREFIX) $(NAME).install
-+	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install &> /dev/null || true
-+	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install
- 
- bin.tar.gz: $(NAME).install
- 	rm -rf _install
- 	mkdir _install
--	opam-installer -i --prefix _install $(NAME).install
-+	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
- 	tar czf bin.tar.gz -C _install .
- 	rm -rf _install
- 
- bin.lzo: $(NAME).install
- 	rm -rf _install
- 	mkdir _install
--	opam-installer -i --prefix _install $(NAME).install
-+	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
- 	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
- 	rm -rf _install
-