diff options
Diffstat (limited to 'data/xkeyboard-config')
24 files changed, 221 insertions, 235 deletions
diff --git a/data/xkeyboard-config/Makefile.inc b/data/xkeyboard-config/Makefile.inc index 8f2b0ec79..be75cba4a 100644 --- a/data/xkeyboard-config/Makefile.inc +++ b/data/xkeyboard-config/Makefile.inc @@ -1,30 +1,42 @@ -# $OpenBSD: Makefile.inc,v 1.2 2009/06/06 19:44:01 matthieu Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2011/01/10 14:42:48 shadchin Exp $ TOP?= ../../.. XKB_DIR= ${.CURDIR}/${TOP}/dist/xkeyboard-config XKB_BASE= ${DESTDIR}${X11BASE}/share/X11/xkb XKBCOMP= xkbcomp +INSTALL_DIR= ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m ${DIRMODE} + .if !target(all) .if defined(DIR_DATA) -all: _SUBDIRUSE ${DIR_DATA} +all: _SUBDIRUSE ${DIR_DATA} .else -all: _SUBDIRUSE +all: _SUBDIRUSE .endif .endif -${DIR_DATA}: ${DATA} +.if defined(DIR_DATA) +${DIR_DATA}: ${DATA} rm -f $@ - cd ${.CURDIR} && ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/$@ '*' + cd ${XKB_DIR}/${XKB_SUBDIR} && ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/$@ '*' +.endif +.if defined(DATA) install: ${DATA} install-dir install-files _SUBDIRUSE + test -z ${XKB_BASE}/${XKB_SUBDIR} || ${INSTALL_DIR} ${XKB_BASE}/${XKB_SUBDIR} @for f in ${DATA}; do \ - echo installing "$$f" ; \ - cmp -s ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f || ${INSTALL_DATA} ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; done + echo installing "$$f" ; \ + cmp -s ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f || \ + ${INSTALL_DATA} ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; \ + done +.else +install: install-dir install-files _SUBDIRUSE +.endif .if defined(DIR_DATA) -install-dir: ${DIR_DATA} - ${INSTALL_DATA} ${DIR_DATA} ${XKB_BASE}/${XKB_SUBDIR} +install-dir: ${DIR_DATA} + test -z ${XKB_BASE} || ${INSTALL_DIR} ${XKB_BASE} + ${INSTALL_DATA} ${DIR_DATA} ${XKB_BASE} .else install-dir: .endif diff --git a/data/xkeyboard-config/compat/Makefile b/data/xkeyboard-config/compat/Makefile index fd4a6eedf..3b27010e7 100644 --- a/data/xkeyboard-config/compat/Makefile +++ b/data/xkeyboard-config/compat/Makefile @@ -1,14 +1,10 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= compat DIR_DATA= compat.dir -DATA = accessx basic complete \ - default iso9995 \ - japan keypad ledcaps \ - lednum ledscroll level5 \ - misc mousekeys norepeat \ - olpc pc pc98 xfree86 \ +DATA = accessx basic caps complete default iso9995 japan keypad ledcaps \ + lednum ledscroll level5 misc mousekeys norepeat olpc pc pc98 xfree86 \ xtest README .include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/geometry/Makefile b/data/xkeyboard-config/geometry/Makefile index cb081ade3..8bec00698 100644 --- a/data/xkeyboard-config/geometry/Makefile +++ b/data/xkeyboard-config/geometry/Makefile @@ -1,17 +1,13 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ SUBDIR= digital_vndr sgi_vndr XKB_SUBDIR= geometry DIR_DATA= geometry.dir -DATA= amiga ataritt chicony \ - dell everex fujitsu \ - hhk hp keytronic kinesis \ - macintosh microsoft nec \ - northgate pc sony thinkpad \ - sun winbook README +DATA= amiga ataritt chicony dell everex fujitsu hhk hp keytronic kinesis \ + macintosh microsoft nec nokia northgate pc sony thinkpad sun \ + typematrix winbook README .include <bsd.xorg.mk> .include <bsd.subdir.mk> - diff --git a/data/xkeyboard-config/geometry/digital_vndr/Makefile b/data/xkeyboard-config/geometry/digital_vndr/Makefile index 26914baff..3ba777bf6 100644 --- a/data/xkeyboard-config/geometry/digital_vndr/Makefile +++ b/data/xkeyboard-config/geometry/digital_vndr/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= geometry/digital_vndr -DATA= lk pc unix +DATA= lk pc unix .include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/geometry/sgi_vndr/Makefile b/data/xkeyboard-config/geometry/sgi_vndr/Makefile index 8f574aa0e..f061db53f 100644 --- a/data/xkeyboard-config/geometry/sgi_vndr/Makefile +++ b/data/xkeyboard-config/geometry/sgi_vndr/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= geometry/sgi_vndr -DATA= indigo indy O2 +DATA= indigo indy O2 .include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/keycodes/Makefile b/data/xkeyboard-config/keycodes/Makefile index 38ba3d622..6c6fafdf6 100644 --- a/data/xkeyboard-config/keycodes/Makefile +++ b/data/xkeyboard-config/keycodes/Makefile @@ -1,23 +1,12 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ SUBDIR= digital_vndr sgi_vndr XKB_SUBDIR= keycodes DIR_DATA= keycodes.dir -DATA= aliases \ - amiga \ - ataritt \ - evdev \ - fujitsu \ - hp \ - ibm \ - macintosh \ - sony \ - sun \ - xfree86 \ - xfree98 \ - README +DATA= aliases amiga ataritt empty evdev fujitsu hp ibm macintosh sony sun \ + xfree86 xfree98 README .include <bsd.xorg.mk> .include <bsd.subdir.mk> diff --git a/data/xkeyboard-config/keycodes/Makefile.inc b/data/xkeyboard-config/keycodes/Makefile.inc new file mode 100644 index 000000000..a2a988cc0 --- /dev/null +++ b/data/xkeyboard-config/keycodes/Makefile.inc @@ -0,0 +1,3 @@ +# $OpenBSD: Makefile.inc,v 1.1 2011/01/10 14:42:48 shadchin Exp $ +TOP= ../../../.. +.include "../Makefile.inc" diff --git a/data/xkeyboard-config/keycodes/digital_vndr/Makefile b/data/xkeyboard-config/keycodes/digital_vndr/Makefile index 7cabe3c84..e53abf392 100644 --- a/data/xkeyboard-config/keycodes/digital_vndr/Makefile +++ b/data/xkeyboard-config/keycodes/digital_vndr/Makefile @@ -1,9 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= keycodes/digital_vndr -TOP= ../../../.. DATA= lk pc -.include "../../Makefile.inc" .include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/keycodes/sgi_vndr/Makefile b/data/xkeyboard-config/keycodes/sgi_vndr/Makefile index f9ffcf77f..38683043a 100644 --- a/data/xkeyboard-config/keycodes/sgi_vndr/Makefile +++ b/data/xkeyboard-config/keycodes/sgi_vndr/Makefile @@ -1,9 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= keycodes/sgi_vndr -TOP= ../../../.. DATA= indigo indy iris -.include "../../Makefile.inc" .include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/keymap/Makefile b/data/xkeyboard-config/keymap/Makefile index b18cd3871..f7e606d26 100644 --- a/data/xkeyboard-config/keymap/Makefile +++ b/data/xkeyboard-config/keymap/Makefile @@ -1,14 +1,11 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ SUBDIR= digital_vndr sgi_vndr sun_vndr XKB_SUBDIR= keymap DIR_DATA= keymap.dir -DATA= amiga ataritt macintosh \ - sony xfree86 xfree98 \ - README +DATA= amiga ataritt macintosh sony xfree86 xfree98 README .include <bsd.xorg.mk> .include <bsd.subdir.mk> - diff --git a/data/xkeyboard-config/keymap/sgi_vndr/Makefile b/data/xkeyboard-config/keymap/sgi_vndr/Makefile index 49c909636..cd17e6471 100644 --- a/data/xkeyboard-config/keymap/sgi_vndr/Makefile +++ b/data/xkeyboard-config/keymap/sgi_vndr/Makefile @@ -1,16 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= keymap/sgi_vndr -DATA= be bg ca \ - ch cz de \ - dk dvorak \ - es fi \ - fr gb \ - hu it jp \ - no pl pt \ - ru se sk \ - th us +DATA= be bg ca ch cz de dk dvorak es fi fr gb hu it jp no pl pt ru se sk th us .include <bsd.xorg.mk> - diff --git a/data/xkeyboard-config/keymap/sun_vndr/Makefile b/data/xkeyboard-config/keymap/sun_vndr/Makefile index 85e2323f2..ba3d408c6 100644 --- a/data/xkeyboard-config/keymap/sun_vndr/Makefile +++ b/data/xkeyboard-config/keymap/sun_vndr/Makefile @@ -1,11 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= keymap/sun_vndr -DATA= all de es fi \ - fr no pl \ - ru se uk \ - us +DATA= all de es fi fr no pl ru se uk us .include <bsd.xorg.mk> - diff --git a/data/xkeyboard-config/rules/Makefile b/data/xkeyboard-config/rules/Makefile index 7f70d4e79..4715f777e 100644 --- a/data/xkeyboard-config/rules/Makefile +++ b/data/xkeyboard-config/rules/Makefile @@ -1,69 +1,75 @@ -# $OpenBSD: Makefile,v 1.2 2009/06/06 19:43:22 matthieu Exp $ +# $OpenBSD: Makefile,v 1.3 2011/01/10 14:42:48 shadchin Exp $ -SUBDIR= compat +SUBDIR= compat extras XKB_SUBDIR= rules -DATA= xkb.dtd README +DATA= xkb.dtd README -base_parts = base.hdr.part base.lists.part \ - compat/base.lists.part \ - HDR base.m_k.part \ - HDR base.l1_k.part \ - HDR base.l_k.part \ - HDR base.o_k.part \ - HDR base.ml_g.part \ - HDR base.m_g.part \ - HDR compat/base.mlv_s.part base.mlv_s.part \ - HDR compat/base.ml_s.part base.ml_s.part \ - HDR compat/base.ml1_s.part base.ml1_s.part \ - HDR compat/base.ml1v1_s.part \ - HDR compat/base.l2_s.part base.l2_s.part \ - HDR compat/base.l3_s.part base.l3_s.part \ - HDR compat/base.l4_s.part base.l4_s.part \ - HDR compat/base.l2v2_s.part \ - HDR compat/base.l3v3_s.part \ - HDR compat/base.l4v4_s.part \ - HDR base.m_s.part \ - HDR base.ml_c.part \ - HDR base.ml1_c.part \ - HDR base.m_t.part \ - HDR base.lo_s.part \ - HDR base.l1o_s.part \ - HDR base.l2o_s.part \ - HDR base.l3o_s.part \ - HDR base.l4o_s.part \ - HDR compat/base.o_s.part base.o_s.part \ - HDR base.o_c.part \ - HDR base.o_t.part +BASE_PARTS= base.hdr.part base.lists.part \ + compat/base.lists.part \ + HDR base.m_k.part \ + HDR base.l1_k.part \ + HDR base.l_k.part \ + HDR base.o_k.part \ + HDR base.ml_g.part \ + HDR base.m_g.part \ + HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ + HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ + HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ + HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ + HDR compat/base.ml2_s.part extras/base.ml2_s.part base.ml2_s.part \ + HDR compat/base.ml3_s.part extras/base.ml3_s.part base.ml3_s.part \ + HDR compat/base.ml4_s.part extras/base.ml4_s.part base.ml4_s.part \ + HDR compat/base.ml2v2_s.part extras/base.ml2v2_s.part \ + HDR compat/base.ml3v3_s.part extras/base.ml3v3_s.part \ + HDR compat/base.ml4v4_s.part extras/base.ml4v4_s.part \ + HDR base.m_s.part \ + HDR compat/base.lv_c.part \ + HDR compat/base.l1v1_c.part \ + HDR compat/base.l2v2_c.part \ + HDR compat/base.l3v3_c.part \ + HDR compat/base.l4v4_c.part \ + HDR base.ml_c.part \ + HDR base.ml1_c.part \ + HDR base.m_t.part \ + HDR base.lo_s.part \ + HDR base.l1o_s.part \ + HDR base.l2o_s.part \ + HDR base.l3o_s.part \ + HDR base.l4o_s.part \ + HDR compat/base.o_s.part base.o_s.part \ + HDR base.o_c.part \ + HDR base.o_t.part -files= base base.lst base.xml +BASE_RULES= base base.lst base.xml base.extras.xml -srcdir= ${XKB_DIR}/rules - -all: _SUBDIRUSE ${files} +all: depend ${BASE_RULES} _SUBDIRUSE depend: _SUBDIRUSE -base: $(base_parts) - HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts) +base: ${BASE_PARTS} + HDR="${XKB_DIR}/${XKB_SUBDIR}/HDR" ${XKB_DIR}/${XKB_SUBDIR}/merge.sh $@ ${BASE_PARTS} -base.lst: base.xml - perl $(srcdir)/xml2lst.pl < base.xml > $@ +base.lst: base.xml + perl ${XKB_DIR}/${XKB_SUBDIR}/xml2lst.pl < base.xml > $@ -base.xml: base.xml.in +base.xml: base.xml.in sed -e 's,<_,<,g' -e 's,</_,</,g' ${XKB_DIR}/${XKB_SUBDIR}/base.xml.in > $@ -install-files: ${files} - @for i in ${files}; do \ - echo "installing $$i"; \ - ${INSTALL_DATA} $$i ${XKB_BASE}/${XKB_SUBDIR}; \ + +base.extras.xml: base.extras.xml.in + sed -e 's,<_,<,g' -e 's,</_,</,g' ${XKB_DIR}/${XKB_SUBDIR}/base.extras.xml.in > $@ + +install-files: ${BASE_RULES} + test -z ${XKB_BASE}/${XKB_SUBDIR} || ${INSTALL_DIR} ${XKB_BASE}/${XKB_SUBDIR} + @for f in ${BASE_RULES}; do \ + echo "installing $$f"; \ + cmp -s $$f ${XKB_BASE}/${XKB_SUBDIR}/$$f || \ + ${INSTALL_DATA} $$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; \ done -clean: _SUBDIRUSE - rm -f base base.lst base.xml +clean: _SUBDIRUSE + rm -f ${BASE_RULES} .include <bsd.xorg.mk> .include <bsd.subdir.mk> - -.PATH: ${XKB_DIR}/rules -.SUFFIXES: .in .lst .xml diff --git a/data/xkeyboard-config/rules/Makefile.inc b/data/xkeyboard-config/rules/Makefile.inc new file mode 100644 index 000000000..d12fdab50 --- /dev/null +++ b/data/xkeyboard-config/rules/Makefile.inc @@ -0,0 +1,10 @@ +# $OpenBSD: Makefile.inc,v 1.1 2011/01/10 14:42:48 shadchin Exp $ + +TOP= ../../../.. + +BINDIR= ${XKB_DIR}/${XKB_SUBDIR}/../bin +SRCDIR= ${XKB_DIR}/${XKB_SUBDIR} + +LST_FILES= layoutsMapping.lst variantsMapping.lst + +.include "../Makefile.inc" diff --git a/data/xkeyboard-config/rules/compat/Makefile b/data/xkeyboard-config/rules/compat/Makefile index de32a6031..e9735bb0a 100644 --- a/data/xkeyboard-config/rules/compat/Makefile +++ b/data/xkeyboard-config/rules/compat/Makefile @@ -1,73 +1,45 @@ -# $OpenBSD: Makefile,v 1.2 2009/06/06 19:42:19 matthieu Exp $ +# $OpenBSD: Makefile,v 1.3 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= rules/compat -TOP= ../../../.. -transform_files=layoutRename.lst variantRename.lst +COMPAT_PARTS= base.ml2_s.part base.ml3_s.part base.ml4_s.part \ + base.ml2v2_s.part base.ml3v3_s.part base.ml4v4_s.part \ + base.ml_s.part base.ml1_s.part base.mlv_s.part \ + base.ml1v1_s.part -transform_scripts= \ - ln_s.sh \ - lnv_s.sh \ - ml_s.sh \ - mlv_s.sh \ - ml1_s.sh \ - ml1v_s.sh \ - ml1v1_s.sh +depend all: ${COMPAT_PARTS} -dist_parts=base.o_s.part +base.ml2_s.part: ${LST_FILES} + sh ${BINDIR}/mln_s.sh 2 ${SRCDIR} -scripts= \ - base.l2_s.part \ - base.l3_s.part \ - base.l4_s.part \ - base.l2v2_s.part \ - base.l3v3_s.part \ - base.l4v4_s.part \ - base.ml_s.part \ - base.ml1_s.part \ - base.mlv_s.part \ - base.ml1v1_s.part \ - base.ml_s.part +base.ml3_s.part: ${LST_FILES} + sh ${BINDIR}/mln_s.sh 3 ${SRCDIR} -depend all: ${scripts} +base.ml4_s.part: ${LST_FILES} + sh ${BINDIR}/mln_s.sh 4 ${SRCDIR} -srcdir= ${XKB_DIR}/${XKB_SUBDIR} +base.ml2v2_s.part: ${LST_FILES} + sh ${BINDIR}/mlnvn_s.sh 2 ${SRCDIR} -base.l2_s.part: ln_s.sh $(transform_files) - sh ${srcdir}/ln_s.sh 2 +base.ml3v3_s.part: ${LST_FILES} + sh ${BINDIR}/mlnvn_s.sh 3 ${SRCDIR} -base.l3_s.part: ln_s.sh $(transform_files) - sh ${srcdir}/ln_s.sh 3 +base.ml4v4_s.part: ${LST_FILES} + sh ${BINDIR}/mlnvn_s.sh 4 ${SRCDIR} -base.l4_s.part: ln_s.sh $(transform_files) - sh ${srcdir}/ln_s.sh 4 +base.ml_s.part: ${LST_FILES} + sh ${BINDIR}/ml_s.sh ${SRCDIR} -base.l2v2_s.part: lnv_s.sh $(transform_files) - sh ${srcdir}/lnv_s.sh 2 +base.ml1_s.part: ${LST_FILES} + sh ${BINDIR}/ml1_s.sh ${SRCDIR} -base.l3v3_s.part: lnv_s.sh $(transform_files) - sh ${srcdir}/lnv_s.sh 3 +base.mlv_s.part: ${LST_FILES} + sh ${BINDIR}/mlv_s.sh ${SRCDIR} -base.l4v4_s.part: lnv_s.sh $(transform_files) - sh ${srcdir}/lnv_s.sh 4 - -base.ml_s.part: ml_s.sh $(transform_files) - sh ${srcdir}/ml_s.sh - -base.ml1_s.part: ml1_s.sh $(transform_files) - sh ${srcdir}/ml1_s.sh - -base.mlv_s.part: mlv_s.sh $(transform_files) - sh ${srcdir}/mlv_s.sh - -base.ml1v1_s.part: ml1v1_s.sh $(transform_files) - sh ${srcdir}/ml1v1_s.sh +base.ml1v1_s.part: ${LST_FILES} + sh ${BINDIR}/ml1v1_s.sh ${SRCDIR} clean: - rm -f ${scripts} + rm -f ${COMPAT_PARTS} -.include "../../Makefile.inc" .include <bsd.xorg.mk> - -.SUFFIXES: .sh -.PATH: ${XSRCDIR}/dist/xkeyboard-config/rules/compat diff --git a/data/xkeyboard-config/rules/extras/Makefile b/data/xkeyboard-config/rules/extras/Makefile new file mode 100644 index 000000000..bb51e0148 --- /dev/null +++ b/data/xkeyboard-config/rules/extras/Makefile @@ -0,0 +1,45 @@ +# $OpenBSD: Makefile,v 1.1 2011/01/10 14:42:48 shadchin Exp $ + +XKB_SUBDIR= rules/extras + +EXTRAS_PARTS= base.ml2_s.part base.ml3_s.part base.ml4_s.part \ + base.ml2v2_s.part base.ml3v3_s.part base.ml4v4_s.part \ + base.ml_s.part base.ml1_s.part base.mlv_s.part \ + base.ml1v1_s.part base.ml_s.part + +depend all: ${EXTRAS_PARTS} + +base.ml2_s.part: ${LST_FILES} + sh ${BINDIR}/mln_s.sh 2 ${SRCDIR} + +base.ml3_s.part: ${LST_FILES} + sh ${BINDIR}/mln_s.sh 3 ${SRCDIR} + +base.ml4_s.part: ${LST_FILES} + sh ${BINDIR}/mln_s.sh 4 ${SRCDIR} + +base.ml2v2_s.part: ${LST_FILES} + sh ${BINDIR}/mlnvn_s.sh 2 ${SRCDIR} + +base.ml3v3_s.part: ${LST_FILES} + sh ${BINDIR}/mlnvn_s.sh 3 ${SRCDIR} + +base.ml4v4_s.part: ${LST_FILES} + sh ${BINDIR}/mlnvn_s.sh 4 ${SRCDIR} + +base.ml_s.part: ${LST_FILES} + sh ${BINDIR}/ml_s.sh ${SRCDIR} + +base.ml1_s.part: ${LST_FILES} + sh ${BINDIR}/ml1_s.sh ${SRCDIR} + +base.mlv_s.part: ${LST_FILES} + sh ${BINDIR}/mlv_s.sh ${SRCDIR} + +base.ml1v1_s.part: ${LST_FILES} + sh ${BINDIR}/ml1v1_s.sh ${SRCDIR} + +clean: + rm -f ${EXTRAS_PARTS} + +.include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/semantics/Makefile b/data/xkeyboard-config/semantics/Makefile index 4684fb509..a0ccc4946 100644 --- a/data/xkeyboard-config/semantics/Makefile +++ b/data/xkeyboard-config/semantics/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= semantics DIR_DATA= semantics.dir -DATA= basic complete default \ - xtest +DATA= basic complete default xtest .include <bsd.xorg.mk> - diff --git a/data/xkeyboard-config/symbols/Makefile b/data/xkeyboard-config/symbols/Makefile index ff072e244..f0b458932 100644 --- a/data/xkeyboard-config/symbols/Makefile +++ b/data/xkeyboard-config/symbols/Makefile @@ -1,39 +1,16 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ -SUBDIR= digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr \ - sony_vndr sun_vndr xfree68_vndr +SUBDIR= digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr \ + nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras XKB_SUBDIR= symbols +DIR_DATA= symbols.dir -DATA= ad af al \ - am ara az \ - be bd \ - bg br ba \ - bt by brai \ - ca cd \ - ch cn cz \ - de dk \ - ee es et epo \ - fi fo fr \ - gb ge gh gn \ - gr hr hu \ - ie il in iq \ - ir is it jp \ - kg kh kr kz \ - la latam latin \ - lk lt lv \ - ma mao me mk \ - mm mn mt mv \ - ng nl no np \ - pc pk pl pt \ - ro rs ru \ - se si sk sn \ - sy th \ - terminate \ - tj tm tr \ - ua us uz vn \ - za \ - altwin capslock compose ctrl eurosign group inet \ +DATA= ad af al am ara at az ba bd be bg br brai bt bw by ca cd ch cn cz de \ + dk ee es et epo fi fo fr gb ge gh gn gr hr hu ie il in iq ir is it jp \ + ke kg kh kr kz la latam latin lk lt lv ma mao me mk ml mm mn mt mv ng \ + nl no np pc pk pl pt ro rs ru se si sk sn sy th terminate tj tm tr tz \ + ua us uz vn za altwin capslock compose ctrl empty eurosign group inet \ keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo .include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/symbols/digital_vndr/Makefile b/data/xkeyboard-config/symbols/digital_vndr/Makefile index 2ada2f0d6..309374871 100644 --- a/data/xkeyboard-config/symbols/digital_vndr/Makefile +++ b/data/xkeyboard-config/symbols/digital_vndr/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= symbols/digital_vndr -DATA= lk pc us \ - vt +DATA= lk pc us vt .include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/symbols/extras/Makefile b/data/xkeyboard-config/symbols/extras/Makefile new file mode 100644 index 000000000..7b14bf525 --- /dev/null +++ b/data/xkeyboard-config/symbols/extras/Makefile @@ -0,0 +1,7 @@ +# $OpenBSD: Makefile,v 1.1 2011/01/10 14:42:48 shadchin Exp $ + +XKB_SUBDIR= symbols/extras + +DATA= apl ir rs ru us + +.include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/symbols/macintosh_vndr/Makefile b/data/xkeyboard-config/symbols/macintosh_vndr/Makefile index fcabeba37..847735c8d 100644 --- a/data/xkeyboard-config/symbols/macintosh_vndr/Makefile +++ b/data/xkeyboard-config/symbols/macintosh_vndr/Makefile @@ -1,12 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= symbols/macintosh_vndr -DATA= apple ch de dk \ - es fi fr \ - gb is it \ - latam nl no pt \ - se us +DATA= apple ch de dk fi fr gb is it jp latam nl no pt se us .include <bsd.xorg.mk> - diff --git a/data/xkeyboard-config/symbols/nokia_vndr/Makefile b/data/xkeyboard-config/symbols/nokia_vndr/Makefile new file mode 100644 index 000000000..dda738241 --- /dev/null +++ b/data/xkeyboard-config/symbols/nokia_vndr/Makefile @@ -0,0 +1,7 @@ +# $OpenBSD: Makefile,v 1.1 2011/01/10 14:42:48 shadchin Exp $ + +XKB_SUBDIR= symbols/nokia_vndr + +DATA= rx-44 rx-51 su-8w + +.include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/symbols/sun_vndr/Makefile b/data/xkeyboard-config/symbols/sun_vndr/Makefile index ed9cec94c..474a869cd 100644 --- a/data/xkeyboard-config/symbols/sun_vndr/Makefile +++ b/data/xkeyboard-config/symbols/sun_vndr/Makefile @@ -1,12 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= symbols/sun_vndr -DATA= cs cz de dk es \ - fi fr gb gr hu \ - it jp ko lt lv \ - nl no pl pt ru \ - se solaris sw tr tuv \ - tw us usb +DATA= ara be br ca ch cz de dk ee es fi fr gb gr it jp kr lt lv nl no pl pt \ + ro ru se sk solaris tr tuv tw ua us .include <bsd.xorg.mk> diff --git a/data/xkeyboard-config/types/Makefile b/data/xkeyboard-config/types/Makefile index b56ab64c3..03eb53beb 100644 --- a/data/xkeyboard-config/types/Makefile +++ b/data/xkeyboard-config/types/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2009/06/06 17:55:01 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2011/01/10 14:42:48 shadchin Exp $ XKB_SUBDIR= types +DIR_DATA= types.dir -DATA= basic cancel caps \ - complete default extra \ - iso9995 level5 mousekeys numpad \ - pc README +DATA= basic cancel caps complete default extra iso9995 level5 mousekeys \ + nokia numpad pc README .include <bsd.xorg.mk> - |