Cleanup, add patch to build w/ gcc-4.3 (#220727)

Package-Manager: portage-2.1.5.5

8 files changed, 76 insertions, 370 deletions

diff --git a/net-mail/bincimap/ChangeLog b/net-mail/bincimap/ChangeLog
index 813b9c36fd00..6582a7581ac7 100644
--- a/net-mail/bincimap/ChangeLog
+++ b/net-mail/bincimap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/bincimap
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.47 2008/03/15 22:58:44 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.48 2008/06/15 11:28:55 dertobi123 Exp $
+
+  15 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/bincimap-1.2.11-gentoo.diff, +files/bincimap-1.2-gcc43.patch,
+  -files/bincimap-1.3.3-gentoo.diff, -bincimap-1.2.11.ebuild,
+  bincimap-1.2.13.ebuild, -bincimap-1.3.3.ebuild:
+  Cleanup, add patch to build w/ gcc-4.3 (#220727)
 
   15 Mar 2008; Mark Loeser <halcy0n@gentoo.org> bincimap-1.2.11.ebuild,
   bincimap-1.2.12.ebuild, bincimap-1.2.13.ebuild, bincimap-1.3.3.ebuild,
diff --git a/net-mail/bincimap/Manifest b/net-mail/bincimap/Manifest
index 98e74a559d61..c9a60d3c143f 100644
--- a/net-mail/bincimap/Manifest
+++ b/net-mail/bincimap/Manifest
@@ -1,27 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX bincimap-1.2.11-gentoo.diff 1438 RMD160 ca3988da8cda271a7b737528adbb0a503cd729d4 SHA1 9b360b00685668bbabef822d95a3a10cea201964 SHA256 e14792e7dc46937824cf79b692e760fef02a74c0b2fda44451f75946c8f9fb01
+AUX bincimap-1.2-gcc43.patch 1750 RMD160 0f52a14c056a4ea76cdcb93a069d654d34270423 SHA1 ec98f1d1b30688e237bc1682a960fc02a0f4888b SHA256 e7894fbe54989dcff917c2b2b31dd94ef0e39997c90eadc04e2507e5756da870
 AUX bincimap-1.2.12-gentoo.diff 1438 RMD160 ca3988da8cda271a7b737528adbb0a503cd729d4 SHA1 9b360b00685668bbabef822d95a3a10cea201964 SHA256 e14792e7dc46937824cf79b692e760fef02a74c0b2fda44451f75946c8f9fb01
 AUX bincimap-1.2.13-gentoo.diff 1438 RMD160 1797ed8e70309b03aa8f7e102fb4f8ad4c3b5f0f SHA1 a037ff39c2873f918e61fac56f903820308a4956 SHA256 7c6c70dde65813a08edcad6044adc2d9c5829faaaa3bc5c7ff5c92d240c1a8d6
-AUX bincimap-1.3.3-gentoo.diff 6685 RMD160 138ad1779a3a7501e9457052521e48ee04192b4d SHA1 155feb8a15f881fe179fbd26fddc3a1e43ee9b89 SHA256 707b7efcd0047a438b961fdec894324e5ab90f1b0853076b08b9561fdf0c730e
 AUX bincimap-1.3.4-gentoo.diff 6685 RMD160 138ad1779a3a7501e9457052521e48ee04192b4d SHA1 155feb8a15f881fe179fbd26fddc3a1e43ee9b89 SHA256 707b7efcd0047a438b961fdec894324e5ab90f1b0853076b08b9561fdf0c730e
-DIST bincimap-1.2.11final.tar.bz2 415209 RMD160 603c25366c0b67baf39d5cbe07b225077c3fa1fb SHA1 22a60bcbfc10ce4c4d16ac86e31d0f7268f577b5 SHA256 44180061f6205730bbc9113ed6f97d6716b66a3922c17b13f4a783a8ec7f8bd1
 DIST bincimap-1.2.12final.tar.bz2 415731 RMD160 67327046c6b4e795c916bf4a0fc2cb0af93fe7a8 SHA1 951e5fe99057dd6dea48b0233746c27f88d70380 SHA256 ffe848e1e0a12abd56bcef28f3c177a5b6687bf228f667d75b8d14f22aabf466
 DIST bincimap-1.2.13final.tar.bz2 416152 RMD160 db5821290cdc193f594181105a41e64b8c975b4e SHA1 cdbc1bf95decbe76e0a218025c351b8174b4b485 SHA256 152368a1674a521a2006b8a27ff36c4db1b8bb0cf766ab1a0ada02698fae4528
-DIST bincimap-1.3.3.tar.bz2 192389 RMD160 b2b80c8b57e4a8d4f4f42aef1baa253a657f31c1 SHA1 afd35d811207619416e0d868a14a5aaf6ce06835 SHA256 07468bcbaaa4eaf74bf76a5a11fa6ebf0349e2156a8ec18e1dbddb04f587439d
 DIST bincimap-1.3.4.tar.bz2 194486 RMD160 9ed00b603c3c9c724eb0fe339d4ddeab719f78f2 SHA1 57e984428e897012ae907a7e915b8588967d2a45 SHA256 01c4426870167ada90be52cb73f220e04d715b4d95e734505f0e16d5ab99b066
-EBUILD bincimap-1.2.11.ebuild 2441 RMD160 f13953b86eb1978c43ea3df4ba5466e2d646333a SHA1 453f30c5f5835d7c6e318c3932ce43da0a32069f SHA256 52c0b4a2c36ceb1ddadf8867d676ba300c12582d9cb79f0e40effcd2c553cb65
 EBUILD bincimap-1.2.12.ebuild 2447 RMD160 536561885550874980c7cd4bab071f240b4b0a8d SHA1 befc9720ac38e5da9347d8a67e1d0dbe21c0a9d5 SHA256 8ac7e86c3a7c5a98060efb4a19706c7d29e819a91f09d5c882b686213c83e240
-EBUILD bincimap-1.2.13.ebuild 2449 RMD160 d91f7a9f84859d5afec67b42b56e038099fbb960 SHA1 d59a2880744b9b2957a33566629f64982803db49 SHA256 53227f878a0096da3d4ec7409f50f70a6eb30343205d526722298512820ac4d7
-EBUILD bincimap-1.3.3.ebuild 2490 RMD160 56f1e615d1185e9f9c8acf99a1cc1edce6f7716d SHA1 28fb9360416992002dff5d4a2faf214d9c25f3eb SHA256 f41fecf098ab5370b585ae6646b7b19135824d80a3c8dfa76f890a7ef864a58f
+EBUILD bincimap-1.2.13.ebuild 2496 RMD160 3e802b5f1123d9fdfa6a14d877c16125efd294ff SHA1 b17af85a927f3d70da5447163ce33528f19d3143 SHA256 5f99f120d2a9cbc4a2eccbb244a1be3c62fb3ce21e5586162656ac51bb452ace
 EBUILD bincimap-1.3.4.ebuild 2490 RMD160 cbfa86f1a7da93b92ecf0b1cc2039e259f1a05e8 SHA1 f1eb7d7a45286ad2a12992a536e9d79d0d85a92a SHA256 324cd4a8cdb7913083c3f313188df44c42e4c63d279c33010934fde46aadfc19
-MISC ChangeLog 7100 RMD160 51b797fbd9e74c8a404017c813a72b8302b7bf5d SHA1 eaab95a21ca390e4224699d8c1488b3cc909d576 SHA256 52618d5fbb2aef187fb0b8fac027bef78a4aeb184d992f2065db251a8efe57d3
+MISC ChangeLog 7394 RMD160 a554915855394a9bd832035c652498a10027ee40 SHA1 4fcddca82938959eef13f6aa1459ccf4a077257d SHA256 f0e5cdbf17008615266b553b913d6a6913eb140bec08b387d3232618a201e298
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH3FSsCRZPokWLroQRAtnOAJ91hcv/pRtf3/ZBhjIdtTQyQImsRQCgojfr
-r0xnIhuhsCz0y+j/WQDUdwU=
-=WreI
------END PGP SIGNATURE-----
diff --git a/net-mail/bincimap/bincimap-1.2.11.ebuild b/net-mail/bincimap/bincimap-1.2.11.ebuild
deleted file mode 100644
index 6579200c26b9..000000000000
--- a/net-mail/bincimap/bincimap-1.2.11.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.11.ebuild,v 1.9 2008/03/15 22:58:44 halcy0n Exp $
-
-inherit eutils
-
-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 amd64 ~ppc"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	sys-process/daemontools
-	sys-apps/ucspi-tcp
-	net-mail/checkpassword
-	!virtual/imapd"
-
-PROVIDE="virtual/imapd"
-
-S="${WORKDIR}/${P}final"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-}
-
-src_compile() {
-	econf $(use_enable ssl) --sysconfdir=/etc/bincimap || die
-	emake localstatedir=/etc/bincimap || die
-}
-
-src_install () {
-	make DESTDIR="${D}" localstatedir=/etc/bincimap prefix=/usr install || die
-	keepdir /var/log/bincimap || die
-	if use ssl; then
-		keepdir /var/log/bincimap-ssl || die
-	fi
-
-	dodoc AUTHORS ChangeLog INSTALL \
-		NEWS README README.SSL TODO
-
-	# backward compatibility
-	dosym /etc/bincimap/service/bincimap /etc/bincimap/service/imap
-	dosym /etc/bincimap/service/bincimaps /etc/bincimap/service/imaps
-}
-
-pkg_postinst() {
-	elog "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
-	elog "and create the following link:"
-	elog "ln -s /etc/bincimap/service/bincimap /service/bincimap"
-	elog
-
-	if use ssl; then
-		elog "If you want to use ssl connections, create the following link:"
-		elog "ln -s /etc/bincimap/service/bincimaps /service/bincimaps"
-		elog
-		elog "And this command will setup bincimap-ssl on your system."
-		elog "emerge --config =${CATEGORY}/${PF}"
-		elog
-	fi
-
-	elog "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it,"
-	elog "edit /etc/bincimap/bincimap.conf"
-	elog
-}
-
-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.13.ebuild b/net-mail/bincimap/bincimap-1.2.13.ebuild
index 14f43e530b2e..95f4b7388ac0 100644
--- a/net-mail/bincimap/bincimap-1.2.13.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.13.ebuild,v 1.6 2008/03/15 22:58:44 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.13.ebuild,v 1.7 2008/06/15 11:28:55 dertobi123 Exp $
 
 inherit eutils
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-1.2-gcc43.patch
 }
 
 src_compile() {
diff --git a/net-mail/bincimap/bincimap-1.3.3.ebuild b/net-mail/bincimap/bincimap-1.3.3.ebuild
deleted file mode 100644
index 0bb9ae1869d5..000000000000
--- a/net-mail/bincimap/bincimap-1.3.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.3.3.ebuild,v 1.7 2008/03/15 22:58:44 halcy0n Exp $
-
-inherit eutils
-
-DESCRIPTION="IMAP server for Maildir"
-SRC_URI="http://www.bincimap.org/dl/tarballs/1.3/${P}.tar.bz2"
-HOMEPAGE="http://www.bincimap.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	sys-process/daemontools
-	sys-apps/ucspi-tcp
-	net-mail/checkpassword
-	!virtual/imapd"
-
-PROVIDE="virtual/imapd"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-}
-
-src_compile() {
-	econf $(use_enable ssl) --sysconfdir=/etc/bincimap \
-		--datadir=/usr/share/doc/${PF} \
-		--localstatedir=/etc/bincimap || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" prefix=/usr install || die
-	keepdir /var/log/bincimap || die
-	if use ssl; then
-		keepdir /var/log/bincimap-ssl || die
-	fi
-
-	# backward compatibility
-	dosym /etc/bincimap/service/bincimap /etc/bincimap/service/imap
-	dosym /etc/bincimap/service/bincimaps /etc/bincimap/service/imaps
-
-	# rename
-	mv "${D}"/etc/xinetd.d/{xinetd-bincimap,bincimap}
-	mv "${D}"/etc/xinetd.d/{xinetd-bincimaps,bincimaps}
-}
-
-pkg_postinst() {
-	elog "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
-	elog "and create the following link:"
-	elog "ln -sf /etc/bincimap/service/bincimap /service/"
-	elog
-
-	if use ssl; then
-		elog "If you want to use ssl connections, create the following link instead of above link."
-		elog "ln -sf /etc/bincimap/service/bincimaps /service/"
-		elog
-		elog "And this command will setup bincimap-ssl on your system."
-		elog "emerge --config =${CATEGORY}/${PF}"
-		elog
-	fi
-
-	#elog "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it, "
-	#elog "edit /etc/bincimap/bincimap.conf"
-	#elog
-}
-
-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/files/bincimap-1.2-gcc43.patch b/net-mail/bincimap/files/bincimap-1.2-gcc43.patch
new file mode 100644
index 000000000000..76cb3a96d6b5
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.2-gcc43.patch
@@ -0,0 +1,64 @@
+diff -NrU5 bincimap-1.2.13final.orig/src/convert.cc bincimap-1.2.13final/src/convert.cc
+--- bincimap-1.2.13final.orig/src/convert.cc	2005-01-08 11:20:48.000000000 +0100
++++ bincimap-1.2.13final/src/convert.cc	2008-05-07 12:32:33.000000000 +0200
+@@ -37,10 +37,12 @@
+ 
+ #include "convert.h"
+ #include "io.h"
+ #include <string>
+ 
++#include <cstring>
++
+ using namespace ::std;
+ using namespace Binc;
+ 
+ //------------------------------------------------------------------------
+ BincStream::BincStream(void)
+diff -NrU5 bincimap-1.2.13final.orig/src/convert.h bincimap-1.2.13final/src/convert.h
+--- bincimap-1.2.13final.orig/src/convert.h	2005-02-08 21:30:22.000000000 +0100
++++ bincimap-1.2.13final/src/convert.h	2008-05-07 12:32:33.000000000 +0200
+@@ -35,10 +35,11 @@
+ #include <config.h>
+ #endif
+ 
+ #ifndef convert_h_included
+ #define convert_h_included
++#include <cstdlib>
+ #include <string>
+ #include <vector>
+ #include <iomanip>
+ #include <iostream>
+ 
+@@ -46,10 +47,12 @@
+ #include <sys/stat.h>
+ 
+ #include "address.h"
+ #include "depot.h"
+ 
++#include <cstring>
++
+ namespace Binc {
+ 
+   //----------------------------------------------------------------------
+   inline std::string toString(int i_in)
+   {
+diff -NrU5 bincimap-1.2.13final.orig/src/tools.cc bincimap-1.2.13final/src/tools.cc
+--- bincimap-1.2.13final.orig/src/tools.cc	2005-01-08 11:20:48.000000000 +0100
++++ bincimap-1.2.13final/src/tools.cc	2008-05-07 12:32:33.000000000 +0200
+@@ -33,13 +33,16 @@
+  */
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+ #include <errno.h>
++#include <cstdlib>
+ 
+ #include "tools.h"
+ 
++#include <cstring>
++
+ using namespace ::std;
+ using namespace Binc;
+ 
+ //------------------------------------------------------------------------
+ Tools::Tools(void)
diff --git a/net-mail/bincimap/files/bincimap-1.2.11-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.11-gentoo.diff
deleted file mode 100644
index 32841b1cfa88..000000000000
--- a/net-mail/bincimap/files/bincimap-1.2.11-gentoo.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naru bincimap-1.2.11final.org/conf/bincimap.conf bincimap-1.2.11final/conf/bincimap.conf
---- bincimap-1.2.11final.org/conf/bincimap.conf	2004-04-18 20:23:28.000000000 +0100
-+++ bincimap-1.2.11final/conf/bincimap.conf	2004-04-24 13:53:10.011618795 +0100
-@@ -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.11final.org/service/log/run-ssl.in bincimap-1.2.11final/service/log/run-ssl.in
---- bincimap-1.2.11final.org/service/log/run-ssl.in	2004-03-02 20:16:02.000000000 +0000
-+++ bincimap-1.2.11final/service/log/run-ssl.in	2004-04-24 13:52:30.562843106 +0100
-@@ -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.11final.org/service/log/run.in bincimap-1.2.11final/service/log/run.in
---- bincimap-1.2.11final.org/service/log/run.in	2004-03-02 20:16:02.000000000 +0000
-+++ bincimap-1.2.11final/service/log/run.in	2004-04-24 13:52:37.988613029 +0100
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap
-+exec multilog t n5 s1048576 /var/log/bincimap
- 
diff --git a/net-mail/bincimap/files/bincimap-1.3.3-gentoo.diff b/net-mail/bincimap/files/bincimap-1.3.3-gentoo.diff
deleted file mode 100644
index df829f30f47c..000000000000
--- a/net-mail/bincimap/files/bincimap-1.3.3-gentoo.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Naru bincimap-1.3.3.org/Makefile.in bincimap-1.3.3/Makefile.in
---- bincimap-1.3.3.org/Makefile.in	2004-11-09 20:18:55.000000000 +0000
-+++ bincimap-1.3.3/Makefile.in	2004-11-19 09:54:41.000000000 +0000
-@@ -397,28 +397,28 @@
- 	@$(BINC_INSTALL_CONF) $(srcdir)/conf/bincimap-localconfig $(DESTDIR)$(sysconfdir) 755
- 	@echo
- 	@echo "* Run files"
--	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimap $(DESTDIR)$(sysconfdir)
--	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimaps $(DESTDIR)$(sysconfdir)
-+	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimap $(DESTDIR)/etc/xinetd.d
-+	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimaps $(DESTDIR)/etc/xinetd.d
- 	@echo
- 	@echo "* Service/run files"
--	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/run $(DESTDIR)$(datadir)/service/bincimap 755
--	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/log/run $(DESTDIR)$(datadir)/service/bincimap/log 755
--	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/log/run $(DESTDIR)$(datadir)/service/bincimaps/log 755
--	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/run $(DESTDIR)$(datadir)/service/bincimaps 755
-+	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/run $(DESTDIR)$(sysconfdir)/service/bincimap 755
-+	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/log/run $(DESTDIR)$(sysconfdir)/service/bincimap/log 755
-+	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/log/run $(DESTDIR)$(sysconfdir)/service/bincimaps/log 755
-+	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/run $(DESTDIR)$(sysconfdir)/service/bincimaps 755
- 	@echo
- 	@echo "* Documentation"
- 	@$(BINC_INSTALL_DOC) $(srcdir)/man/bincimap.1 $(DESTDIR)$(mandir)/man1
--	@$(BINC_INSTALL_DOC) $(srcdir)/ChangeLog $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/AUTHORS $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING.OpenSSL $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/README $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/TODO $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-goals.html $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-imapdir.html $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-tech.html $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)/doc/bincimap
-+	@$(BINC_INSTALL_DOC) $(srcdir)/ChangeLog $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/AUTHORS $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING.OpenSSL $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/README $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/TODO $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-goals.html $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-imapdir.html $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-tech.html $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)
- 	@echo
- 	@echo "* Binaries"
- 	@$(BINC_INSTALL_BIN) src/bincimapd $(DESTDIR)$(bindir)
-diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimap bincimap-1.3.3/conf/xinetd-bincimap
---- bincimap-1.3.3.org/conf/xinetd-bincimap	2004-11-09 20:08:05.000000000 +0000
-+++ bincimap-1.3.3/conf/xinetd-bincimap	2004-11-19 09:51:30.000000000 +0000
-@@ -13,14 +13,14 @@
- # description: Binc IMAP
- service imap
- {
--	disable		= no
-+	disable		= yes
- 	flags		= REUSE
- 	socket_type	= stream        
- 	wait		= no
- 	user		= root
- 	group		= root
- 	instances	= UNLIMITED
--	server		= /usr/local/etc/bincimap-config
--	server_args	= /usr/local/bin/bincimap-up -- /bin/checkpassword /usr/local/etc/bincimap-localconfig /usr/local/bin/bincimapd Maildir
-+	server		= /etc/bincimap/bincimap-config
-+	server_args	= /usr/bin/bincimap-up -- /bin/checkpassword /etc/bincimap/bincimap-localconfig /usr/bin/bincimapd Maildir
- 	log_type	= SYSLOG daemon info
- }
-diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimap.in bincimap-1.3.3/conf/xinetd-bincimap.in
---- bincimap-1.3.3.org/conf/xinetd-bincimap.in	2004-05-24 10:17:16.000000000 +0100
-+++ bincimap-1.3.3/conf/xinetd-bincimap.in	2004-11-29 01:35:09.020518914 +0000
-@@ -13,7 +13,7 @@
- # description: Binc IMAP
- service imap
- {
--	disable		= no
-+	disable		= yes
- 	flags		= REUSE
- 	socket_type	= stream        
- 	wait		= no
-diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimaps bincimap-1.3.3/conf/xinetd-bincimaps
---- bincimap-1.3.3.org/conf/xinetd-bincimaps	2004-11-09 20:08:05.000000000 +0000
-+++ bincimap-1.3.3/conf/xinetd-bincimaps	2004-11-19 09:50:53.000000000 +0000
-@@ -13,14 +13,14 @@
- # description: Binc IMAP, SSL
- service imaps
- {
--	disable		= no
-+	disable		= yes
- 	flags		= REUSE
- 	socket_type	= stream        
- 	wait		= no
- 	user		= root
- 	group		= root
- 	instances	= UNLIMITED
--	server		= /usr/local/etc/bincimap-config
--	server_args	= /usr/local/bin/bincimap-up --enable-ssl -- /bin/checkpassword /usr/local/etc/bincimap-localconfig /usr/local/bin/bincimapd Maildir
-+	server		= /etc/bincimap/bincimap-config
-+	server_args	= /usr/bin/bincimap-up --enable-ssl -- /bin/checkpassword /etc/bincimap/bincimap-localconfig /usr/bin/bincimapd Maildir
- 	log_type	= SYSLOG daemon info
- }
-diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimaps.in bincimap-1.3.3/conf/xinetd-bincimaps.in
---- bincimap-1.3.3.org/conf/xinetd-bincimaps.in	2004-05-24 10:17:16.000000000 +0100
-+++ bincimap-1.3.3/conf/xinetd-bincimaps.in	2004-11-29 01:35:20.008893378 +0000
-@@ -13,7 +13,7 @@
- # description: Binc IMAP, SSL
- service imaps
- {
--	disable		= no
-+	disable		= yes
- 	flags		= REUSE
- 	socket_type	= stream        
- 	wait		= no
-diff -Naru bincimap-1.3.3.org/service/plain/log/run.in bincimap-1.3.3/service/plain/log/run.in
---- bincimap-1.3.3.org/service/plain/log/run.in	2004-06-17 21:37:33.000000000 +0100
-+++ bincimap-1.3.3/service/plain/log/run.in	2004-11-16 14:52:51.000000000 +0000
-@@ -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.3.3.org/service/ssl/log/run.in bincimap-1.3.3/service/ssl/log/run.in
---- bincimap-1.3.3.org/service/ssl/log/run.in	2004-06-17 21:37:33.000000000 +0100
-+++ bincimap-1.3.3/service/ssl/log/run.in	2004-11-16 14:52:58.000000000 +0000
-@@ -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
-