Marked as stable.

10 files changed, 8 insertions, 447 deletions

diff --git a/net-mail/bincimap/ChangeLog b/net-mail/bincimap/ChangeLog
index 667bda44ee04..e67c5453a587 100644
--- a/net-mail/bincimap/ChangeLog
+++ b/net-mail/bincimap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/bincimap
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.8 2004/02/25 14:39:16 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.9 2004/03/05 17:25:03 nakano Exp $
+
+  05 Mar 2004; Masatomo Nakano <nakano@gentoo.org> bincimap-1.2.3.ebuild,
+  bincimap-1.2.4.ebuild, bincimap-1.2.5.ebuild, bincimap-1.2.6.ebuild,
+  files/bincimap-1.2.4-gentoo.diff, files/bincimap-1.2.5-gentoo.diff:
+  Marked 1.2.6 as stable and cleaned old ebuilds up.
 
   25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> bincimap-1.2.5.ebuild:
   Adding amd64 keyword. Closing #38881.
diff --git a/net-mail/bincimap/bincimap-1.2.3.ebuild b/net-mail/bincimap/bincimap-1.2.3.ebuild
deleted file mode 100644
index fe2fee116bd7..000000000000
--- a/net-mail/bincimap/bincimap-1.2.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.3.ebuild,v 1.1 2003/10/11 20:26:52 nakano Exp $
-
-DESCRIPTION="IMAP server for Maildir"
-SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}.tar.bz2"
-HOMEPAGE="http://www.bincimap.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ssl"
-
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	sys-apps/daemontools
-	net-mail/checkpassword"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	econf `use_enable ssl ssl` --sysconfdir=/etc/bincimap || die
-	emake || die
-}
-
-src_install () {
-	einstall sysconfdir=${D}/etc/bincimap || die
-	keepdir /var/log/bincimap || die
-	if [ `use ssl` ]; then
-		keepdir /var/log/bincimap-ssl || die
-	fi
-
-	dodoc AUTHORS COPYING COPYING.OpenSSL ChangeLog INSTALL \
-		NEWS README TODO
-
-	cd doc
-	dodoc *.html
-	dodoc manual/bincimap-manual.dvi manual/bincimap-manual.ps
-}
-
-pkg_postinst() {
-	if [ `use ssl` ]; then
-		einfo "This command will setup bincimap-ssl on your system."
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-
-	einfo "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following links :"
-	einfo "ln -s /etc/bincimap/service/imap /service/imap"
-
-	einfo "If you use ssl, "
-	einfo "ln -s /etc/bincimap/service/imaps /service/imaps"
-}
-
-pkg_config() {
-	if [ `use ssl` ]; then
-		local pemfile=/etc/bincimap/bincimap.pem
-		if [ ! -f $pemfile ]; then
-			echo "Creating a self-signed ssl-cert:"
-			/usr/bin/openssl req -new -x509 -nodes -out $pemfile -days 366 -keyout $pemfile
-			chmod 640 $pemfile
-
-			einfo "If You want to have a signed cert, do the following:"
-			einfo "openssl req -new -nodes -out req.pem \\"
-			einfo "-keyout $pemfile"
-			einfo "chmod 640 $pemfile"
-			einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-			einfo "cat signed_req.pem >> $pemfile"
-		fi
-	fi
-}
diff --git a/net-mail/bincimap/bincimap-1.2.4.ebuild b/net-mail/bincimap/bincimap-1.2.4.ebuild
deleted file mode 100644
index 5b25f2140740..000000000000
--- a/net-mail/bincimap/bincimap-1.2.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.4.ebuild,v 1.1 2004/01/08 23:04:58 nakano Exp $
-
-DESCRIPTION="IMAP server for Maildir"
-SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}.tar.bz2"
-HOMEPAGE="http://www.bincimap.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ssl"
-
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	sys-apps/daemontools
-	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	econf `use_enable ssl ssl` --sysconfdir=/etc/bincimap || die
-	emake || die
-}
-
-src_install () {
-	einstall sysconfdir=${D}/etc/bincimap || die
-	keepdir /var/log/bincimap || die
-	if [ `use ssl` ]; then
-		keepdir /var/log/bincimap-ssl || die
-	fi
-
-	dodoc AUTHORS COPYING COPYING.OpenSSL ChangeLog INSTALL \
-		NEWS README TODO
-
-	cd doc
-	dodoc *.html
-	dodoc manual/bincimap-manual.dvi manual/bincimap-manual.ps
-}
-
-pkg_postinst() {
-	if [ `use ssl` ]; then
-		einfo "This command will setup bincimap-ssl on your system."
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-
-	einfo "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following links :"
-	einfo "ln -s /etc/bincimap/service/imap /service/imap"
-
-	einfo "If you use ssl, "
-	einfo "ln -s /etc/bincimap/service/imaps /service/imaps"
-}
-
-pkg_config() {
-	if [ `use ssl` ]; then
-		local pemfile=/etc/bincimap/bincimap.pem
-		if [ ! -f $pemfile ]; then
-			echo "Creating a self-signed ssl-cert:"
-			/usr/bin/openssl req -new -x509 -nodes -out $pemfile -days 366 -keyout $pemfile
-			chmod 640 $pemfile
-
-			einfo "If You want to have a signed cert, do the following:"
-			einfo "openssl req -new -nodes -out req.pem \\"
-			einfo "-keyout $pemfile"
-			einfo "chmod 640 $pemfile"
-			einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-			einfo "cat signed_req.pem >> $pemfile"
-		fi
-	fi
-}
diff --git a/net-mail/bincimap/bincimap-1.2.5.ebuild b/net-mail/bincimap/bincimap-1.2.5.ebuild
deleted file mode 100644
index 8e6e03b1cd6a..000000000000
--- a/net-mail/bincimap/bincimap-1.2.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.5.ebuild,v 1.2 2004/02/25 14:39:16 aliz Exp $
-
-DESCRIPTION="IMAP server for Maildir"
-SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}.tar.bz2"
-HOMEPAGE="http://www.bincimap.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ssl"
-
-DEPEND="virtual/glibc
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	sys-apps/daemontools
-	sys-apps/ucspi-tcp
-	net-mail/checkpassword"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	econf `use_enable ssl ssl` --sysconfdir=/etc/bincimap || die
-	emake || die
-}
-
-src_install () {
-	einstall sysconfdir=${D}/etc/bincimap || die
-	keepdir /var/log/bincimap || die
-	if [ `use ssl` ]; then
-		keepdir /var/log/bincimap-ssl || die
-	fi
-
-	dodoc AUTHORS COPYING COPYING.OpenSSL ChangeLog INSTALL \
-		NEWS README TODO
-
-	cd doc
-	dodoc *.html
-	dodoc manual/bincimap-manual.dvi manual/bincimap-manual.ps
-}
-
-pkg_postinst() {
-	if [ `use ssl` ]; then
-		einfo "This command will setup bincimap-ssl on your system."
-		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	fi
-
-	einfo "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
-	einfo "and create the following links :"
-	einfo "ln -s /etc/bincimap/service/imap /service/imap"
-
-	einfo "If you use ssl, "
-	einfo "ln -s /etc/bincimap/service/imaps /service/imaps"
-}
-
-pkg_config() {
-	if [ `use ssl` ]; then
-		local pemfile=/etc/bincimap/bincimap.pem
-		if [ ! -f $pemfile ]; then
-			echo "Creating a self-signed ssl-cert:"
-			/usr/bin/openssl req -new -x509 -nodes -out $pemfile -days 366 -keyout $pemfile
-			chmod 640 $pemfile
-
-			einfo "If You want to have a signed cert, do the following:"
-			einfo "openssl req -new -nodes -out req.pem \\"
-			einfo "-keyout $pemfile"
-			einfo "chmod 640 $pemfile"
-			einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-			einfo "cat signed_req.pem >> $pemfile"
-		fi
-	fi
-}
diff --git a/net-mail/bincimap/bincimap-1.2.6.ebuild b/net-mail/bincimap/bincimap-1.2.6.ebuild
index 481e9f0b315e..e1a09c65a84a 100644
--- a/net-mail/bincimap/bincimap-1.2.6.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.6.ebuild,v 1.1 2004/02/15 09:51:58 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.6.ebuild,v 1.2 2004/03/05 17:25:03 nakano Exp $
 
 DESCRIPTION="IMAP server for Maildir"
 SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}final.tar.bz2"
 HOMEPAGE="http://www.bincimap.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE="ssl"
 
 DEPEND="virtual/glibc
