Thu Oct 1 02:27:59 2009 UTC ()
properly fix the xkbcomp output, and make compiled a symlink.


(mrg)
diff -r1.4 -r1.5 src/external/mit/xorg/bin/xkbcomp/Makefile
diff -r1.1 -r1.2 src/external/mit/xorg/bin/xkbcomp/Makefile.common
cvs diff -r1.4 -r1.5 src/external/mit/xorg/bin/xkbcomp/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xkbcomp/Makefile 2009/09/25 06:07:06 1.4
+++ src/external/mit/xorg/bin/xkbcomp/Makefile 2009/10/01 02:27:59 1.5
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.4 2009/09/25 06:07:06 mrg Exp $ 1# $NetBSD: Makefile,v 1.5 2009/10/01 02:27:59 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PROG= xkbcomp 6PROG= xkbcomp
7SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \ 7SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \
8 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \ 8 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \
9 symbols.c geometry.c xkbpath.c listing.c \ 9 symbols.c geometry.c xkbpath.c listing.c \
10 xkbparse.y parseutils.c utils.c 10 xkbparse.y parseutils.c utils.c
11 11
12CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBCOMPDIR}\" 12CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBCOMPDIR}\"
13 13
14CPPFLAGS+= -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H 14CPPFLAGS+= -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
15CPPFLAGS.geometry.c= -Wno-error # XXX 15CPPFLAGS.geometry.c= -Wno-error # XXX
16 16
17FILESDIR=${X11LIBDIR}/xkb 17FILESDIR=${X11LIBDIR}/xkb
18FILES= README README.config README.enhancing 18FILES= README README.config README.enhancing
19 19
20SYMLINKS+=${BINDIR}/xkbcomp ${X11LIBDIR}/xkb/xkbcomp 20SYMLINKS+= ${BINDIR}/xkbcomp ${X11LIBDIR}/xkb/xkbcomp
 21SYMLINKS+= ${XKBCOMPDIR} ${X11LIBDIR}/xkb/compiled
21 22
22LDADD+= -lxkbfile -lXext -lX11 23LDADD+= -lxkbfile -lXext -lX11
23DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11} 24DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
24 25
25.PATH: ${X11SRCDIR.${PROG}} 26.PATH: ${X11SRCDIR.${PROG}}
26 27
27.include <bsd.x11.mk> 28.include <bsd.x11.mk>
28.include <bsd.prog.mk> 29.include <bsd.prog.mk>
cvs diff -r1.1 -r1.2 src/external/mit/xorg/bin/xkbcomp/Makefile.common (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xkbcomp/Makefile.common 2009/09/25 06:07:06 1.1
+++ src/external/mit/xorg/bin/xkbcomp/Makefile.common 2009/10/01 02:27:59 1.2
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1# $NetBSD: Makefile.common,v 1.1 2009/09/25 06:07:06 mrg Exp $ 1# $NetBSD: Makefile.common,v 1.2 2009/10/01 02:27:59 mrg Exp $
2 2
3XKBCOMPDIR= /var/db/xkb 3XKBCOMPDIR= ${X11LIBDIR}/xkb