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

[Jan de Groot]

    Date: Thursday, April 8, 2010 @ 03:25:41
  Author: jgc
Revision: 76147

Change weird install scriptlet to optdepends (FS#18870)

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

-----------------+
 PKGBUILD        |   11 ++++++-----
 libsasl.install |   13 -------------
 2 files changed, 6 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-08 01:07:03 UTC (rev 76146)
+++ PKGBUILD	2010-04-08 07:25:41 UTC (rev 76147)
@@ -9,7 +9,8 @@
 url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
 license=('custom')
 depends=('db>=4.8')
-install=libsasl.install
+optdepends=('cyrus-sasl: saslauthd'
+            'cyrus-sasl-plugins: authentication plugisn other than sasldb')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
 	cyrus-sasl-2.1.19-checkpw.c.patch db-4.7.patch)
 options=('!makeflags')
@@ -18,7 +19,7 @@
          '71a3b7454f4d7cc2966b347bdf03f2fc')
 
 build() {
-  cd ${srcdir}/cyrus-sasl-${pkgver}
+  cd "${srcdir}/cyrus-sasl-${pkgver}"
   patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch || return 1
   patch -Np0 -i ${srcdir}/db-4.7.patch || return 1
   ./configure --prefix=/usr \
@@ -31,14 +32,14 @@
 	--enable-login \
 	--disable-otp \
 	--enable-plain \
-        --mandir=/usr/share/man
+        --mandir=/usr/share/man || return 1
   for dir in include lib sasldb plugins utils; do
     pushd ${dir} || return 1
     make || return 1
-    make DESTDIR=${pkgdir} install || return 1
+    make DESTDIR="${pkgdir}" install || return 1
     popd
   done
 
   # install license
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
 }

Deleted: libsasl.install
===================================================================
--- libsasl.install	2010-04-08 01:07:03 UTC (rev 76146)
+++ libsasl.install	2010-04-08 07:25:41 UTC (rev 76147)
@@ -1,13 +0,0 @@
-post_install() {
-cat << _EOF
-==>
-==>  cyrus-sasl has been split up into several standalone packages.
-==>
-==>  - If you use saslauthd, make sure you have cyrus-sasl installed
-==>
-==>  - If you use authentication modules other than sasldb,
-==>    install cyrus-sasl-plugins
-==>
-_EOF
-
-}