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)

Remove support for OSVERSION < 5

- 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)

Fix the build on 4.X with the new freetype2.

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

Fix the build on 4.X with the new freetype2.

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

Remove USE_REINPLACE from categories starting with X

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.

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

At Kris's request, back out the MACHINE_ARCH spelling correction until
after 5.4-RELEASE.

Assist getting more ports working on AMD64 by obeying the
Ports Collection documentation and use 'ARCH' rather than 'MACHINE_ARCH'.

Remove directory on deinstall.

Properly fix the termios race rather than disabling copyTermios.

PR:             ports/74981
Submitted by:   Rong-En Fan, rafan at infor dotorg
Obtained from:  XFree86 Bugzilla #867

Bump PORTREVISION, since html manpages are no longer built/installed
and that changes packaging content.

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)

Grab changes to Xpm security patch from x11/xorg-libraries:
Using SIZE_MAX instead of [U]INT_MAX in several tests would result in the
tests being useless on 64-bit machines.

Submitted by:   nectar
Obtained from:  Matthieu Herrb (matthieu herrb at laas fr) by nectar

Apply fixes for CAN-2004-0687 and CAN-2004-0688 in libXpm (stack-based and
integer overflow security vulnerabilities).

Approved by:    portmgr

Add conflicts to Mesa and xpm ports. Libraries that they install are
already included in this port.

Noticed by:     David Julien (david dot julien at gmail dot com)
PR:             ports/70004
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

Fix build after X.Org patch.

PR:             ports/69545
Submitted by:   Dejan Lesjak <dejan.lesjak@ijs.si>

- 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 new xorg ports.

Register CONFLICTS for new xlibs ports.

Install a shared version of libXau and libXRes.
They are necessary to compile GNOME 2.6(libgtop2 and libwnck)
on amd64 (and probably ia64). Bump PORTREVISION

Reviewed by:    x11 (earlier version)

SIZEify (maintainer timeout)

Declare CONFLICTS between libXt and XFree86-4-libraries

Declare CONFLICTS between freedesktop.org X extension/library ports and
XFree86-libraries.

Move the REINPLACE bits to Makefile.in so that all the XFree86 ports can
use them.  Without this, the patch was being applied to the other ports,
but the PTHREAD substitutions were not being done.

Reported by:    adamw

Fix a copy/paste mistake on the previous commit.

Reported by:    adamw

Do a PTHREAD_{CFLAGS,LIBS} substitution to handle the new threading scheme
on -CURRENT.

Bah.  Some of the servers don't have the fonts/util/, causing failure due to
patches being shared by all the ports.  So, add them to clients only and use
EXTRA_PATCHES.  This should be done to more patches from XFree86-4-libraries.

Use #!/usr/bin/env perl instead of #!/usr/bin/perl to increase the chances
of success.

Make this package on amd64 now that I've added two more files.

Second change to get kdebase3 to work on amd64.  kdebase builds a plugin
called kxkb.so, which links against libxkbfile.  This is fatal on
amd64 because XFree86 does not normally provide libxkbfile.so, and it is
a guaranteed fatal error to link non-PIC code into a .so file.

I have only arranged for libxkbfile.so to be build on amd64 so as to
not risking distrubing dependencies on other platforms.

Fix XFree86-4-FontServer build on sparc64.

Requested by:   kris

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

Disable the patch from XFree86 bug 641 to copy the terminal's settings in
luit to its new pty.  This code doesn't work for some reason and produces
"Couldn't copy terminal settings" when luit is run manually or the symptom
of an xterm -lc flashing on screen and exiting.

Submitted by:   Guido Berhoerster <ich@guido-berhoerster.org>

Update luit (helper app that does locale translation for xterm) in
XFree86-4-clients from XFree86 CVS.  This allows luit to be used setuid, which
closes a security hole (tty left world-writable) that luit complains about on
startup if not setuid.  Setting WITH_SETUID_LUIT installs luit setuid.

PR:             ports/51632
Submitted by:   Guido Berhoerster <ich@guido-berhoerster.org>
Help from:      ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>

Fix a bug in my last commit -- the second coma in -Wl,rpath,DIRECTORY
was missing.

Reported by:    Andy Fawcett (who watches the ports cluster logs)
                Uwe Laverenz

Add a patch for Mesa's glheader.h to teach it about the Intel
compiler(s) (no __cdecl, INLINE means inline). Add a hunk to the
FreeBSD.cf patch to make always prepend -rpath with the -Wl, --
GCC understands it either way, but Intel's icc, for example,
does not -- and need not.

Approved by:            enholt (maintainer)
Also reviewed by:       netchild (icc guru)

Fix XFree86-4-clients build.  It was failing depending on lib*.a which weren't
being built due to the split build.  Remove the dependencies on them, and it'll
pick them up from ${X11BASE}/lib.  I don't know why this broke now but worked
in the past.

Reported by:    everyone
Tested on:      ref5 (libraries,clients)

Somehow the typo in the previous commit didn't make the build fail.  Fix it.

Suppress warnings in system headers with gcc 3.x.

Allow the patch directory to be overridden.

Approved by:    portmgr (will)

Fixes for potential integer overflows in font libraries.

Obtained from:  XFree86 CVS

Remove the disabling of MTRRs on amd64, as MTRR support has been added to
-current.  No PORTREVISION bump because the installed base is small enough.

Submitted by:   peter

