Remove support for XFree8-4.

From now on, X_WINDOW_SYSTEM != "xorg" is not supported anymore.

PR:             ports/119418
Submitted by:   flz
Approved by:    portmgr (pav)

- Update X.org ports to 7.3.
- Mark XFree86-4 as DEPRECATED with EXPIRATION_DATE set to 2007-12-25.
I hope that nobody will be bored enough on Christmas to remove them on
that day.

Tested by:      vehemens, Rene Ladan, Beech Rintoul, sarek on x11@

- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

Add some old internal FreeType definitions to fix the server runtime.  These
definitions come from the old ftinternal.h.

Submitted by:   Scott Allendorf <scott-allendorf@uiowa.edu>
Approved by:    portmgr (implicit)

Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.

Submitted by:   mezz, ahze, pav, and many others
Approved by:    portmgr (implicit, kris)

Fix crash by bad pcf font.

Obtained from:  XFree86 CVS
Security:       CVE-2006-3467

Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

Approved by:    krion@
PR:             ports/88711 (related)

If port belongs to X11 distribution different than ${X_WINDOW_SYSTEM} one,
point to The X Window System and Virtual Consoles chapter of FAQ.

Add SHA256.

Fix the fix for CAN-2005-2495.

Obtained from:  XFree86 CVS

Fix integer overflow when allocating large pixmaps.
(Freedesktop.org bug #594)

Obtained from:  Red Hat via simon
Security:       CAN-2005-2495

- Install X server setuid root by default, and provide a switch
  NO_SUID_XSERVER to disable this. The end result is same as it was before
  with x11/wrapper installed as the code from there is included in X
  server. It is also the same as xorg-server port does (from which this
  changes were taken). This should conclude removal of dependency on
  x11/wrapper from meta port for above reasons. [1]

- (patch-bsdResource.c) 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. [2]

- (patch-HALlib_bindings.c patch-mga_driver.c) Revert the MGA HALlib
  MGASetDisplayStart interface back to HALSetDisplayStart (taken from
  upstream CVS) [3]

Noticed by:     (bugsgrief at bugsgrief.net) [1]
Submitted by:   marius [2]
Reported and tested by: Steven Friedrich (FreeBSD at InsightBB.com) [3]

Upgrade to XFree86 4.5.0.

Ports changes:
- Drop dependency on x11/wrapper. X server already contains this code
(programs/Xserver/os/utils.c rev. 3.58).
- Install default SecurityPolicy with XFree86-4-libraries, thus avoiding
plists and who-owns-what complications between different fooServer ports.
Copy default file to real one if that doesn't exist and remove both upon
uninstall if they are the same.
- Revert change to Imake.rules rev. 3.132 in devel/imake-4 port, since
couple of ports break with this change
(devel/imake-4/files/patch-Imake.rules)
- Add grehans patches for PPC [1]
- Several of directories that were previously in /etc/mtree/BSD.x11-4.dist
were moved to respective ports pkg-plists

PR:             [1] 78345, 78346, 78348, 78352, 78353, 78354, 78355, 78356

- Grab a fix for ati driver panel mode decoding from Marc La France. [1]
- Install driver manpages with 'x' postfix so the ones that clash with
  FreeBSD ones are easier to obtain. [2]
- Fix plist.

PR:             ports/25576 [2]
Obtained from:  XFree86 CVS [1]
Reported and tested by: julian [1]

Depend on xfree86-dri rather than dri. Also depend on it on amd64.

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)

