1 files changed, 21 insertions, 14 deletions
diff --git a/abs/extra/ocaml/PKGBUILD b/abs/extra/ocaml/PKGBUILD
index 7f60fc6..2527a98 100644
--- a/abs/extra/ocaml/PKGBUILD
+++ b/abs/extra/ocaml/PKGBUILD
@@ -3,22 +3,22 @@
 
 pkgbase='ocaml'
 pkgname=('ocaml' 'ocaml-compiler-libs')
-pkgver=4.04.0
-pkgrel=1
+pkgver=4.06.0
+pkgrel=2
 pkgdesc="A functional language with OO extensions"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('LGPL2.1' 'custom: QPL-1.0')
 url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
 source=(http://caml.inria.fr/distrib/ocaml-${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('1878ba4338e4fad5b057428e182fba806c545d57')
+sha1sums=('831fab643feb0f78bd206f0a9a09a92df58838e7')
 options=('!makeflags' '!emptydirs' 'staticlibs')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure -prefix /usr -x11include /usr/include 
+  ./configure -prefix /usr -x11include /usr/include
   make world.opt
 }
 
@@ -32,6 +32,9 @@ package_ocaml() {
   # install license
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+  # remove compiler libs
+  rm -rf "${pkgdir}/usr/lib/ocaml/compiler-libs"
 }
 
 package_ocaml-compiler-libs() {
@@ -41,15 +44,19 @@ depends=('ocaml')
 optdepends=()
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Install compiler libraries
-  local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs"
-  mkdir -p "$compiler_libs"/{parsing,typing,utils}
-  cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing
-  cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing
-  cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils
-  # duplicated by installation
-  rm -f "$compiler_libs"/typing/outcometree.{cmi,mli}
+  # from Makefile
+  BYTESTART=driver/main.cmo
+  TOPLEVELSTART=toplevel/topstart.cmo
+  mkdir -p "${pkgdir}/usr/lib/ocaml/compiler-libs"
+  cp utils/*.cmi utils/*.cmt utils/*.cmti utils/*.mli \
+     parsing/*.cmi parsing/*.cmt parsing/*.cmti parsing/*.mli \
+     typing/*.cmi typing/*.cmt typing/*.cmti typing/*.mli \
+     bytecomp/*.cmi bytecomp/*.cmt bytecomp/*.cmti bytecomp/*.mli \
+     driver/*.cmi driver/*.cmt driver/*.cmti driver/*.mli \
+     toplevel/*.cmi toplevel/*.cmt toplevel/*.cmti toplevel/*.mli \
+     "${pkgdir}/usr/lib/ocaml/compiler-libs"
+  cp compilerlibs/* ${BYTESTART} ${TOPLEVELSTART} \
+  "${pkgdir}/usr/lib/ocaml/compiler-libs"
 
   # install license
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"