closing bug #5096.

5 files changed, 10 insertions, 141 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index d9b2f8840477..4a1cf174aacd 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.19 2002/07/09 14:07:21 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.20 2002/07/19 15:06:39 g2boojum Exp $
+
+*postfix-1.1.11-r4 (19 Jul 2002)
+
+  19 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+
+  removed /usr/bin/mail symlink; that's what mailx and nail are for.
+  Removed old versions.  Bumped -r since that symlink really should be yanked.
+  Closes bug #5096
 
 *postfix-1.1.11-r1 (09 Jul 2002)
 
diff --git a/net-mail/postfix/files/digest-postfix-1.1.11-r3 b/net-mail/postfix/files/digest-postfix-1.1.11-r4
index 6ad541484afc..6ad541484afc 100644
--- a/net-mail/postfix/files/digest-postfix-1.1.11-r3
+++ b/net-mail/postfix/files/digest-postfix-1.1.11-r4
diff --git a/net-mail/postfix/files/digest-postfix-1.1.8 b/net-mail/postfix/files/digest-postfix-1.1.8
deleted file mode 100644
index d67c9d9bb7de..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3b07a59e8bdb46af8c1d82f085a62d73 postfix-1.1.8.tar.gz 1187634
-MD5 a7f37543d0e265ba06058648846d600d pfixtls-0.8.8-1.1.8-0.9.6d.tar.gz 195225
diff --git a/net-mail/postfix/postfix-1.1.11-r3.ebuild b/net-mail/postfix/postfix-1.1.11-r4.ebuild
index 14d9d853b559..27f0bf18b224 100644
--- a/net-mail/postfix/postfix-1.1.11-r3.ebuild
+++ b/net-mail/postfix/postfix-1.1.11-r4.ebuild
@@ -1,6 +1,6 @@
 # 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/postfix/postfix-1.1.11-r3.ebuild,v 1.2 2002/07/17 05:07:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.11-r4.ebuild,v 1.1 2002/07/19 15:06:39 g2boojum Exp $
 
 DESCRIPTION="A fast and secure drop-in replacement for sendmail"
 HOMEPAGE="http://www.postfix.org/"
@@ -109,7 +109,6 @@ src_install () {
 	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
 	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
 
-	dosym /usr/sbin/sendmail /usr/bin/mail
 	dosym /usr/sbin/sendmail /usr/bin/mailq
 	dosym /usr/sbin/sendmail /usr/bin/newaliases
 	dosym /usr/sbin/sendmail /usr/lib/sendmail
diff --git a/net-mail/postfix/postfix-1.1.8.ebuild b/net-mail/postfix/postfix-1.1.8.ebuild
deleted file mode 100644
index b47c5614def4..000000000000
--- a/net-mail/postfix/postfix-1.1.8.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.8.ebuild,v 1.1 2002/05/14 03:49:25 woodchip Exp
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-
-POSTFIX_TLS_VER="0.8.8-${PV}-0.9.6d"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.28 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )"
-RDEPEND="${DEPEND} 
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-SLOT="0"
-LICENSE="IPL-1"
-KEYWORDS="x86"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	use ssl && ( \
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	)
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	use mysql \
-		&& CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
-		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-
-	use ldap \
-		&& CCARGS="${CCARGS} -DHAS_LDAP" \
-		&& AUXLIBS="${AUXLIBS} -lldap -llber"
-
-	use ssl \
-		&& CCARGS="${CCARGS} -DHAS_SSL" \
-		&& AUXLIBS="${AUXLIBS} -lssl"
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	use pam && AUXLIBS="${AUXLIBS} -lpam"
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -ldl -lcrypt"
-	if [ "`use sasl`" ]
-	then
-		AUXLIBS="${AUXLIBS} -lsasl"
-		CCARGS="${CCARGS} -DUSE_SASL_AUTH"
-	fi
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES INSTALL
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version	     *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly.                              *"
-	einfo "***************************************************************"
-}