(x11/keyboard-config) Re: pkgsrc NetBSD 5.2/i386 2013-06-23 00:46

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Hi,
I'm usually packaging my personal-config with some 1,000 packages
(say, partial pbulk).

Now for testing purpose, doing on NetBSD/i386 5.2 with
X11_TYPE=native.

Right now, I needed the change, as attached.
With that, another fix may be necessary on x11/xkeyboard-config:

(But I didn't figure out the relation of two phrases of WARNING message)
---------------------
checking pkg-config is at least version 0.9.0... yes
checking for DEPS... no
configure: WARNING:
                 Required dependencies not found. These dependencies are
                 run-time dependencies only and not required for building.
                 Skip this check with --disable-runtime-deps.

                 Installing this version of xkeyboard-config on a host
                 without the required dependencies may result in unusable
                 keyboard layouts.
                 
configure: error: Requested 'x11 >= 1.4.3' but version of X11 is 1.2.2
*** Error code 1
------------------------

Index: Makefile
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/x11/xkeyboard-config/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- Makefile    29 May 2013 22:36:49 -0000      1.21
+++ Makefile    26 Jun 2013 23:23:40 -0000
@@ -27,6 +27,7 @@
 CONFIGURE_ARGS+=       --with-xkb-base=${XKBBASE:Q}
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/share
 CONFIGURE_ARGS+=       --without-xsltproc
+CONFIGURE_ARGS+=       --disable-runtime-deps
 ###
 REPLACE_SH=            rules/merge.sh
 ###

---
Makoto Fujiwara, 
Chiba, Japan, Narita Airport and Disneyland prefecture.

Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.224
diff -u -r1.224 mk.conf
--- mk/defaults/mk.conf 14 Jun 2013 22:24:01 -0000      1.224
+++ mk/defaults/mk.conf 26 Jun 2013 23:35:39 -0000
@@ -194,7 +194,11 @@
 # Possible: yes, no
 # Default: no
 
-.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
+.if (!empty(MACHINE_PLATFORM:MNetBSD-5*-*) && \
+       exists(/usr/X11R7/lib/libX11.so))
+# X11R7 installed NetBSD/5.x
+PREFER_PKGSRC?=                glproto dri2proto xextproto xineramaproto 
xproto randrproto
+.elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
      exists(/usr/X11R7/lib/libX11.so))
 PREFER_PKGSRC?=
 .elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \