x11-servers/xorg-server 21.1.25,1

[1] Fix the Chipset lines written by xorgcfg for 3dfx cards. [2] Add the PCI ID for Radeon X600, 0x5B62 to a place that was missed.

PR:		[1] ports/32121
Submitted by:	[1] alane
		[2] Vladimir Kushnir <vkushnir@i.kiev.ua>

Fix up plist after modifications to mtree (BSD.x11-4.dist rev. 1.27).

- Correct the ranges of the bus resource windows on sparc64.   This makes PCI video cards work that hang off directly from   the Host-to-PCI bridge in machines like the Blade 100. [1] - Default to old 'keyboard' driver for sparc64. Patches for 'kbd'   one were not enough so until new driver is fixed, this change   makes Xorg work with sparc64 keyboards. Knob WITH_SPARC_KBD is   provided to ease ef

Submitted by:	marius [1]

Bump max number of buttons supported by mouse driver to 16 so Logitech MediaPlay mouse works. (Xorg Bugzilla #2389)

PR:		ports/80744
Submitted by:	cy

Speed up extract target by not extracting */CVS/*. From ahze:

With Patch:
(pII 400Mhz)
real 1m12.597s
user 0m14.706s
sys 0m12.061s

(athlon 2500+ 3disk raid 0)
real 0m12.912s
user 0m2.884s
sys 0m3.128s

Without Patch:
(pII 400Mhz)
real 1m43.233s
user 0m14.565s
sys 0m13.951s

(athlon 2500+ 3disk raid 0)
real 0m22.967s
user 0m2.925s
sys 0m3.576s

Submitted by:	ahze

Sync with etc/mtree/BSD.x11-4.dist rev. 1.26: Add mt locale directory, since more and more ports create and use it.

Requested by:	krion
Approved by:	portmgr (krion; in advance)

Add Peter Grehan's patches to port xorg-server to PowerPC.

PR:		ports/78345, ports/78346, ports/78348, ports/78352,
		ports/78353, ports/78354, ports/78355, ports/78356,
		ports/78358, ports/78359
Submitted by:	grehan

Remove a duplicated imake define that adds noise to the configure stage.

Upgrade X.Org ports to 6.8.2. Release notes are available at http://www.x.org/X11R6.8.2/doc/RELNOTES.html

Thanks to kris and krion for running several cluster test builds,
maintainers of GNOME for prompt responses, portmgr for postponing ports
freeze for this update, testers on FreeBSD-X11@ list and others that I
might have mised here.

Also included:
- fix for ATI Mobility on Dell Inspiron 7500 (obtained from Marc Aurele La
  France; obtained and tested by julian)
- fix for kbd driver on Sparc64 (tested by Aaron Dudek, Michael G. Jung and
  Matthias Muthmann), which still appears to have problems with some
  keyboards - so
- fix for kbd driver on PC98 (reported and tested by NAKAJI Hiroyuki; PR
  ports/77217)
- fix for i810 on HP D530 (obtained from Egbert Eich; obtained and tested
  by Anders Nor Berle; PR ports/74757)

[1] Add i810 driver to AMD64 package. [2] Put the manpages from section 4 under 4x.  For example, you can do     "man 4x vga" to get the X vga(4x) manpage, still do man 4 cirrus to get     cirrus(4x), and man -a vga to get both vga manpages. [3] Apply several important-looking fixes to ATI drivers from the stable branch:     - Fix mode setting with Mach64 on some laptops.     - Don't crash with ma

PR:		[2] ports/25576
Submitted by:	[2] fanf
Requested by:	[1] peter
Obtained from:	[3] XORG-6_8-branch

[1] Fix a crash on startup with i830+ systems due to failure to follow an API change that occurred. [2] Install the xorg.conf referred to by xorg.conf(5).  Installation was disabled during the XF86 name avoidance phase, but could still be of use. [3] Add a section about the Composite extension to xorg.conf. [4] Add MakeDllModules YES to the WITH_DEBUG flag's options.  While it won't package correc

PR:		[1] ports/75425
		[2] ports/73915
		[6] ports/73257
Submitted by:	[1] Marc Silver, marcs at draenor dot org
		[2] Frank J. Laszlo, laszlof at vonostingroup dot com
		[6] Ken Stailey kstailey at yahoo dot com
		[6] r1.4 of X.Org CVS.
Approved by:	portmgr

Re-add libXThrStub for FreeBSD that requires thread stubs.  Between 6.7 and 6.8 I had moved libXThrStub into libX11, because it seemed unnecessary.  However, because libc_r symbols are also weak, the weak stubs in libX11 would interfere, however they don't if they are in a library linked by libX11.  The most common manifestation of the problem was: GThread-ERROR **: file gthread-posix.c: line 137 

PR:		ports/75477
Submitted by:	KIMURA Yasuhiro, yasu at utahime dot org
Testing by:	marcus

- Rewrap to fit on 80 columns console

Approved by:	anholt (x11 hat)

Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2.  Because Mesa 6.2 DRI drivers are incompatible with the old libGL in XFree86, they have been repocopied to graphics/xfree86-dri.  Also note that with this commit the html manpages are going away, and with it the runtime dependency on perl for the imake port.

Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt

Props to:	kris (multiple cluster runs and sorting through logs)
		lesi (fixing all the issues in those logs, and more)

Don't refer people to nonexistant 'Monitors' file in xorgconfig. (freedesktop.org Bugzilla #1692)

Reported by:	znerd
PR:		ports/56275

Fix behaviour of keyboard under pc98 where keycodes differ from i386.

Submitted by:	Satoshi Kimura
Approved by:	portmgr (linimon), mentor (anholt)

Fix behaviour of keyboard under sparc64, where keycodes were off by one (i.e., when pressing 'd' on keyboard, server would get code for 'f').

Submitted by:	marius
Approved by:	portmgr (linimon), anholt (mentor)

Fix problem with XVideo (insufficient resources for operation). [1] Use correct prototype for sysarch(2). [2]

PR:		ports/70317 [1],  ports/71037 [2]
Submitted by:	Andrew Elmore (aelmore at interwoven.com) [2]
Approved by:	anholt (mentor)
Obtained from:	Free Desktop.Org Bugzilla #474 [1]

Use MASTER_SITE_XORG.

Approved by:	anholt (mentor)

Fix missing symbol with SiS driver [1]. Fix package list (partly [2]).

PR:		ports/69790 [1], ports/70376 [2]
Submitted by:	Andreas Kohn (andreas AT syndrom23.de) [1]
		John R. Makosky (jrm-spam1 AT crackpot.org) [2]
Approved by:	anholt (mentor)

- Correct typo (CLFAGS -> CFLAGS)

PR:		ports/69703
Submitted by:	Masakazu HIGAKI <higamasa@dream.com>

- Extend IGNORE message, point users to instructions how to switch   from XFree86-4 to X.Org.

Approved by:	anholt (x11 hat)

- Add the X_WINDOW_SYSTEM={xorg,xfree86-4,xfree86-3} variable to bsd.port.mk,   and make XFREE86_VERSION map to it.  XFREE86_VERSION is now deprecated. - Make xorg the default X_WINDOW_SYSTEM on -current. - Add several new X_*_PORT variables which point to various pieces of X11 based   on the setting of X_WINDOW_SYSTEM, and make ports use them. - Add information to CHANGES about how to handle the 

PR:		ports/68763
Approved by:	portmgr (marcus)
Approved by:	re (scottl)

New port: xorg-nestserver, the nesting X server from X.Org.

s/WITH_XLIB/USE_XLIB/ -- fixes missing dependency.

Reported by:	pointyhat via kris (over and over)

Rethink the DRI dependency.  It's not actually needed for the server to work. It's only useful with both server and libraries.  It should really be depended on by the metaport instead.

PR:		ports/68484
Submitted by:	Roman Bogorodskiy <bogorodskiy@inbox.ru>

And my hat collection grows.  Actually remove the remnants of pkg-message stuff.

- Install the server setuid by default.  The x11/wrapper/files/wrapper.c code is already in the server.  I can't even imagine a situation where running an X server (which is run as root, mind you) is ok, while having a setuid X server with arguments and environment checking ala wrapper.c is not.  But put an option in anyway. - Include the SERVER_PATCHES define needed for the new server ports.

New port: xorg-vfbserver, the virtual framebuffer X server from X.Org.

Install xorgcfg and xorgconfig.

PR:		ports/67656
Submitted by:	Alex Deiter <tiamat@komi.mts.ru>

- Only set XFREE86_HTML_MAN if there are going to be manpages installed   (XMAN_DIRS is set). - Remove spammed-in configure.gen.pre - Pass thread flags/libs to configure like should have been done - Add changes to config/cf/* for the fonts ports.

- Depend on xorg-libraries by default instead of the modular libraries. - Don't install Xserver.1 (a manpage for all X servers), which is provided by   xorg-manpages.

Add some more patches based on XFree86-4-libraries/files, for the xorg-libraries and -clients ports.

[1] Fix packaging on amd64 [2] Remove sparc64 patch that got spammed into the wrong location in FreeBSD.cf [3] Fix many problems in the Render implementation. [4] Depend on libGL to provide glx headers, until they're located in a more     appropriate package.

PR:		[1] ports/66682
Submitted by:	[1] Francois Tigeot <ftigeot@wolfpond.org>
Obtained from:	[3] X.Org CVS

[1] Add missing dependency on freetype2. [2] Add missing AMD64 patch that was in XFree86-4-Server.

Reported by:	[1] bento via kris
Submitted by:	[2] Francois Tigeot <ftigeot@wolfpond.org>

Correct a typo in one of the LIB_PC_DEPENDS.

New port: xorg-server taken from X.org release 6.7.0.

Tested only on x86 so far due to problems installing dependencies on build
cluster.  Based on XFree86-4-Server originally, but I decided the history
wasn't worth keeping that much as a lot has been changed.