diff --git a/net-mail/bincimap/files/bincimap-1.2.4-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.4-gentoo.diff
deleted file mode 100644
index aa0d316b9513..000000000000
--- a/net-mail/bincimap/files/bincimap-1.2.4-gentoo.diff
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Naru bincimap-1.2.3.org/Makefile.in bincimap-1.2.3/Makefile.in
---- bincimap-1.2.3.org/Makefile.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/Makefile.in	2003-10-09 07:56:28.000000000 +0900
-@@ -131,7 +131,7 @@
- target_alias = @target_alias@
- 
- #--------------------------------------------------------------------------
--SUBDIRS = conf contrib doc man service src tests
-+SUBDIRS = conf contrib man service src tests
- 
- #--------------------------------------------------------------------------
- EXTRA_DIST = bincimap.spec config.h COPYING.OpenSSL config.h.in
-diff -Naru bincimap-1.2.3.org/conf/bincimap.conf.in bincimap-1.2.3/conf/bincimap.conf.in
---- bincimap-1.2.3.org/conf/bincimap.conf.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/conf/bincimap.conf.in	2003-10-09 08:06:34.000000000 +0900
-@@ -56,7 +56,7 @@
-     type = "Maildir",                              /* only Maildir
- 						    * support */
- 
--    path = "Maildir",                              /* default path */
-+    path = ".maildir",                              /* default path */
- 
-     auto create inbox = "yes",                     /* create INBOX in
- 						    * given format if
-diff -Naru bincimap-1.2.3.org/service/Makefile.in bincimap-1.2.3/service/Makefile.in
---- bincimap-1.2.3.org/service/Makefile.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/Makefile.in	2003-10-09 07:56:28.000000000 +0900
-@@ -425,10 +425,10 @@
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imap
- 
- 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imap/run ]; then $(INSTALL_DATA) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/run;  else $(INSTALL_DATA) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/run.new; echo "- New service/imap/run file saved as $(DESTDIR)$(sysconfdir)/service/imap/run.new" >> $(srcdir)/../install.log; fi;
--	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/down
-+#	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/down
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imaps
- 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imaps/run ]; then $(INSTALL_DATA) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/run;  else $(INSTALL_DATA) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/run.new; echo "- New service/imaps/run file saved as $(DESTDIR)$(sysconfdir)/service/imaps/run.new" >> $(srcdir)/../install.log; fi;
--	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/down
-+#	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/down
- 
- #--------------------------------------------------------------------------
- uninstall-hook:
-diff -Naru bincimap-1.2.3.org/service/log/Makefile.in bincimap-1.2.3/service/log/Makefile.in
---- bincimap-1.2.3.org/service/log/Makefile.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/log/Makefile.in	2003-10-09 07:56:28.000000000 +0900
-@@ -281,12 +281,12 @@
- install-exec-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imap/log
- 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imap/log/run ]; then $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/log/run;  else $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/log/run.new; echo "- New service/imap/run file saved as $(DESTDIR)$(sysconfdir)/service/imap/log/run.new" >> $(srcdir)/../../install.log; fi
--	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/log/down
-+#	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/log/down
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imaps/log
- 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imaps/log/run ]; then $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/log/run;  else $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/log/run.new; echo "- New service/imaps/run file saved as $(DESTDIR)$(sysconfdir)/service/imaps/log/run.new" >> $(srcdir)/../../install.log; fi;
--	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/log/down
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap-ssl
-+#	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/log/down
-+#	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap
-+#	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap-ssl
- 
- #--------------------------------------------------------------------------
- uninstall-hook:
-diff -Naru bincimap-1.2.3.org/service/log/run-ssl.in bincimap-1.2.3/service/log/run-ssl.in
---- bincimap-1.2.3.org/service/log/run-ssl.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/log/run-ssl.in	2003-10-09 07:56:28.000000000 +0900
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap-ssl
-+exec multilog t n5 s1048576 /var/log/bincimap-ssl
- 
-diff -Naru bincimap-1.2.3.org/service/log/run.in bincimap-1.2.3/service/log/run.in
---- bincimap-1.2.3.org/service/log/run.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/log/run.in	2003-10-09 07:56:28.000000000 +0900
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap
-+exec multilog t n5 s1048576 /var/log/bincimap
- 
-diff -Naru bincimap-1.2.3.org/service/run-ssl.in bincimap-1.2.3/service/run-ssl.in
---- bincimap-1.2.3.org/service/run-ssl.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/run-ssl.in	2003-10-09 07:56:28.000000000 +0900
-@@ -7,8 +7,8 @@
- exec	tcpserver -c 100 -u 0 -g 0			\
-     -l $(hostname) -HDRP				\
-     0 993						\
--    @prefix@/bin/bincimap-up				\
-+    /usr/bin/bincimap-up				\
-     --logtype=multilog					\
-     --conf=@sysconfdir@/bincimap.conf --ssl --     	\
-     /bin/checkpassword					\
--    @prefix@/bin/bincimapd
-+    /usr/bin/bincimapd
-diff -Naru bincimap-1.2.3.org/service/run.in bincimap-1.2.3/service/run.in
---- bincimap-1.2.3.org/service/run.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/run.in	2003-10-09 07:56:28.000000000 +0900
-@@ -7,10 +7,10 @@
- exec	tcpserver -c 100 -u 0 -g 0		\
-     -l $(hostname) -HDRP			\
-     0 143					\
--    @prefix@/bin/bincimap-up			\
-+    /usr/bin/bincimap-up			\
-     --logtype=multilog				\
-     --conf=@sysconfdir@/bincimap.conf --	\
-     /bin/checkpassword				\
--    @prefix@/bin/bincimapd
-+    /usr/bin/bincimapd
- 
- 
diff --git a/net-mail/bincimap/files/bincimap-1.2.5-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.5-gentoo.diff
deleted file mode 100644
index aa0d316b9513..000000000000
--- a/net-mail/bincimap/files/bincimap-1.2.5-gentoo.diff
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Naru bincimap-1.2.3.org/Makefile.in bincimap-1.2.3/Makefile.in
---- bincimap-1.2.3.org/Makefile.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/Makefile.in	2003-10-09 07:56:28.000000000 +0900
-@@ -131,7 +131,7 @@
- target_alias = @target_alias@
- 
- #--------------------------------------------------------------------------
--SUBDIRS = conf contrib doc man service src tests
-+SUBDIRS = conf contrib man service src tests
- 
- #--------------------------------------------------------------------------
- EXTRA_DIST = bincimap.spec config.h COPYING.OpenSSL config.h.in
-diff -Naru bincimap-1.2.3.org/conf/bincimap.conf.in bincimap-1.2.3/conf/bincimap.conf.in
---- bincimap-1.2.3.org/conf/bincimap.conf.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/conf/bincimap.conf.in	2003-10-09 08:06:34.000000000 +0900
-@@ -56,7 +56,7 @@
-     type = "Maildir",                              /* only Maildir
- 						    * support */
- 
--    path = "Maildir",                              /* default path */
-+    path = ".maildir",                              /* default path */
- 
-     auto create inbox = "yes",                     /* create INBOX in
- 						    * given format if
-diff -Naru bincimap-1.2.3.org/service/Makefile.in bincimap-1.2.3/service/Makefile.in
---- bincimap-1.2.3.org/service/Makefile.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/Makefile.in	2003-10-09 07:56:28.000000000 +0900
-@@ -425,10 +425,10 @@
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imap
- 
- 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imap/run ]; then $(INSTALL_DATA) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/run;  else $(INSTALL_DATA) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/run.new; echo "- New service/imap/run file saved as $(DESTDIR)$(sysconfdir)/service/imap/run.new" >> $(srcdir)/../install.log; fi;
--	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/down
-+#	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/down
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imaps
- 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imaps/run ]; then $(INSTALL_DATA) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/run;  else $(INSTALL_DATA) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/run.new; echo "- New service/imaps/run file saved as $(DESTDIR)$(sysconfdir)/service/imaps/run.new" >> $(srcdir)/../install.log; fi;
--	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/down
-+#	$(INSTALL_DATA) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/down
- 
- #--------------------------------------------------------------------------
- uninstall-hook:
-diff -Naru bincimap-1.2.3.org/service/log/Makefile.in bincimap-1.2.3/service/log/Makefile.in
---- bincimap-1.2.3.org/service/log/Makefile.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/log/Makefile.in	2003-10-09 07:56:28.000000000 +0900
-@@ -281,12 +281,12 @@
- install-exec-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imap/log
- 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imap/log/run ]; then $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/log/run;  else $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run $(DESTDIR)$(sysconfdir)/service/imap/log/run.new; echo "- New service/imap/run file saved as $(DESTDIR)$(sysconfdir)/service/imap/log/run.new" >> $(srcdir)/../../install.log; fi
--	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/log/down
-+#	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imap/log/down
- 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/service/imaps/log
- 	@if [ ! -e $(DESTDIR)$(sysconfdir)/service/imaps/log/run ]; then $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/log/run;  else $(INSTALL_SCRIPT) -m 0755 $(srcdir)/run-ssl $(DESTDIR)$(sysconfdir)/service/imaps/log/run.new; echo "- New service/imaps/run file saved as $(DESTDIR)$(sysconfdir)/service/imaps/log/run.new" >> $(srcdir)/../../install.log; fi;
--	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/log/down
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap-ssl
-+#	$(INSTALL_SCRIPT) -m 0644 $(srcdir)/down $(DESTDIR)$(sysconfdir)/service/imaps/log/down
-+#	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap
-+#	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log/bincimap-ssl
- 
- #--------------------------------------------------------------------------
- uninstall-hook:
-diff -Naru bincimap-1.2.3.org/service/log/run-ssl.in bincimap-1.2.3/service/log/run-ssl.in
---- bincimap-1.2.3.org/service/log/run-ssl.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/log/run-ssl.in	2003-10-09 07:56:28.000000000 +0900
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap-ssl
-+exec multilog t n5 s1048576 /var/log/bincimap-ssl
- 
-diff -Naru bincimap-1.2.3.org/service/log/run.in bincimap-1.2.3/service/log/run.in
---- bincimap-1.2.3.org/service/log/run.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/log/run.in	2003-10-09 07:56:28.000000000 +0900
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap
-+exec multilog t n5 s1048576 /var/log/bincimap
- 
-diff -Naru bincimap-1.2.3.org/service/run-ssl.in bincimap-1.2.3/service/run-ssl.in
---- bincimap-1.2.3.org/service/run-ssl.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/run-ssl.in	2003-10-09 07:56:28.000000000 +0900
-@@ -7,8 +7,8 @@
- exec	tcpserver -c 100 -u 0 -g 0			\
-     -l $(hostname) -HDRP				\
-     0 993						\
--    @prefix@/bin/bincimap-up				\
-+    /usr/bin/bincimap-up				\
-     --logtype=multilog					\
-     --conf=@sysconfdir@/bincimap.conf --ssl --     	\
-     /bin/checkpassword					\
--    @prefix@/bin/bincimapd
-+    /usr/bin/bincimapd
-diff -Naru bincimap-1.2.3.org/service/run.in bincimap-1.2.3/service/run.in
---- bincimap-1.2.3.org/service/run.in	2003-10-09 07:56:04.000000000 +0900
-+++ bincimap-1.2.3/service/run.in	2003-10-09 07:56:28.000000000 +0900
-@@ -7,10 +7,10 @@
- exec	tcpserver -c 100 -u 0 -g 0		\
-     -l $(hostname) -HDRP			\
-     0 143					\
--    @prefix@/bin/bincimap-up			\
-+    /usr/bin/bincimap-up			\
-     --logtype=multilog				\
-     --conf=@sysconfdir@/bincimap.conf --	\
-     /bin/checkpassword				\
--    @prefix@/bin/bincimapd
-+    /usr/bin/bincimapd
- 
- 
diff --git a/net-mail/bincimap/files/digest-bincimap-1.2.3 b/net-mail/bincimap/files/digest-bincimap-1.2.3
deleted file mode 100644
index 64927a332168..000000000000
--- a/net-mail/bincimap/files/digest-bincimap-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6476c80deb03dfcab1fc34a754b91b8 bincimap-1.2.3.tar.bz2 427598
diff --git a/net-mail/bincimap/files/digest-bincimap-1.2.4 b/net-mail/bincimap/files/digest-bincimap-1.2.4
deleted file mode 100644
index 55b5580f969c..000000000000
--- a/net-mail/bincimap/files/digest-bincimap-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3f484582ef7ff4014135482797ad9d2 bincimap-1.2.4.tar.bz2 414225
diff --git a/net-mail/bincimap/files/digest-bincimap-1.2.5 b/net-mail/bincimap/files/digest-bincimap-1.2.5
deleted file mode 100644
index f61bbc719696..000000000000
--- a/net-mail/bincimap/files/digest-bincimap-1.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2551aaa51a37cad6b1b83562c98215f7 bincimap-1.2.5.tar.bz2 414705