ocaml-camomile Comprehensive Unicode library for OCaml

2 files changed, 51 insertions, 18 deletions

diff --git a/pcr/ocaml-camomile/0002-Install-missing-camomileLibrary.a.patch b/pcr/ocaml-camomile/0002-Install-missing-camomileLibrary.a.patch
new file mode 100644
index 000000000..23d300d1b
--- /dev/null
+++ b/pcr/ocaml-camomile/0002-Install-missing-camomileLibrary.a.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 29 Jul 2011 19:46:45 +0200
+Subject: Install missing camomileLibrary.a
+
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e1fc579..45dc0ac 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -406,7 +406,7 @@ install-with-ocamlfind:
+ 	files= &&\
+ 	if [ -f camomileLibrary.cmx ]; then files=camomileLibrary.cmx; fi && \
+ 	if [ -f camomileLibrary.cma ]; then files="camomileLibrary.cma $$files"; fi && \
+-	if [ -f camomileLibrary.cmxa ]; then files="camomileLibrary.cmxa $$files"; fi && \
++	if [ -f camomileLibrary.cmxa ]; then files="camomileLibrary.cmxa camomileLibrary.a $$files"; fi && \
+ 	if [ -f camomileLibraryDefault.cmx ]; then files="camomileLibraryDefault.cmx $$files"; fi && \
+ 	if [ -f camomileLibraryDyn.cmx ]; then files="camomileLibraryDyn.cmx $$files"; fi && \
+ 	if [ -f camomile.cma ]; then files="camomile.cma $$files"; fi&& \
+-- 
diff --git a/pcr/ocaml-camomile/PKGBUILD b/pcr/ocaml-camomile/PKGBUILD
index 555211fbf..5537b4af0 100644
--- a/pcr/ocaml-camomile/PKGBUILD
+++ b/pcr/ocaml-camomile/PKGBUILD
@@ -1,28 +1,38 @@
-# Contributor (Arch): Serge Zirukin <ftrvxmtrx@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
+# Maintainer : Aurélien Desbrières <aurelien@hackers.camp>
+# Contributor: Marek Kubica <marek@xivilization.net>
+# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>
 pkgname=ocaml-camomile
-pkgver=0.8.4
-pkgrel=2
+pkgver=0.8.5
+pkgrel=5
 pkgdesc="Comprehensive Unicode library for OCaml"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="https://github.com/yoriyuki/Camomile"
 license=('LGPL')
-depends=('ocaml' 'ocaml-findlib>=1.2.3')
-install=
-source=(https://github.com/downloads/yoriyuki/${pkgname/ocaml-}/${pkgname/ocaml-/}-$pkgver.tar.bz2)
-md5sums=('389f1a7e5c2a634fbb3ea6f764d77bd3')
-options=(!strip !makeflags)
+makedepends=('ocaml' 'camlp4' 'ocaml-findlib>=1.2.3')
+source=(https://github.com/yoriyuki/${pkgname/ocaml-}/releases/download/rel-$pkgver/${pkgname/ocaml-/}-$pkgver.tar.bz2
+        0002-Install-missing-camomileLibrary.a.patch)
+options=(!strip !makeflags staticlibs)
+
+prepare() {
+  cd "${srcdir}/${pkgname/ocaml-/}-${pkgver}"
+  # Patch from Debian, Slackware to add camomileLibrary.a which is required
+  # for some code to build
+  patch -Np1 -i ../0002-Install-missing-camomileLibrary.a.patch
+}
 
 build() {
-  cd "$srcdir/${pkgname/ocaml-/}-$pkgver"
+  cd "${srcdir}/${pkgname/ocaml-/}-${pkgver}"
 
   ./configure --prefix=/usr
-  mkdir -p $pkgdir$(ocamlfind printconf destdir) || return 1
-  mkdir -p $pkgdir/usr/bin
-  sed -i -e 's|ocamlfind install|ocamlfind install -destdir '$pkgdir$(ocamlfind printconf destdir)'|' Makefile || return 1
-  make || return 1
-  make DATADIR="$pkgdir/usr/share" BINDIR="$pkgdir/usr/bin" install
-  install -Dm 644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  sed -i -e 's|ocamlfind install|ocamlfind install -destdir '${pkgdir}$(ocamlfind printconf destdir)'|' Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname/ocaml-/}-${pkgver}"
+
+  mkdir -p "${pkgdir}$(ocamlfind printconf destdir)"
+  make DATADIR="${pkgdir}/usr/share" install
+  install -Dm 644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }