[pkgsrc/trunk]: pkgsrc/x11/mrxvt Install configuration files in the right pla...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26cb4e70dd0d
branches:  trunk
changeset: 528610:26cb4e70dd0d
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu May 10 00:44:38 2007 +0000

description:
Install configuration files in the right place. Patch macro parser bug.
PKGREVISION++

diffstat:

 x11/mrxvt/Makefile         |  14 ++++++++------
 x11/mrxvt/distinfo         |   3 ++-
 x11/mrxvt/patches/patch-ab |  28 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 7 deletions(-)

diffs (76 lines):

diff -r e13693cfd0b6 -r 26cb4e70dd0d x11/mrxvt/Makefile
--- a/x11/mrxvt/Makefile        Wed May 09 23:44:34 2007 +0000
+++ b/x11/mrxvt/Makefile        Thu May 10 00:44:38 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/05/09 23:14:40 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2007/05/10 00:44:38 tnn Exp $
 #
 
 DISTNAME=      mrxvt-0.5.2
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=materm/}
 
@@ -19,12 +20,13 @@
 CONFIGURE_ARGS+=       --enable-24bits
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
-EGDIR=                 ${PREFIX}/share/examples/mrxvt
-CONF_FILES=            ${EGDIR}/mrxvtrc ${PKG_SYSCONFDIR}/mrxvtrc
-CONF_FILES+=           ${EGDIR}/default.menu ${PKG_SYSCONFDIR}/default.menu
-CONF_FILES+=           ${EGDIR}/submenus.menu ${PKG_SYSCONFDIR}/submenus.menu
+EGDIR=                 ${PREFIX}/share/examples
+MAKE_DIRS+=            ${PKG_SYSCONFDIR}/mrxvt
+CONF_FILES=            ${EGDIR}/mrxvt/mrxvtrc ${PKG_SYSCONFDIR}/mrxvt/mrxvtrc
+CONF_FILES+=           ${EGDIR}/mrxvt/default.menu ${PKG_SYSCONFDIR}/mrxvt/default.menu
+CONF_FILES+=           ${EGDIR}/mrxvt/submenus.menu ${PKG_SYSCONFDIR}/mrxvt/submenus.menu
 
-INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR:C/\/mrxvt//:Q}
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r e13693cfd0b6 -r 26cb4e70dd0d x11/mrxvt/distinfo
--- a/x11/mrxvt/distinfo        Wed May 09 23:44:34 2007 +0000
+++ b/x11/mrxvt/distinfo        Thu May 10 00:44:38 2007 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2007/05/09 23:14:40 tnn Exp $
+$NetBSD: distinfo,v 1.3 2007/05/10 00:44:38 tnn Exp $
 
 SHA1 (mrxvt-0.5.2.tar.gz) = a8fba2500b1edfabdd794e899b74666b2d909692
 RMD160 (mrxvt-0.5.2.tar.gz) = 85ccf709be85dc91374b1c6c893059155ab5c26f
 Size (mrxvt-0.5.2.tar.gz) = 559242 bytes
 SHA1 (patch-aa) = bb665893ce02548636cf29e938f22ea6521d7a35
+SHA1 (patch-ab) = 071b06c1a6fa3e894ed6fc5e13b67aa2ab0f2ee0
diff -r e13693cfd0b6 -r 26cb4e70dd0d x11/mrxvt/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/mrxvt/patches/patch-ab        Thu May 10 00:44:38 2007 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2007/05/10 00:44:38 tnn Exp $
+
+--- src/macros.c.orig  2007-05-10 02:39:14.000000000 +0200
++++ src/macros.c
+@@ -354,7 +354,10 @@ rxvt_parse_macros( rxvt_t *r, const char
+      * Always store the keysym as lower case. That way we can treat shift
+      * correctly even when Caps Lock is pressed.
+      */
+-    keysym = tolower( XStringToKeysym( keyname_nomods ) );
++    {
++        KeySym upper;
++        XConvertCase(XStringToKeysym(keyname_nomods), &keysym, &upper);
++    }
+ 
+     if (NOT_KEYSYM(keysym))
+     {
+@@ -746,7 +749,10 @@ rxvt_process_macros( rxvt_t *r, KeySym k
+     if (ev->state & r->h->ModMetaMask)            ck.modFlags |= MACRO_META;
+ 
+     /* Use lowercase version so we can ignore caps lock */
+-    ck.keysym = tolower( keysym );
++    {
++        KeySym upper;
++        XConvertCase(keysym, &ck.keysym, &upper);
++    }
+ 
+     /* Check if macro ck is in our list of macros. */
+     macro = bsearch( &ck, r->macros, r->nmacros, sizeof( macros_t ),