[arch-commits] CVS update of extra/network/dovecot (PKGBUILD)

[Paul Mattal]

    Date: Sunday, July 15, 2007 @ 13:45:50
  Author: paul
    Path: /home/cvs-extra/extra/network/dovecot

Modified: PKGBUILD (1.7 -> 1.8)

upgpkg: dovecot 1.0.2-1
updated to 1.0.2, fixed #2 of task #7564


----------+
 PKGBUILD |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)


Index: extra/network/dovecot/PKGBUILD
diff -u extra/network/dovecot/PKGBUILD:1.7 extra/network/dovecot/PKGBUILD:1.8
--- extra/network/dovecot/PKGBUILD:1.7	Sun Jun 17 09:27:52 2007
+++ extra/network/dovecot/PKGBUILD	Sun Jul 15 13:45:49 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.7 2007/06/17 13:27:52 paul Exp $
+# $Id: PKGBUILD,v 1.8 2007/07/15 17:45:49 paul Exp $
 #
 # Contributor: Paul Mattal <paul at mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo at despammed.com>
@@ -6,7 +6,7 @@
 # Maintainer: Paul Mattal <paul at archlinux.org>
 
 pkgname=dovecot
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
@@ -14,18 +14,18 @@
 license="LGPL"
 depends=('pam' 'libmysqlclient' 'postgresql-libs>=8.2.3')
 makedepends=()
-conflicts=('imap-server' 'pop3-server')
 provides=('imap-server' 'pop3-server')
 replaces=()
 options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/$pkgname-$pkgver.tar.gz dovecot.sh)
-md5sums=('0878f744382417fce09d83f5b1c14030' 'd020d43eab4ded6fb379dadc570a9490')
+md5sums=('769f0dd2750e7de521de3396999a09e5' 'd020d43eab4ded6fb379dadc570a9490')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver || return 1
 
   # configure with openssl, mysql, and postgresql support
+  # dont relocate /usr/libexec to /usr/lib because it causes filename conflicts
   ./configure --prefix=/usr --sysconfdir=/etc/dovecot --with-mysql \
   	--with-pgsql --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
 	|| return 1
@@ -36,6 +36,14 @@
   # install
   make DESTDIR=$startdir/pkg install || return 1
 
+  # remove empty directories for cleanliness
+  # /usr/share will usually end up empty except for documentation, but we
+  # should not rely on that to remain true, so we do it this way
+  rm -rf $startdir/pkg/usr/share/doc || return 1
+  rmdir $startdir/pkg/usr/share || return 1
+  rmdir $startdir/pkg/usr/include/dovecot || return 1
+  rmdir $startdir/pkg/usr/include || return 1
+
   # install the launch script
   install -D -m755 $startdir/src/$pkgname.sh $startdir/pkg/etc/rc.d/$pkgname \
   	|| return 1