[pkgsrc/trunk]: pkgsrc/mail/mew In the Lisp code, reference the correct direc...

[cjep <cjep%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/008cbf84ce5f
branches:  trunk
changeset: 536963:008cbf84ce5f
user:      cjep <cjep%pkgsrc.org@localhost>
date:      Sun Dec 30 16:24:54 2007 +0000

description:
In the Lisp code, reference the correct directory for the icons.

Fixes PR#30530.

diffstat:

 mail/mew/Makefile         |  11 +++++++++--
 mail/mew/distinfo         |   3 ++-
 mail/mew/patches/patch-aa |  13 +++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diffs (63 lines):

diff -r d11ccf378739 -r 008cbf84ce5f mail/mew/Makefile
--- a/mail/mew/Makefile Sun Dec 30 15:30:11 2007 +0000
+++ b/mail/mew/Makefile Sun Dec 30 16:24:54 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2007/02/20 12:41:53 uebayasi Exp $
+# $NetBSD: Makefile,v 1.74 2007/12/30 16:24:54 cjep Exp $
 
 DISTNAME=      mew-5.2
+PKGREVISION=   1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=    mail
 MASTER_SITES=  http://www.mew.org/Release/
@@ -23,15 +24,21 @@
 MAKE_FLAGS+=   prefix=${PREFIX:Q}
 MAKE_FLAGS+=   EMACS=${EMACS_BIN:Q}
 MAKE_FLAGS+=   elispdir=${EMACS_LISPPREFIX}/mew
-MAKE_FLAGS+=   etcdir=${PREFIX}/share/mew
+MAKE_FLAGS+=   etcdir=${EMACS_ETCPREFIX}/mew
 MAKE_FLAGS+=   infodir=${EMACS_INFOPREFIX}
 MAKE_FLAGS+=   mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
+CONFIGURE_ARGS+=       --with-etcdir=${EMACS_ETCPREFIX}/mew
 
 SUBST_CLASSES+=                local
 SUBST_STAGE.local=     post-configure
 SUBST_FILES.local=     Makefile bin/configure info/Makefile
 SUBST_SED.local=       -e 's|/usr/local|${PREFIX}|g'
 
+post-configure:
+       ${MV} ${WRKSRC}/mew-key.el ${WRKSRC}/mew-key.el.1
+       ${SED} -e 's|@ICONDIR@|${EMACS_ETCPREFIX}/mew|g' \
+               ${WRKSRC}/mew-key.el.1 > ${WRKSRC}/mew-key.el
+
 post-install:
        ${INSTALL_DATA_DIR} ${MEW_CONTRIB_DIR}
        ${INSTALL_DATA} ${WRKSRC}/contrib/* ${MEW_CONTRIB_DIR}
diff -r d11ccf378739 -r 008cbf84ce5f mail/mew/distinfo
--- a/mail/mew/distinfo Sun Dec 30 15:30:11 2007 +0000
+++ b/mail/mew/distinfo Sun Dec 30 16:24:54 2007 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.33 2007/01/19 15:10:50 taca Exp $
+$NetBSD: distinfo,v 1.34 2007/12/30 16:24:54 cjep Exp $
 
 SHA1 (mew-5.2.tar.gz) = dc9127bc1039e8d1d6840ff81755152c953d6bd0
 RMD160 (mew-5.2.tar.gz) = 83ef3aa726b9e6763624c26d7f774598d134f274
 Size (mew-5.2.tar.gz) = 969584 bytes
+SHA1 (patch-aa) = 485a4ab13e9ed5befc8fc0bac8ae7226450a520d
diff -r d11ccf378739 -r 008cbf84ce5f mail/mew/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/mew/patches/patch-aa Sun Dec 30 16:24:54 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2007/12/30 16:24:54 cjep Exp $
+
+--- mew-key.el.orig    2007-01-04 06:49:11.000000000 +0000
++++ mew-key.el
+@@ -618,7 +618,7 @@
+           (throw 'loop (expand-file-name "etc" (car path)))
+         (setq path (cdr path)))))))
+ 
+-(defvar mew-icon-directory (mew-which-mew-etc))
++(defvar mew-icon-directory "@ICONDIR@")
+ 
+ (defvar mew-icon-separate nil)
+ (defvar mew-icon-blank nil)