[arch-commits] Commit in libldap/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Tuesday, June 22, 2010 @ 14:32:52
  Author: andrea
Revision: 83737

upgpkg: libldap 2.4.22-1
upstream release

Modified:
  libldap/trunk/PKGBUILD

----------+
 PKGBUILD |   49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-22 18:13:25 UTC (rev 83736)
+++ PKGBUILD	2010-06-22 18:32:52 UTC (rev 83737)
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer:
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=libldap
-pkgver=2.4.21
-pkgrel=2
+pkgver=2.4.22
+pkgrel=1
 pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -13,15 +13,16 @@
 depends=('libsasl' 'openssl')
 makedepends=('tcp_wrappers')
 options=('!libtool')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz
-        ntlm.patch)
-md5sums=('e7128c57b2bacd940e8906057c94ff26'
+source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz"
+        'ntlm.patch')
+md5sums=('ef01b52255ce8e3fbf8aa34f6fe7598b'
          'dfa9eb6f2fd9d0a3dab0e1860923489e')
 
 build() {
   cd ${srcdir}/openldap-${pkgver}
-  patch -Np1 -i ${srcdir}/ntlm.patch || return 1
 
+  patch -Np1 -i ${srcdir}/ntlm.patch
+
   ./configure --prefix=/usr \
               --libexecdir=/usr/sbin \
               --sysconfdir=/etc \
@@ -31,30 +32,42 @@
               --with-threads --enable-wrappers \
 	      --enable-spasswd --with-cyrus-sasl \
 	      --disable-bdb --disable-hdb
+
   cd include
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
 
   cd ../libraries
-  make depend || return 1
-  make || return 1
+  make depend
+  make
 
-  make DESTDIR=${pkgdir} install || return 1
+  cd ../doc/man/man3
+  make
+  
+  cd ../man5
+  make
+}
 
+package() {
+  cd ${srcdir}/openldap-${pkgver}
+
+  cd include
+  make DESTDIR=${pkgdir} install
+
+  cd ../libraries
+  make DESTDIR=${pkgdir} install
+
   cd ../doc/man/man3
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
   cd ../man5
-  make || return 1
   install -Dm644 ldap.conf.5.tmp \
-    ${pkgdir}/usr/share/man/man5/ldap.conf.5 || return 1
+    ${pkgdir}/usr/share/man/man5/ldap.conf.5
   
   # get rid of duplicate default conf files
   rm ${pkgdir}/etc/openldap/*.default
 
-  ln -sf liblber.so ${pkgdir}/usr/lib/liblber.so.2 || return 1
-  ln -sf libldap.so ${pkgdir}/usr/lib/libldap.so.2 || return 1
+  ln -sf liblber.so ${pkgdir}/usr/lib/liblber.so.2
+  ln -sf libldap.so ${pkgdir}/usr/lib/libldap.so.2
 
   install -Dm644 ${srcdir}/openldap-${pkgver}/LICENSE \
     ${pkgdir}/usr/share/licenses/$pkgname/LICENSE