this update provides exim rc5/rc6 support. also, i cleaned up the rc6

initscript a bit, and significantly tidied up the ebuilds in general.
there was a lot of unnecessary complexity and some pretty old syxtax.
~woodchip

6 files changed, 247 insertions, 120 deletions

diff --git a/net-mail/exim/exim-3.32-r6.ebuild b/net-mail/exim/exim-3.32-r6.ebuild
new file mode 100644
index 000000000000..8fb798952ee8
--- /dev/null
+++ b/net-mail/exim/exim-3.32-r6.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Jerry Alexandratos <jerry@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-3.32-r6.ebuild,v 1.1 2001/09/13 06:20:47 woodchip Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="ftp://ftp.exim.org/pub/exim/${P}.tar.gz"
+HOMEPAGE="http://www.exim.org/"
+
+DEPEND="virtual/glibc
+        >=sys-libs/db-3.2
+        >=sys-devel/perl-5.6.0
+        pam? ( >=sys-libs/pam-0.75 )
+        tcpd? ( sys-apps/tcp-wrappers )
+        mta-tls? ( >=dev-libs/openssl-0.9.6 )
+        mta-ldap? ( >=net-nds/openldap-2.0.7 )
+        mta-mysql? ( >=dev-db/mysql-3.23.28 )"
+
+RDEPEND="${DEPEND}
+         !virtual/mta
+         >=net-mail/mailbase-0.00"
+
+PROVIDE="virtual/mta"
+
+
+src_unpack() {
+
+    local myconf
+    unpack ${A}
+    cd ${S}
+
+    mkdir Local
+    sed -e "48i\CFLAGS=${CFLAGS}" \
+	-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
+	-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
+	-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
+	-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
+	-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
+	-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
+	-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
+	-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
+	-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
+	-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
+	-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
+	-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
+	-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
+	src/EDITME > Local/Makefile
+
+    cd Local
+    if [ "`use pam`" ] ; then
+	cp Makefile Makefile.orig
+	sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
+	myconf="${myconf} -lpam"
+    fi
+    if [ "`use tcpd`" ] ; then
+	cp Makefile Makefile.orig
+	sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
+	myconf="${myconf} -lwrap"
+    fi
+    if [ "$myconf" ] ; then
+	echo "EXTRALIBS=${myconf}" >> Makefile
+    fi
+
+    cd ${S}
+    if [ "`use mta-tls`" ] ; then
+	cp Local/Makefile Local/Makefile.tmp
+	sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
+	    -e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
+    fi
+    if [ "`use mta-ldap`" ] ; then
+	cp Local/Makefile Local/Makefile.tmp
+	sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
+	    -e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
+	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
+	    -e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
+    fi
+    if [ -n "`use mta-mysql`" ] ; then
+	cp Local/Makefile Local/Makefile.tmp
+	sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
+	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
+    fi
+}
+
+
+src_compile() {
+
+    try make
+}
+
+
+src_install () {
+
+    cd ${S}/build-Linux-i386
+    insopts -o root -g root -m 4755
+    insinto /usr/sbin
+    doins exim
+
+    dodir /usr/bin /usr/sbin /usr/lib
+    dosym /usr/sbin/exim /usr/bin/mailq
+    dosym /usr/sbin/exim /usr/bin/newaliases
+    dosym /usr/sbin/exim /usr/bin/mail
+    dosym /usr/sbin/exim /usr/lib/sendmail
+    dosym /usr/sbin/exim /usr/sbin/sendmail
+
+    exeinto /usr/sbin
+    for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
+    do
+	doexe $i
+    done
+
+    cd ${S}/util
+    exeinto /usr/sbin
+    for i in exigrep eximstats exiqsumm
+    do
+	doexe $i
+    done
+
+    dodir /etc/exim /etc/exim/samples
+
+    insopts -o root -g root -m 0644
+    insinto /etc/exim
+    doins ${FILESDIR}/configure
+
+    cd ${S}/src
+    insopts -o root -g root -m 0644
+    insinto /etc/exim/samples
+    doins configure.default
+
+    dodoc ${S}/doc/*
+
+    # INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
+    insinto /etc/pam.d
+    doins ${FILESDIR}/pam.d-exim
+
+    # A nice filter for exim to protect your windows clients.
+    insinto /etc/exim
+    doins ${FILESDIR}/system_filter.exim
+    einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
+    dodoc ${FILESDIR}/auth_conf.sub
+    einfo "Cat this to the end of your configure for AUTH=PAM support"
+    # FIXME The above messages should be moved into pkg_postinst !!!
+
+    exeinto /etc/init.d
+    newexe ${FILESDIR}/exim.rc6 exim
+}
+
+
+pkg_config() {
+
+    ${ROOT}/usr/sbin/rc-update add exim
+}
diff --git a/net-mail/exim/exim-3.32.ebuild b/net-mail/exim/exim-3.32.ebuild
index 77cb9f728125..ee253c387c60 100644
--- a/net-mail/exim/exim-3.32.ebuild
+++ b/net-mail/exim/exim-3.32.ebuild
@@ -1,115 +1,96 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# /home/cvsroot/gentoo-x86/skel.ebuild,v 1.1 2000/10/09 18:00:52 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-3.32.ebuild,v 1.6 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/exim/exim-3.32.ebuild,v 1.7 2001/09/13 06:20:47 woodchip Exp $
 
-
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="ftp://ftp.exim.org/pub/exim/${A}"
+SRC_URI="ftp://ftp.exim.org/pub/exim/${P}.tar.gz"
 HOMEPAGE="http://www.exim.org/"
 
-
 DEPEND="virtual/glibc
+        >=sys-libs/db-3.2
         >=sys-devel/perl-5.6.0
         pam? ( >=sys-libs/pam-0.75 )
-        >=sys-libs/db-3.2"
-
-
-TLS_DEP=">=dev-libs/openssl-0.9.6"
-LDAP_DEP=">=net-nds/openldap-2.0.7"
-MYSQL_DEP=">=dev-db/mysql-3.23.28"
-
-if [ -n "`use mta-tls`" ]; then
-    DEPEND="${DEPEND} ${TLS_DEP}"
-fi
-
-if [ -n "`use mta-ldap`" ]; then
-    DEPEND="${DEPEND} ${LDAP_DEP}"
-fi
-
-if [ -n "`use mta-mysql`" ]; then
-    DEPEND="${DEPEND} ${MYSQL_DEP}"
-fi
-RDEPEND="$DEPEND !virtual/mta >=net-mail/mailbase-0.00"
-
-DEPEND="$DEPEND tcpd? ( sys-apps/tcp-wrappers )"
+        tcpd? ( sys-apps/tcp-wrappers )
+        mta-tls? ( >=dev-libs/openssl-0.9.6 )
+        mta-ldap? ( >=net-nds/openldap-2.0.7 )
+        mta-mysql? ( >=dev-db/mysql-3.23.28 )"
 
+RDEPEND="${DEPEND}
+         !virtual/mta
+         >=net-mail/mailbase-0.00"
 
 PROVIDE="virtual/mta"
 
+
 src_unpack() {
+
+    local myconf
     unpack ${A}
     cd ${S}
 
     mkdir Local
     sed -e "48i\CFLAGS=${CFLAGS}" \
-        -e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
-        -e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
-        -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
-        -e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
-        -e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
-        -e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
-        -e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
-        -e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
-		  -e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
-        -e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
-        -e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
-        -e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
-        -e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
-        src/EDITME > Local/Makefile
+	-e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \
+	-e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \
+	-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \
+	-e "s:COMPRESS_COMMAND=/opt/gnu/bin/gzip:COMPRESS_COMMAND=/usr/bin/gzip:" \
+	-e "s:ZCAT_COMMAND=/opt/gnu/bin/zcat:ZCAT_COMMAND=/usr/bin/zcat:" \
+	-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/configure:" \
+	-e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \
+	-e "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" \
+	-e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \
+	-e "s:# LOG_FILE_PATH=syslog:LOG_FILE_PATH=syslog:" \
+	-e "s:# PID_FILE_PATH=/var/lock/exim%s.pid:PID_FILE_PATH=/var/run/exim%s.pid:" \
+	-e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \
+	-e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \
+	src/EDITME > Local/Makefile
 
     cd Local
-    local myconf
     if [ "`use pam`" ] ; then
-        cp Makefile Makefile.orig
-        sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" \
-        Makefile.orig > Makefile
-        myconf="-lpam"
+	cp Makefile Makefile.orig
+	sed -e "s:# SUPPORT_PAM=yes:SUPPORT_PAM=yes:" Makefile.orig > Makefile
+	myconf="${myconf} -lpam"
     fi
     if [ "`use tcpd`" ] ; then
-        cp Makefile Makefile.orig
-        sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" \
-        Makefile.orig > Makefile
-        myconf="$myconf -lwrap"
+	cp Makefile Makefile.orig
+	sed -e "s:# USE_TCP_WRAPPERS=yes:USE_TCP_WRAPPERS=yes:" Makefile.orig > Makefile
+	myconf="${myconf} -lwrap"
     fi
     if [ "$myconf" ] ; then
-      echo "EXTRALIBS=$myconf" >> Makefile
+	echo "EXTRALIBS=${myconf}" >> Makefile
     fi
 
-    cd ..
-
-# Why the heck is this here?
-#		try make
-
-    if [ -n "`use mta-tls`" ]; then
-        cp Local/Makefile Local/Makefile.tmp
-        sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
-            -e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
+    cd ${S}
+    if [ "`use mta-tls`" ] ; then
+	cp Local/Makefile Local/Makefile.tmp
+	sed -e "s:# SUPPORT_TLS=yes:SUPPORT_TLS=yes:" \
+	    -e "s:# TLS_LIBS=-lssl -lcrypto:TLS_LIBS=-lssl -lcrypto:" Local/Makefile.tmp > Local/Makefile
     fi
-
-    if [ -n "`use mta-ldap`" ]; then
-        cp Local/Makefile Local/Makefile.tmp
-        sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
-            -e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
-            -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
-            -e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
+    if [ "`use mta-ldap`" ] ; then
+	cp Local/Makefile Local/Makefile.tmp
+	sed -e "s:# LOOKUP_LDAP=yes:LOOKUP_LDAP=yes:" \
+	    -e "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=-I/usr/include/ldap -I/usr/include/mysql:" \
+	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" \
+	    -e "s:# LDAP_LIB_TYPE=OPENLDAP2:LDAP_LIB_TYPE=OPENLDAP2:" Local/Makefile.tmp >| Local/Makefile
     fi
-
-    if [ -n "`use mta-mysql`" ]; then
-        cp Local/Makefile Local/Makefile.tmp
-        sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
-            -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
+    if [ -n "`use mta-mysql`" ] ; then
+	cp Local/Makefile Local/Makefile.tmp
+	sed -e "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" \
+	    -e "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq:LOOKUP_LIBS=-L/usr/lib -lldap -llber -lmysqlclient -lpq:" Local/Makefile.tmp >| Local/Makefile
     fi
 }
 
+
 src_compile() {
+
     try make
 }
 
+
 src_install () {
+
     cd ${S}/build-Linux-i386
     insopts -o root -g root -m 4755
     insinto /usr/sbin
@@ -122,20 +103,17 @@ src_install () {
     dosym /usr/sbin/exim /usr/lib/sendmail
     dosym /usr/sbin/exim /usr/sbin/sendmail
 
-    insopts -o root -g root -m 0755
-    insinto /usr/sbin
-    for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb \
-    exim_lock exim_tidydb exinext exiwhat
+    exeinto /usr/sbin
+    for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock exim_tidydb exinext exiwhat
     do
-      doins $i
+	doexe $i
     done
 
     cd ${S}/util
-    insopts -o root -g root -m 0755
-    insinto /usr/sbin
+    exeinto /usr/sbin
     for i in exigrep eximstats exiqsumm
     do
-      doins $i
+	doexe $i
     done
 
     dodir /etc/exim /etc/exim/samples
@@ -149,23 +127,26 @@ src_install () {
     insinto /etc/exim/samples
     doins configure.default
 
-    insopts -o root -g root -m 0755
-    insinto /etc/rc.d/init.d
-    doins ${FILESDIR}/exim
-
     dodoc ${S}/doc/*
-# INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
-	 insinto /etc/pam.d
-	 doins ${FILESDIR}/pam.d-exim
-
-# A nice filter for exim to protect your windows clients.
-	insinto /etc/exim
-	doins ${FILESDIR}/system_filter.exim
-	einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
-	dodoc ${FILESDIR}/auth_conf.sub
-	einfo "Cat this to the end of your configure for AUTH=PAM support"
+
+    # INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam
+    insinto /etc/pam.d
+    doins ${FILESDIR}/pam.d-exim
+
+    # A nice filter for exim to protect your windows clients.
+    insinto /etc/exim
+    doins ${FILESDIR}/system_filter.exim
+    einfo "Read the bottom of /etc/exim/system_filter.exim for usage"
+    dodoc ${FILESDIR}/auth_conf.sub
+    einfo "Cat this to the end of your configure for AUTH=PAM support"
+    # FIXME The above messages should be moved into pkg_postinst !!!
+
+    exeinto /etc/rc.d/init.d
+    newexe ${FILESDIR}/exim.rc5 exim
 }
 
+
 pkg_config() {
+
     ${ROOT}/usr/sbin/rc-update add exim
 }
diff --git a/net-mail/exim/files/digest-exim-3.32-r6 b/net-mail/exim/files/digest-exim-3.32-r6
new file mode 100644
index 000000000000..f127a5992078
--- /dev/null
+++ b/net-mail/exim/files/digest-exim-3.32-r6
@@ -0,0 +1 @@
+MD5 d299f68420a9c8359a5106a605258bb6 exim-3.32.tar.gz
diff --git a/net-mail/exim/files/exim-init.d-rc6 b/net-mail/exim/files/exim-init.d-rc6
deleted file mode 100644
index 6569d5d6ddad..000000000000
--- a/net-mail/exim/files/exim-init.d-rc6
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-SERVICE=exim
-opts="start stop restart"
-
-PIDFILE=/var/run/exim.pid
-EXE=/usr/sbin/exim
-ARGS="-bd -q15m"
-
-depend() { need sysklogd net }
-
-start() {
-		ebegin "Starting $SERVICE..."
-     		start-stop-daemon --start --quiet --exec $EXE -- $ARGS
-		eend $? 
-}
-
-stop() {
-		ebegin "Stopping $SERVICE..."
-		start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXE
-		eend $? 
-}
-
-restart() {
-		stop
-		start
-}
diff --git a/net-mail/exim/files/exim b/net-mail/exim/files/exim.rc5
index eedbfbee6258..eedbfbee6258 100755..100644
--- a/net-mail/exim/files/exim
+++ b/net-mail/exim/files/exim.rc5
diff --git a/net-mail/exim/files/exim.rc6 b/net-mail/exim/files/exim.rc6
new file mode 100644
index 000000000000..c34d8392b4a7
--- /dev/null
+++ b/net-mail/exim/files/exim.rc6
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+
+OPTS="-bd -q15m"
+
+depend() {
+    need sysklogd net
+}
+
+start() {
+    ebegin "Starting exim"
+    start-stop-daemon --start --quiet --exec /usr/sbin/exim -- $OPTS
+    eend $? 
+}
+
+stop() {
+    ebegin "Stopping exim"
+    start-stop-daemon --stop --quiet --pidfile /var/run/exim.pid
+    eend $? 
+}