1 files changed, 22 insertions, 6 deletions
diff --git a/network/dovecot/dovecot.SlackBuild b/network/dovecot/dovecot.SlackBuild
index db6b75d042..51114504c0 100644
--- a/network/dovecot/dovecot.SlackBuild
+++ b/network/dovecot/dovecot.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="dovecot"
-VERSION="1.1.15"
+VERSION="2.0.0"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,6 +40,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG="$TMP/package-$PRGNAM"
 OUTPUT=${OUTPUT:-/tmp}
 
+# Build with mysql database by default, sqlite/mysql/postgresql are supported
+DATABASE=${DATABASE:-mysql}
+case "$DATABASE" in
+       pgsql) DATABASE="--with-pgsql" ;;
+       mysql) DATABASE="--with-mysql" ;;
+      sqlite) DATABASE="--with-sqlite" ;;
+           *) DATABASE="" ;;
+esac
+
 # Bail if user isn't valid on your system
 if ! grep -q ^dovecot: /etc/passwd ; then
   echo "  You must have a dovecot user to run this script."
@@ -68,6 +77,7 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chmod -R a-s,u+w,go+r-w .
@@ -83,11 +93,11 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-header-install \
   --with-notify=inotify \
-  --disable-ipv6 \
   --without-pam \
   --with-pop3d \
   --disable-static \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  $DATABASE
 
 make
 make install-strip DESTDIR=$PKG
@@ -97,10 +107,16 @@ cp -a AUTHORS COPYING COPYING.LGPL COPYING.MIT ChangeLog INSTALL NEWS \
    README TODO doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/dovecot.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/dovecot.SlackBuild
 rm -rf $PKG/usr/share/doc
+find $PKG/usr/doc -type f \( -name "Makefile*" -o -name "*.in" \) -delete
+
+# Place a default conf file in /etc
+cat $PKG/usr/doc/dovecot-2.0.0/example-config/dovecot.conf > \
+    $PKG/etc/dovecot/dovecot.conf
 
-# Put the example files with the documentation
-mv $PKG/etc/dovecot-ldap-example.conf $PKG/etc/dovecot-sql-example.conf \
-   $PKG/usr/doc/$PRGNAM-$VERSION
+# Handle man pages
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # Add an init script
 mkdir -p $PKG/etc/rc.d