Index: Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/mail/wl/Makefile,v
retrieving revision 1.39
diff -u -a -r1.39 Makefile
--- Makefile	13 Oct 2008 08:07:02 -0000	1.39
+++ Makefile	22 Nov 2008 16:16:49 -0000
@@ -2,7 +2,7 @@
 
 DISTNAME=	wl-2.14.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/
 
@@ -10,6 +10,7 @@
 HOMEPAGE=	http://www.gohome.org/wl/
 COMMENT=	Mail/news management system with IMAP4rev1 support for Emacs
 
+USE_TOOLS=     patch
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET=	all info
@@ -20,6 +21,15 @@
 MAKE_FLAGS+=	PIXMAPDIR=${DESTDIR:Q}${PREFIX:Q}/share/wl
 INFO_FILES=	# PLIST
 
+       # Change default wl-icon-directory for PIXMAP.
+       # Why not just use patch-ab ?  $PREFIX is to be embedded.
+
+SUBST_CLASSES+=			icon_directory
+SUBST_STAGE.icon_directory=	pre-configure
+SUBST_MESSAGES.icon_directory=	Fixing wl-icon-directory default value (defvar)
+SUBST_FILES.icon_directory=	${WRKSRC}/wl/wl-vars.el
+SUBST_SED.icon_directory=	-e 's|%%PREFIX%%|${PREFIX}|'
+
 DOCDIR=			${PREFIX}/share/doc/wl
 EXAMPLESDIR=		${PREFIX}/share/examples/wl
 INSTALLATION_DIRS=	${DOCDIR}/en ${DOCDIR}/ja \
Index: PLIST
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/mail/wl/PLIST,v
retrieving revision 1.12
diff -u -a -r1.12 PLIST
--- PLIST	12 Apr 2008 22:43:04 -0000	1.12
+++ PLIST	23 Nov 2008 00:08:46 -0000
@@ -131,6 +131,8 @@
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/wl/wl-xmas.elc
+${FOR_emacs23}${EMACS_LISPPREFIX}/wl/wl-e21.el
+${FOR_emacs23}${EMACS_LISPPREFIX}/wl/wl-e21.elc
 ${EMACS_LISPPREFIX}/wl/wl-expire.el
 ${EMACS_LISPPREFIX}/wl/wl-expire.elc
 ${EMACS_LISPPREFIX}/wl/wl-fldmgr.el
Index: distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/mail/wl/distinfo,v
retrieving revision 1.13
diff -u -a -r1.13 distinfo
--- distinfo	8 Apr 2006 19:02:18 -0000	1.13
+++ distinfo	22 Nov 2008 16:17:17 -0000
@@ -4,3 +4,4 @@
 RMD160 (wl-2.14.0.tar.gz) = 1a5aa025fc05cbcf2a7d390b1804cc1b22f5df2b
 Size (wl-2.14.0.tar.gz) = 1101505 bytes
 SHA1 (patch-aa) = ede97cce8b2574737a91941a905e067c940fb50a
+SHA1 (patch-ab) = b68648a7e9a9fba1d3d204d12a3fe647edb30f41
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-ab	22 Nov 2008 16:14:17 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- wanderlust/wl/wl-vars.el.orig	2008-02-15 23:10:39.000000000 +0900
++++ wl/wl-vars.el	2008-11-19 08:56:50.000000000 +0900
+@@ -172,8 +172,8 @@
+ 
+ (defcustom wl-icon-directory (if (fboundp 'locate-data-directory)
+ 				 (locate-data-directory "wl")
+-			       (let ((icons (expand-file-name "wl/icons/"
+-							      data-directory)))
++			       (let ((icons (expand-file-name "share/wl"
++							      "%%PREFIX%%")))
+ 				 (if (file-directory-p icons)
+ 				     icons)))
+   "*Directory to load the icon files from, or nil if none."