src build glue etc. for https://github.com/tsutsui/xorg-server-Xsun

xorg-server-Xsun_src.diff

Index: external/mit/xorg/server/xorg-server.old/hw/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server.old/hw/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -d -r1.1.1.1 Makefile
--- external/mit/xorg/server/xorg-server.old/hw/Makefile	10 Jun 2016 03:42:14 -0000	1.1.1.1
+++ external/mit/xorg/server/xorg-server.old/hw/Makefile	16 Jul 2020 13:57:39 -0000
@@ -11,6 +11,12 @@ SUBDIR+= xfree86
 SUBDIR+=netbsd/x68k
 .endif
 
+.if ${XSERVER_XSUN} != "no" || \
+    ${XSERVER_XSUNMONO} != "no" || \
+    ${XSERVER_XSUN24} != "no"
+SUBDIR+=sun
+.endif
+
 .if 0
 .if ${XSERVER_XALPHANETBSD} != "no"
 SUBDIR+=netbsd/alpha
@@ -52,10 +58,6 @@ SUBDIR+=netbsd/macppc
 SUBDIR+=netbsd/newsmips
 .endif
 
-.if ${XSERVER_XSUN} != "no"
-SUBDIR+=sun
-.endif
-
 .if ${XSERVER_XVFB} != "no"
 SUBDIR+=vfb
 .endif
