Created
July 27, 2015 16:42
-
-
Save steleto/c923723bd7c6ca46c3c4 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: distrib/sets/lists/xserver/md.i386 | |
================================================================== | |
--- distrib/sets/lists/xserver/md.i386 | |
+++ distrib/sets/lists/xserver/md.i386 | |
@@ -372,10 +372,11 @@ | |
./usr/X11R6/man/man4/wacom.4 -unknown- .man,x11 | |
./usr/X11R6/man/man4/wsfb.4 -unknown- .man,x11 | |
./usr/X11R6/man/man5/XF86Config.5 -unknown- .man,x11 | |
./usr/X11R7/bin/X -unknown- xorg | |
./usr/X11R7/bin/Xorg -unknown- xorg | |
+./usr/X11R7/bin/Xwsfb -unknown- xorg | |
./usr/X11R7/bin/cvt -unknown- xorg | |
./usr/X11R7/bin/gtf -unknown- xorg | |
./usr/X11R7/bin/inb -unknown- obsolete | |
./usr/X11R7/bin/inl -unknown- obsolete | |
./usr/X11R7/bin/inw -unknown- obsolete | |
@@ -689,10 +690,11 @@ | |
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg | |
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg | |
./usr/X11R7/man/cat4/xgi.0 -unknown- .cat,xorg | |
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg | |
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg | |
+./usr/X11R7/man/html1/Xwsfb.html -unknown- html,xorg | |
./usr/X11R7/man/html1/cvt.html -unknown- html,xorg | |
./usr/X11R7/man/html1/gtf.html -unknown- html,xorg | |
./usr/X11R7/man/html1/pcitweak.html -unknown- obsolete | |
./usr/X11R7/man/html1/scanpci.html -unknown- obsolete | |
./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete | |
@@ -735,10 +737,11 @@ | |
./usr/X11R7/man/html4/ws.html -unknown- html,xorg | |
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg | |
./usr/X11R7/man/html4/xgi.html -unknown- html,xorg | |
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg | |
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg | |
+./usr/X11R7/man/man1/Xwsfb.1 -unknown- .man,xorg | |
./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg | |
./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg | |
./usr/X11R7/man/man1/pcitweak.1 -unknown- obsolete | |
./usr/X11R7/man/man1/scanpci.1 -unknown- obsolete | |
./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete | |
Index: distrib/sets/lists/xserver/md.zaurus | |
================================================================== | |
--- distrib/sets/lists/xserver/md.zaurus | |
+++ distrib/sets/lists/xserver/md.zaurus | |
@@ -2,10 +2,11 @@ | |
./etc/X11/xorg.conf.C3x00 -unknown- xorg | |
./etc/X11/xorg.conf.C7x0 -unknown- xorg | |
./etc/X11/xorg.conf.sample -unknown- obsolete | |
./usr/X11R7/bin/X -unknown- xorg | |
./usr/X11R7/bin/Xorg -unknown- xorg | |
+./usr/X11R7/bin/Xwsfb -unknown- xorg | |
./usr/X11R7/bin/cvt -unknown- xorg | |
./usr/X11R7/bin/gtf -unknown- xorg | |
./usr/X11R7/lib/X11/doc/README.DRI -unknown- obsolete | |
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg | |
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete | |
@@ -88,10 +89,11 @@ | |
./usr/X11R7/man/cat4/void.0 -unknown- obsolete | |
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg | |
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg | |
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg | |
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg | |
+./usr/X11R7/man/html1/Xwsfb.html -unknown- html,xorg | |
./usr/X11R7/man/html1/cvt.html -unknown- html,xorg | |
./usr/X11R7/man/html1/gtf.html -unknown- html,xorg | |
./usr/X11R7/man/html4/exa.html -unknown- html,xorg | |
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg | |
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg | |
@@ -98,10 +100,11 @@ | |
./usr/X11R7/man/html4/void.html -unknown- obsolete | |
./usr/X11R7/man/html4/ws.html -unknown- html,xorg | |
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg | |
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg | |
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg | |
+./usr/X11R7/man/man1/Xwsfb.1 -unknown- .man,xorg | |
./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg | |
./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg | |
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg | |
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg | |
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg | |
Index: external/mit/xorg/server/xorg-server/Makefile.Xserver | |
================================================================== | |
--- external/mit/xorg/server/xorg-server/Makefile.Xserver | |
+++ external/mit/xorg/server/xorg-server/Makefile.Xserver | |
@@ -58,11 +58,14 @@ | |
hw/xfree86/x86emu \ | |
hw/xfree86/xaa \ | |
hw/xfree86/xf8_16bpp \ | |
hw/xfree86/xf8_32bpp \ | |
hw/xfree86/xf86config \ | |
- hw/xfree86/xf86modes | |
+ hw/xfree86/xf86modes \ | |
+ hw/kdrive/src/kdrive \ | |
+ hw/kdrive/src/kdrivestub \ | |
+ hw/netbsd/kdrive/wscons | |
.if !defined(LIBDIR.${_SL}) | |
LIBDIR.${_SL}!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/${_SL} && ${PRINTOBJDIR} | |
.MAKEOVERRIDES+=LIBDIR.${_SL} | |
.endif | |
Index: external/mit/xorg/server/xorg-server/Makefile.common | |
================================================================== | |
--- external/mit/xorg/server/xorg-server/Makefile.common | |
+++ external/mit/xorg/server/xorg-server/Makefile.common | |
@@ -56,10 +56,14 @@ | |
.if ${MACHINE} == "x68k" | |
XSERVER_X68K= yes | |
.endif | |
+.if ${MACHINE} == "zaurus" || ${MACHINE} == "i386" | |
+KDRIVE_LIB= yes | |
+KDRIVE_WSFB= yes | |
+.endif | |
# Does this server need Xfont/fontbase libraries? | |
XSERVER_NEEDS_XFONT?= no | |
# Does this platform build XFree86 X server? | |
@@ -89,5 +93,9 @@ | |
XSERVER_XSUN24?= no | |
# Does this platform build X68k X servers? | |
XSERVER_X68K?= no | |
# Does this platform build Xvfb X server? | |
XSERVER_XVFB?= yes | |
+# Does this platform build KDrive X servers? | |
+KDRIVE_LIB?= no | |
+# Does this platform build Xwsfb KDrive server? | |
+KDRIVE_WSFB?= no | |
Index: external/mit/xorg/server/xorg-server/hw/Makefile | |
================================================================== | |
--- external/mit/xorg/server/xorg-server/hw/Makefile | |
+++ external/mit/xorg/server/xorg-server/hw/Makefile | |
@@ -58,7 +58,16 @@ | |
.if ${XSERVER_XVFB} != "no" | |
SUBDIR+=vfb | |
.endif | |
.endif | |
+ | |
+.if ${KDRIVE_LIB} != "no" | |
+SUBDIR+=kdrive/src | |
+.endif | |
+ | |
+.if ${KDRIVE_WSFB} != "no" | |
+SUBDIR+=netbsd/kdrive/wscons | |
+SUBDIR+=netbsd/kdrive/wsfb | |
+.endif | |
.include <bsd.subdir.mk> | |
ADDED external/mit/xorg/server/xorg-server/hw/kdrive/src/Makefile | |
Index: external/mit/xorg/server/xorg-server/hw/kdrive/src/Makefile | |
================================================================== | |
--- external/mit/xorg/server/xorg-server/hw/kdrive/src/Makefile | |
+++ external/mit/xorg/server/xorg-server/hw/kdrive/src/Makefile | |
@@ -0,0 +1,5 @@ | |
+# $NetBSD:$ | |
+ | |
+SUBDIR= kdrive kdrivestub | |
+ | |
+.include <bsd.subdir.mk> | |
ADDED external/mit/xorg/server/xorg-server/hw/kdrive/src/kdrive/Makefile | |
Index: external/mit/xorg/server/xorg-server/hw/kdrive/src/kdrive/Makefile | |
================================================================== | |
--- external/mit/xorg/server/xorg-server/hw/kdrive/src/kdrive/Makefile | |
+++ external/mit/xorg/server/xorg-server/hw/kdrive/src/kdrive/Makefile | |
@@ -0,0 +1,31 @@ | |
+# $NetBSD$ | |
+ | |
+.include "../../../../Makefile.serverlib" | |
+.include "../../../../Makefile.servermod" | |
+ | |
+LIB= kdrive | |
+SHLIB_MAJOR=0 | |
+ | |
+.PATH: ${X11SRCDIR.xorg-server}/hw/kdrive/src | |
+SRCS= kcmap.c kdrive.c kinfo.c kinput.c kmode.c kshadow.c kxv.c | |
+ | |
+.PATH: ${X11SRCDIR.xorg-server}/mi | |
+SRCS+= miinitext.c | |
+ | |
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ | |
+ -I${X11SRCDIR.xorg-server}/hw/kdrive/src \ | |
+ -I${X11SRCDIR.xorg-server}/fb \ | |
+ -I${X11SRCDIR.xorg-server}/mi \ | |
+ -I${X11SRCDIR.xorg-server}/miext/damage \ | |
+ -I${X11SRCDIR.xorg-server}/miext/shadow \ | |
+ -I${X11SRCDIR.xorg-server}/randr \ | |
+ -I${X11SRCDIR.xorg-server}/render \ | |
+ -I${X11SRCDIR.xorg-server}/Xi \ | |
+ -I${DESTDIR}${X11INCDIR}/X11 \ | |
+ | |
+CPPFLAGS+= -DHAVE_CONFIG_H -DHAVE_KDRIVE_CONFIG_H | |
+ | |
+.include "../../../../Makefile.Xserver" | |
+ | |
+.include <bsd.x11.mk> | |
+.include <bsd.lib.mk> | |
ADDED external/mit/xorg/server/xorg-server/hw/kdrive/src/kdrivestub/Makefile | |
Index: external/mit/xorg/server/xorg-server/hw/kdrive/src/kdrivestub/Makefile | |
================================================================== | |
--- external/mit/xorg/server/xorg-server/hw/kdrive/src/kdrivestub/Makefile | |
+++ external/mit/xorg/server/xorg-server/hw/kdrive/src/kdrivestub/Makefile | |
@@ -0,0 +1,28 @@ | |
+# $NetBSD$ | |
+ | |
+.include "../../../../Makefile.serverlib" | |
+.include "../../../../Makefile.servermod" | |
+ | |
+LIB= kdrivestub | |
+SHLIB_MAJOR=0 | |
+ | |
+.PATH: ${X11SRCDIR.xorg-server}/fb | |
+SRCS+= fbcmap_mi.c | |
+ | |
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ | |
+ -I${X11SRCDIR.xorg-server}/hw/kdrive/src \ | |
+ -I${X11SRCDIR.xorg-server}/fb \ | |
+ -I${X11SRCDIR.xorg-server}/mi \ | |
+ -I${X11SRCDIR.xorg-server}/miext/damage \ | |
+ -I${X11SRCDIR.xorg-server}/miext/shadow \ | |
+ -I${X11SRCDIR.xorg-server}/randr \ | |
+ -I${X11SRCDIR.xorg-server}/render \ | |
+ -I${X11SRCDIR.xorg-server}/Xi \ | |
+ -I${DESTDIR}${X11INCDIR}/X11 \ | |
+ | |
+CPPFLAGS+= -DHAVE_CONFIG_H -DHAVE_KDRIVE_CONFIG_H | |
+ | |
+.include "../../../../Makefile.Xserver" | |
+ | |
+.include <bsd.x11.mk> | |
+.include <bsd.lib.mk> | |
ADDED external/mit/xorg/server/xorg-server/hw/netbsd/kdrive/wscons/Makefile | |
Index: external/mit/xorg/server/xorg-server/hw/netbsd/kdrive/wscons/Makefile | |
================================================================== | |
--- external/mit/xorg/server/xorg-server/hw/netbsd/kdrive/wscons/Makefile | |
+++ external/mit/xorg/server/xorg-server/hw/netbsd/kdrive/wscons/Makefile | |
@@ -0,0 +1,30 @@ | |
+# $NetBSD$ | |
+ | |
+.include <bsd.own.mk> | |
+ | |
+.include "../../../../Makefile.serverlib" | |
+.include "../../../../Makefile.servermod" | |
+ | |
+LIB= wscons | |
+SHLIB_MAJOR=0 | |
+ | |
+.PATH: ${X11SRCDIR.xorg-server}/hw/netbsd/kdrive/wscons | |
+SRCS= wscons.c wskbd.c wskeymap.c wsmouse.c | |
+ | |
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ | |
+ -I${X11SRCDIR.xorg-server}/hw/kdrive/src \ | |
+ -I${X11SRCDIR.xorg-server}/fb \ | |
+ -I${X11SRCDIR.xorg-server}/mi \ | |
+ -I${X11SRCDIR.xorg-server}/miext/damage \ | |
+ -I${X11SRCDIR.xorg-server}/miext/shadow \ | |
+ -I${X11SRCDIR.xorg-server}/randr \ | |
+ -I${X11SRCDIR.xorg-server}/render \ | |
+ -I${X11SRCDIR.xorg-server}/Xi \ | |
+ -I${DESTDIR}${X11INCDIR}/X11 \ | |
+ | |
+CPPFLAGS+= -DHAVE_CONFIG_H -DHAVE_KDRIVE_CONFIG_H | |
+ | |
+.include "../../../../Makefile.Xserver" | |
+ | |
+.include <bsd.x11.mk> | |
+.include <bsd.lib.mk> | |
ADDED external/mit/xorg/server/xorg-server/hw/netbsd/kdrive/wsfb/Makefile | |
Index: external/mit/xorg/server/xorg-server/hw/netbsd/kdrive/wsfb/Makefile | |
================================================================== | |
--- external/mit/xorg/server/xorg-server/hw/netbsd/kdrive/wsfb/Makefile | |
+++ external/mit/xorg/server/xorg-server/hw/netbsd/kdrive/wsfb/Makefile | |
@@ -0,0 +1,91 @@ | |
+# $NetBSD$ | |
+ | |
+.include <bsd.own.mk> | |
+ | |
+PROG= Xwsfb | |
+BINMODE= 4711 | |
+ | |
+.include "../../../../Makefile.serverlib" | |
+.include "../../../../Makefile.servermod" | |
+ | |
+.PATH: ${X11SRCDIR.xorg-server}/hw/netbsd/kdrive/wsfb | |
+SRCS= wsfbinit.c wsfb.c | |
+ | |
+#.PATH: ${X11SRCDIR.xorg-server}/Xext | |
+#SRCS+= dpmsstubs.c | |
+ | |
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \ | |
+ -I${X11SRCDIR.xorg-server}/hw/kdrive/src \ | |
+ -I${X11SRCDIR.xorg-server}/fb \ | |
+ -I${X11SRCDIR.xorg-server}/mi \ | |
+ -I${X11SRCDIR.xorg-server}/miext/damage \ | |
+ -I${X11SRCDIR.xorg-server}/miext/shadow \ | |
+ -I${X11SRCDIR.xorg-server}/randr \ | |
+ -I${X11SRCDIR.xorg-server}/render \ | |
+ -I${X11SRCDIR.xorg-server}/Xi \ | |
+ -I${DESTDIR}${X11INCDIR}/X11 \ | |
+ | |
+CPPFLAGS+= -DHAVE_CONFIG_H -DHAVE_KDRIVE_CONFIG_H | |
+ | |
+.include "../../../../Makefile.Xserver" | |
+ | |
+LDADD+= ${LDADD.dix} \ | |
+ ${LDADD.hw/kdrive/src/kdrive} \ | |
+ ${LDADD.hw/netbsd/kdrive/wscons} \ | |
+ ${LDADD.Xext} \ | |
+ ${LDADD.Xi} \ | |
+ ${LDADD.glx} \ | |
+ ${LDADD.damageext} \ | |
+ ${LDADD.composite} \ | |
+ ${LDADD.randr} \ | |
+ ${LDADD.xfixes} \ | |
+ ${LDADD.dbe} \ | |
+ ${LDADD.record} \ | |
+ ${LDADD.fb} \ | |
+ ${LDADD.hw/kdrive/src/kdrivestub} \ | |
+ ${LDADD.miext/sync} \ | |
+ ${LDADD.miext/damage} \ | |
+ ${LDADD.miext/shadow} \ | |
+ ${LDADD.xkb} \ | |
+ ${LDADD.xkbstubs} \ | |
+ ${LDADD.render} \ | |
+ ${LDADD.os} \ | |
+ ${LDADD.mi} \ | |
+ -lXfont \ | |
+ -lpixman-1 \ | |
+ -lXext \ | |
+ -lX11 \ | |
+ -lXdmcp \ | |
+ -lXau | |
+ | |
+DPADD+= ${DPADD.dix} \ | |
+ ${DPADD.hw/kdrive/src/kdrive} \ | |
+ ${DPADD.hw/netbsd/kdrive/wscons} \ | |
+ ${DPADD.Xext} \ | |
+ ${DPADD.Xi} \ | |
+ ${DPADD.xkb} \ | |
+ ${DPADD.glx} \ | |
+ ${DPADD.damageext} \ | |
+ ${DPADD.composite} \ | |
+ ${DPADD.randr} \ | |
+ ${DPADD.xfixes} \ | |
+ ${DPADD.dbe} \ | |
+ ${DPADD.record} \ | |
+ ${DPADD.fb} \ | |
+ ${DPADD.hw/kdrive/src/kdrivestub} \ | |
+ ${DPADD.miext/sync} \ | |
+ ${DPADD.miext/damage} \ | |
+ ${DPADD.miext/shadow} \ | |
+ ${DPADD.xkbstubs} \ | |
+ ${DPADD.render} \ | |
+ ${DPADD.os} \ | |
+ ${DPADD.mi} \ | |
+ ${LIBXFONT} \ | |
+ ${LIBPIXMAN-1} \ | |
+ ${LIBXEXT} \ | |
+ ${LIBX11} \ | |
+ ${LIBXDMCP} \ | |
+ ${LIBXAU} | |
+ | |
+.include <bsd.x11.mk> | |
+.include <bsd.prog.mk> | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment