Added ppx_let and dependencies

5 files changed, 84 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c16d6c62495e..63dfe27a97ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,23 @@
 pkgbase = ocaml-re
 	pkgdesc = Pure OCaml regular expressions, with support for Perl and POSIX-style strings
-	pkgver = 1.8.0
+	pkgver = 1.9.0
 	pkgrel = 1
 	url = https://github.com/ocaml/ocaml-re
-	arch = i686
 	arch = x86_64
+	arch = i686
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = custom:LGPL2.1 with linking exception
+	checkdepends = ocaml-ounit
 	makedepends = dune
-	depends = ocaml
+	depends = ocaml>=4.02.0
 	depends = ocaml-seq
 	options = !strip
-	source = https://github.com/ocaml/ocaml-re/releases/download/1.8.0/re-1.8.0.tbz
-	sha512sums = 368c43d115b45c80c72770d2a61952f2614f4e4d1fc2a6b63691edda58b3eceac12f69f437b326cdf91b20ee62ce0e25ed3e89909e9e3c79ab56640691772085
+	source = ocaml-re-1.9.0-1.tar.gz::https://github.com/ocaml/ocaml-re/archive/1.9.0.tar.gz
+	source = fix-ounit-name.diff
+	sha256sums = 4a2408bb270e0d1aef101d6b5edfeec6753874a6bcf54eb43d9fd3a7ddd777c1
+	sha256sums = cb9109cfb78cd0c57c521fe7be23a6edee0d1e3be29f313b37093ae2848eecdc
 
 pkgname = ocaml-re
-
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 ce40a8d40dd4..c628b8782972 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,51 @@
-# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
+# Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 # Contributor: Taylor Venable <taylor@metasyntax.net>
-
-pkgname=ocaml-re
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="Pure OCaml regular expressions, with support for Perl and POSIX-style strings"
-arch=('i686' 'x86_64')
-url="https://github.com/ocaml/ocaml-re"
+_projectname='re'
+pkgname="ocaml-$_projectname"
+pkgver='1.9.0'
+pkgrel='1'
+pkgdesc='Pure OCaml regular expressions, with support for Perl and POSIX-style strings'
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+url="https://github.com/ocaml/$pkgname"
 license=('custom:LGPL2.1 with linking exception')
-depends=('ocaml' 'ocaml-seq')
+depends=('ocaml>=4.02.0' 'ocaml-seq')
 makedepends=('dune')
+checkdepends=('ocaml-ounit')
 options=('!strip')
-source=("https://github.com/ocaml/ocaml-re/releases/download/${pkgver}/re-${pkgver}.tbz")
-sha512sums=('368c43d115b45c80c72770d2a61952f2614f4e4d1fc2a6b63691edda58b3eceac12f69f437b326cdf91b20ee62ce0e25ed3e89909e9e3c79ab56640691772085')
+source=(
+	"$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz"
+	'fix-ounit-name.diff'
+)
+sha256sums=('4a2408bb270e0d1aef101d6b5edfeec6753874a6bcf54eb43d9fd3a7ddd777c1'
+            'cb9109cfb78cd0c57c521fe7be23a6edee0d1e3be29f313b37093ae2848eecdc')
 
-build() {
-  cd "${srcdir}/re-${pkgver}"
+_sourcedirectory="$pkgname-$pkgver"
 
-  jbuilder build
+prepare() {
+	cd "$srcdir/$_sourcedirectory/"
+	patch --forward -p1 < '../fix-ounit-name.diff'
 }
 
+build() {
+	cd "$srcdir/$_sourcedirectory/"
+	dune build -p "$_projectname" --verbose
+}
+
+check() {
+	cd "$srcdir/$_sourcedirectory/"
+	dune runtest -p "$_projectname" --verbose
+}
 
 package() {
-  cd "${srcdir}/re-${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"
-  jbuilder 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/fix-ounit-name.diff b/fix-ounit-name.diff
new file mode 100644
index 000000000000..a31e8b9a15c7
--- /dev/null
+++ b/fix-ounit-name.diff
@@ -0,0 +1,12 @@
+diff --git a/lib_test/fort_unit/dune b/lib_test/fort_unit/dune
+index 2882be8..c3defc7 100644
+--- a/lib_test/fort_unit/dune
++++ b/lib_test/fort_unit/dune
+@@ -3,4 +3,4 @@
+ (library
+  (name fort_unit)
+  (wrapped false)
+- (libraries re oUnit))
+\ No newline at end of file
++ (libraries re ounit2))
+\ No newline at end of file