[src/trunk]: src/external/mit/xorg/bin/xkbcomp properly fix the xkbcomp outpu...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/977324793627
branches:  trunk
changeset: 747749:977324793627
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Oct 01 02:27:59 2009 +0000

description:
properly fix the xkbcomp output, and make compiled a symlink.

diffstat:

 external/mit/xorg/bin/xkbcomp/Makefile        |  5 +++--
 external/mit/xorg/bin/xkbcomp/Makefile.common |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r af67db7c89fb -r 977324793627 external/mit/xorg/bin/xkbcomp/Makefile
--- a/external/mit/xorg/bin/xkbcomp/Makefile    Thu Oct 01 00:25:14 2009 +0000
+++ b/external/mit/xorg/bin/xkbcomp/Makefile    Thu Oct 01 02:27:59 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2009/09/25 06:07:06 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2009/10/01 02:27:59 mrg Exp $
 
 .include <bsd.own.mk>
 .include "Makefile.common"
@@ -17,7 +17,8 @@
 FILESDIR=${X11LIBDIR}/xkb
 FILES= README README.config README.enhancing
 
-SYMLINKS+=${BINDIR}/xkbcomp ${X11LIBDIR}/xkb/xkbcomp
+SYMLINKS+=     ${BINDIR}/xkbcomp ${X11LIBDIR}/xkb/xkbcomp
+SYMLINKS+=     ${XKBCOMPDIR} ${X11LIBDIR}/xkb/compiled
 
 LDADD+=        -lxkbfile -lXext -lX11
 DPADD+=        ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
diff -r af67db7c89fb -r 977324793627 external/mit/xorg/bin/xkbcomp/Makefile.common
--- a/external/mit/xorg/bin/xkbcomp/Makefile.common     Thu Oct 01 00:25:14 2009 +0000
+++ b/external/mit/xorg/bin/xkbcomp/Makefile.common     Thu Oct 01 02:27:59 2009 +0000
@@ -1,3 +1,3 @@
-#      $NetBSD: Makefile.common,v 1.1 2009/09/25 06:07:06 mrg Exp $
+#      $NetBSD: Makefile.common,v 1.2 2009/10/01 02:27:59 mrg Exp $
 
-XKBCOMPDIR=            /var/db/xkb
+XKBCOMPDIR=    ${X11LIBDIR}/xkb