diff options
| -rw-r--r-- | mail/mew/Makefile | 3 | ||||
| -rw-r--r-- | mail/mew/distinfo | 3 | ||||
| -rw-r--r-- | mail/mew/patches/patch-ac | 70 |
3 files changed, 74 insertions, 2 deletions
diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 1c5340882a7..73211c1a87c 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.80 2010/02/06 05:31:25 taca Exp $ +# $NetBSD: Makefile,v 1.81 2010/10/06 12:29:42 taca Exp $ DISTNAME= mew-6.3 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.mew.org/Release/ diff --git a/mail/mew/distinfo b/mail/mew/distinfo index 9b0032e90ad..68e37637132 100644 --- a/mail/mew/distinfo +++ b/mail/mew/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.37 2010/02/06 05:31:25 taca Exp $ +$NetBSD: distinfo,v 1.38 2010/10/06 12:29:42 taca Exp $ SHA1 (mew-6.3.tar.gz) = 206709f9423c787d94e120f9bac606b975d6aab1 RMD160 (mew-6.3.tar.gz) = da816f4c7679a968b1765192a8eda78118d179a6 Size (mew-6.3.tar.gz) = 976352 bytes SHA1 (patch-aa) = 85e20cda02fa5b7551776b11b80a911e0338afbc +SHA1 (patch-ac) = 8f993fd86774f2ae725cbbe81338862f08dfdfbf diff --git a/mail/mew/patches/patch-ac b/mail/mew/patches/patch-ac new file mode 100644 index 00000000000..46f1c737dbe --- /dev/null +++ b/mail/mew/patches/patch-ac @@ -0,0 +1,70 @@ +$NetBSD: patch-ac,v 1.1 2010/10/06 12:29:42 taca Exp $ + +Two fixes for cmew problem: + + http://www.mew.org/pipermail/mew-dist/2010-August/028963.html + http://www.mew.org/pipermail/mew-dist/2010-August/028962.html + +--- bin/cmew.orig 2009-09-09 00:57:27.000000000 +0000 ++++ bin/cmew +@@ -127,6 +127,8 @@ def register(db, maildir, ignore_regex, + deleted = 0 + skipdir = '' + ++begin ++ + Find.find(target) do |fpath| + if fpath =~ ignore_regex + if FileTest.directory?(fpath) +@@ -135,7 +137,7 @@ def register(db, maildir, ignore_regex, + end + # next + else +- st = File.lstat(fpath) ++ st = File.lstat(fpath) rescue next + if st.symlink? + if FileTest.directory?(fpath) + print fpath, " (ignored)\n" +@@ -159,14 +161,14 @@ def register(db, maildir, ignore_regex, + elsif st.file? and fpath =~ /\/[0-9]+(\.mew)?$/ + next if File.dirname(fpath) == skipdir + next if last_mod > st.ctime.tv_sec +- m = Mail.new(fpath) ++ m = Mail.new(fpath) rescue next + id = get_id(m) + parid = get_parid(m) + date = get_date(m) + path = get_path(fpath) + newpath = true + if last_mod > 0 +- get_entry.execute!(id) do |row| ++ get_entry.execute(id).each do |row| + past_path = row['path'] + unless File.exist?(past_path) + del_entry.execute(id, past_path) +@@ -183,10 +185,16 @@ def register(db, maildir, ignore_regex, + end + end + end ++ ++ensure ++ + add_entry.close + get_entry.close + del_entry.close + print 'Registered: ', registred, ', deleted: ', deleted, "\n" ++ ++end ++ + end + + ################################################################ +@@ -209,7 +217,7 @@ OptionParser.new {|opt| + + db_file = ARGV[0] || File.expand_path('~/Mail/id.db') + maildir = ARGV[1] || File.expand_path('~/Mail') +-ignore_regex = Regexp.new(ARGV[2] || '^\./casket$|^\./casket/|/\.') ++ignore_regex = Regexp.new(ARGV[2] || '^\./casket$|^\./casket/|^\./casket_replica$|^\./casket_replica/|/\.') + target = if ARGV[3]; './' + ARGV[3] else '.' end + have_target = if ARGV[3]; true else false end + fullupdate = opts[:f] == true |