summaryrefslogtreecommitdiff
path: root/mail/wl
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2008-11-29 02:55:41 +0000
committerobache <obache@pkgsrc.org>2008-11-29 02:55:41 +0000
commit0f220e4428ed4f4193fa9ac29d92e0fd24c607c5 (patch)
treea0e90c0ca31b3c2d30abcf55c518389c98491bb1 /mail/wl
parent19d936aa16c70dfe3f24d5cb2525617ef8978435 (diff)
downloadpkgsrc-0f220e4428ed4f4193fa9ac29d92e0fd24c607c5.tar.gz
Fixes two issuses:
* compatibility with flim-1.14.9 (patch-ad) * default icon location (patch-ae), reported in PR 40022. Bump PKGREVISION.
Diffstat (limited to 'mail/wl')
-rw-r--r--mail/wl/Makefile12
-rw-r--r--mail/wl/distinfo4
-rw-r--r--mail/wl/patches/patch-ad18
-rw-r--r--mail/wl/patches/patch-ae17
4 files changed, 47 insertions, 4 deletions
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index ab93aca8ee1..56ec2b03dc5 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2008/10/13 08:07:02 uebayasi Exp $
+# $NetBSD: Makefile,v 1.40 2008/11/29 02:55:41 obache Exp $
DISTNAME= wl-2.14.0
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= mail
MASTER_SITES= ftp://ftp.gohome.org/wl/stable/
@@ -18,7 +18,13 @@ MAKE_FLAGS+= INFODIR=${DESTDIR:Q}${EMACS_INFOPREFIX:Q}
MAKE_FLAGS+= LISPDIR=${DESTDIR:Q}${EMACS_LISPPREFIX:Q}
MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q}
MAKE_FLAGS+= PIXMAPDIR=${DESTDIR:Q}${PREFIX:Q}/share/wl
-INFO_FILES= # PLIST
+INFO_FILES= yes
+
+SUBST_CLASSES+= pixmap
+SUBST_STAGE.pixmap= post-configure
+SUBST_MESSAGE.pixmap= Fixing wl-icon-directory default value
+SUBST_FILES.pixmap= wl/wl-vars.el
+SUBST_VARS.pixmap= PREFIX
DOCDIR= ${PREFIX}/share/doc/wl
EXAMPLESDIR= ${PREFIX}/share/examples/wl
diff --git a/mail/wl/distinfo b/mail/wl/distinfo
index 1a7596e2723..a07507207e2 100644
--- a/mail/wl/distinfo
+++ b/mail/wl/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.13 2006/04/08 19:02:18 jlam Exp $
+$NetBSD: distinfo,v 1.14 2008/11/29 02:55:41 obache Exp $
SHA1 (wl-2.14.0.tar.gz) = 75b93013444cb27ca540462afbaefdce0e157b3f
RMD160 (wl-2.14.0.tar.gz) = 1a5aa025fc05cbcf2a7d390b1804cc1b22f5df2b
Size (wl-2.14.0.tar.gz) = 1101505 bytes
SHA1 (patch-aa) = ede97cce8b2574737a91941a905e067c940fb50a
+SHA1 (patch-ad) = 74e15c41f2f3521833e126809c713e65509fe5ce
+SHA1 (patch-ae) = fac4a79a5c8e315c7c92ba17eb3316c5f6338c4f
diff --git a/mail/wl/patches/patch-ad b/mail/wl/patches/patch-ad
new file mode 100644
index 00000000000..a6301f5d4ac
--- /dev/null
+++ b/mail/wl/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2008/11/29 02:55:41 obache Exp $
+
+smtp-end-of-line was abolished by flim-1.4.19.
+patch taken from upstream CVS repository.
+
+--- wl/wl-draft.el.orig 2005-03-20 13:10:03.000000000 +0000
++++ wl/wl-draft.el
+@@ -147,10 +147,6 @@ e.g.
+ (if (eq wl-smtp-connection-type 'ssl)
+ #'open-ssl-stream
+ smtp-open-connection-function))
+- (smtp-end-of-line
+- (if (eq wl-smtp-connection-type 'ssl)
+- "\n"
+- smtp-end-of-line))
+ smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
+ (setq smtp-sasl-user-name wl-smtp-posting-user
+ smtp-sasl-properties (when wl-smtp-authenticate-realm
diff --git a/mail/wl/patches/patch-ae b/mail/wl/patches/patch-ae
new file mode 100644
index 00000000000..e4d8e91b3e5
--- /dev/null
+++ b/mail/wl/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2008/11/29 02:55:41 obache Exp $
+
+Refrect custmization of PIXMAPDIR by pkgsrc.
+
+--- wl/wl-vars.el.orig 2005-02-25 15:05:50.000000000 +0000
++++ wl/wl-vars.el
+@@ -172,8 +172,8 @@ Supersede `wl-user-mail-address-list'."
+
+ (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."