Update to 1.1.0. From the changelog:

* Support for hierarchical mailboxes in Patterns.
* Full support for IMAP pipelining (streaming, parallelization)
  added. This is considerably faster especially with high-latency
  networks.
* Faster and hopefully more reliable support for IMAP servers without
  the UIDPLUS extension (e.g., M$ Exchange).
* More automatic handling of SSL certificates.
* IPv6 support.
* IMAP password query can be scripted.
* Message arrival dates can be propagated.
* Data safety in case of system crashes was improved.
* MaxMessages was made vastly more useful.

6 files changed, 60 insertions, 35 deletions

diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index b2db61736ee..9bfef642d2c 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2014/02/12 23:18:08 tron Exp $
+# $NetBSD: Makefile,v 1.33 2014/04/24 14:48:44 schmonz Exp $
 
-DISTNAME=	isync-1.0.4
-PKGREVISION=	6
+DISTNAME=	isync-1.1.0
 CATEGORIES=	mail net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
@@ -17,14 +16,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 LDFLAGS+=		-lcrypto
 
-INSTALLATION_DIRS+=	share/examples/isync
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/src/mbsyncrc.sample \
-		${DESTDIR}${PREFIX}/share/examples/isync/mbsyncrc.sample
-	${INSTALL_DATA} ${WRKSRC}/src/compat/isyncrc.sample \
-		${DESTDIR}${PREFIX}/share/examples/isync/isyncrc.sample
-
 BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index 402becca5ed..781751b9b81 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.10 2010/06/02 13:05:01 adam Exp $
+$NetBSD: distinfo,v 1.11 2014/04/24 14:48:44 schmonz Exp $
 
-SHA1 (isync-1.0.4.tar.gz) = a327cc5b81946c7ccb3a26ddd971933e2e006ed3
-RMD160 (isync-1.0.4.tar.gz) = 23475533ff9848c38b95911eae6191ca03132185
-Size (isync-1.0.4.tar.gz) = 170264 bytes
-SHA1 (patch-ae) = 2fddc575e8824ecbbb4b8c51a56193840b43d647
-SHA1 (patch-af) = 12fc0ec1b2292c422e7c3347b37167438866728d
+SHA1 (isync-1.1.0.tar.gz) = d99bd9603e17f94ebe4af1691482a6676ea0fb42
+RMD160 (isync-1.1.0.tar.gz) = 0060ef3249accc4e48bf7cd0a4b24be3c570337d
+Size (isync-1.1.0.tar.gz) = 249374 bytes
+SHA1 (patch-ae) = e1a1badcb99fe6089a15a259985933aceedfc110
+SHA1 (patch-af) = f3803de6c97733fa5fd17ab89dbd75910eec3301
+SHA1 (patch-src_Makefile.in) = f946bff2e0a2b9a50fdcc752b2d5e3767f42a03b
+SHA1 (patch-src_compat_Makefile.in) = 82ee8cb1abcb8479865856b085c2ca016242b6dd
diff --git a/mail/isync/patches/patch-ae b/mail/isync/patches/patch-ae
index 75e1617f07e..02352281ae6 100644
--- a/mail/isync/patches/patch-ae
+++ b/mail/isync/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.5 2007/01/18 18:26:21 tonio Exp $
+$NetBSD: patch-ae,v 1.6 2014/04/24 14:48:44 schmonz Exp $
 
---- src/config.c.orig	2006-11-01 07:54:31.000000000 +0100
+Avoid segfault when parsing configuration file under NetBSD.
+
+--- src/config.c.orig	2013-12-13 17:54:37.000000000 +0000
 +++ src/config.c
