[arch-commits] Commit in ocaml/trunk (PKGBUILD ocaml.install)

[Ronald van Haren]

    Date: Tuesday, August 19, 2008 @ 05:52:27
  Author: ronald
Revision: 9830

upgpkg: ocaml 3.10.2-2

Modified:
  ocaml/trunk/PKGBUILD
Deleted:
  ocaml/trunk/ocaml.install

---------------+
 PKGBUILD      |   20 +++++++++++---------
 ocaml.install |   24 ------------------------
 2 files changed, 11 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-19 09:41:27 UTC (rev 9829)
+++ PKGBUILD	2008-08-19 09:52:27 UTC (rev 9830)
@@ -3,25 +3,27 @@
 
 pkgname=ocaml	
 pkgver=3.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Ocaml compiler - Ocaml is a functional language with OO extensions"
 arch=(i686 x86_64)
-license=('LGPL2' 'QPL-1.0')
+license=('LGPL2' 'custom: QPL-1.0')
 url="http://caml.inria.fr/"
 depends=('gdbm')
-makedepends=('tk' 'ncurses' 'libx11')
+makedepends=('tk' 'ncurses=5.6-7' 'libx11')
+optdepends=('ncurses=5.6-7: advanced ncurses features' 'tk: advanced tk features')
 source=(http://caml.inria.fr/distrib/ocaml-3.10/$pkgname-$pkgver.tar.gz)
-install=(ocaml.install)
-options=(!makeflags)
+options=('!makeflags' '!emptydirs')
+md5sums=('52c795592c90ecb15c2c4754f04eeff4')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure -prefix /usr
-  make world.opt
-  make PREFIX=$startdir/pkg/usr install   
+  make world.opt || return 1
+  make PREFIX=$pkgdir/usr install || return 1
+   
 # Save >10MB with this one, makepkg only strips debug symbols.
  find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
+
 # install license
 install -D -m 644 $startdir/src/$pkgname-$pkgver/LICENSE $startdir/pkg/usr/share/licenses/ocaml/LICENSE
 }
-md5sums=('52c795592c90ecb15c2c4754f04eeff4')

Deleted: ocaml.install
===================================================================
--- ocaml.install	2008-08-19 09:41:27 UTC (rev 9829)
+++ ocaml.install	2008-08-19 09:52:27 UTC (rev 9830)
@@ -1,24 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  post_upgrade
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  echo "==> ocaml: advanced feature dependences:"
-  echo "    -------------------------------------"
-  echo "    ncurses: 'ncurses'"
-  echo "    tk:      'tk'     "
-  echo "        "
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*