--- /dev/null	2020-07-16 22:57:55.312704919 +0900
+++ external/mit/xorg/server/xorg-server.old/hw/sun/Makefile	2020-07-16 02:41:25.220115679 +0900
@@ -0,0 +1,15 @@
+#	$NetBSD$
+
+.include "../../Makefile.common"
+
+SUBDIR= Xsun
+
+.if ${XSERVER_XSUNMONO} != "no"
+SUBDIR+= XsunMono
+.endif
+
+.if ${XSERVER_XSUN24} != "no"
+SUBDIR+= Xsun24
+.endif
+
+.include <bsd.subdir.mk>
--- /dev/null	2020-07-16 22:57:55.312704919 +0900
+++ external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun	2020-07-15 19:26:41.447010100 +0900
@@ -0,0 +1,142 @@
+#	$NetBSD$
+
+.include <bsd.own.mk>
+
+PROG?=		Xsun
+BINMODE=	4711
+
+.include "../../../Makefile.serverlib"
+.include "../../../Makefile.servermod"
+
+WARNS?=	2
+
+.PATH:	${X11SRCDIR.xorg-server}/hw/sun
+
+BUILDSYMLINKS=
+
+# for Xsun (8bpp)
+.if ${PROG} == "Xsun"
+SRCS=	sunInit.c
+SRCS+=	sunCfb.c
+# XXX not yet
+#SRCS+=	sunGX.c sunCursor.c
+# XXX BW2Init()
+SRCS+=	sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+=	sunInitExt.c
+.endif
+
+# for XsunMono (1bpp)
+.if ${PROG} == "XsunMono"
+BUILDSYMLINKS+= sunInit.c sunInitMono.c
+SRCS=	sunInitMono.c
+SRCS+=	sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInExMono.c
+SRCS+=	sunInExMono.c
+
+CPPFLAGS.sunInitMono.c=		-DSUNMAXDEPTH=1
+CPPFLAGS.sunInExMono.c=		-URENDER
+.endif
+
+# for Xsun24 (24bpp)
+.if ${PROG} == "Xsun24"
+BUILDSYMLINKS+= sunInit.c sunInitMulti.c
+SRCS+=	sunInitMulti.c
+SRCS+=	sunCfb.c
+SRCS+=	sunCfb24.c
+# XXX BW2Init()
+SRCS+=	sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+=	sunInitExt.c
+
+CPPFLAGS.sunInitMulti.c=	-DSUNMAXDEPTH=32
+.endif
+
+# for XsunMulti (XXX: incomplete?)
+.if 0
+SRCS+=	sunMultiDepth.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+=	sunInitExt.c
+.endif
+
+# common sources
+SRCS+=	sunFbs.c sunIo.c sunKbd.c sunKeyMap.c sunMouse.c
+
+.PATH:	${X11SRCDIR.xorg-server}/Xext
+SRCS+=	dpmsstubs.c
+
+.PATH:  ${X11SRCDIR.xorg-server}/Xi
+SRCS+=  stubs.c
+
+.PATH:	${X11SRCDIR.xorg-server}/fb
+SRCS+=	fbcmap_mi.c
+
+CPPFLAGS+=	-I${X11SRCDIR.xorg-server} \
+		-I${X11SRCDIR.xorg-server}/include \
+		-I${X11SRCDIR.xorg-server}/hw/sun \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
+		-I${X11SRCDIR.xorg-server}/fb \
+		-I${X11SRCDIR.xorg-server}/mi \
+		-I${X11SRCDIR.xorg-server}/render \
+		-I${X11SRCDIR.xorg-server}/miext/damage \
+		-I${DESTDIR}${X11INCDIR}/X11
+
+CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+		-UXF86DRI -UXF86BIGFONT
+
+#CPPFLAGS+=	-DLOWMEMFTPT
+CPPFLAGS+=	-DINCLUDE_CG2_HEADER
+
+.include "../../../Makefile.Xserver"
+
+LDADD+= ${LDADD.dix} \
+	${LDADD.fb} \
+	${LDADD.mi} \
+	${LDADD.xkb} \
+	${LDADD.xkbstubs} \
+	${LDADD.randr} \
+	${LDADD.Xext} \
+	${LDADD.composite} \
+	${LDADD.record} \
+	${LDADD.render} \
+	${LDADD.os} \
+	${LDADD.xfixes} \
+	${LDADD.damageext} \
+	${LDADD.miext/damage} \
+	${LDADD.miext/sync} \
+	${LDADD.Xi} \
+	-lXfont \
+	-lpixman-1 \
+	-lXext \
+	-lX11 \
+	-lz \
+	-lm
+
+DPADD+= ${LDADD.dix} \
+	${DPADD.fb} \
+	${DPADD.mi} \
+	${DPADD.xkb} \
+	${DPADD.randr} \
+	${DPADD.Xext} \
+	${DPADD.composite} \
+	${DPADD.record} \
+	${DPADD.render} \
+	${DPADD.os} \
+	${DPADD.xfixes} \
+	${DPADD.damageext} \
+	${DPADD.miext/damage} \
+	${DPADD.miext/sync} \
+	${DPADD.Xi} \
+	${LIBXFONT} \
+	${LIBPIXMAN-1} \
+	${LIBXEXT} \
+	${LIBX11} \
+	${LIBZ} \
+	${LIBM}
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
--- /dev/null	2020-07-16 22:57:55.312704919 +0900
+++ external/mit/xorg/server/xorg-server.old/hw/sun/Xsun/Makefile	2020-07-16 02:35:58.018807289 +0900
@@ -0,0 +1,9 @@
+#       $NetBSD$
+
+PROG=	Xsun
+
+.if ${MACHINE} == "sun3"
+SYMLINKS=	${X11BINDIR}/Xsun ${X11BINDIR}/X
+.endif
+
+.include "../Makefile.Xsun"
--- /dev/null	2020-07-16 22:57:55.312704919 +0900
+++ external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono/Makefile	2020-07-16 02:36:03.596971407 +0900
@@ -0,0 +1,6 @@
+#       $NetBSD$
+
+PROG=	XsunMono
+NOMAN=
+
+.include "../Makefile.Xsun"
--- /dev/null	2020-07-16 22:57:55.312704919 +0900
+++ external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24/Makefile	2020-07-16 02:36:00.742023535 +0900
@@ -0,0 +1,6 @@
+#       $NetBSD$
+
+PROG=	Xsun24
+NOMAN=
+
+.include "../Makefile.Xsun"
--- /dev/null	2020-07-16 22:57:55.312704919 +0900
+++ distrib/sets/lists/xserver/md.sun3	2020-07-16 02:31:42.779097467 +0900
@@ -0,0 +1,7 @@
+# $NetBSD$
+./usr/X11R7/bin/X					-unknown-	xorg
+./usr/X11R7/bin/Xsun					-unknown-	xorg
+./usr/X11R7/bin/XsunMono				-unknown-	xorg
+./usr/X11R7/man/cat1/Xsun.0				-unknown-	.cat,xorg
+./usr/X11R7/man/html1/Xsun.html				-unknown-	html,xorg
+./usr/X11R7/man/man1/Xsun.1				-unknown-	.man,xorg
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.1149.2.3
diff -u -p -d -r1.1149.2.3 bsd.own.mk
--- share/mk/bsd.own.mk	9 Dec 2019 15:19:30 -0000	1.1149.2.3
+++ share/mk/bsd.own.mk	17 Jul 2020 16:11:52 -0000
@@ -1466,6 +1466,7 @@ X11SRCDIR.${_proto}proto?=		${X11SRCDIRM
     ${MACHINE} == "netwinder"	|| \
     ${MACHINE} == "newsmips"	|| \
     ${MACHINE} == "sgimips"	|| \
+    ${MACHINE} == "sun3"	|| \
     ${MACHINE} == "vax"		|| \
     ${MACHINE} == "x68k"	|| \
     ${MACHINE} == "zaurus"