Updated mail/imapsync to 1.264, and adjusted to use p5-Mail-IMAPClient2

revision 1.264
    Archiveopteryx 3.0.0
revision 1.263
    Added modules versions output.
revision 1.262
    Work fine under XP.
revision 1.261
    - Fixed bug about ssl and justconnect option
    - Cleaned connect code.
    - Started gmail support.
revision 1.260
    - Added option --idatefromheader :
      sets the internal dates on host2 same as the "Date:" headers.
revision 1.259
    - Made a function for regexmess() --regexmess to be able to
      check it easily
    - Added function tests_regexmess() to check regexmess(), 3
      tests.
    - Removed imapsync copyleft GPL licence output (boring).
      Replaced by wishlist link.
    - Added thank_author() to avoid duplicate code about thanks.
    - Better bug report documentation.
revision 1.258
    Change report bug information order.
revision 1.257
    removed comment and ugly output
revision 1.256
    Applied patch from Simon Heimlicher to avoid non-selectable
    folders.
revision 1.255
    Domino (Notes) 4.61
revision 1.254
    Some server (Microsoft Exchange 6.0.6249.0 for example)
    returns message size a lot
    s than the real size
    Now imapsync accept this silly behavior.
revision 1.253
    Archiveopteryx  2.09
revision 1.252
    Added mailing list information.
revision 1.251
    Fixed message_string returning empty message when < expected size.
revision 1.250
    Bug fix "parse_headers want an ARRAY ref"
revision 1.249
    warn about BUG_IMAPClient_3.xx
revision 1.248
    Cleaned check_lib_version()
revision 1.247
    Added id in output warn when no header found.
revision 1.246
    Removed $^W use.
revision 1.245
    Back to append_string()
    Turn on --syncinternaldates by default
    Date_Init("TZ=GMT") if no timezone (windows) set.
revision 1.244
    Removed old *_2() functions (unused)
revision 1.243
    Moved functins *_2() into override_imapclient()
revision 1.242
    Ignore message when it has no header.

2 files changed, 16 insertions, 7 deletions

diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile
index 043c381e4cb..1b797e56d5c 100644
--- a/mail/imapsync/Makefile
+++ b/mail/imapsync/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/03/04 17:57:18 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2008/09/08 22:25:13 abs Exp $
 #
 
-DISTNAME=	imapsync-1.241
+DISTNAME=	imapsync-1.264
 CATEGORIES=	mail
 MASTER_SITES=	http://www.linux-france.org/prj/imapsync/dist/
 EXTRACT_SUFX=	.tgz
@@ -10,10 +10,13 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.linux-france.org/prj/imapsync/
 COMMENT=	Incremental recursive IMAP transfer tool
 
+# Mail-IMAPClient-3.x (at least as of 3.08) has SSL regressions which make
+# it not usable for imapsync, hence we have a p5-Mail-IMAPClient2 package
+
 DEPENDS+=	p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
 DEPENDS+=	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
-DEPENDS+=	p5-Mail-IMAPClient>=2.2.9:../../mail/p5-Mail-IMAPClient
+DEPENDS+=	p5-Mail-IMAPClient2>=2.2.9:../../mail/p5-Mail-IMAPClient2
 DEPENDS+=	p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -24,6 +27,12 @@ REPLACE_PERL+=	imapsync
 
 INSTALLATION_DIRS=	bin share/doc
 
+SUBST_CLASSES+=         conf
+SUBST_STAGE.conf=       pre-configure
+SUBST_FILES.conf=	imapsync
+SUBST_SED.conf=         -e "s:IMAPClient:IMAPClient2:g"
+SUBST_MESSAGE.conf=     Replacing IMAPClient with IMAPClient2
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/imapsync ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/imapsync
diff --git a/mail/imapsync/distinfo b/mail/imapsync/distinfo
index 5c2638b7769..33d2d0cb45a 100644
--- a/mail/imapsync/distinfo
+++ b/mail/imapsync/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/02/14 21:05:15 tv Exp $
+$NetBSD: distinfo,v 1.3 2008/09/08 22:25:13 abs Exp $
 
-SHA1 (imapsync-1.241.tgz) = 6de72945fecce9438c218e150fc44f13481b3419
-RMD160 (imapsync-1.241.tgz) = 1d37b7022b42d9d5b67d4a2b29e38d51143d1585
-Size (imapsync-1.241.tgz) = 367006 bytes
+SHA1 (imapsync-1.264.tgz) = 4f2d06cddbe0ee56826a8f2e08f94da2c75f705c
+RMD160 (imapsync-1.264.tgz) = 1c56bfd7724d6906ccfd11aa066ba251661ee9b6
+Size (imapsync-1.264.tgz) = 318077 bytes