- Update to 1.1.0

- Move to BDB 46+

Patches provided by:	gahr

6 files changed, 54 insertions, 11 deletions

diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index c5405ad440d8..d03a425796e3 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	isync
-PORTVERSION=	1.0.6
+PORTVERSION=	1.1.0
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -13,22 +13,16 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_BDB=	42+
-
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
-PLIST_FILES=	bin/get-cert bin/isync bin/mbsync bin/mdconvert \
-		man/man1/isync.1.gz man/man1/mbsync.1.gz man/man1/mdconvert.1.gz
+USE_BDB=	46+
 
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${OPENSSLINC}
 LDFLAGS+=	-L${BDB_LIB_DIR} -L${OPENSSLLIB} -lssl -lcrypto
 
 OPTIONS_DEFINE=	DOCS
 
-# does not compile
-PORTSCOUT=	skipv:1.1.0
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|: install-docDATA|:|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-ansi||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index fd6cd24687bf..aa4c434a95b0 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,2 +1,2 @@
-SHA256 (isync-1.0.6.tar.gz) = e543767a5e36574256e8c25ba43acd6666df060fdf5f6a7029b127560d87632f
-SIZE (isync-1.0.6.tar.gz) = 188572
+SHA256 (isync-1.1.0.tar.gz) = 51f5618c239013fb770f98ae269f24ee417214efaaf7e22821b4a27cf9a9213c
+SIZE (isync-1.1.0.tar.gz) = 249374
diff --git a/mail/isync/files/patch-src__drv_imap.c b/mail/isync/files/patch-src__drv_imap.c
new file mode 100644
index 000000000000..1ac6ae196a13
--- /dev/null
+++ b/mail/isync/files/patch-src__drv_imap.c
@@ -0,0 +1,16 @@
+--- ./src/drv_imap.c.orig	2013-12-15 13:46:06.000000000 +0100
++++ ./src/drv_imap.c	2014-03-10 17:37:57.715669758 +0100
+@@ -835,11 +835,11 @@
+ 	memset( &datetime, 0, sizeof(datetime) );
+ 	if (!(end = strptime( str, "%d-%b-%Y %H:%M:%S ", &datetime )))
+ 		return -1;
+-	if ((date = mktime( &datetime )) == -1)
++	if ((date = timegm( &datetime )) == -1)
+ 		return -1;
+ 	if (sscanf( end, "%3d%2d", &hours, &mins ) != 2)
+ 		return -1;
+-	return date - (hours * 60 + mins) * 60 - timezone;
++	return date - (hours * 60 + mins) * 60;
+ }
+ 
+ static int
diff --git a/mail/isync/files/patch-src__drv_maildir.c b/mail/isync/files/patch-src__drv_maildir.c
new file mode 100644
index 000000000000..575868fd09fd
--- /dev/null
+++ b/mail/isync/files/patch-src__drv_maildir.c
@@ -0,0 +1,11 @@
+--- ./src/drv_maildir.c.orig	2013-12-18 18:58:26.000000000 +0100
++++ ./src/drv_maildir.c	2014-03-10 17:37:57.712669529 +0100
+@@ -43,7 +43,7 @@
+ # define LEGACY_FLOCK 1
+ #endif
+ 
+-#ifndef _POSIX_SYNCHRONIZED_IO
++#if !defined(_POSIX_SYNCHRONIZED_IO) || defined(__FreeBSD__)
+ # define fdatasync fsync
+ #endif
+ 
diff --git a/mail/isync/files/patch-src__sync.c b/mail/isync/files/patch-src__sync.c
new file mode 100644
index 000000000000..2972d4ad79a8
--- /dev/null
+++ b/mail/isync/files/patch-src__sync.c
@@ -0,0 +1,11 @@
+--- ./src/sync.c.orig	2013-12-18 22:09:33.000000000 +0100
++++ ./src/sync.c	2014-03-10 17:37:57.711669884 +0100
+@@ -35,7 +35,7 @@
+ #include <errno.h>
+ #include <sys/stat.h>
+ 
+-#ifndef _POSIX_SYNCHRONIZED_IO
++#if !defined(_POSIX_SYNCHRONIZED_IO) || defined(__FreeBSD__)
+ # define fdatasync fsync
+ #endif
+ 
diff --git a/mail/isync/pkg-plist b/mail/isync/pkg-plist
new file mode 100644
index 000000000000..138fdaf09ba0
--- /dev/null
+++ b/mail/isync/pkg-plist
@@ -0,0 +1,11 @@
+bin/get-cert
+bin/isync
+bin/mbsync
+bin/mdconvert
+man/man1/isync.1.gz
+man/man1/mbsync.1.gz
+man/man1/mdconvert.1.gz
+%%DOCSDIR%%/examples/isyncrc.sample
+%%DOCSDIR%%/examples/mbsyncrc.sample
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%