Apply patch from PR 43580 to fix broken build, and update PLIST for

emacs23. PKGREVISION++ as a precaution.

4 files changed, 25 insertions, 4 deletions

diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index 32304df1ae4..9f0215256bb 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2010/01/17 12:02:26 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2010/07/14 02:16:45 dholland Exp $
 
 DISTNAME=	wl-2.14.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/
 
diff --git a/mail/wl/PLIST b/mail/wl/PLIST
index eaebffb2e05..48835a0f2eb 100644
--- a/mail/wl/PLIST
+++ b/mail/wl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:04:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/07/14 02:16:46 dholland Exp $
 ${EMACS_INFOPREFIX}/wl-ja.info
 ${EMACS_INFOPREFIX}/wl.info
 ${EMACS_LISPPREFIX}/wl/acap.el
@@ -129,6 +129,10 @@ ${FOR_emacs22}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs22}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
+${FOR_emacs23}${EMACS_LISPPREFIX}/wl/wl-e21.el
+${FOR_emacs23}${EMACS_LISPPREFIX}/wl/wl-e21.elc
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/wl/wl-e21.el
+${FOR_emacs23nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.elc
 ${EMACS_LISPPREFIX}/wl/wl-expire.el
diff --git a/mail/wl/distinfo b/mail/wl/distinfo
index a07507207e2..0de300ae43c 100644
--- a/mail/wl/distinfo
+++ b/mail/wl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2008/11/29 02:55:41 obache Exp $
+$NetBSD: distinfo,v 1.15 2010/07/14 02:16:46 dholland Exp $
 
 SHA1 (wl-2.14.0.tar.gz) = 75b93013444cb27ca540462afbaefdce0e157b3f
 RMD160 (wl-2.14.0.tar.gz) = 1a5aa025fc05cbcf2a7d390b1804cc1b22f5df2b
@@ -6,3 +6,4 @@ Size (wl-2.14.0.tar.gz) = 1101505 bytes
 SHA1 (patch-aa) = ede97cce8b2574737a91941a905e067c940fb50a
 SHA1 (patch-ad) = 74e15c41f2f3521833e126809c713e65509fe5ce
 SHA1 (patch-ae) = fac4a79a5c8e315c7c92ba17eb3316c5f6338c4f
+SHA1 (patch-ba) = b17616f6c32e72e5feecdff7e30966c5a222de2d
diff --git a/mail/wl/patches/patch-ba b/mail/wl/patches/patch-ba
new file mode 100644
index 00000000000..42a6b124d74
--- /dev/null
+++ b/mail/wl/patches/patch-ba
@@ -0,0 +1,16 @@
+$NetBSD: patch-ba,v 1.1 2010/07/14 02:16:46 dholland Exp $
+
+Patch from upstream to stop emacs from trying to read stdin during the
+build. From Makoto Fujiwara in PR 43580.
+
+--- doc/wl.texi.orig	2005-02-25 15:05:48.000000000 +0000
++++ doc/wl.texi
+@@ -4329,7 +4329,7 @@
+ 
+ @item wl-summary-resend-use-cache
+ @vindex wl-summary-resend-use-cache
+-The initial setting is @code{nil}¡£If non-nil, messages are resend
++The initial setting is @code{nil}.  If non-nil, messages are resend
+ using cache even in the offline status. Note that if you use cache,
+ the message identity is not guaranteed.
+