cosmetic updates

3 files changed, 13 insertions, 31 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 7a03637187e4..ebbfc58ca895 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.5 2004/06/20 23:28:52 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.6 2004/06/21 00:09:43 swtaylor Exp $
+
+  20 Jun 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-0.45.6.20040618.ebuild, courier-0.45.6.ebuild:
+  cosmetic changes
 
   20 Jun 2004; Scott W Taylor <swtaylor@gentoo.org>
   courier-0.45.6.20040618.ebuild:
diff --git a/mail-mta/courier/courier-0.45.6.20040618.ebuild b/mail-mta/courier/courier-0.45.6.20040618.ebuild
index 72ce5052fc6d..a9f01a910e2e 100644
--- a/mail-mta/courier/courier-0.45.6.20040618.ebuild
+++ b/mail-mta/courier/courier-0.45.6.20040618.ebuild
@@ -43,10 +43,6 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-#	sed -i -e 's:\#define.*USER_DIR.*\"Maildir\":\#define\tUSER_DIR\t\".maildir\":' \
-#		webmail/sqwebmail.h || die "failed to change maildir"
-#	sed -i -e 's:maildir="Maildir";:maildir=".maildir";:' \
-#		webmail/auth.c || die "failed to change maildir"
 	use norewrite && epatch ${FILESDIR}/norewrite.patch
 }
 
@@ -67,7 +63,6 @@ src_compile() {
 		myconf="${myconf} --without-authvchkpw"
 	fi
 
-	#
 	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
 	#    enable the specified unicode sets
 	# 2. If nls is enabled and no unicode sets are specified,
@@ -154,7 +149,7 @@ set_maildir() {
 	local f
 	for f in ${files}
 	do
-		einfo "changing ${origmaildir} in ${f} to ${newmaildir}"
+		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
 		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
 		rm -f ${f}.tmp 1> /dev/null 2>&1
 	done
@@ -275,15 +270,9 @@ pkg_postinst() {
 	einfo "$ chmod a+rx /usr/lib/courier/courier/webmail"
 	einfo "Then visit: http(s)://localhost/courier/webmail"
 	echo
-	einfo "imap behavior has changed, you may need to have your imap clients logoff"
-	einfo "and back on again"
-	echo
-	echo
-	ewarn "The init scripts for courier have changed."
-	ewarn "There is now one init script (/etc/init.d/courier). The rest"
-	ewarn "are obsolete. You can remove /etc/init.d/courier-*. You also"
-	ewarn "need to edit the following files in /etc/courier to enable"
-	ewarn "the different services:"
+	ewarn "There is one init script (/etc/init.d/courier)."
+	ewarn "Each component is activated by a line in its config"
+	ewarn "which is in /etc/courier:"
 	ewarn "imapd"
 	ewarn "imapd-ssl"
 	ewarn "pop3d"
diff --git a/mail-mta/courier/courier-0.45.6.ebuild b/mail-mta/courier/courier-0.45.6.ebuild
index d32984249010..6cdbcd8c18d7 100644
--- a/mail-mta/courier/courier-0.45.6.ebuild
+++ b/mail-mta/courier/courier-0.45.6.ebuild
@@ -43,10 +43,6 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-#	sed -i -e 's:\#define.*USER_DIR.*\"Maildir\":\#define\tUSER_DIR\t\".maildir\":' \
-#		webmail/sqwebmail.h || die "failed to change maildir"
-#	sed -i -e 's:maildir="Maildir";:maildir=".maildir";:' \
-#		webmail/auth.c || die "failed to change maildir"
 	use norewrite && epatch ${FILESDIR}/norewrite.patch
 }
 
@@ -67,7 +63,6 @@ src_compile() {
 		myconf="${myconf} --without-authvchkpw"
 	fi
 
-	#
 	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
 	#    enable the specified unicode sets
 	# 2. If nls is enabled and no unicode sets are specified,
@@ -260,7 +255,7 @@ src_install() {
 	chg_cfg authdaemonrc authmodulelist authpam
 	chg_cfg authdaemonrc version authdaemond.plain
 	set_mime esmtpd esmtpd-ssl esmtpd-msa
-	set_maildir courierd imapd pop3d sqwebmaild
+	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
 }
 
 pkg_postinst() {
@@ -275,15 +270,9 @@ pkg_postinst() {
 	einfo "$ chmod a+rx /usr/lib/courier/courier/webmail"
 	einfo "Then visit: http(s)://localhost/courier/webmail"
 	echo
-	einfo "imap behavior has changed, you may need to have your imap clients logoff"
-	einfo "and back on again"
-	echo
-	echo
-	ewarn "The init scripts for courier have changed."
-	ewarn "There is now one init script (/etc/init.d/courier). The rest"
-	ewarn "are obsolete. You can remove /etc/init.d/courier-*. You also"
-	ewarn "need to edit the following files in /etc/courier to enable"
-	ewarn "the different services:"
+	ewarn "There is one init script (/etc/init.d/courier)."
+	ewarn "Each component is activated by a line in its config"
+	ewarn "which is in /etc/courier:"
 	ewarn "imapd"
 	ewarn "imapd-ssl"
 	ewarn "pop3d"