Version bump and keywording.

Package-Manager: portage-2.0.51.19

8 files changed, 67 insertions, 246 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 07e0575a8045..f94b0fa3ccf0 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.25 2005/03/06 21:23:18 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.26 2005/04/05 14:41:27 g2boojum Exp $
+
+*sendmail-8.13.4 (05 Apr 2005)
+
+  05 Apr 2005; Grant Goodyear <g2boojum@gentoo.org>
+  -sendmail-8.12.11-r3.ebuild, -sendmail-8.13.1.ebuild,
+  sendmail-8.13.3.ebuild, +sendmail-8.13.4.ebuild:
+  Version bump (thanks lcars!). Note that with 8.13.4 the "milter" use flag
+  has been removed, since milter is now compiled in by default. Also some
+  general cleaning and keywording.
 
   06 Mar 2005; Grant Goodyear <g2boojum@gentoo.org> sendmail-8.13.3.ebuild:
   Aesthetic fix to here docs in the latest sendmail ebuild.
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 36c69b9a7456..70cf35ef4c7e 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,22 +1,20 @@
-MD5 7305d59f620aa83a09e9b84003e9f237 ChangeLog 10145
-MD5 07aa1897fda73805b9d68a2b82090e5f metadata.xml 218
-MD5 c3b560b6e0a3004e1675628cea8454ec sendmail-8.13.1.ebuild 5852
+MD5 8b1f7ba638ccef1c77eebd06fad2d6a4 sendmail-8.13.3.ebuild 5960
 MD5 50e814379c50db0570cb6ab678be1691 sendmail-8.13.1-r1.ebuild 5923
-MD5 68f74250a203067d1676280d4de3155b sendmail-8.12.11-r3.ebuild 5848
-MD5 3313355e344d561cbb32b951d268ad6a sendmail-8.13.3.ebuild 5963
-MD5 cf0c79a7387b7d83db30abc68269f467 files/digest-sendmail-8.12.11-r3 69
-MD5 61d4e49cceb149f6ff46cf6a1b598b88 files/mailer.conf 1306
-MD5 34585ddfef902dacb4e02e6eeace6dec files/sendmail 596
+MD5 01569c8ed1454c6c197f5343be395a89 sendmail-8.13.4.ebuild 5816
+MD5 183c9e61f1804e4aaa76d0741a9a9ace ChangeLog 10522
+MD5 07aa1897fda73805b9d68a2b82090e5f metadata.xml 218
+MD5 9cf5b1a30908c5f96f258b835f430865 files/sendmail.cf 39312
+MD5 1a9fedeb2f17b9a7de4f0f8da6c06d63 files/sendmail.mc 299
+MD5 edb5fd06df2d238778a89dd5265dd9e5 files/site.config.m4 481
 MD5 d7d99c72954d524b1d0eafbfe0e77afc files/sendmail-8.12.2-makemapman.patch 2088
-MD5 4b37f61de2fd8de372a4bd8ab6f92edf files/sendmail-8.12.2-smrsh-paths.patch 5625
 MD5 b412547381b852586d5d4d6ffcd80b4a files/sendmail-8.12.2-unix.patch 395
 MD5 95d58f15432e44c91f8018839f65327c files/sendmail-8.12.6-r1-gentoo.diff 1701
+MD5 45c504b2c249bc5724f0029328d56b78 files/digest-sendmail-8.13.3 68
+MD5 470e80bc008f602eb5fcc165f9e3546b files/digest-sendmail-8.13.4 68
 MD5 875d3c33bfa16e73e5e75ecb1d1a9d2b files/sendmail-procmail.cf 39897
 MD5 40db5be0dc4aad98df023d3af8e8c132 files/sendmail-procmail.mc 357
-MD5 9cf5b1a30908c5f96f258b835f430865 files/sendmail.cf 39312
-MD5 1a9fedeb2f17b9a7de4f0f8da6c06d63 files/sendmail.mc 299
-MD5 edb5fd06df2d238778a89dd5265dd9e5 files/site.config.m4 481
-MD5 0027be040b9dacdf253813fe2ddb8982 files/digest-sendmail-8.13.1 68
+MD5 34585ddfef902dacb4e02e6eeace6dec files/sendmail 596
+MD5 61d4e49cceb149f6ff46cf6a1b598b88 files/mailer.conf 1306
 MD5 0027be040b9dacdf253813fe2ddb8982 files/digest-sendmail-8.13.1-r1 68
 MD5 7b2a2b2f8f608ddbd8b0c1b910ffb981 files/sendmail-delivered_hdr.patch 341
