Don't start qmail automatically, added .keep files to the file hierarchy,

create qmail-sumo package which installs everything that's qmail related.

19 files changed, 53 insertions, 592 deletions

diff --git a/net-mail/qmail/files/1.03-r5/dot_qmail b/net-mail/qmail/files/1.03-r6/dot_qmail
index 7c9e5d08f067..7c9e5d08f067 100644
--- a/net-mail/qmail/files/1.03-r5/dot_qmail
+++ b/net-mail/qmail/files/1.03-r6/dot_qmail
diff --git a/net-mail/qmail/files/1.03-r5/qmail-control b/net-mail/qmail/files/1.03-r6/qmail-control
index 2d7c1319f600..468eaeaf8564 100644
--- a/net-mail/qmail/files/1.03-r5/qmail-control
+++ b/net-mail/qmail/files/1.03-r6/qmail-control
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/1.03-r5/qmail-control,v 1.2 2001/12/06 20:17:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/1.03-r6/qmail-control,v 1.1 2001/12/07 17:55:16 gbevin Exp $
 
 opts="start stop restart reload"
 
diff --git a/net-mail/qmail/files/1.03-r5/qmail-linksync.patch b/net-mail/qmail/files/1.03-r6/qmail-linksync.patch
index 1b35f12aaa1f..1b35f12aaa1f 100644
--- a/net-mail/qmail/files/1.03-r5/qmail-linksync.patch
+++ b/net-mail/qmail/files/1.03-r6/qmail-linksync.patch
diff --git a/net-mail/qmail/files/1.03-r5/rc b/net-mail/qmail/files/1.03-r6/rc
index 57fdec522803..57fdec522803 100644
--- a/net-mail/qmail/files/1.03-r5/rc
+++ b/net-mail/qmail/files/1.03-r6/rc
diff --git a/net-mail/qmail/files/1.03-r5/run-qmailsend b/net-mail/qmail/files/1.03-r6/run-qmailsend
index 8dbd3adf524f..8dbd3adf524f 100644
--- a/net-mail/qmail/files/1.03-r5/run-qmailsend
+++ b/net-mail/qmail/files/1.03-r6/run-qmailsend
diff --git a/net-mail/qmail/files/1.03-r5/run-qmailsendlog b/net-mail/qmail/files/1.03-r6/run-qmailsendlog
index 5ff50d1e7711..5ff50d1e7711 100644
--- a/net-mail/qmail/files/1.03-r5/run-qmailsendlog
+++ b/net-mail/qmail/files/1.03-r6/run-qmailsendlog
diff --git a/net-mail/qmail/files/1.03-r5/run-qmailsmtpd b/net-mail/qmail/files/1.03-r6/run-qmailsmtpd
index 0d61202a7cf3..0d61202a7cf3 100644
--- a/net-mail/qmail/files/1.03-r5/run-qmailsmtpd
+++ b/net-mail/qmail/files/1.03-r6/run-qmailsmtpd
diff --git a/net-mail/qmail/files/1.03-r5/run-qmailsmtpdlog b/net-mail/qmail/files/1.03-r6/run-qmailsmtpdlog
index 2d9546146583..2d9546146583 100644
--- a/net-mail/qmail/files/1.03-r5/run-qmailsmtpdlog
+++ b/net-mail/qmail/files/1.03-r6/run-qmailsmtpdlog
diff --git a/net-mail/qmail/files/digest-qmail-1.03-r3 b/net-mail/qmail/files/digest-qmail-1.03-r3
deleted file mode 100644
index 2a9cd77c8255..000000000000
--- a/net-mail/qmail/files/digest-qmail-1.03-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 12288
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 8192
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 221184
-MD5 536b8dd8648dee72c137569a5ae2ac46 qmail-nosync.patch 4096
diff --git a/net-mail/qmail/files/digest-qmail-1.03-r4 b/net-mail/qmail/files/digest-qmail-1.03-r4
deleted file mode 100644
index 77f719a6ad12..000000000000
--- a/net-mail/qmail/files/digest-qmail-1.03-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 12288
-MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 8192
-MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 221184
-MD5 abc975ae7274a2b5332231ba3f78db76 qmail-link-sync.patch 4096
diff --git a/net-mail/qmail/files/digest-qmail-1.03-r5 b/net-mail/qmail/files/digest-qmail-1.03-r6
index 30aa583b5e7c..30aa583b5e7c 100644
--- a/net-mail/qmail/files/digest-qmail-1.03-r5
+++ b/net-mail/qmail/files/digest-qmail-1.03-r6
diff --git a/net-mail/qmail/files/qmail b/net-mail/qmail/files/qmail
deleted file mode 100755
index fec6a79c4997..000000000000
--- a/net-mail/qmail/files/qmail
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-##########################################################################################
-#RCUPDATE:3 4:72:Required for rc-update
-. /etc/rc.d/config/functions
-
-. /etc/rc.d/config/basic
-
-SERVICE=qmail
-EXE="/var/qmail/bin/qmail-start"
-#TCPS="/usr/local/bin/tcpserver"
-#RBL="/usr/local/bin/rblsmtpd"
-opts="start stop restart"
-export PATH="/var/qmail/bin:$PATH"
-
-start()	{
-		einfo "Starting ${SERVICE}.."
-		export DEBUGLEVEL=255
-		exec $EXE ./.maildir/ splogger qmail &
-#		exec $TCPS -x/etc/tcp.smtp.cdb -uqmaild -gnofiles 0 smtp $RBL -b -rrbl.maps.vix.com qmail-smtpd 2>&1 | splogger &
-#		exec $TCPS -u0 -g0 0 110 qmail-popup /usr/local/bin/checkvpw qmail-pop3d .maildir 2>&1 | splogger &
-		eend $? "Error starting ${SERVICE}."
-}
-
-stop ()	{
-		einfo "Stopping ${SERVICE}..."
-		start-stop-daemon --stop --quiet -u root -n qmail-lspawn 1>&2
-		eend $? "Error stopping ${SERVICE}."
-}
-
-restart() {
-		stop
-		start
-}
-
-doservice ${@}
-
-
diff --git a/net-mail/qmail/files/qmail-linksync.patch b/net-mail/qmail/files/qmail-linksync.patch
deleted file mode 100644
index 1b35f12aaa1f..000000000000
--- a/net-mail/qmail/files/qmail-linksync.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../qmail-1.03.orig/qmail-local.c	Mon Jun 15 12:53:16 1998
-+++ qmail-local.c	Sun Jul 16 16:19:04 2000
-@@ -1,5 +1,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include "readwrite.h"
- #include "sig.h"
- #include "env.h"
-@@ -128,6 +129,9 @@
-  if (close(fd) == -1) goto fail; /* NFS dorks */
- 
-  if (link(fntmptph,fnnewtph) == -1) goto fail;
-+ if ((fd = open(fnnewtph, O_RDONLY)) < 0 ||
-+     fsync(fd) < 0 || close(fd) < 0) goto fail;
-+   
-    /* if it was error_exist, almost certainly successful; i hate NFS */
-  tryunlinktmp(); _exit(0);
- 
---- ../qmail-1.03.orig/qmail-queue.c	Mon Jun 15 12:53:16 1998
-+++ qmail-queue.c	Sun Jul 16 16:19:33 2000
-@@ -1,5 +1,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
- #include "readwrite.h"
- #include "sig.h"
- #include "exit.h"
-@@ -155,6 +156,7 @@
- {
-  unsigned int len;
-  char ch;
-+ int fd;
- 
-  sig_blocknone();
-  umask(033);
-@@ -183,7 +185,7 @@
-  todofn = fnnum("todo/",0);
-  intdfn = fnnum("intd/",0);
- 
-- if (link(pidfn,messfn) == -1) die(64);
-+ if (link(pidfn,messfn) == -1) die(64); 
-  if (unlink(pidfn) == -1) die(63);
-  flagmademess = 1;
- 
-@@ -248,6 +250,8 @@
-  if (fsync(intdfd) == -1) die_write();
- 
-  if (link(intdfn,todofn) == -1) die(66);
-+ if ((fd = open(todofn, O_RDONLY)) < 0 ||
-+     fsync(fd) < 0 || close(fd) < 0) die(66); 
- 
-  triggerpull();
-  die(0);
diff --git a/net-mail/qmail/files/tcp.smtp b/net-mail/qmail/files/tcp.smtp
deleted file mode 100644
index 59d7ded3cb0c..000000000000
--- a/net-mail/qmail/files/tcp.smtp
+++ /dev/null
@@ -1,6 +0,0 @@
-#/etc/tcp.smtp file to control mail relay using qmail.Relay also uses RBL SMTP Block
-#defaults to localhost only. Add your network as per your requirements.
-# Script by Parag Mehta <pm@gentoo.org>
-
-127.0.0.1:allow,RELAYCLIENT='',RBLSMTP=''
-:allow
diff --git a/net-mail/qmail/files/tcp.smtp.cdb b/net-mail/qmail/files/tcp.smtp.cdb
deleted file mode 100644
index b030e83ecd62..000000000000
--- a/net-mail/qmail/files/tcp.smtp.cdb
+++ /dev/null
diff --git a/net-mail/qmail/files/tcprulesedit.sh b/net-mail/qmail/files/tcprulesedit.sh
deleted file mode 100644
index 3a6da83167b4..000000000000
--- a/net-mail/qmail/files/tcprulesedit.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-#Script to edit /etc/tcp.smtp to control mail relay from your machine using wmail
-#Script by Parag Mehta <pm@gentoo.org>
-#
-
-vi /etc/tcp.smtp
-/usr/bin/tcprules /etc/tcp.smtp.cdb /etc/tcp.smtp.tmp < /etc/tcp.smtp
-
diff --git a/net-mail/qmail/qmail-1.03-r3.ebuild b/net-mail/qmail/qmail-1.03-r3.ebuild
deleted file mode 100644
index d7e96f995c21..000000000000
--- a/net-mail/qmail/qmail-1.03-r3.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r3.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
-
-S=${WORKDIR}/qmail-1.03
-DESCRIPTION="A modern replacement for sendmail which uses maildirs"
-
-QMAIL_SRC="http://cr.yp.to/software/qmail-1.03.tar.gz
-           http://www.qmail.org/big-todo.103.patch
-           http://www.qmail.org/big-concurrency.patch
-           http://www.jedi.claranet.fr/qmail-nosync.patch"
-MYSQL_SRC="http://iain.cx/unix/qmail/qmail-mysql.patch"
-LDAP_SRC="http://www.nrg4u.com/qmail/qmail-ldap-1.03-20001201.patch.gz"
-
-QMAIL_DEP="virtual/glibc"
-
-MYSQL_DEP=">=dev-db/mysql-3.23.28"
-LDAP_DEP=">=net-nds/openldap-1.2.11"
-
-HOMEPAGE="http://www.qmail.org/
-          http://www.jedi.claranet.fr/qmail-tuning.html
-          http://iain.cx/unix/qmail/mysql.php
-          http://www.nrg4u.com/"
-
-# oversize dns patch (unnecessary?)
-#         http://www.ckdhr.com/ckd/qmail-1.03.patch
-
-if [ "${P}" = "qmail-mysql-1.03" ]; then
-    SRC_URI="${QMAIL_SRC} ${MYSQL_SRC}"
-    DEPEND="${QMAIL_DEP} ${MYSQL_DEP}"
-elif [ "${P}" = "qmail-ldap-1.03" ]; then
-    SRC_URI="${QMAIL_SRC} ${LDAP_SRC}"
-    DEPEND="${QMAIL_DEP} ${LDAP_DEP}"
-else
-    SRC_URI="${QMAIL_SRC}"
-    DEPEND="${QMAIL_DEP}"
-fi
-
-PROVIDE="virtual/mta"
-RDEPEND="$DEPEND"
-DEPEND="$DEPEND sys-apps/groff"
-
-
-
-src_unpack() {
-    cd ${WORKDIR}
-    unpack qmail-1.03.tar.gz
-
-    cd ${S}
-    echo Applying big-todo patch...
-    patch < ${DISTDIR}/big-todo.103.patch
-
-    echo Applying big-concurrency patch...
-    patch < ${DISTDIR}/big-concurrency.patch
-
-    echo Applying Ext2FS/ReiserFS patch...
-    patch < ${DISTDIR}/qmail-nosync.patch
-
-    if [ "${P}" = "qmail-mysql-1.03" ]; then
-        cd ${S}
-        echo Applying MySQL patch...
-        patch < ${DISTDIR}/qmail-mysql.patch
-    fi
-
-    echo "gcc ${CFLAGS}" > conf-cc
-    echo "gcc" > conf-ld
-    echo "500" > conf-spawn
-}
-
-
-src_compile() {
-    cd ${S}
-
-    if [ "${P}" = "qmail-mysql-1.03" ]; then
-        cp Makefile Makefile.orig
-        sed -e "s:MYSQL_LIBS=.*:MYSQL_LIBS=/usr/lib/mysql/libmysqlclient.a -lm:" \
-            -e "s:MYSQL_INCLUDE=.*:MYSQL_INCLUDE=-I/usr/include/mysql:" Makefile.orig > Makefile
-    fi
-
-    try make it man
-}
-
-
-
-src_install() {                 
-    cd ${S}
-    diropts -m 755 -o root -g qmail
-    dodir /var/qmail
-
-    for i in bin boot control users
-    do
-        dodir /var/qmail/$i
-    done
-
-    diropts -m 755 -o alias -g qmail
-    dodir /var/qmail/alias
-
-    diropts -m 750 -o qmailq -g qmail
-    dodir /var/qmail/queue
-    dodir /var/qmail/queue/todo
-
-    diropts -m 700 -o qmailq -g qmail
-    dodir /var/qmail/queue/pid
-
-    diropts -m0700 -o qmails -g qmail
-    dodir /var/qmail/queue/bounce
-
-    diropts -m 750 -o qmailq -g qmail
-    dodir /var/qmail/queue/mess
-
-    for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-    do
-        dodir /var/qmail/queue/mess/$i
-        dodir /var/qmail/queue/todo/$i
-        dodir /var/qmail/queue/intd/$i
-    done
-
-    diropts -m 700 -o qmails -g qmail
-    for i in info local remote
-    do
-        dodir /var/qmail/queue/$i
-    done
-
-    for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-    do
-        dodir /var/qmail/queue/info/$i
-        dodir /var/qmail/queue/local/$i
-        dodir /var/qmail/queue/remote/$i
-    done
-
-    diropts -m 750 -o qmailq -g qmail 
-    dodir /var/qmail/queue/lock
-
-    dd if=/dev/zero of=${D}/var/qmail/queue/lock/tcpto bs=1024 count=1
-    fperms 644 /var/qmail/queue/lock/tcpto
-    fowners qmailr.qmail /var/qmail/queue/lock/tcpto
-
-    touch ${D}/var/qmail/queue/lock/sendmutex
-    fperms 600 /var/qmail/queue/lock/sendmutex
-    fowners qmails.qmail /var/qmail/queue/lock/sendmutex
- 
-    mkfifo ${D}/var/qmail/queue/lock/trigger
-    fperms 622 /var/qmail/queue/lock/trigger
-    fowners qmails.qmail /var/qmail/queue/lock/trigger
- 
-    insopts -o root -g qmail -m 755
-    insinto /var/qmail/boot
-    doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
-    into /usr
-    dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
-    dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
- 
-    insopts -o qmailq -g qmail -m 4711
-    insinto /var/qmail/bin
-    doins qmail-queue qmail-queue
-        
-    insopts -o root -g qmail -m 700
-    insinto /var/qmail/bin
-    doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
-    insopts -o root -g qmail -m 711
-    insinto /var/qmail/bin
-    doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
-        qmail-clean qmail-send splogger qmail-pw2u
- 
-    insopts -o root -g qmail -m 755
-    insinto /var/qmail/bin
-    doins qmail-inject predate datemail mailsubj qmail-showctl \
-        qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
-        qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
-        sendmail tcp-env qreceipt qsmhook qbiff forward preline \
-        condredirect bouncesaying except maildirmake maildir2mbox \
-        maildirwatch qail elq pinq config-fast
-
-    diropts -m 755
-    dodir /usr/sbin /usr/lib
-    dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-    dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-
-    into /usr
-    for i in *.1 *.5 *.8
-    do
-        doman $i
-    done
-
-    diropts -m 700 -o alias -g qmail
-    if [ ! -d ${ROOT}/var/qmail/alias/Maildir ] ; then
-        dodir /var/qmail/alias/Maildir
-
-        for i in cur new tmp
-        do
-            dodir /var/qmail/alias/Maildir/$i
-        done
-    fi
-
-    for i in mailer-daemon postmaster root
-    do
-        touch ${D}/var/qmail/alias/.qmail-${i}
-        fowners alias.qmail /var/qmail/alias/.qmail-${i}
-    done
- 
-    insinto /etc/rc.d/init.d
-    insopts -m755
-    doins ${O}/files/qmail
-}
-
-
-# pkg_config() {
-#     export QmailHost=`uname -n`
-#     ${ROOT}/usr/sbin/rc-update add qmail
-#     if [ ${ROOT} = "/" ] ; then
-# 
-#       if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-#           ${ROOT}/var/qmail/bin/config-fast $QmailHost  
-#       fi
-# 
-#     fi
-# }
diff --git a/net-mail/qmail/qmail-1.03-r4.ebuild b/net-mail/qmail/qmail-1.03-r4.ebuild
deleted file mode 100644
index e340e9b0bb6f..000000000000
--- a/net-mail/qmail/qmail-1.03-r4.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Parag Mehta <pm@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r4.ebuild,v 1.4 2001/08/11 12:29:57 pm Exp $
-
-S=${WORKDIR}/qmail-1.03
-DESCRIPTION="A modern replacement for sendmail which uses maildirs"
-
-QMAIL_SRC="http://cr.yp.to/software/qmail-1.03.tar.gz
-           http://www.qmail.org/big-todo.103.patch
-           http://www.qmail.org/big-concurrency.patch
-           http://www.jedi.claranet.fr/qmail-link-sync.patch"
-MYSQL_SRC="http://iain.cx/unix/qmail/qmail-mysql.patch"
-LDAP_SRC="http://www.nrg4u.com/qmail/qmail-ldap-1.03-20001201.patch.gz"
-
-QMAIL_DEP="virtual/glibc
-	   >=net-mail/checkpassword-0.90"
-
-MYSQL_DEP=">=dev-db/mysql-3.23.28"
-LDAP_DEP=">=net-nds/openldap-1.2.11"
-
-HOMEPAGE="http://www.qmail.org/
-          http://www.jedi.claranet.fr/qmail-tuning.html
-          http://iain.cx/unix/qmail/mysql.php
-          http://www.nrg4u.com/"
-
-# oversize dns patch (unnecessary?)
-#         http://www.ckdhr.com/ckd/qmail-1.03.patch
-
-if [ "${P}" = "qmail-mysql-1.03" ]; then
-    SRC_URI="${QMAIL_SRC} ${MYSQL_SRC}"
-    DEPEND="${QMAIL_DEP} ${MYSQL_DEP}"
-elif [ "${P}" = "qmail-ldap-1.03" ]; then
-    SRC_URI="${QMAIL_SRC} ${LDAP_SRC}"
-    DEPEND="${QMAIL_DEP} ${LDAP_DEP}"
-else
-    SRC_URI="${QMAIL_SRC}"
-    DEPEND="${QMAIL_DEP}"
-fi
-
-PROVIDE="virtual/mta"
-RDEPEND="$DEPEND"
-DEPEND="$DEPEND sys-apps/groff"
-
-
-
-src_unpack() {
-    cd ${WORKDIR}
-    unpack qmail-1.03.tar.gz
-
-    cd ${S}
-    echo Applying big-todo patch...
-    patch < ${DISTDIR}/big-todo.103.patch
-
-    echo Applying big-concurrency patch...
-    patch < ${DISTDIR}/big-concurrency.patch
-
-    echo Applying Ext2FS/ReiserFS patch...
-    patch < ${DISTDIR}/qmail-link-sync.patch
-
-    if [ "${P}" = "qmail-mysql-1.03" ]; then
-        cd ${S}
-        echo Applying MySQL patch...
-        patch < ${DISTDIR}/qmail-mysql.patch
-    fi
-
-    echo "gcc ${CFLAGS}" > conf-cc
-    echo "gcc" > conf-ld
-    echo "500" > conf-spawn
-}
-
-
-src_compile() {
-    cd ${S}
-
-    if [ "${P}" = "qmail-mysql-1.03" ]; then
-        cp Makefile Makefile.orig
-        sed -e "s:MYSQL_LIBS=.*:MYSQL_LIBS=/usr/lib/mysql/libmysqlclient.a -lm:" \
-            -e "s:MYSQL_INCLUDE=.*:MYSQL_INCLUDE=-I/usr/include/mysql:" Makefile.orig > Makefile
-    fi
-
-    try make it man
-}
-
-
-
-src_install() {                 
-    cd ${S}
-    diropts -m 755 -o root -g qmail
-    dodir /var/qmail
-
-    for i in bin boot control users
-    do
-        dodir /var/qmail/$i
-    done
-
-    diropts -m 755 -o alias -g qmail
-    dodir /var/qmail/alias
-
-    diropts -m 750 -o qmailq -g qmail
-    dodir /var/qmail/queue
-    dodir /var/qmail/queue/todo
-
-    diropts -m 700 -o qmailq -g qmail
-    dodir /var/qmail/queue/pid
-
-    diropts -m0700 -o qmails -g qmail
-    dodir /var/qmail/queue/bounce
-
-    diropts -m 750 -o qmailq -g qmail
-    dodir /var/qmail/queue/mess
-
-    for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-    do
-        dodir /var/qmail/queue/mess/$i
-        dodir /var/qmail/queue/todo/$i
-        dodir /var/qmail/queue/intd/$i
-    done
-
-    diropts -m 700 -o qmails -g qmail
-    for i in info local remote
-    do
-        dodir /var/qmail/queue/$i
-    done
-
-    for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
-    do
-        dodir /var/qmail/queue/info/$i
-        dodir /var/qmail/queue/local/$i
-        dodir /var/qmail/queue/remote/$i
-    done
-
-    diropts -m 750 -o qmailq -g qmail 
-    dodir /var/qmail/queue/lock
-
-    dd if=/dev/zero of=${D}/var/qmail/queue/lock/tcpto bs=1024 count=1
-    fperms 644 /var/qmail/queue/lock/tcpto
-    fowners qmailr.qmail /var/qmail/queue/lock/tcpto
-
-    touch ${D}/var/qmail/queue/lock/sendmutex
-    fperms 600 /var/qmail/queue/lock/sendmutex
-    fowners qmails.qmail /var/qmail/queue/lock/sendmutex
- 
-    mkfifo ${D}/var/qmail/queue/lock/trigger
-    fperms 622 /var/qmail/queue/lock/trigger
-    fowners qmails.qmail /var/qmail/queue/lock/trigger
- 
-    insopts -o root -g qmail -m 755
-    insinto /var/qmail/boot
-    doins home home+df proc proc+df binm1 binm1+df binm2 binm2+df binm3 binm3+df
- 
-    into /usr
-    dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY 
-    dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
- 
-    insopts -o qmailq -g qmail -m 4711
-    insinto /var/qmail/bin
-    doins qmail-queue qmail-queue
-        
-    insopts -o root -g qmail -m 700
-    insinto /var/qmail/bin
-    doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
-        
-    insopts -o root -g qmail -m 711
-    insinto /var/qmail/bin
-    doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
-        qmail-clean qmail-send splogger qmail-pw2u
- 
-    insopts -o root -g qmail -m 755
-    insinto /var/qmail/bin
-    doins qmail-inject predate datemail mailsubj qmail-showctl \
-        qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
-        qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
-        sendmail tcp-env qreceipt qsmhook qbiff forward preline \
-        condredirect bouncesaying except maildirmake maildir2mbox \
-        maildirwatch qail elq pinq config-fast
-
-    diropts -m 755
-    dodir /usr/sbin /usr/lib
-    dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-    dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-
-    into /usr
-    for i in *.1 *.5 *.8
-    do
-        doman $i
-    done
-
-    diropts -m 700 -o alias -g qmail
-    if [ ! -d ${ROOT}/var/qmail/alias/.maildir ] ; then
-        dodir /var/qmail/alias/.maildir
-
-        for i in cur new tmp
-        do
-            dodir /var/qmail/alias/.maildir/$i
-        done
-    fi
-
-    for i in mailer-daemon postmaster root
-    do
-        touch ${D}/var/qmail/alias/.qmail-${i}
-        fowners alias.qmail /var/qmail/alias/.qmail-${i}
-    done
- 
-    insinto /etc/rc.d/init.d
-    insopts -m755
-    doins ${O}/files/qmail
-    dodir ${D}/var/qmail/bin/maildirmake /etc/skel/.maildir
-    dodir ${D}/var/qmail/bin/maildirmake /root/.maildir
-    mkdir ${D}/usr/local
-    mkdir ${D}/usr/local/bin
-    cp ${FILESDIR}/tcp.smtp ${D}/etc/tcp.smtp
-    cp ${FILESDIR}/tcp.smtp.cdb ${D}/etc/tcp.smtp.cdb
-    cp ${FILESDIR}/tcprulesedit.sh ${D}/usr/bin/
-    echo -e "\033[1;42m\033[1;33m Please do not forget to run, the following syntax : \033[0m"
-    echo -e "\033[1;42m\033[1;33m ebuild qmail-1.03-r4.ebuild config \033[0m"
-    echo -e "\033[1;42m\033[1;33m This will add the necessary post install config to your system. \033[0m"
-}
-
-
- pkg_config() {
-     ${ROOT}/usr/sbin/rc-update add qmail
-
-#     export QmailHost="localhost"
-      export qhost=`hostname`			
-     if [ ${ROOT} = "/" ] ; then
- 
-       if [ ! -f ${ROOT}/var/qmail/control/me ] ; then
-           ${ROOT}/var/qmail/bin/config-fast $qhost 
-       fi
- 
-     fi
-/etc/rc.d/init.d/qmail start
-echo "Modifications Applied and Qmail Started."
- }
diff --git a/net-mail/qmail/qmail-1.03-r5.ebuild b/net-mail/qmail/qmail-1.03-r6.ebuild
index 770985137b43..cb8b0491d55f 100644
--- a/net-mail/qmail/qmail-1.03-r5.ebuild
+++ b/net-mail/qmail/qmail-1.03-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Geert Bevin <gbevin@theleaf.be>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r5.ebuild,v 1.1 2001/12/05 02:33:04 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r6.ebuild,v 1.1 2001/12/07 17:55:16 gbevin Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A modern replacement for sendmail which uses maildirs"
@@ -18,10 +18,13 @@ SRC_URI="http://cr.yp.to/software/qmail-1.03.tar.gz
 DEPEND="virtual/glibc
 	sys-apps/groff
 	>=sys-apps/ucspi-tcp-0.88
-	>=sys-apps/daemontools-0.76
-	>=net-mail/checkpassword-0.90
-	>=net-mail/fastforward-0.51
-	>=net-mail/dot-forward-0.71"
+	>=net-mail/checkpassword-0.90"
+
+RDEPEND="virtual/glibc
+	sys-apps/groff
+	>=sys-apps/ucspi-tcp-0.88
+	>=sys-apps/daemontools-0.76-r1
+	>=net-mail/checkpassword-0.90"
 
 PROVIDE="virtual/mta"
 
@@ -65,50 +68,66 @@ src_install() {
     cd ${S}
     diropts -m 755 -o root -g qmail
     dodir /var/qmail
+	touch ${D}/var/qmail/.keep
 
     for i in bin boot control users
     do
-        dodir /var/qmail/$i
+        dodir /var/qmail/${i}
+		touch ${D}/var/qmail/${i}/.keep
     done
 
     diropts -m 755 -o alias -g qmail
     dodir /var/qmail/alias
+	touch ${D}/var/qmail/alias/.keep
 
     diropts -m 750 -o qmailq -g qmail
     dodir /var/qmail/queue
     dodir /var/qmail/queue/todo
+	touch ${D}/var/qmail/queue/.keep
+	touch ${D}/var/qmail/queue/todo/.keep
 
     diropts -m 700 -o qmailq -g qmail
     dodir /var/qmail/queue/pid
+	touch ${D}/var/qmail/queue/pid/.keep
 
     diropts -m0700 -o qmails -g qmail
     dodir /var/qmail/queue/bounce
+	touch ${D}/var/qmail/queue/bounce/.keep
 
     diropts -m 750 -o qmailq -g qmail
     dodir /var/qmail/queue/mess
+	touch ${D}/var/qmail/queue/mess/.keep
 
     for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
     do
-        dodir /var/qmail/queue/mess/$i
-        dodir /var/qmail/queue/todo/$i
-        dodir /var/qmail/queue/intd/$i
+        dodir /var/qmail/queue/mess/${i}
+		touch ${D}/var/qmail/queue/mess/${i}/.keep
+        dodir /var/qmail/queue/todo/${i}
+		touch ${D}/var/qmail/queue/todo/${i}/.keep
+        dodir /var/qmail/queue/intd/${i}
+		touch ${D}/var/qmail/queue/intd/${i}/.keep
     done
 
     diropts -m 700 -o qmails -g qmail
     for i in info local remote
     do
-        dodir /var/qmail/queue/$i
+        dodir /var/qmail/queue/${i}
+		touch ${D}/var/qmail/queue/${i}/.keep
     done
 
     for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
     do
-        dodir /var/qmail/queue/info/$i
-        dodir /var/qmail/queue/local/$i
-        dodir /var/qmail/queue/remote/$i
+        dodir /var/qmail/queue/info/${i}
+		touch ${D}/var/qmail/queue/info/${i}/.keep
+        dodir /var/qmail/queue/local/${i}
+		touch ${D}/var/qmail/queue/local/${i}/.keep
+        dodir /var/qmail/queue/remote/${i}
+		touch ${D}/var/qmail/queue/remote/${i}/.keep
     done
 
     diropts -m 750 -o qmailq -g qmail 
     dodir /var/qmail/queue/lock
+	touch ${D}/var/qmail/queue/lock/.keep
 
     dd if=/dev/zero of=${D}/var/qmail/queue/lock/tcpto bs=1024 count=1
     fperms 644 /var/qmail/queue/lock/tcpto
@@ -195,18 +214,25 @@ src_install() {
     einfo "Setting up daemontools ..."
     insopts -o root -g root -m 755
     diropts -m 755 -o root -g root
-    dodir /service
     dodir /var/qmail/supervise
+    touch ${D}/var/qmail/supervise/.keep
     dodir /var/qmail/supervise/qmail-send
+    touch ${D}/var/qmail/supervise/qmail-send/.keep
     dodir /var/qmail/supervise/qmail-send/log
+    touch ${D}/var/qmail/supervise/qmail-send/.keep
     dodir /var/qmail/supervise/qmail-smtpd
+    touch ${D}/var/qmail/supervise/qmail-smtpd/.keep
     dodir /var/qmail/supervise/qmail-smtpd/log
+    touch ${D}/var/qmail/supervise/qmail-smtpd/.keep
     chmod +t ${D}/var/qmail/supervise/qmail-send
     chmod +t ${D}/var/qmail/supervise/qmail-smtpd
     diropts -m 755 -o qmaill
     dodir /var/log/qmail
+    touch ${D}/var/log/qmail/.keep
     dodir /var/log/qmail/qmail-send
+    touch ${D}/var/log/qmail/qmail-send/.keep
     dodir /var/log/qmail/qmail-smtpd
+    touch ${D}/var/log/qmail/qmail-smtpd/.keep
 
     insinto /var/qmail/supervise/qmail-send
     newins ${FILESDIR}/${PV}-${PR}/run-qmailsend run
@@ -216,8 +242,6 @@ src_install() {
     newins ${FILESDIR}/${PV}-${PR}/run-qmailsmtpd run                            
     insinto /var/qmail/supervise/qmail-smtpd/log
     newins ${FILESDIR}/${PV}-${PR}/run-qmailsmtpdlog run                            
-    dosym /var/qmail/supervise/qmail-send /service/qmail-send
-    dosym /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd
 
     einfo "Installing the qmail control file ..."
     exeinto /var/qmail/bin
@@ -227,12 +251,20 @@ src_install() {
     insinto /var/qmail
     doins ${FILESDIR}/${PV}-${PR}/rc
 
-    echo -e "\033[1;42m\033[1;33m Please do not forget to run, the following syntax : \033[0m"
-    echo -e "\033[1;42m\033[1;33m ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config \033[0m"
-    echo -e "\033[1;42m\033[1;33m This will add the necessary post install config to your system. \033[0m"
-
 }
 
+pkg_postinst() {
+
+    echo -e "\e[32;01m Please do not forget to run, the following syntax :\033[0m"
+    echo -e "\e[32;01m ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config \033[0m"
+    echo -e "\e[32;01m This will setup qmail to run out-of-the-box on your system. \033[0m"
+    echo -e ""
+    echo -e "\e[32;01m To start qmail at boot you have to enable the /etc/init.d/svscan rc file \033[0m"
+    echo -e "\e[32;01m and create the following links : \033[0m"
+    echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-send /service/qmail-send \033[0m"
+    echo -e "\e[32;01m ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd \033[0m"
+
+}
 
 pkg_config() {