Module Name: src
Committed By: mbalmer
Date: Sat Nov 28 16:48:25 UTC 2009
Modified Files:
src/distrib/sets/lists/xserver: md.i386
src/external/mit/xorg/server/drivers: Makefile
src/share/mk: bsd.own.mk
Log Message:
Add the xf86-input-elographics driver to i386 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.596 -r1.597 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.72 src/distrib/sets/lists/xserver/md.i386:1.73
--- src/distrib/sets/lists/xserver/md.i386:1.72 Sat Nov 28 12:10:25 2009
+++ src/distrib/sets/lists/xserver/md.i386 Sat Nov 28 16:48:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.72 2009/11/28 12:10:25 mbalmer Exp $
+# $NetBSD: md.i386,v 1.73 2009/11/28 16:48:25 mbalmer Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -481,6 +481,8 @@
./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 -obsolete- obsolete
./usr/X11R7/lib/modules/drivers/cyrix_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/cyrix_drv.so.1 -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/elographics_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/elographics_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/i128_drv.so -unknown- xorg
@@ -702,6 +704,7 @@
./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/cyrix.0 -unknown- obsolete
+./usr/X11R7/man/cat4/elographics.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg
@@ -745,6 +748,7 @@
./usr/X11R7/man/html4/chips.html -unknown- html,xorg
./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg
./usr/X11R7/man/html4/cyrix.html -unknown- obsolete
+./usr/X11R7/man/html4/elographics.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/glint.html -unknown- html,xorg
./usr/X11R7/man/html4/i128.html -unknown- html,xorg
@@ -788,6 +792,7 @@
./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg
./usr/X11R7/man/man4/cirrus.4 -unknown- .man,xorg
./usr/X11R7/man/man4/cyrix.4 -unknown- obsolete
+./usr/X11R7/man/man4/elographics.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg
./usr/X11R7/man/man4/i128.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.34 src/external/mit/xorg/server/drivers/Makefile:1.35
--- src/external/mit/xorg/server/drivers/Makefile:1.34 Sat Nov 28 12:10:24 2009
+++ src/external/mit/xorg/server/drivers/Makefile Sat Nov 28 16:48:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/11/28 12:10:24 mbalmer Exp $
+# $NetBSD: Makefile,v 1.35 2009/11/28 16:48:25 mbalmer Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -6,6 +6,11 @@
xf86-input-void \
xf86-input-ws
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+= \
+ xf86-input-elographics
+.endif
+
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.596 src/share/mk/bsd.own.mk:1.597
--- src/share/mk/bsd.own.mk:1.596 Sat Nov 28 12:10:24 2009
+++ src/share/mk/bsd.own.mk Sat Nov 28 16:48:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.596 2009/11/28 12:10:24 mbalmer Exp $
+# $NetBSD: bsd.own.mk,v 1.597 2009/11/28 16:48:25 mbalmer Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -910,7 +910,7 @@
.endfor
.for _i in \
- keyboard mouse vmmouse void ws
+ elographics keyboard mouse vmmouse void ws
X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIRMIT}/xf86-input-${_i}/dist
.endfor
