Update to 1.6.1.901, first 1.6.2 prerelease.

Lots of changes since last pkgsrc version 1.4.x.
Based on patches provided by Hasso Tepper on pkgsrc-users.
Enable dri by default.

NOTE: You must install new versions of all dependencies, old ones
won't work!

1 files changed, 20 insertions, 57 deletions

diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
index 20734ba9e1e..c0cf158ba2f 100644
--- a/x11/modular-xorg-server/PLIST
+++ b/x11/modular-xorg-server/PLIST
@@ -1,38 +1,18 @@
-@comment $NetBSD: PLIST,v 1.10 2008/10/28 05:08:52 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/07 11:23:46 wiz Exp $
 bin/X
 bin/Xnest
 bin/Xorg
 bin/Xvfb
 bin/cvt
 bin/gtf
-bin/inb
-bin/inl
-bin/inw
-bin/ioport
-bin/outb
-bin/outl
-bin/outw
-bin/pcitweak
-bin/scanpci
-bin/xorgconfig
 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
@@ -45,13 +25,15 @@ include/xorg/damagestr.h
 include/xorg/dbestruct.h
 include/xorg/dgaproc.h
 include/xorg/dix.h
+include/xorg/dixaccess.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
+${PLIST.dri}include/xorg/dri.h
+include/xorg/dri2.h
+${PLIST.dri}include/xorg/dristruct.h
 include/xorg/edid.h
 include/xorg/exa.h
 include/xorg/exevents.h
@@ -61,21 +43,19 @@ 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/geext.h
+include/xorg/geint.h
 include/xorg/globals.h
 include/xorg/glyphstr.h
 include/xorg/hotplug.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
@@ -101,21 +81,26 @@ include/xorg/picture.h
 include/xorg/picturestr.h
 include/xorg/pixmap.h
 include/xorg/pixmapstr.h
+include/xorg/privates.h
 include/xorg/property.h
 include/xorg/propertyst.h
+include/xorg/ptrveloc.h
 include/xorg/randrstr.h
 include/xorg/region.h
 include/xorg/regionstr.h
+include/xorg/registry.h
 include/xorg/renderedge.h
 include/xorg/resource.h
 include/xorg/rgb.h
-include/xorg/sarea.h
+include/xorg/rrtransform.h
+${PLIST.dri}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/shmint.h
 include/xorg/site.h
 include/xorg/swaprep.h
 include/xorg/swapreq.h
@@ -134,15 +119,12 @@ 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/xf86Crtc.h
 include/xorg/xf86Cursor.h
 include/xorg/xf86DDC.h
 include/xorg/xf86Modes.h
 include/xorg/xf86Module.h
-include/xorg/xf86OSmouse.h
 include/xorg/xf86Opt.h
 include/xorg/xf86Optrec.h
 include/xorg/xf86Parser.h
@@ -155,12 +137,9 @@ include/xorg/xf86RamDac.h
 include/xorg/xf86RandR12.h
 include/xorg/xf86Rename.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
@@ -171,42 +150,32 @@ include/xorg/xf86xv.h
 include/xorg/xf86xvmc.h
 include/xorg/xf86xvpriv.h
 include/xorg/xisb.h
+include/xorg/xkbfile.h
+include/xorg/xkbrules.h
 include/xorg/xkbsrv.h
+include/xorg/xkbstr.h
 include/xorg/xorg-server.h
 include/xorg/xorgVersion.h
+include/xorg/xserver-properties.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
-lib/X11/Cards
 lib/X11/Options
 lib/pkgconfig/xorg-server.pc
-${PLIST.dri}lib/xorg/modules/extensions/libGLcore.la
 lib/xorg/modules/extensions/libdbe.la
-lib/xorg/modules/extensions/libdri.la
+${PLIST.dri}lib/xorg/modules/extensions/libdri.la
+lib/xorg/modules/extensions/libdri2.la
 lib/xorg/modules/extensions/libextmod.la
 ${PLIST.dri}lib/xorg/modules/extensions/libglx.la
-lib/xorg/modules/extensions/librecord.la
-lib/xorg/modules/extensions/libxtrap.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/libcfb32.la
 lib/xorg/modules/libexa.la
 lib/xorg/modules/libfb.la
 lib/xorg/modules/libint10.la
-lib/xorg/modules/libmfb.la
-lib/xorg/modules/libpcidata.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/libwfb.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
@@ -215,27 +184,21 @@ 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/xserver/SecurityPolicy
+lib/xorg/protocol.txt
 man/man1/Xnest.1
 man/man1/Xorg.1
 man/man1/Xserver.1
 man/man1/Xvfb.1
 man/man1/cvt.1
 man/man1/gtf.1
-man/man1/pcitweak.1
-man/man1/scanpci.1
-man/man1/xorgconfig.1
 man/man4/exa.4
 man/man4/fbdevhw.4
-man/man5/SecurityPolicy.5
 man/man5/xorg.conf.5
 share/aclocal/xorg-server.m4
-@dirrm lib/xserver
 @dirrm lib/xorg/modules/multimedia
 @dirrm lib/xorg/modules/linux
 @exec ${MKDIR} %D/lib/xorg/modules/input
 @dirrm lib/xorg/modules/input
-@dirrm lib/xorg/modules/fonts
 @dirrm lib/xorg/modules/extensions
 @exec ${MKDIR} %D/lib/xorg/modules/drivers
 @dirrm lib/xorg/modules/drivers