-MD5 45c504b2c249bc5724f0029328d56b78 files/digest-sendmail-8.13.3 68
+MD5 4b37f61de2fd8de372a4bd8ab6f92edf files/sendmail-8.12.2-smrsh-paths.patch 5625
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.12.11-r3 b/mail-mta/sendmail/files/digest-sendmail-8.12.11-r3
deleted file mode 100644
index a08afe72d5e8..000000000000
--- a/mail-mta/sendmail/files/digest-sendmail-8.12.11-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fafda7f8043f0c34b9aa295618aa598c sendmail.8.12.11.tar.gz 1899112
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.1 b/mail-mta/sendmail/files/digest-sendmail-8.13.1
deleted file mode 100644
index 7c05c7348120..000000000000
--- a/mail-mta/sendmail/files/digest-sendmail-8.13.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5407db289086261d7e7a09920d2ea14e sendmail.8.13.1.tar.gz 1963257
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.4 b/mail-mta/sendmail/files/digest-sendmail-8.13.4
new file mode 100644
index 000000000000..517a9b0b4e1a
--- /dev/null
+++ b/mail-mta/sendmail/files/digest-sendmail-8.13.4
@@ -0,0 +1 @@
+MD5 61e336750b48b01abaa69b4d7c9473b5 sendmail.8.13.4.tar.gz 1974606
diff --git a/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild b/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild
deleted file mode 100644
index 7c582a243ca3..000000000000
--- a/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.12.11-r3.ebuild,v 1.13 2005/02/12 14:37:37 g2boojum Exp $
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="x86 ppc sparc hppa alpha ia64 s390 amd64 ppc64"
-IUSE="ssl ldap sasl tcpd mbox milter mailwrapper"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	"
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
-		mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-PROVIDE="virtual/mta"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	confCCOPTS="${CFLAGS}"
-	confMAPDEF="-DMAP_REGEX"
-	conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_ENVDEF="${conf_sendmail_ENVDEF} -DSASL=2"  \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_ENVDEF="${conf_sendmail_ENVDEF} -DSTARTTLS" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use milter && confENVDEF="${confENVDEF} -DMILTER"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_ENVDEF@@/${conf_sendmail_ENVDEF}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
-}
-
-src_compile() {
-	sh Build || die "compilation failed in main Build script"
-
-	if use milter
-	then
-	    pushd libmilter
-		sh Build || die "libmilter compilation failed"
-		popd
-	fi
-}
-
-src_install () {
-	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /etc/pam.d /usr/bin /usr/lib
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-
-	if use milter
-	then
-	    dodir /usr/include/libmilter
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/libmilter \
-			|| die "install failed"
-	fi
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-
-	if use milter
-	then
-		newdoc libmilter/README README.libmilter
-	fi
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -a cf/* ${D}/usr/share/sendmail-cf
-	insinto /etc/mail
-	if use mbox
-	then
-		doins ${FILESDIR}/{sendmail.cf,sendmail.mc}
-	else
-		newins ${FILESDIR}/sendmail-procmail.cf sendmail.cf
-		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
-	fi
-	echo "# local-host-names - include all aliases for your machine here" \
-		> ${D}/etc/mail/local-host-names
-	cat << EOF > ${D}/etc/mail/trusted-users
-# trusted-users - users that can send mail as others without a warning
-# apache, mailman, majordomo, uucp are good candidates
-EOF
-	cat << EOF > ${D}/etc/mail/access
-# Check the /usr/share/doc/sendmail/README.cf file for a description
-# of the format of this file. (search for access_db in that file)
-# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-# package.
-#
-
-EOF
-cat << EOF > ${D}/etc/conf.d/sendmail
-# Config file for /etc/init.d/sendmail
-# add start-up options here
-SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-EOF
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/sendmail
-	keepdir /usr/adm/sm.bin
-
-	if use mailwrapper
-	then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.sendmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
-	fi
-
-}
-
-pkg_postinst() {
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged sendmail without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/sendmail/sendmail-8.13.3.ebuild b/mail-mta/sendmail/sendmail-8.13.3.ebuild
index f9203e2c3409..c4453d89aeb0 100644
--- a/mail-mta/sendmail/sendmail-8.13.3.ebuild
+++ b/mail-mta/sendmail/sendmail-8.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.3.ebuild,v 1.3 2005/03/07 02:11:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.3.ebuild,v 1.4 2005/04/05 14:41:27 g2boojum Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
 
 LICENSE="Sendmail"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~s390 ~amd64 ~ppc64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~s390 amd64 ~ppc64"
 IUSE="ssl ldap sasl tcpd mbox milter mailwrapper ipv6"
 
 DEPEND="net-mail/mailbase
diff --git a/mail-mta/sendmail/sendmail-8.13.1.ebuild b/mail-mta/sendmail/sendmail-8.13.4.ebuild
index 10dc55ed7ce1..e760eaf2cb3f 100644
--- a/mail-mta/sendmail/sendmail-8.13.1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.13.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.1.ebuild,v 1.2 2005/02/12 14:37:37 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.4.ebuild,v 1.1 2005/04/05 14:41:27 g2boojum Exp $
+
+inherit eutils
 
 DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
 HOMEPAGE="http://www.sendmail.org/"
@@ -9,7 +11,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
 LICENSE="Sendmail"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~s390 ~amd64 ~ppc64"
-IUSE="ssl ldap sasl tcpd mbox milter mailwrapper"
+IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6"
 
 DEPEND="net-mail/mailbase
 	sys-devel/m4
@@ -18,6 +20,7 @@ DEPEND="net-mail/mailbase
 	ssl? ( dev-libs/openssl )
 	ldap? ( net-nds/openldap )
 	>=sys-libs/db-3.2
+	!net-mail/vacation
 	"
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
@@ -30,41 +33,36 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	epatch ${FILESDIR}/sendmail-delivered_hdr.patch || die
+
 	confCCOPTS="${CFLAGS}"
 	confMAPDEF="-DMAP_REGEX"
 	conf_sendmail_LIBS=""
 	use sasl && confLIBS="${confLIBS} -lsasl2"  \
 		&& confENVDEF="${confENVDEF} -DSASL=2" \
 		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_ENVDEF="${conf_sendmail_ENVDEF} -DSASL=2"  \
 		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
 	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
 		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS" \
+	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
 		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_ENVDEF="${conf_sendmail_ENVDEF} -DSTARTTLS" \
 		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
 	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
 		&& confLIBS="${confLIBS} -lldap -llber"
-	use milter && confENVDEF="${confENVDEF} -DMILTER"
+	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
 	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
 		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
 		-e "s/@@confENVDEF@@/${confENVDEF}/" \
 		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_ENVDEF@@/${conf_sendmail_ENVDEF}/" \
 		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
 		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
 }
 
 src_compile() {
 	sh Build || die "compilation failed in main Build script"
-
-	if use milter
-	then
-	    pushd libmilter
-		sh Build || die "libmilter compilation failed"
-		popd
-	fi
+	pushd libmilter
+	sh Build || die "libmilter compilation failed"
+	popd
 }
 
 src_install () {
@@ -94,9 +92,7 @@ src_install () {
 			|| die "install failed"
 	done
 
-	if use milter
-	then
-	    dodir /usr/include/libmilter
+	dodir /usr/include/libmilter
 		make DESTDIR=${D} MANROOT=/usr/share/man/man \
 			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
 			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
@@ -104,7 +100,6 @@ src_install () {
 			MSPQOWN=root CFOWN=root CFGRP=root \
 			install -C ${OBJDIR}/libmilter \
 			|| die "install failed"
-	fi
 
 	fowners root:smmsp /usr/sbin/sendmail
 	fperms 2555 /usr/sbin/sendmail
@@ -118,11 +113,7 @@ src_install () {
 	newdoc sendmail/SECURITY SECURITY
 	newdoc sendmail/TUNING TUNING
 	newdoc smrsh/README README.smrsh
-
-	if use milter
-	then
-		newdoc libmilter/README README.libmilter
-	fi
+	newdoc libmilter/README README.libmilter
 
 	newdoc cf/README README.cf
 	newdoc cf/cf/README README.install-cf
@@ -130,33 +121,33 @@ src_install () {
 	insinto /etc/mail
 	if use mbox
 	then
-		doins ${FILESDIR}/{sendmail.cf,sendmail.mc}
+		doins ${FILESDIR}/sendmail.mc
 	else
-		newins ${FILESDIR}/sendmail-procmail.cf sendmail.cf
 		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
 	fi
+	m4 ${D}/etc/mail/sendmail.mc > ${D}/etc/mail/sendmail.cf
 	echo "# local-host-names - include all aliases for your machine here" \
 		> ${D}/etc/mail/local-host-names
-	cat << EOF > ${D}/etc/mail/trusted-users
-# trusted-users - users that can send mail as others without a warning
-# apache, mailman, majordomo, uucp are good candidates
-EOF
-	cat << EOF > ${D}/etc/mail/access
-# Check the /usr/share/doc/sendmail/README.cf file for a description
-# of the format of this file. (search for access_db in that file)
-# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-# package.
-#
-
-EOF
-cat << EOF > ${D}/etc/conf.d/sendmail
-# Config file for /etc/init.d/sendmail
-# add start-up options here
-SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-EOF
+	cat <<- EOF > ${D}/etc/mail/trusted-users
+		# trusted-users - users that can send mail as others without a warning
+		# apache, mailman, majordomo, uucp are good candidates
+	EOF
+	cat <<- EOF > ${D}/etc/mail/access
+		# Check the /usr/share/doc/sendmail/README.cf file for a description
+		# of the format of this file. (search for access_db in that file)
+		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
+		# package.
+		#
+
+	EOF
+	cat <<- EOF > ${D}/etc/conf.d/sendmail
+		# Config file for /etc/init.d/sendmail
+		# add start-up options here
+		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
+		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
+		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
+
+	EOF
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/sendmail
 	keepdir /usr/adm/sm.bin
@@ -171,6 +162,12 @@ EOF
 
 }
 
+pkg_preinst() {
+	if ! groupmod smmsp; then
+		groupadd smmsp || die "problem adding group smmsp"
+	fi
+}
+
 pkg_postinst() {
 	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
 	then