Import modular-xorg-server-1.1.1 based on xorg-server from pkgsrc-wip.

The X.org X11 Server from the modularized source tree of
X.org X11.

Note that this most likely does not work on anything but NetBSD/i386
right now.

9 files changed, 456 insertions, 0 deletions

diff --git a/x11/modular-xorg-server/DESCR b/x11/modular-xorg-server/DESCR
new file mode 100644
index 00000000000..232af8063fd
--- /dev/null
+++ b/x11/modular-xorg-server/DESCR
@@ -0,0 +1,2 @@
+The X.org X11 Server from the modularized source tree of
+X.org X11.
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
new file mode 100644
index 00000000000..dd5c4c13396
--- /dev/null
+++ b/x11/modular-xorg-server/Makefile
@@ -0,0 +1,77 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+
+DISTNAME=	xorg-server-1.1.1
+PKGNAME=	modular-${DISTNAME}
+CATEGORIES=	x11
+MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
+EXTRACT_SUFX=	.tar.bz2
+
+SPECIAL_PERMS+=	bin/Xorg ${SETUID_ROOT_PERMS}
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+COMMENT=	Xorg X11 Server from modular X.org X11
+
+USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
+PKGCONFIG_OVERRIDE+=	xorg-server.pc.in
+USE_TOOLS+=		pkg-config
+USE_TOOLS+=		gmake
+USE_TOOLS+=		perl
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+
+BUILD_DEFS+=		VARBASE
+
+DEPENDS+=		xkbdata-[0-9]*:../../x11/xkbdata
+
+BUILDLINK_API_DEPENDS.fixesproto+=	fixesproto>=4.0
+BUILDLINK_API_DEPENDS.kbproto+=		kbproto>=1.0.3
+BUILDLINK_API_DEPENDS.libXfixes+=	libXfixes>=4.0
+BUILDLINK_API_DEPENDS.scrnsaverproto+=	scrnsaverproto>=1.1
+BUILDLINK_API_DEPENDS.xkbui+=		xkbui>=1.0.2
+
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/libfontenc/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/bigreqsproto/buildlink3.mk"
+.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/evieext/buildlink3.mk"
+.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXfont/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXxf86misc/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/liblbxutil/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/libxkbui/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/recordproto/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/resourceproto/buildlink3.mk"
+.include "../../x11/scrnsaverproto/buildlink3.mk"
+.include "../../x11/trapproto/buildlink3.mk"
+.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xcmiscproto/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xf86bigfontproto/buildlink3.mk"
+.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xf86driproto/buildlink3.mk"
+.include "../../x11/xf86miscproto/buildlink3.mk"
+.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xtrans/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
new file mode 100644
index 00000000000..feb1a0eb45a
--- /dev/null
+++ b/x11/modular-xorg-server/PLIST
@@ -0,0 +1,264 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+bin/X
+bin/Xnest
+bin/Xorg
+bin/Xvfb
+bin/cvt
+bin/getconfig
+bin/getconfig.pl
+bin/gtf
+bin/inb
+bin/inl
+bin/inw
+bin/ioport
+bin/outb
+bin/outl
+bin/outw
+bin/pcitweak
+bin/scanpci
+bin/xorgcfg
+bin/xorgconfig
+include/X11/bitmaps/card.xbm
+include/X11/bitmaps/down.xbm
+include/X11/bitmaps/keyboard.xbm
+include/X11/bitmaps/left.xbm
+include/X11/bitmaps/monitor.xbm
+include/X11/bitmaps/mouse.xbm
+include/X11/bitmaps/narrower.xbm
+include/X11/bitmaps/right.xbm
+include/X11/bitmaps/shorter.xbm
+include/X11/bitmaps/taller.xbm
+include/X11/bitmaps/up.xbm
+include/X11/bitmaps/wider.xbm
+include/X11/pixmaps/card.xpm
+include/X11/pixmaps/computer.xpm
+include/X11/pixmaps/keyboard.xpm
+include/X11/pixmaps/monitor.xpm
+include/X11/pixmaps/mouse.xpm
+include/xorg/BT.h
+include/xorg/IBM.h
+include/xorg/TI.h
+include/xorg/XIstubs.h
+include/xorg/afb.h
+include/xorg/assyntax.h
+include/xorg/atKeynames.h
+include/xorg/bstore.h
+include/xorg/bstorestr.h
+include/xorg/bt829.h
+include/xorg/cfb.h
+include/xorg/cfb16.h
+include/xorg/cfb32.h
+include/xorg/cfb8_16.h
+include/xorg/cfb8_32.h
+include/xorg/cfbmap.h
+include/xorg/cfbmskbits.h
+include/xorg/cfbunmap.h
+include/xorg/closestr.h
+include/xorg/closure.h
+include/xorg/colormap.h
+include/xorg/colormapst.h
+include/xorg/compiler.h
+include/xorg/cursor.h
+include/xorg/cursorstr.h
+include/xorg/damage.h
+include/xorg/damagestr.h
+include/xorg/dbestruct.h
+include/xorg/dgaproc.h
+include/xorg/dix.h
+include/xorg/dixevents.h
+include/xorg/dixfont.h
+include/xorg/dixfontstr.h
+include/xorg/dixgrabs.h
+include/xorg/dixstruct.h
+include/xorg/dri.h
+include/xorg/dristruct.h
+include/xorg/edid.h
+include/xorg/elf.h
+include/xorg/exa.h
+include/xorg/exevents.h
+include/xorg/extension.h
+include/xorg/extinit.h
+include/xorg/extnsionst.h
+include/xorg/fb.h
+include/xorg/fbdevhw.h
+include/xorg/fboverlay.h
+include/xorg/fbpseudocolor.h
+include/xorg/fbrop.h
+include/xorg/fi1236.h
+include/xorg/fourcc.h
+include/xorg/gc.h
+include/xorg/gcstruct.h
+include/xorg/globals.h
+include/xorg/glyphstr.h
+include/xorg/i2c_def.h
+include/xorg/input.h
+include/xorg/inputstr.h
+include/xorg/mfb.h
+include/xorg/mfbmap.h
+include/xorg/mfbunmap.h
+include/xorg/mi.h
+include/xorg/mibank.h
+include/xorg/mibstore.h
+include/xorg/micmap.h
+include/xorg/micoord.h
+include/xorg/mifillarc.h
+include/xorg/mifpoly.h
+include/xorg/migc.h
+include/xorg/miline.h
+include/xorg/mipict.h
+include/xorg/mipointer.h
+include/xorg/mipointrst.h
+include/xorg/misc.h
+include/xorg/miscstruct.h
+include/xorg/mispans.h
+include/xorg/mistruct.h
+include/xorg/miwideline.h
+include/xorg/mizerarc.h
+include/xorg/msp3430.h
+include/xorg/opaque.h
+include/xorg/os.h
+include/xorg/picture.h
+include/xorg/picturestr.h
+include/xorg/pixmap.h
+include/xorg/pixmapstr.h
+include/xorg/property.h
+include/xorg/propertyst.h
+include/xorg/randrstr.h
+include/xorg/region.h
+include/xorg/regionstr.h
+include/xorg/renderedge.h
+include/xorg/resource.h
+include/xorg/rgb.h
+include/xorg/sarea.h
+include/xorg/screenint.h
+include/xorg/scrnintstr.h
+include/xorg/selection.h
+include/xorg/servermd.h
+include/xorg/shadow.h
+include/xorg/shadowfb.h
+include/xorg/site.h
+include/xorg/swaprep.h
+include/xorg/swapreq.h
+include/xorg/tda8425.h
+include/xorg/tda9850.h
+include/xorg/tda9885.h
+include/xorg/uda1380.h
+include/xorg/validate.h
+include/xorg/vbe.h
+include/xorg/vbeModes.h
+include/xorg/vdif.h
+include/xorg/vgaHW.h
+include/xorg/window.h
+include/xorg/windowstr.h
+include/xorg/xaa.h
+include/xorg/xaaWrapper.h
+include/xorg/xaalocal.h
+include/xorg/xaarop.h
+include/xorg/xf1bpp.h
+include/xorg/xf4bpp.h
+include/xorg/xf86.h
+include/xorg/xf86Cursor.h
+include/xorg/xf86DDC.h
+include/xorg/xf86Module.h
+include/xorg/xf86OSKbd.h
+include/xorg/xf86OSmouse.h
+include/xorg/xf86Opt.h
+include/xorg/xf86Pci.h
+include/xorg/xf86PciInfo.h
+include/xorg/xf86Priv.h
+include/xorg/xf86Privstr.h
+include/xorg/xf86RAC.h
+include/xorg/xf86RamDac.h
+include/xorg/xf86Resources.h
+include/xorg/xf86Version.h
+include/xorg/xf86Xinput.h
+include/xorg/xf86_OSlib.h
+include/xorg/xf86_OSproc.h
+include/xorg/xf86_ansic.h
+include/xorg/xf86_libc.h
+include/xorg/xf86cmap.h
+include/xorg/xf86fbman.h
+include/xorg/xf86i2c.h
+include/xorg/xf86int10.h
+include/xorg/xf86sbusBus.h
+include/xorg/xf86str.h
+include/xorg/xf86xv.h
+include/xorg/xf86xvmc.h
+include/xorg/xf86xvpriv.h
+include/xorg/xisb.h
+include/xorg/xorg-server.h
+include/xorg/xorgVersion.h
+include/xorg/xvdix.h
+include/xorg/xvmcext.h
+lib/X11/Cards
+lib/X11/Options
+lib/X11/getconfig/cfg.sample
+lib/X11/getconfig/xorg.cfg
+lib/pkgconfig/xorg-server.pc
+lib/xorg/modules/extensions/libdbe.la
+lib/xorg/modules/extensions/libdri.la
+lib/xorg/modules/extensions/libextmod.la
+lib/xorg/modules/extensions/librecord.la
+lib/xorg/modules/extensions/libxtrap.la
+lib/xorg/modules/fonts/libbitmap.la
+lib/xorg/modules/fonts/libfreetype.la
+lib/xorg/modules/fonts/libtype1.la
+lib/xorg/modules/libafb.la
+lib/xorg/modules/libcfb.la
+lib/xorg/modules/libcfb16.la
+lib/xorg/modules/libcfb32.la
+lib/xorg/modules/libddc.la
+lib/xorg/modules/libexa.la
+lib/xorg/modules/libfb.la
+lib/xorg/modules/libi2c.la
+lib/xorg/modules/libint10.la
+lib/xorg/modules/libmfb.la
+lib/xorg/modules/libpcidata.la
+lib/xorg/modules/librac.la
+lib/xorg/modules/libramdac.la
+lib/xorg/modules/libscanpci.la
+lib/xorg/modules/libshadow.la
+lib/xorg/modules/libshadowfb.la
+lib/xorg/modules/libvbe.la
+lib/xorg/modules/libvgahw.la
+lib/xorg/modules/libxaa.la
+lib/xorg/modules/libxf1bpp.la
+lib/xorg/modules/libxf4bpp.la
+lib/xorg/modules/libxf8_16bpp.la
+lib/xorg/modules/libxf8_32bpp.la
+lib/xorg/modules/linux/libfbdevhw.la
+lib/xorg/modules/multimedia/bt829_drv.la
+lib/xorg/modules/multimedia/fi1236_drv.la
+lib/xorg/modules/multimedia/msp3430_drv.la
+lib/xorg/modules/multimedia/tda8425_drv.la
+lib/xorg/modules/multimedia/tda9850_drv.la
+lib/xorg/modules/multimedia/tda9885_drv.la
+lib/xorg/modules/multimedia/uda1380_drv.la
+lib/xorg/modules/${LOWER_OPSYS}/libdrm.la
+lib/xserver/SecurityPolicy
+man/man1/Xnest.1
+man/man1/Xorg.1
+man/man1/Xserver.1
+man/man1/Xvfb.1
+man/man1/cvt.1
+man/man1/getconfig.1
+man/man1/gtf.1
+man/man1/pcitweak.1
+man/man1/scanpci.1
+man/man1/xorgcfg.1
+man/man1/xorgconfig.1
+man/man4/fbdevhw.4
+man/man5/getconfig.5
+man/man5/xorg.conf.5
+share/X11/app-defaults/XOrgCfg
+share/X11/xkb/compiled/README.compiled
+share/aclocal/xorg-server.m4
+@dirrm lib/xserver
+@dirrm lib/xorg/modules/${LOWER_OPSYS}
+@dirrm lib/xorg/modules/multimedia
+@dirrm lib/xorg/modules/linux
+@dirrm lib/xorg/modules/fonts
+@dirrm lib/xorg/modules/extensions
+@dirrm lib/xorg/modules
+@dirrm lib/xorg
+@dirrm lib/X11/getconfig
diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk
new file mode 100644
index 00000000000..74c9892b0e4
--- /dev/null
+++ b/x11/modular-xorg-server/buildlink3.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+MODULAR_XORG_SERVER_BUILDLINK3_MK:=	${MODULAR_XORG_SERVER_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	modular-xorg-server
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmodular-xorg-server}
+BUILDLINK_PACKAGES+=	modular-xorg-server
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server
+
+.if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.modular-xorg-server+=	modular-xorg-server>=1.1.1
+BUILDLINK_PKGSRCDIR.modular-xorg-server?=	../../x11/modular-xorg-server
+.endif	# MODULAR_XORG_SERVER_BUILDLINK3_MK
+
+.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xf86driproto/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
new file mode 100644
index 00000000000..c863508947c
--- /dev/null
+++ b/x11/modular-xorg-server/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+
+SHA1 (xorg-server-1.1.1.tar.bz2) = eb29dd4fea9f184321cbb5512f68b674ada4daf7
+RMD160 (xorg-server-1.1.1.tar.bz2) = 17675c45b1e6ec8ed025f73efcf481c60ff42941
+Size (xorg-server-1.1.1.tar.bz2) = 6252103 bytes
+SHA1 (patch-aa) = bc460c6376ec76a7f6adbefb4c9b75a6b0e2a040
+SHA1 (patch-ab) = be6748cac5db41bab46d02e2d8ab75bed6e11aa8
+SHA1 (patch-ac) = 3319535f0ab2f92e4c7f92af5266d7add7571630
+SHA1 (patch-ad) = 67a94598ac23c23688caba23b851aec317a9e7a3
diff --git a/x11/modular-xorg-server/patches/patch-aa b/x11/modular-xorg-server/patches/patch-aa
new file mode 100644
index 00000000000..7d0d670180a
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+
+--- xkb/maprules.c.orig	2006-11-06 21:19:20.000000000 +0000
++++ xkb/maprules.c
+@@ -1092,7 +1092,7 @@ int			len,headingtype,extra_ndx = 0;
+     for ( ; GetInputLine(file,&line,False); line.num_line= 0) {
+ 	if (line.line[0]=='!') {
+ 	    tok = strtok(&(line.line[1]), " \t");
+-	    if (_XkbStrCaseCmp(tolower(tok),"model") == 0)
++	    if (_XkbStrCaseCmp(tok,"model") == 0)
+ 		headingtype = HEAD_MODEL;
+ 	    else if (_XkbStrCaseCmp(tok,"layout") == 0)
+ 		headingtype = HEAD_LAYOUT;
diff --git a/x11/modular-xorg-server/patches/patch-ab b/x11/modular-xorg-server/patches/patch-ab
new file mode 100644
index 00000000000..40e52934557
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+
+--- configure.orig	2006-07-08 01:46:19.000000000 +0200
++++ configure
+@@ -24340,6 +24340,11 @@ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
++#define PCVT_SUPPORT 1
++_ACEOF
++
++
++cat >>confdefs.h <<\_ACEOF
+ #define WSCONS_SUPPORT 1
+ _ACEOF
+ 
+@@ -27910,7 +27915,7 @@ _ACEOF
+ 
+ fi
+ 
+-VENDOR_RELEASE="((($VERSION_MAJOR) * 10000000) + (($VERSION_MINOR) * 100000) + (($VERSION_PATCH) * 1000) + $VERSION_SNAP)"
++VENDOR_RELEASE=`expr \( $VERSION_MAJOR \* 10000000 \) + \( $VERSION_MINOR \* 100000 \) + \( $VERSION_PATCH \* 1000 \) + $VERSION_SNAP`
+ 
+ if test $VERSION_SNAP = "0"; then
+ 	if test $VERSION_PATCH = "0"; then
diff --git a/x11/modular-xorg-server/patches/patch-ac b/x11/modular-xorg-server/patches/patch-ac
new file mode 100644
index 00000000000..a1132ac2d1c
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+
+--- hw/xfree86/os-support/Makefile.in.orig	2006-11-06 21:29:12.000000000 +0000
++++ hw/xfree86/os-support/Makefile.in
+@@ -560,7 +560,7 @@ noinst_LTLIBRARIES = libxorgos.la
+ libxorgos_la_SOURCES = xorgos.c
+ libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \
+                       bus/libbus.la \
+-                      misc/libmisc.la
++                      misc/libmisc.la -li386
+ 
+ DISTCLEANFILES = xorgos.c
+ all: all-recursive
diff --git a/x11/modular-xorg-server/patches/patch-ad b/x11/modular-xorg-server/patches/patch-ad
new file mode 100644
index 00000000000..6c01f817cfb
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1.1.1 2006/11/14 16:59:30 joerg Exp $
+
+--- hw/xfree86/common/xf86Xinput.c.orig	2006-07-05 18:31:40.000000000 +0000
++++ hw/xfree86/common/xf86Xinput.c
+@@ -940,15 +940,10 @@ xf86PostMotionEvent(DeviceIntPtr	device,
+ 		    /* modeled from xf86Events.c */
+ 		    if (device->ptrfeed->ctrl.threshold) {
+ 			if ((abs(dx) + abs(dy)) >= device->ptrfeed->ctrl.threshold) {
+-			    local->dxremaind = ((float)dx * (float)(device->ptrfeed->ctrl.num)) /
+-			        (float)(device->ptrfeed->ctrl.den) + local->dxremaind;
+-			    valuator[0] = (int)local->dxremaind;
+-			    local->dxremaind = local->dxremaind - (float)valuator[0];
+-			    
+-			    local->dyremaind = ((float)dy * (float)(device->ptrfeed->ctrl.num)) /
+-			        (float)(device->ptrfeed->ctrl.den) + local->dyremaind;
+-			    valuator[1] = (int)local->dyremaind;
+-			    local->dyremaind = local->dyremaind - (float)valuator[1];
++			    valuator[0] = (dx * device->ptrfeed->ctrl.num) /
++					   device->ptrfeed->ctrl.den;
++			    valuator[1] = (dy * device->ptrfeed->ctrl.num) /
++					   device->ptrfeed->ctrl.den;
+ 			}
+ 		    }
+ 		    else if (dx || dy) {