Subject: pkg/22189: update request of mail/isync
To: None <gnats-bugs@gnats.netbsd.org>
From: None <hiramatu@boreas.dti.ne.jp>
List: netbsd-bugs
Date: 07/19/2003 19:53:07
>Number: 22189
>Category: pkg
>Synopsis: update request of mail/isync
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sat Jul 19 10:53:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator: Hiramatsu Yoshifumi
>Release: NetBSD 1.6U
>Organization:
>Environment:
System: NetBSD orinoco.my.domain 1.6U NetBSD 1.6U (Orinoco) #0: Fri Jul 4 20:00:33 JST 2003 root@orinoco.my.domain:/sys/arch/i386/compile/Orinoco i386
Architecture: i386
Machine: i386
>Description:
This patch updates mail/isync to 0.9.1.
>How-To-Repeat:
>Fix:
diff -buNr isync.orig/Makefile isync/Makefile
--- isync.orig/Makefile 2003-07-19 00:19:40.000000000 +0900
+++ isync/Makefile 2003-07-19 00:19:52.000000000 +0900
@@ -1,16 +1,31 @@
# $NetBSD$
#
-DISTNAME= isync-0.8
+DISTNAME= isync-0.9.1
CATEGORIES= mail net
-MASTER_SITES= http://www.cs.hmc.edu/~me/isync/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
MAINTAINER= cez+misc.pkgsrc@compsoc.man.ac.uk
-HOMEPAGE= http://www.cs.hmc.edu/~me/isync/
+HOMEPAGE= http://isync.sourceforge.net/
COMMENT= Syncronize a maildir with an imap server
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
+DOCDIR= ${PREFIX}/share/doc/isync
+EXAMPLEDIR= ${PREFIX}/share/examples/isync
+LDFLAGS+= -lcrypto
+
+post-install:
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/TODO ${DOCDIR}
+ ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/isyncrc.sample ${EXAMPLEDIR}
+
.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -buNr isync.orig/PLIST isync/PLIST
--- isync.orig/PLIST 2003-07-19 00:19:40.000000000 +0900
+++ isync/PLIST 2003-07-19 00:19:52.000000000 +0900
@@ -1,3 +1,12 @@
@comment $NetBSD$
bin/isync
man/man1/isync.1
+share/doc/isync/AUTHORS
+share/doc/isync/COPYING
+share/doc/isync/ChangeLog
+share/doc/isync/NEWS
+share/doc/isync/README
+share/doc/isync/TODO
+share/examples/isync/isyncrc.sample
+@dirrm share/examples/isync
+@dirrm share/doc/isync
diff -buNr isync.orig/distinfo isync/distinfo
--- isync.orig/distinfo 2003-07-19 00:19:40.000000000 +0900
+++ isync/distinfo 2003-07-19 00:19:52.000000000 +0900
@@ -1,9 +1,6 @@
$NetBSD$
-SHA1 (isync-0.8.tar.gz) = d93b2e63f3239ea5ff15a037f957e252f380c3ac
-Size (isync-0.8.tar.gz) = 66347 bytes
-SHA1 (patch-aa) = 3c73e5b5b9d8a1a9e7eccc463b2489ef52e45184
-SHA1 (patch-ab) = 72c16339f5e588c71bd133bff2bbf345d1f91e53
-SHA1 (patch-ac) = e691332efb46c56c92e6a4e8fa0dfe3d126b91a7
-SHA1 (patch-ad) = 1862831c101c0d68e8bb2695f5803a705096ac74
-SHA1 (patch-ae) = 54440ab2d23b7a1808476b1b3d26061c62d19b44
+SHA1 (isync-0.9.1.tar.gz) = 03a0c5ea6e74097978f79c6821576d702ddafd67
+Size (isync-0.9.1.tar.gz) = 106953 bytes
+SHA1 (patch-ac) = 8eaea9e03366d02054e32de4ef8eb0477b3712fc
+SHA1 (patch-af) = 3fb352340c82ce8c2d05c569d42d60b99d2dbcd9
diff -buNr isync.orig/patches/patch-aa isync/patches/patch-aa
--- isync.orig/patches/patch-aa 2003-07-19 00:19:40.000000000 +0900
+++ isync/patches/patch-aa 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- configure.orig Sat Dec 7 13:58:13 2002
-+++ configure
-@@ -1386,7 +1386,7 @@ else
- #line 1387 "configure"
- #include "confdefs.h"
- #define DB_DBM_HSEARCH 1
--#include <db.h>
-+#include <ndbm.h>
- int main() {
- dbm_open(0,0,0);
- ; return 0; }
diff -buNr isync.orig/patches/patch-ab isync/patches/patch-ab
--- isync.orig/patches/patch-ab 2003-07-19 00:19:40.000000000 +0900
+++ isync/patches/patch-ab 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- configure.in.orig Mon Jan 28 19:32:58 2002
-+++ configure.in
-@@ -30,7 +30,7 @@ if test $ac_cv_dbmopen = no; then
- LIBS="$LIBS -ldb"
- ac_cv_libdb=no
- AC_TRY_LINK([#define DB_DBM_HSEARCH 1
--#include <db.h>],
-+#include <ndbm.h>],
- [dbm_open(0,0,0);],
- [ac_cv_libdb=yes])
- LIBS="$save_LIBS"])
diff -buNr isync.orig/patches/patch-ac isync/patches/patch-ac
--- isync.orig/patches/patch-ac 2003-07-19 00:19:40.000000000 +0900
+++ isync/patches/patch-ac 2003-07-19 00:19:52.000000000 +0900
@@ -1,8 +1,8 @@
$NetBSD$
---- sync.c.orig Mon Jan 28 19:19:56 2002
-+++ sync.c
-@@ -48,7 +48,7 @@ set_uid (DBM * db, const char *f, unsign
+--- src/sync.c.orig 2003-07-05 03:51:23.000000000 +0900
++++ src/sync.c 2003-07-05 03:51:47.000000000 +0900
+@@ -53,7 +53,7 @@
key.dptr = (void *) f;
s = strchr (f, ':');
diff -buNr isync.orig/patches/patch-ad isync/patches/patch-ad
--- isync.orig/patches/patch-ad 2003-07-19 00:19:40.000000000 +0900
+++ isync/patches/patch-ad 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- isync.h.orig Wed Jan 16 19:47:28 2002
-+++ isync.h
-@@ -25,7 +25,7 @@
- #if HAVE_LIBSSL
- #include <openssl/ssl.h>
- #endif
--#include <db.h>
-+#include <ndbm.h>
- #include "debug.h"
-
- typedef struct
diff -buNr isync.orig/patches/patch-ae isync/patches/patch-ae
--- isync.orig/patches/patch-ae 2003-07-19 00:19:40.000000000 +0900
+++ isync/patches/patch-ae 1970-01-01 09:00:00.000000000 +0900
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- maildir.c.orig Wed Jan 16 22:17:54 2002
-+++ maildir.c
-@@ -280,7 +280,7 @@ maildir_open (const char *path, int flag
- */
- key.dptr = p->file;
- s = strchr (key.dptr, ':');
-- key.dsize = s ? (size_t) (s - key.dptr) : strlen (key.dptr);
-+ key.dsize = s ? (size_t) (s - (char *)key.dptr) : strlen (key.dptr);
- key = dbm_fetch (m->db, key);
- if (key.dptr)
- {
-@@ -336,7 +336,7 @@ maildir_expunge (mailbox_t * mbox, int d
- /* remove the message from the UID map */
- key.dptr = tmp->file;
- s = strchr (key.dptr, ':');
-- key.dsize = s ? (size_t) (s - key.dptr) : strlen (key.dptr);
-+ key.dsize = s ? (size_t) (s - (char *)key.dptr) : strlen (key.dptr);
- dbm_delete (mbox->db, key);
- *cur = (*cur)->next;
- free (tmp->file);
diff -buNr isync.orig/patches/patch-af isync/patches/patch-af
--- isync.orig/patches/patch-af 1970-01-01 09:00:00.000000000 +0900
+++ isync/patches/patch-af 2003-07-19 00:19:52.000000000 +0900
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/maildir.c.orig 2003-07-05 03:52:06.000000000 +0900
++++ src/maildir.c 2003-07-05 03:52:41.000000000 +0900
+@@ -239,7 +239,7 @@
+ */
+ key.dptr = p->file;
+ s = strchr (key.dptr, ':');
+- key.dsize = s ? (size_t) (s - key.dptr) : strlen (key.dptr);
++ key.dsize = s ? (size_t) (s - (char *)key.dptr) : strlen (key.dptr);
+ key = dbm_fetch (m->db, key);
+ if (key.dptr)
+ {
+@@ -294,7 +294,7 @@
+ /* remove the message from the UID map */
+ key.dptr = tmp->file;
+ s = strchr (key.dptr, ':');
+- key.dsize = s ? (size_t) (s - key.dptr) : strlen (key.dptr);
++ key.dsize = s ? (size_t) (s - (char *)key.dptr) : strlen (key.dptr);
+ dbm_delete (mbox->db, key);
+ *cur = (*cur)->next;
+ free (tmp->file);
>Release-Note:
>Audit-Trail:
>Unformatted: