summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/mew/Makefile10
-rw-r--r--mail/mew/PLIST16
-rw-r--r--mail/mew/distinfo10
-rw-r--r--mail/mew/patches/patch-ac107
-rw-r--r--mail/mew/patches/patch-mew-ssl.el16
5 files changed, 7 insertions, 152 deletions
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index da23afe6127..cb582893682 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2011/09/12 16:27:18 taca Exp $
+# $NetBSD: Makefile,v 1.84 2011/10/19 18:32:50 ryoon Exp $
-DISTNAME= mew-6.3
+DISTNAME= mew-6.4
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 3
CATEGORIES= mail
MASTER_SITES= http://www.mew.org/Release/
@@ -25,8 +24,6 @@ GNU_CONFIGURE= yes
EMACS_VERSIONS_ACCEPTED= emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox
EMACS_MODULES+= base
-MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
-
MAKE_FLAGS+= DESTDIR=${DESTDIR:Q}
MAKE_FLAGS+= prefix=${PREFIX:Q}
MAKE_FLAGS+= exec_prefix=${PREFIX:Q}
@@ -49,9 +46,6 @@ post-configure:
${SED} -e 's|@ICONDIR@|${EMACS_ETCPREFIX}/mew|g' \
${WRKSRC}/mew-key.el.1 > ${WRKSRC}/mew-key.el
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/contrib/* ${DESTDIR}${MEW_CONTRIB_DIR}
-
.include "../../devel/zlib/buildlink3.mk"
.include "../../editors/emacs/modules.mk"
.include "../../lang/ruby/replace.mk"
diff --git a/mail/mew/PLIST b/mail/mew/PLIST
index 7b88069ecce..d5c539e1de1 100644
--- a/mail/mew/PLIST
+++ b/mail/mew/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/08/09 12:01:18 minskim Exp $
+@comment $NetBSD: PLIST,v 1.18 2011/10/19 18:32:50 ryoon Exp $
bin/cmew
bin/incm
bin/mew-pinentry
@@ -18,14 +18,6 @@ man/man1/mewencode.1
man/man1/mewest.1
man/man1/mewl.1
man/man1/smew.1
-${EMACS_LISPPREFIX}/mew/contrib/00readme
-${EMACS_LISPPREFIX}/mew/contrib/mew-browse.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-caesar.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-edebug.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-fancy-summary.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-nmz-fixer.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-refile-view.el
-${EMACS_LISPPREFIX}/mew/contrib/mew-toolbar-frame.el
${EMACS_LISPPREFIX}/mew/mew-addrbook.el
${EMACS_LISPPREFIX}/mew/mew-addrbook.elc
${EMACS_LISPPREFIX}/mew/mew-attach.el
@@ -160,12 +152,6 @@ share/mew/Mew.img
share/mew/Mew.png
share/mew/Mew.xbm
share/mew/Mew.xpm
-share/mew/etc/COLOR
-share/mew/etc/mew-Plain.xpm
-share/mew/etc/mew-curr.xpm
-share/mew/etc/mew-folder.xpm
-share/mew/etc/mew-inc2.xpm
-share/mew/etc/mew-kill.xpm
share/mew/mew-Audio.xpm
share/mew/mew-Blank.xpm
share/mew/mew-External.xpm
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
index 7dc1f2e9d8b..5d66b39be44 100644
--- a/mail/mew/distinfo
+++ b/mail/mew/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.40 2011/09/12 16:27:18 taca Exp $
+$NetBSD: distinfo,v 1.41 2011/10/19 18:32:50 ryoon Exp $
-SHA1 (mew-6.3.tar.gz) = 206709f9423c787d94e120f9bac606b975d6aab1
-RMD160 (mew-6.3.tar.gz) = da816f4c7679a968b1765192a8eda78118d179a6
-Size (mew-6.3.tar.gz) = 976352 bytes
+SHA1 (mew-6.4.tar.gz) = 260cf65b0852c2e871faa1c34a445ab692e26359
+RMD160 (mew-6.4.tar.gz) = 295634fa5b2a58a29a8e5c2d271900990d726835
+Size (mew-6.4.tar.gz) = 1025983 bytes
SHA1 (patch-aa) = 7d98b2408108ef93137677373b289e7658949209
-SHA1 (patch-ac) = 6bcbb0988dd00cc30f5cd1a8717a7f816e5cbf63
-SHA1 (patch-mew-ssl.el) = 2697e2f12bd4639538c1adadfc5151261c4e7381
diff --git a/mail/mew/patches/patch-ac b/mail/mew/patches/patch-ac
deleted file mode 100644
index f21dccf8b44..00000000000
--- a/mail/mew/patches/patch-ac
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/09/12 16:27:18 taca Exp $
-
-* Portability with Ruby 1.9 and later:
-
- Use own class to get mail header instead of using mailread.
-
-* 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
-@@ -13,7 +13,31 @@ require 'sqlite3'
- require 'time'
- require 'fileutils'
- require 'find'
--require 'mailread'
-+
-+################################################################
-+##
-+## mail_header
-+##
-+## Get header from mail message. If multiple header field
-+## exists, last one will be used.
-+##
-+def mail_header(path)
-+ @header = {}
-+ value = nil
-+ File.open(path) do |f|
-+ while l = f.gets.chomp
-+ next if /^From / =~ l
-+ break if /^$/ =~ l
-+ if /^\s+/ !~ l
-+ (name, value) = l.split(/:\s+/, 2)
-+ @header[name.downcase] = value
-+ else
-+ value << $'
-+ end
-+ end
-+ end
-+ return @header
-+end
-
- ################################################################
- ##
-@@ -127,6 +151,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 +161,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 +185,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_header(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 +209,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 +241,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
diff --git a/mail/mew/patches/patch-mew-ssl.el b/mail/mew/patches/patch-mew-ssl.el
deleted file mode 100644
index efafc5ffdf0..00000000000
--- a/mail/mew/patches/patch-mew-ssl.el
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-mew-ssl.el,v 1.1 2011/07/11 14:54:38 ryoon Exp $
-
-* Support "stunnel -version" output of stunnel-4.39.
-
---- mew-ssl.el.orig 2009-01-21 05:54:58.000000000 +0000
-+++ mew-ssl.el
-@@ -260,7 +260,8 @@ A local port number can be obtained the
- (with-temp-buffer
- (call-process mew-prog-ssl nil t nil "-version")
- (goto-char (point-min))
-- (if (looking-at "stunnel 4\\.\\([0-9]+\\)")
-+ (re-search-forward "^stunnel " nil t 1)
-+ (if (looking-at "4\\.\\([0-9]+\\)")
- (progn
- (setq mew-ssl-ver 4)
- (setq mew-ssl-minor-ver (string-to-number (mew-match-string 1))))
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 16:20:03 +0000