[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>

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

Submitted by:   peter (amd64)

Removing -lc from the link line of libGL.so broke on -alpha.  Revert the patch
until a solution can be found.

Reported by:    kris (bento)

Convert .for/.endfor to shell script to fix building of XFree86-4-Server,
which sets the variables involved after including this file.  No PORTREVISION
bump because the last XFree86-4-Server bump was for packaging and packaging
was broken in the last revision.

Reported by:    Kent Stewart <kstewart@owt.com>

[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

Add a patch to work around a gcc/gas problem on sparc64.  No revision bump
necessary as this is a build fix.

Submitted by:   tmm

Fix a small memory leak in XvQueryAdaptors()

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

Fix a memory leak in libX11.

Obtained from:  RedHat

Add a fix for a possible buffer overflow in _XlcLocaleDirName().  Privileged
binaries are not vulnerable.

Approved by:    portmgr (kris)
Obtained from:  XFree86 CVS xf-4_3-branch

Re-add patch-xdm_session.c which was accidentally dropped in the 4.3.0 upgrade.
This fixes problems with environment not being set in xdm sessions.

Submitted by:   many
Approved by:    portmgr (kris)

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.

Fix XFree86-4-libraries after Xft renaming removal:
Add `pkg-config xft --cflags` and --libs to Imakefiles of programs that use Xft
and remove a bit of code not needed for Xft2, remove xftcache program.

Reported by:    many

Remove the renaming of Xft headers and library from the Xft (Xft2) port.
Remove installing of Xft1 from XFree86-4-libraries, and add dependencies
to the Xft port by all the ports that use it along with whatever patches are
necessary.

Approved by:    portmgr (kris), marcus

[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

Fix build for IA64.  Should not affect architectures where this is already
building.

Requested by:   kkenn, marcel
Obtained from:  XFree86 CVS r1.5

Back to previous one because of unofficial patch.

Add XIM patch to files/patch-XlcDL.c

[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

Make XFree86-4-libraries build on ia64

Submitted by:   marcel
Approved by:    portmgr

[1] Fix the en_US.ISO8859-15 locale support.
[2] Fix the gb_GB.CP1251 locale support.
Bump PORTREVISION.

PR:             [1] 36565, [2] 40189
Submitted by:   [1] Simon 'corecode' Schubert <corecode@corecode.ath.cx>
                [2] Stanislav Grozev <tacho@factline.com>

Make using an outdated imake a little harder: depend on version.def being
installed rather than the imake binary.

Disable building of libXThrStub on current newer than 500043

Submitted by:   dfr

[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

Fix XFree86-4-clients build on alpha by disabling SharedLibXdmGreet.
No difference on non-alpha, and gets alpha building with this version, so
no PORTREVISION bump.

PR:             43663

Add patch to support XFree86-4-libraries and -clients on sparc64

Submitted by:   tmm

Actually remove these files.

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)

Due to popular demant into each port which might be inserted into dependency
list by bsd.port.mk insert anti foot-shooting device, which prevents
infinite fork loop when the user defines corresponding USE_XXX in global
make.conf, command line or environment.

Similar devices should probably be inserted into ports that might be inserted
into dependency list by others bsd.foo.mk files (bsd.ruby.mk, bsd.python.mk
and so on.)

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)

Fix the us_intl keymap.

Submitted by:   Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
Obtained from:  Andoni Zubimendi <andoni@lpsat.net>

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

PR:             41408

Add patches for last commit (fixing scrollwheel on -current, and enabling
SYSVIPC to aid nv binary drivers)

Approved by:    mdodd

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)

Allow this port to build in -current (i.e. with gcc 3.1)

Submitted by:   Motoyuki Konno <motoyuki@bsdclub.org>

imake(1) thinks that the first place where to look for a compiler on FreeBSD
is /usr/local/bin/gcc, which simply is not true. Correct it. Bump
PORTREVISION for imake-4 port (XFree86-4-libraries isn't bumped because this
port doesn't install its own imake binary, but builds it for internal
consumption only).

No reply from:  MAINTAINERs

x86emu update for new BIOS's

Submitted by:   Larry Rosenman <ler@lerctr.org>
PR:             37610

Fix ioctl #define abuse

Use <sys/joystick.h> instead of <machine/joystick.h>.

Reviewed by:    will

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>

Preemptive compile fix from XFree86 for "newer GCC versions" (presumably
they refer to GCC 3.x).  PORTREVISION not bumped -- package unaffected.
Untested on the target platforms.

PR:             36104
Submitted by:   Hidekazu Kuroki <hidekazu@pc88.gr.jp>
Seconded by:    gad (sparc64 & possibly ia64 uses GCC3 by default)

Add fix for XDM: Use SU="su -m" instead of SU="su", otherwise given the
default setup for the "nobody" account, login will fail.  PORTREVISION
bumped to include this fix for XFree86-4-clients.

PR:             36084
Submitted by:   Stefan `Sec` Zehl <sec@42.org>

Resurrect patch-startx which changes the default to turn off TCP listening,
and adds an option to allow turning it back on.  Bump PORTREVISION in
XFree86-4-clients only, to denote this feature (re)addition.

Submitted by:   Jochem Kossen <j.kossen@home.nl>

Fix i18n problem found by XFree86.  This makes XIM work properly.  Bump
PORTREVISION to denote fix.

Submitted by:   motoyuki

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

Bump PORTREVISION after the freetype2 shlib major update.

Chase increase of freetype2 shlib version.

Update version number of freetype2 shared library.