-@@ -252,7 +252,7 @@ int
+@@ -316,7 +316,7 @@ int
  load_config( const char *where, int pseudo )
  {
  	conffile_t cfile;
--	store_conf_t *store, **storeapp = &stores, **sptarg;
-+	store_conf_t *store = NULL, **storeapp = &stores, **sptarg;
+-	store_conf_t *store, **storeapp = &stores;
++	store_conf_t *store = NULL, **storeapp = &stores;
  	channel_conf_t *channel, **channelapp = &channels;
  	group_conf_t *group, **groupapp = &groups;
  	string_list_t *chanlist, **chanlistapp;
diff --git a/mail/isync/patches/patch-af b/mail/isync/patches/patch-af
index a2bafdb0a5b..d38d3036bd8 100644
--- a/mail/isync/patches/patch-af
+++ b/mail/isync/patches/patch-af
@@ -1,26 +1,26 @@
-$NetBSD: patch-af,v 1.4 2009/07/12 20:26:59 tonio Exp $
+$NetBSD: patch-af,v 1.5 2014/04/24 14:48:44 schmonz Exp $
 
-time_t may be 64bits
+time_t may be 64-bit.
 
---- src/drv_maildir.c.orig	2008-02-23 10:02:21.000000000 +0100
+--- src/drv_maildir.c.orig	2013-12-18 17:58:26.000000000 +0000
 +++ src/drv_maildir.c
-@@ -936,7 +936,7 @@ maildir_store_msg( store_t *gctx, msg_da
- 	int ret, fd, bl;
+@@ -1167,7 +1167,7 @@ maildir_store_msg( store_t *gctx, msg_da
+ 	int ret, fd, bl, uid;
  	char buf[_POSIX_PATH_MAX], nbuf[_POSIX_PATH_MAX], fbuf[NUM_FLAGS + 3], base[128];
  
--	bl = nfsnprintf( base, sizeof(base), "%ld.%d_%d.%s", time( 0 ), Pid, ++MaildirCount, Hostname );
-+	bl = nfsnprintf( base, sizeof(base), "%lld.%d_%d.%s", (long long int) time( 0 ), Pid, ++MaildirCount, Hostname );
- 	if (uid) {
+-	bl = nfsnprintf( base, sizeof(base), "%ld.%d_%d.%s", (long)time( 0 ), Pid, ++MaildirCount, Hostname );
++	bl = nfsnprintf( base, sizeof(base), "%lld.%d_%d.%s", (long long int)time( 0 ), Pid, ++MaildirCount, Hostname );
+ 	if (!to_trash) {
  #ifdef USE_DB
  		if (ctx->db) {
-@@ -1086,8 +1086,8 @@ maildir_trash_msg( store_t *gctx, messag
+@@ -1347,8 +1347,8 @@ maildir_trash_msg( store_t *gctx, messag
  	for (;;) {
  		nfsnprintf( buf, sizeof(buf), "%s/%s/%s", gctx->path, subdirs[gmsg->status & M_RECENT], msg->base );
  		s = strstr( msg->base, ":2," );
--		nfsnprintf( nbuf, sizeof(nbuf), "%s%s/%s/%ld.%d_%d.%s%s", gctx->conf->path, gctx->conf->trash,
--		            subdirs[gmsg->status & M_RECENT], time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" );
-+		nfsnprintf( nbuf, sizeof(nbuf), "%s%s/%s/%lld.%d_%d.%s%s", gctx->conf->path, gctx->conf->trash,
-+		            subdirs[gmsg->status & M_RECENT], (long long int) time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" );
+-		nfsnprintf( nbuf, sizeof(nbuf), "%s/%s/%ld.%d_%d.%s%s", ctx->trash,
+-		            subdirs[gmsg->status & M_RECENT], (long)time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" );
++		nfsnprintf( nbuf, sizeof(nbuf), "%s/%s/%lld.%d_%d.%s%s", ctx->trash,
++		            subdirs[gmsg->status & M_RECENT], (long long int)time( 0 ), Pid, ++MaildirCount, Hostname, s ? s : "" );
  		if (!rename( buf, nbuf ))
  			break;
  		if (!stat( buf, &st )) {
diff --git a/mail/isync/patches/patch-src_Makefile.in b/mail/isync/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..89e050f49c6
--- /dev/null
+++ b/mail/isync/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2014/04/24 14:48:44 schmonz Exp $
+
+Install example config files in pkgsrc hierarchy.
+
+--- src/Makefile.in.orig	2013-12-18 21:09:58.000000000 +0000
++++ src/Makefile.in
+@@ -331,7 +331,7 @@ noinst_HEADERS = common.h config.h drive
+ mdconvert_SOURCES = mdconvert.c
+ mdconvert_LDADD = -ldb
+ man_MANS = mbsync.1 mdconvert.1
+-exampledir = $(docdir)/examples
++exampledir = $(datadir)/examples/isync
+ example_DATA = mbsyncrc.sample
+ EXTRA_DIST = run-tests.pl $(example_DATA) $(man_MANS)
+ all: all-recursive
diff --git a/mail/isync/patches/patch-src_compat_Makefile.in b/mail/isync/patches/patch-src_compat_Makefile.in
new file mode 100644
index 00000000000..da8e489480e
--- /dev/null
+++ b/mail/isync/patches/patch-src_compat_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_compat_Makefile.in,v 1.1 2014/04/24 14:48:44 schmonz Exp $
+
+Install example config files in pkgsrc hierarchy.
+
+--- src/compat/Makefile.in.orig	2013-12-18 21:09:58.000000000 +0000
++++ src/compat/Makefile.in
+@@ -280,7 +280,7 @@ isync_SOURCES = main.c config.c convert.
+ isync_LDADD = -ldb
+ noinst_HEADERS = isync.h
+ man_MANS = isync.1
+-exampledir = $(docdir)/examples
++exampledir = $(datadir)/examples/isync
+ example_DATA = isyncrc.sample
+ EXTRA_DIST = $(example_DATA) $(man_MANS)
+ all: all-am