Version bump.

7 files changed, 52 insertions, 134 deletions

diff --git a/net-mail/bincimap/ChangeLog b/net-mail/bincimap/ChangeLog
index f349be42764c..a7733b5aaaae 100644
--- a/net-mail/bincimap/ChangeLog
+++ b/net-mail/bincimap/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2004/03/28 05:01:45 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.11 2004/04/19 00:14:37 nakano Exp $
+
+*bincimap-1.2.7 (19 Apr 2004)
+
+  19 Apr 2004; Masatomo Nakano <nakano@gentoo.org>
+  -files/bincimap-1.2.3-gentoo.diff, +files/bincimap-1.2.7-gentoo.diff,
+  -bincimap-1.2.3-r1.ebuild, +bincimap-1.2.7.ebuild:
+  Version bump and removed old version(1.2.3).
 
   28 Mar 2004; Masatomo Nakano <nakano@gentoo.org> bincimap-1.2.6.ebuild:
   Fixed infomation after install.
diff --git a/net-mail/bincimap/Manifest b/net-mail/bincimap/Manifest
index 40dcc41fa503..5c6d9e6297cf 100644
--- a/net-mail/bincimap/Manifest
+++ b/net-mail/bincimap/Manifest
@@ -1,8 +1,8 @@
 MD5 b3ff10d4ea263c69cad3bdca1b813a28 bincimap-1.2.6.ebuild 2113
-MD5 2e04ad9855af069f71e3f4b092362140 ChangeLog 1694
+MD5 69685e5c49a7e0c523af96bc7094a609 bincimap-1.2.7.ebuild 2451
+MD5 0c5ac381dc3619eafb0599b4c0b17b23 ChangeLog 1949
 MD5 38f7e7e07cecf943cd078f4aef09fef1 metadata.xml 250
-MD5 8275ab0a32bbb173e66f574eefb7baf8 bincimap-1.2.3-r1.ebuild 2044
-MD5 0292f9ed05ad50bdbdd139e6b62036cd files/bincimap-1.2.3-gentoo.diff 6482
+MD5 91c6992ad5bdd53094e68ad810f7a204 files/bincimap-1.2.7-gentoo.diff 613
 MD5 bf88a86c174f13b9059bf6c6f5b95ed9 files/digest-bincimap-1.2.6 72
-MD5 7faa38e06bc7ca25b09ea04fedf1e941 files/digest-bincimap-1.2.3-r1 67
+MD5 ca8425d79faf2c0c420135cd10fa5372 files/digest-bincimap-1.2.7 72
 MD5 7f1e2005fb3643a54f2a77505ed79f48 files/bincimap-1.2.6-gentoo.diff 6565
diff --git a/net-mail/bincimap/bincimap-1.2.3-r1.ebuild b/net-mail/bincimap/bincimap-1.2.7.ebuild
index ee28238a9fe3..353da30e7e47 100644
--- a/net-mail/bincimap/bincimap-1.2.3-r1.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.3-r1.ebuild,v 1.2 2003/10/22 18:29:27 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.2.7.ebuild,v 1.1 2004/04/19 00:14:38 nakano Exp $
 
 DESCRIPTION="IMAP server for Maildir"
-SRC_URI="http://www.bincimap.org/dl/tarballs/1.2/${P}.tar.bz2"
+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
@@ -18,41 +18,49 @@ RDEPEND="${DEPEND}
 	sys-apps/ucspi-tcp
 	net-mail/checkpassword"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/${P}final"
 
 src_compile() {
+	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 	econf `use_enable ssl ssl` --sysconfdir=/etc/bincimap || die
-	emake || die
+	emake localstatedir=/etc/bincimap || die
 }
 
 src_install () {
-	einstall sysconfdir=${D}/etc/bincimap || die
+	cd ${S}
+	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 COPYING COPYING.OpenSSL ChangeLog INSTALL \
-		NEWS README TODO
+		NEWS README README.SSL TODO
 
-	cd doc
-	dodoc *.html
-	dodoc manual/bincimap-manual.dvi manual/bincimap-manual.ps
+	# backward compatibility
+	dosym /etc/bincimap/service/bincimap /etc/bincimap/service/imap
+	dosym /etc/bincimap/service/bincimaps /etc/bincimap/service/imaps
 }
 
 pkg_postinst() {
+	einfo "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
+	einfo "and create the following link:"
+	einfo "ln -s /etc/bincimap/service/bincimap /service/bincimap"
+	einfo ""
+
 	if [ `use ssl` ]; then
-		einfo "This command will setup bincimap-ssl on your system."
+		einfo "If you want to use ssl connections, create the following link: "
+		einfo "ln -s /etc/bincimap/service/bincimaps /service/bincimaps"
+		einfo ""
+		einfo "And this command will setup bincimap-ssl on your system."
 		einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+		einfo ""
 	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"
+	einfo "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it, "
+	einfo "edit /etc/bincimap/bincimap.conf"
+	einfo ""
 }
 
 pkg_config() {
diff --git a/net-mail/bincimap/files/bincimap-1.2.3-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.3-gentoo.diff
deleted file mode 100644
index aa0d316b9513..000000000000
--- a/net-mail/bincimap/files/bincimap-1.2.3-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.7-gentoo.diff b/net-mail/bincimap/files/bincimap-1.2.7-gentoo.diff
new file mode 100644
index 000000000000..cba8cc97baa1
--- /dev/null
+++ b/net-mail/bincimap/files/bincimap-1.2.7-gentoo.diff
@@ -0,0 +1,13 @@
+diff -Naru bincimap-1.2.7final_org/conf/bincimap.conf bincimap-1.2.7final/conf/bincimap.conf
+--- bincimap-1.2.7final_org/conf/bincimap.conf	2004-04-18 23:10:09.680888894 +0100
++++ bincimap-1.2.7final/conf/bincimap.conf	2004-04-19 00:06:49.237706729 +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 --git a/net-mail/bincimap/files/digest-bincimap-1.2.3-r1 b/net-mail/bincimap/files/digest-bincimap-1.2.3-r1
deleted file mode 100644
index 64927a332168..000000000000
--- a/net-mail/bincimap/files/digest-bincimap-1.2.3-r1
+++ /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.7 b/net-mail/bincimap/files/digest-bincimap-1.2.7
new file mode 100644
index 000000000000..b7cb505e5f7b
--- /dev/null
+++ b/net-mail/bincimap/files/digest-bincimap-1.2.7
@@ -0,0 +1 @@
+MD5 c90fc8de62028fb6af6169a5737e9ea4 bincimap-1.2.7final.tar.bz2 397211