Enable use of cirrus driver on NEC PC-9821 with CLGD755x. Patch was
submitted by Satoshi Kimura to both x11@freebsd.org and XFree86. It is
already in XFree86 CVS (Changelog #125) so the diff was taken from there.
Also install two files with Japanese documentation.

Submitted by:   Satoshi Kimura

Don't refer people to nonexistant 'Monitors' file in xf86config.
(XFree86 Bugzilla #1498)

Reported by:    znerd
PR:             ports/56275

Fix behaviour of keyboard under pc98 where keycodes differ from i386. [1]
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'). [2]

PR:             ports/71937 [1]
Submitted by:   Satoshi Kimura [1], marius [2]
Approved by:    portmgr (linimon), mentor (anholt)

Fix problem with XVideo (insufficient resources for operation).

PR:             ports/70317
Approved by:    anholt (mentor)
Obtained from:  Free Desktop.Org Bugzilla #474

Fix missing symbol with SiS driver.

PR:             ports/69790
Submitted by:   Andreas Kohn (andreas AT syndrom23.de)
Approved by:    anholt (mentor)

Fix PLIST_SUB variables in amd64 and i386 cases to generate proper plist
and thus include all drivers in package. Bump PORTREVISION, since package
contents changed.

PR:             ports/70589
Approved by:    anholt (mentor)

Update XFree86 clients to 4.4 release.  Release notes are available at
http://www.xfree86.org/4.4.0/RELNOTES.html

PR:             ports/67733 imake
                ports/67508 libraries
                ports/67510 clients
                ports/67513 server
                ports/67776 100dpi fonts
                ports/67777 75dpi fonts
                ports/67778 cyrillic fonts
                ports/67779 default bitmap fonts
                ports/67781 font encodings
                ports/67783 scalable fonts
                ports/67784 font server
                ports/67785 XFree86 meta-port

- 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 transition.

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

Register CONFLICTS on xorg-server.

SIZEify (maintainer timeout)

. Build and install the SiS driver on the Alpha.  I've had this patch in
  my tree for quite some time, and it builds and installs correctly.  An
  earlier version (4.2) ran on a DS10 with a SiS card we had at work, but
  I no longer have access to that machine to test 4.3.  Despite that, I
  think this is worth putting in.

. Use the correct prototype for sysarch(2).  Should fix the build on
  CURRENT/alpha.

Submitted by:   bento via kris

Fix several buffer overflow issues in the fontpath handling code.
Remove an earlier patch which only partially addressed these issues.

Approved by:    so

Fix buffer overflow in font alias handling code.

Approved by:    so

GC a patch that no longer applies.

Fix XFree86-4-FontServer build on sparc64.

Requested by:   kris

Remove my e-mail address from these files, to reduce spam.

Switch MAINTAINER to x11@FreeBSD.org for group maintaining of these ports.

The DRI client drivers are now provided by graphics/dri.  RUN_DEPENDS on them
instead of installing them from this port.

Mark NOT_FOR_ARCHS=ia64 and do a little plist sorting fix.

Having the Xserver open /dev/io on amd64 as well would help.  The nv
driver (among others) do not appreciate the lack of this.

Fix packaging of sunffb on sparc64.

Submitted by:   Marius Strobl <marius@alchemy.franken.de>

Re-add the scanpci manpage on i386.

Reported by:    bento

Fixes for potential integer overflows in font libraries.

Obtained from:  XFree86 CVS

Add support for AMD64.

[1] Fix xdmcp queries in the X servers (bug 277)
[2] Fix underlining in the freetype backend (bug 330)

PR:             [1] ports/52387
                [2] ports/55134
Submitted by:   [1] Joel Ray Holveck <joelh@piqnet.org>
                [2] Ariff Abdullah <skywizard@MyBSD.org.my>

Add support for sparc64.

Submitted by:   jake (based on)

Add missing newlines which got lost somehow in my patching.

Noticed by:     peter

Fix compile of XFree86-4-Server on -current and add amd64 patches.

Submitted by:   peter (amd64)

SuperProbe no longer comes with XFree86, don't mention it here.

[1] Make the HTML manpages get put into the packages again.
[2] Check that XFREE86_VERSION=4 is set when building, rather than setting it.
[3] Move many common Makefile bits to XFree86-4-libraries/Makefile.inc
[4] Make the XFree86-4-Server port not install libXfont.so.
[5] Move the xcursor.pc file to its proper location in
${X11BASE}/libdata/pkgconfig
[6] Don't explicitly link libGL.so against libc, for the sake of 4.x's pthreads.

Submitted by:   [5,6] Ports Fury

Remove libXfont.* from the pkg-plist, since it's part of XFree86-4-libraries
and not part of this port.  This shouldn't cause portupgade problems for most
people because the port still installs libXfont.*  That will be fixed later.

Reported by:    kris

Fix a crash with the siliconmotion (smi) driver.

PR:             ports/51450
Tested by:      Stacey Roberts <stacey@vickiandstacey.com>
Obtained from:  XFree86 bug #50

Fix a small memory leak in __driUtilCreateScreen()

PR:             ports/51580
Submitted by:   Alexey Dokuchaev <danfe@regency.nsu.ru>

Fix a typo which caused problems on Radeon R300 cards, including text mode
restoring not working.

Obtained from:  RedHat

Fix a package building problem on Alpha and fix a bad copy'n'paste.

Submitted by:   bento (via kris)

Followup to last commit: Add missing radeon_cursor.c to the list of patches.

[1] Fix a hang in int10 on starting the server with multiple cards
[2] Fix a server hang on reset with DRI enabled on Radeons
[3] Fix a server hang on reset with DRI enabled on Matrox
[4] Fix screen going into powersaving with Xinerama, Xcursor, and Radeons
[5] Fix an unresolved symbol in the nv driver
[6] Fix a crash in DDC with Riva 128 cards (XFree86 bug 71)
[7] Add some missing manpages to the MAN4 list

PR:             [7] ports/50113
Obtained from:  [1] XFree86 bug 6
                [2] XFree86 bug 94
                [3] Panagiotis Papadakos <papadako@csd.uoc.gr>
                [4] XFree86 bug 90
                [5,6] XFree86 CVS

Add a patch to fix xkb initialization.

Approved by:    portmgr (kris)
Obtained from:  XFree86 CVS

[1] Add a fix for a hang with Radeon cards in specific apps.
[2] Fix unresolved symbols messages in mga and r128 drivers.

Approved by:    portmgr (kris)
Obtained from:  [1] DRI CVS
                [2] Leif Delgass

Update XFree86 ports, including linux_dri, to 4.3.0.  Set IGNORE= in dri-devel
for being outdated.  Thank you to all the testers and people who submitted
patches for this update.

Approved by:    portmgr

Clear moonlight beckons.
Requiem mors pacem pkg-comment,
And be calm ports tree.

E Nomini Patri, E Fili, E Spiritu Sancti.

Re-add mga_hal's checksum yet again.
(working on a separate mga_hal port to get rid of this mess once and for all)

Submitted by:   many

[1] Fix missing symbols in i810 driver
[2] Fix xdm on Alpha by using NetBSD's version of Wraphelp.c
[3] Report buttons 7 and when using sysmouse protocol
[4] Fix missing symbols in r128 driver.
[5] Reset /usr/X11R6/bin/X to Xwrapper-4 after install if Xwrapper-4 exists.

PR:             [1] i386/44203
                [2] ports/43664
                [3] ports/43232

[1] Move the recently committed patch-common_x86.c to XFree86-4-libraries
    so it covers libOSMesa, too.
[2] Reduce stack usage in libX11 (helps JDK 1.4)

PR:             [1] ports/46037
Submitted by:   [2] phantom
Approved by:    portmgr

[1] Quiet some prolific debug output in cirrus driver.
[2] Stop SIGILLs when running GL clients on systems with SSE but no
    CPU_ENABLE_SSE in the kernel.
[3] Fix imake complaints after XFree86-4-libraries patch to stop libXThrStub
    build on post-500043 -current.

PR:             [1] 38590
Approved by:    portmgr

[1] Make the 4.2.1 ports all use the merged 4.2.1+mitshm patch.
[2] Make the ports respect CFLAGS better.  Now CFLAGS (and CC/CXX) are set for
the build during the configure stage.

PR:             [2] 40271, 43369

o Back out a patch from the 4.2.1 update which broke DPMS on Rage 128 hardware
o Use XFree86's mga driver, even in the WITH_MATROX_GXX_DRIVER case. (it now
  only adds installation of the hal library)

Missed the PORTREVISION bump

Fix Matrox G550 cursor in the non-WITH_MATROX_GXX_DRIVER case.

PR:             37542
Submitted by:   Peter Johnson <freebsd@bilogic.org>

Update XFree86 Servers ports to 4.2.1 + the second SHM security fix (for
XFree86-4-Servers, this fixes the case where the X Server is started by xdm).

Update XFree86-4-* ports which share XFree86-4-libraries's patches:
- Reduce build times by not rebuilding some programs/libraries in each port.
- Move some files from -clients to -libraries and from -libraries to -server.
- Make package-building in XFree86-4 more intuitive

PR:     41606 (package building)

Fix WITH_MATROX_GXX_DRIVER case after 4.2.1 upgrade.

Submitted by:   obraun

Update XFree86-4-clients, -Servers, and -libraries to 4.2.1.
The most notable update is fixing what appears to be possible privelege
escalation with libX11 and setuid clients (xterm is one).

When initialising s3 driver call fbPictureInit() like other drivers do. This
fixes a problem with RENDER extention not working with s3 driver. Bump
PORTREVISION.

Approved by:    maintainer (implicitly)

gzip the new patches to help users who are getting mangled text files from
${MASTER_SITE_LOCAL}

PR:             41408

Add missing checksum unbreaking WITH_MATROX_GXX_DRIVER

PR:             41367
Submitted by:   Sergey N. Voronkov <serg@tmn.ru>
Approved by:    maintainer (travelling approval)

1. Use XlcDL.c from X CVS to help people with Korean or Japanese XIM and GTK+
2. Update PCI IDs and nv driver to include newer nv chipsets
3. Add SHM to XFree86's libc wrapper on bsd to help with nv binary drivers.
4. Fix mouse scrollwheels on -current (new gcc)

Submitted by:   [1] Hye-Shik Chang <perky@FreeBSD.org>
                [2] Chris Dillon <cdillon@wolves.k12.mo.us>
                [3] Matthew N. Dodd <mdodd@freebsd.org>
                [4] Ted Lindgreen <ted@sanne.nlnetlabs.nl>
Approved by:    mdodd

gzip Wraphelp.c and put it in local_distfiles, to help users having troubles
downloading it.  Move freebsd-glide3headers there too.  Update BUILD_DEPENDS
for font ports to catch new requirements as of 4.2.0.

PR:             40362, 40759
Approved by:    des (mentor)

Make XFree86-4 miniports use imake-4's HasXdmAuth setting (default is YES).
Clean up Wraphelp.c inclusion in the ports that need it.
Add USE_PERL5 to imake-4.

Approved by:    des

Take over maintainership of XFree86-4 ports.  Add patches to fix libGLU on
-current, fix the DRI with Wine, update the config files for the X ports, and
fix many of them to allow continuing of the X build after interruption (it
used to clean and rebuild).

Approved by:    will, des (mentor)

FreeBSD'ize the XFree86 v4 server configuration programs.

Sponsored by:   FreeBSD Mall, Inc.

Update to always compile DRI on i386 machines, including 3dfx support.
/sys no longer needs to be accessible, nor does Glide support (unlike with
4.1.0).  Bump PORTREVISION to denote update.

PR:             36181
Submitted by:   Eric Anholt <eanholt@gladstone.uoregon.edu>

Fix alpha package -- some files are not installed when MACHINE_ARCH=alpha.
No PORTREVISION bump -- package for alpha didn't build last time and for
all other arches nothing changes.  Tested on i386 only.  This also fixes
the logic error which added MATROX files to pkg-plist if BuildXF86DRI was
set to NO.

Submitted by:   gallatin

Tweaks to get this compiling on alpha:

- Disable the building of DRI (as it only works on x86)
- Ensure that HaveMatroxHal is defined to a valid value when DRI is not
  built, otherwise imake complains about a syntax error when it encounters
  HaveMatroxHal in the mga driver Imakefile

reviewed by: will

More cosmetic fixes:
 [1] Move warning about Matrox HAL drivers to pre-everything target, so the
     user gets the warning whether or not they enable the driver.
 [2] Tag Matrox-specific master sites and distfile.

[1] Update MGA HAL drivers for XFree86 4.2.0.
[2] If WITH_MATROX_GXX_DRIVER defined, bump PORTREVISION to preserve the
    upgrade path for users who already have 4.2.0 but not this.
[3] Cosmetic cleanups.

Submitted by:   [1] Glenn Johnson <glennpj@charter.net>

XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades
        [1] Upgrade to 4.2.0.
        [2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES
            by default.

Submitted by:   [1] sf, taguchi@tohoku.iij.ad.jp
Approved by:    [2] core

sync with XFree86-4    - Fix a flickering LCD problem with i815 chipset.    

configure exits with error if    - USA_RESIDENT=YES and    - imake-4 assumes
HasXdmAuth=YES and    - Wraphelp.c can't be found.    

o pre-fetch: -> pre-everything::   o ECHO -> ECHO_MSG   o add comments.    

remove redundant definition.    

sync with x11/XFree86-4    - support ATI XPERT 128.    

Fix last commit; unbreak WITH_MATROX_GXX_DRIVER.    

Make pre-fetch in line 161 (one colon) consistent with others (two colons).    

Fix long-standing bug of this ports: support HasXdmAuth correctly.    

o sync with x11/XFree86-4    - re-enable DRI support.    - fix radeon DRI
module.    

sync with x11/XFree86-4.    

Get rid of 'X11R6.4' from pkg-comment.   XFree86-4.1.0 is based on X11R6.5.1.   

Change ${RM} to ${RM} -f in post-build, otherwise things stop   right at the end
of the build process with a complaint that it   can't remove a non-existent
file.    

display PKGMESSAGE correctly.    

fix typo to unbreak Alpha arch.    

update to 4.1.0.   get rid of version number from comments in Makefile,
pkg-comment and pkg-descr.    

Chase checksum of xc/mga-1_2_0beta.tgz.    

@dirrm DRI module directory which is not made by mtree.   This can be changed in
the future.