Re: pkg/47946: x11/enlightenment patches for DragonFly 3.5 x86_64

["OBATA Akio" <obache%netbsd.org@localhost>]

The following reply was made to PR pkg/47946; it has been noted by GNATS.

From: "OBATA Akio" <obache%netbsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/47946: x11/enlightenment patches for DragonFly 3.5 x86_64
Date: Fri, 30 Aug 2013 21:20:10 +0900

 On Fri, 21 Jun 2013 07:50:00 +0900, <davshao%gmail.com@localhost> wrote:
 
 > 3) There are two files that apparently want the path to xkb rules.  The 
 > patch adds the pkg path.  (Might apply to all platforms not using native 
 > xorg, effect of omission not tested.)
 
 
 > diff --git a/x11/enlightenment/patches/patch-src_modules_wizard_page__011.c 
 > b/x11/enlightenment/patches/patch-src_modules_wizard_page__011.c
 > new file mode 100644
 > index 0000000..9b343d4
 > --- /dev/null
 > +++ b/x11/enlightenment/patches/patch-src_modules_wizard_page__011.c
 > @@ -0,0 +1,12 @@
 > +$NetBSD$
 > +
 > +--- src/modules/wizard/page_011.c.orig      2013-06-20 06:51:49.490470000 
 > +0000
 > ++++ src/modules/wizard/page_011.c
 > +@@ -23,6 +23,7 @@ find_rules(void)
 > + #elif defined __OpenBSD__
 > +       "/usr/X11R6/share/X11/xkb/rules/base.lst",
 > + #endif
 > ++      "/usr/pkg/share/X11/xkb/rules/base.lst",
 > +       "/usr/share/X11/xkb/rules/xorg.lst",
 > +       "/usr/share/X11/xkb/rules/xfree86.lst",
 > +       "/usr/local/share/X11/xkb/rules/xorg.lst",
 
 How about add following instead of hard code "/usr/pkg/..." one on the top of 
list?
 
 #if defined PKGSRC_X11BASE
      PKGSRC_X11BASE "/share/x11/xkb/rules/base.lst",
 #endif
 
 and put following on package's Makefile
 
 .if ${X11_TYPE} == "modular"
 CPPFLAGS+=      -DPKGSRC_X11BASE=\"${X11BASE:Q}\"
 .endif
 
 
 -- 
 OBATA Akio / obache%NetBSD.org@localhost