CVS log for src/share/mk/bsd.x11.mk

Up to [cvs.NetBSD.org] / src / share / mk

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Apply patch, requested by mrg in ticket #998

	share/mk/bsd.x11.mk		(apply patch)

Bump Xorg server version to 21.1.14

update for xorg-server 21.1.14

bump xorg-server version.

avoid an error in the previous with unexpected inputs.

add some more transformations for man pages, needed by new appres.

stop using and linking against libXxf86misc

support for this extension was removed from xorg in 2008,
our xorg-server and our xorg-server.old can't use it.

xdm(1) was renamed xdm(8) a long while ago.  catch up location.

add support for section 8 X manuals.  amusingly, we already knew
to convert __adminmansuffix__ into "8", but not how to create
.8 from X .man.

Pull up following revision(s) (requested by riastradh in ticket #1954):

	share/mk/bsd.lib.mk: revision 1.398
	share/mk/bsd.lib.mk: revision 1.399
	share/mk/bsd.x11.mk: revision 1.152
	(via patch)

PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}

Back-out unintented commit.

Pull up following revision(s) (requested by riastradh in ticket #1826):

	share/mk/bsd.lib.mk: revision 1.398
	share/mk/bsd.lib.mk: revision 1.399
	share/mk/bsd.x11.mk: revision 1.152
	(via patch)

PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}

Back-out unintented commit.

Pull up following revision(s) (requested by riastradh in ticket #654):

	share/mk/bsd.lib.mk: revision 1.398
	share/mk/bsd.lib.mk: revision 1.399
	share/mk/bsd.x11.mk: revision 1.152
	(via patch)

PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}

Back-out unintented commit.

Use default X11FLAGS to build Xorg servers on vax.

It looks necessary on HAVE_XORG_SERVER_VER=120.

PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}

Pull up following revision(s) (requested by mrg in ticket #436):

	share/mk/bsd.x11.mk: revision 1.151

bump xorg server version.

bump xorg server version.

Pull up following revision(s) (requested by mrg in ticket #261):

	share/mk/bsd.x11.mk: revision 1.147

properly prefix ${X11INCDIR} uses with ${DESTDIR}.

this fixes a build issue seen where the host pixman.h was included,
and has been problem ever since tsutsui fixed my original code (from
2008) about 29 months ago.  i'm surprised this has not been seen
anywhere else in that time.

Pull up following revision(s) (requested by mrg in ticket #135):

	share/mk/bsd.x11.mk: revision 1.150

bump XORG_SERVER_TEENY.

bump XORG_SERVER_TEENY.

Pull up following revision(s) (requested by mrg in ticket #73):

	share/mk/bsd.x11.mk: revision 1.149

bump xorg-server version.

bump xorg-server version.

bump xorg-server version here.

properly prefix ${X11INCDIR} uses with ${DESTDIR}.

this fixes a build issue seen where the host pixman.h was included,
and has been problem ever since tsutsui fixed my original code (from
2008) about 29 months ago.  i'm surprised this has not been seen
anywhere else in that time.

XXX: pullup-10

Pull up following revision(s) (requested by mrg in ticket #16):

	share/mk/bsd.x11.mk: revision 1.146

bump xorg-server version.

bump xorg-server version.

update for xorg-server 21.1.4.

update for xorg-server 21.1.3.

bsd.x11.mk: Add xlocaledir substitution.

Add Xwsfb X server to pmax build

With the previous tweak to TURBOchannel framebuffers in sys/dev/tc this
should allows pmax to once again run X11.

TODO: Investigate pullup to -9

xorg-server is now at 1.20.13.

xorg-server is now 1.20.12.

font library combinations

sync with head

avoid Xt duplication

Switch amiga to Xorg server 1.20; wsfb(4) is only graphic driver both for
1.10 and 1.20 (Xamiga was gone a long ago...), and there is no reason to
stay with 1.10.

At least, 1.20 works fine on wsdisplay(4) at amidisplaycc(4).

Work towards X sources building statically and on sun2.

Setup specific make variables to contain the full set of library
flags (LDADD and DPADD) for programs in the xorg suite. Each list
contains all needed dependencies so that the programs will build
statically.

Suggested by mrg@

xorg-server 1.20.11 is now current.

bump version for xorg-server 1.20.10.

Pull up following revision(s) (requested by kim in ticket #1059):

	share/mk/bsd.x11.mk: revision 1.133
	share/mk/bsd.x11.mk: revision 1.136
	external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile: revision 1.8
	external/mit/xorg/server/xorg-server/doc/Makefile: revision 1.6

Allow overriding the default man substitutions with X11EXTRAMANTRANSFORMS
fix various missing transforms for man page, ala PR#55422.
add method to transform both the "__foo__" and "@foo@"
version of various transforms, while upstream are converting
from the former to the latter it seems.  convert all the
common transforms to this method.

expand the grep for .pc files to look for missing @foo@

fixes to the man page genration, and ignore a few things
(thanks uwe@ - .IN lines, and stuff between tab(@) and .TE.)

xorg-server __default_font_path__ -> @default_font_path@,
and xfree86 transform xconfigdir, xkbdir, and modulepath
using new both method.

fix various missing transforms for man page, ala PR#55422.

add method to transform both the "__foo__" and "@foo@"
version of various transforms, while upstream are converting
from the former to the latter it seems.  convert all the
common transforms to this method.

expand the grep for .pc files to look for missing @foo@
fixes to the man page genration, and ignore a few things
(thanks uwe@ - .IN lines, and stuff between tab(@) and .TE.)

xorg-server __default_font_path__ -> @default_font_path@,
and xfree86 transform xconfigdir, xkbdir, and modulepath
using new both method.

Pull up following revision(s) (requested by tsutsui in ticket #1028):

	share/mk/bsd.x11.mk: revision 1.135
	external/mit/xorg/server/xorg-server/hw/xnest/Makefile: revision 1.22
	external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile: revision 1.4

Fix typos in ${X11INCS.DIX} include paths. PR/55500
Remove extra "-I" for ${X11INCS.DIX} macro.

Fix typos in ${X11INCS.DIX} include paths. PR/55500

Mostly merge changes from HEAD upto 20200411

Merge changes from current as of 20200406

update for xorg-server 1.20.6.

Allow overriding the default man substitutions with X11EXTRAMANTRANSFORMS

break the build if a .pc generation leaves something matching "@.*@".
this is an error in the build that doesn't trigger issues until you
try to integrate with eg, pkgsrc.

Sync with HEAD

xorg-server 1.20.5 is now current.

Pull up following revision(s) via patch (requested by mrg in ticket #1243):

	external/mit/xorg/bin/xinit/Makefile: revision 1.7
	external/mit/xorg/lib/libXaw/Makefile: revision 1.12
	external/mit/xorg/lib/xkeyboard-config/Makefile: revision 1.13
	external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile: revision 1.2
	share/mk/bsd.x11.mk: revision 1.130
	external/mit/xorg/bin/sessreg/Makefile: revision 1.7
	external/mit/xorg/bin/proxymngr/Makefile: revision 1.4

fix a bunch of man page transforms.

XXX X11MANCPP=yes has only one use left, maybe it can go away!

fix a bunch of man page transforms.

XXX X11MANCPP=yes has only one use left, maybe it can go away!

xorg-server 1.20.4 is now current.

Sync with HEAD

Most of the mv operations are to move temporary files to their final place.
Some use -f, others don't. This can lead to spurious build failures when
the user performing the build changes. Centralize, and always use -f.

Synch with HEAD

move some defines from xorg-server dix-config.h back into makefiles,
so that Xx68k can build.

updates for xorg-server 1.20.  don't define stuff here for it.

last I checked powerpc64 was 64 bits, so it needs _XSERVER64..

Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)

Make ia64 considered 64bit for the _XSERVER64 define so a release with x11 will at least build.

Sync with HEAD

Consider aarch64 a 64bit architecture for the purpose of crappy long use
in X.

move some flags from dix-config.h into X11FLAGS.DIX

fix up X11FLAGS.LOADABLE for modern xorg.

add a HAVE_XORG_SERVER_VER for use in sets.  clean up the x11
defines a little for modern xorg, particularly the version.

Add missing transform for xpresent.pc.

Add NO{SSP,FORTIFY}

remove the xfree86 reachover makefiles and the vast majority of
the support in the rest of the source tree.

X11 sets could use some cleaning up perhaps (just deletion, as
we've never really marked the old X11R6 as obsolete for native
xorg using platforms so far either.)

Support building the xorg X11 libraries under MKCOMPAT.
Add XORG_MACHINE_ARCH to compat's bsd.*.mk
Turn xorg makekeys and makestrs into real host tools which are installed into
${TOOLSDIR}

Build and install Mesa GBM buffer management library (libgbm).

move xorg-server.pc's SDK_REQUIRED_MODULES into the local Makefile.

Pullup additional patches requested by mrg in ticket #1178:

share/mk/bsd.x11.mk				patch

	- Fix unexpanded @@ in .pc files.

Rebase to HEAD as of a few days ago.

Rebase.

Add new transform for gl.pc.
Now GLX_TLS is "no" since GLX_USE_TLS is not defined.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

make pkg-config files be cleaned by "make clean"

allow for .pc substitutions to be listed per makefile
(could maybe do per-target, as well.)  fix the remaining
substitutions for xcb-proto, fontconfig and xorg-server.

(XXX: move many per-package-specific parts out of
bsd.x11.mk itself, into the relevant Makefile.)

Fix generation of pkg-config(1) files. Patch from Ryo ONODERA via
"current-users" mailing list.

substitute several more values for .pc files:
+ 		s,@LIBXML2_CFLAGS@,,; \
+ 		s,@ICONV_CFLAGS@,,; \
+ 		s,@PACKAGE@,${PKGDIST},; \
+ 		s,@PKGCONFIG_REQUIRES@,xx,; \
+ 		s,@PKGCONFIG_REQUIRES_PRIVATELY@,xx,; \
+ 		s,@ERRORDBDIR@,${X11LIBDIR},; \
+ 		s,@EXPAT_CFLAGS@,,; \
+ 		s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \
+ 		s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.17 randrproto >= 1.2.99.3 renderproto >= 0.11 xextproto >= 7.1.99 inputproto >= 1.9.99.902 kbproto >= 1.0.3 fontsproto," \

resync from head

make .pc files depend upon configure files if they exist.  this
will force them to be rebuilt when the version has changed.
this fixes one of the most often broken parts of update builds
after a version update.

update to xorg-server 1.10.6.

sync with head

Disable new -Wstring-plus-int warning where needed for now.
Adjust various places that add GCC-only options to check for the active
compiler first.

For xkb_base, do not use ${libdir} (xkeyboard-config.pc does not define
it) but its value ${prefix}/lib instead.

Fix the setting of "xcbincludedir" in .pc files (where the xcb XML
files live) so that anything that needs to find them can. Fixes build
of pkgsrc libxcb, not that that in particular is terribly important.

Move all "clean" and "cleandir" processing to a new bsd.clean.mk
file, as proposed in tech-toolchain.

pcc cpp(1) does not understand the '-undef' and '-traditional' long form
arguments, use $(CC) -E instead of $(CPP) for these

Pull up following revision(s) (requested by dholland in ticket #1646):
	share/mk/bsd.x11.mk: revision 1.98
Fix the value of "appdefaultdir" that ends up in native X .pc files.
(It should be "app-defaults" but was "app-default", probably because
of a typo; it's been wrong ever since this logic was put in two and a
half years ago, and as app-defaults files are a legacy mechanism it
took this long for anyone to notice.) Should be pulled up to -5.

updates for xorg-server 1.10.3

update to xorg-server 1.9.5

updates for freetype 2.4.5

Fix the value of "appdefaultdir" that ends up in native X .pc files.
(It should be "app-defaults" but was "app-default", probably because
of a typo; it's been wrong ever since this logic was put in two and a
half years ago, and as app-defaults files are a legacy mechanism it
took this long for anyone to notice.) Should be pulled up to -5.

Adjust --sysroot related usage:
-Wl,-rpath does not expand =, so just drop it.

Drop -Wl,-rpath-link entries that duplicate the -Wl,-rpath entries, this
is done implicitly now that ld is built with sysroot support.

Use ${DESTDIR} explicitly for the remaining -Wl,-rpath-link entries.

GCC 4.1 doesn't have the support code for -I =... yet, so don't use it
for now.

For USETOOLS=yes, use the --sysroot support of the compiler to cut down
the number of hard-coded pathes and magic invocations.

CLEANFILES is not processed by <bsd.files.mk> so don't assume that
anything assigned there will be cleaned up; handle clean up of the
PKGCONFIG files explicitly. (eg lib/dri/dri.pc was not cleaned)

Don't depend on ${CC} passing down -R to ld, use -Wl,-rpath explicitly.

- always include <xorg-config.h> for DIX components
- update stuff to xorg-server 1.9.2

add transforms for dri.pc.

Fix pkg-config substitution for glu

PR/43772: enami tsugutomo: __XCONFIGFILEMAN__ is left unexpaneded in
xinit(1)/startx(1)

add/fix some transforms for some font, GL and xcb .pc files.

XXX: xcb still has pythondir=@pythondir@ in it.

add some more transforms to the hacky ugly sed script for pkg-config files,
and note a few more that are not yet handled but should be.

Support xserver for prep.
  It tested only s3(864).

ugh.  this needs a real fix, but for now just update it to reality.
the diff -u is more obvious than a description:

-X11FLAGS.VERSION=      -DOSMAJORVERSION=1 -DOSMINORVERSION=6           # XXX
+X11FLAGS.VERSION=      -DOSMAJORVERSION=5 -DOSMINORVERSION=99          # XXX

Needs additional single quotes to keep the double qoutes. Magic...

XORGVERSION should be a single quoted expression as it represents a
single argument for .TH

Remove a / between a ${DESTDIR}${X11USRLIBDIR} which would result in a
double /

sync to netbsd-5

The support of X for zaurus is added.

Enable Stack Smash Protection (SSP) by default for NetBSD/amd64 and
NetBSD/i386 as previously discussed on the "port-amd64" and
"port-i386" mailing lists. No objections from the core team.

Thanks a lot to Tobias Nygren for helping me with the benchmarking
and to Christos Zoulas for fixing SSP problems in cgd(4).

update for xorg-server 1.6.5

Apply patch (requested by mrg in ticket #958):
Sync X.Org reachover build framework and setlists with the new X.Org.

update for xorg-server 1.6.3.

we have xorg 1.6.2 now.

XORG_CURRENT_VERSION is now 1.6.2.

add transforms for new GLU, GLUT and xorg-server pkgconfig files.

update XORG_VERSION_CURRENT.
update the pkgconfig sed script to handle newer pixman.

XXX: should make the pkgconfig sed script barf it it ends up leaving
XXX: behind something that looks like "@.*@", i think.

don't define FONTCACHE here any more, for Xorg.

Add support for X11FLAVOUR=xorg to NetBSD/alpha. Tested on PWS500
(ev56, handled as non-BWX by Xorg) and XP1000 (ev6, BWX). Also
tested by Rafael Ruiz on a AlphaStation 255 (thanks !).
non-PCI adapters are not supported; someone should make these work
as a wsfb device.

Pull up following revision(s) (requested by mrg in ticket #64):
	distrib/sets/Makefile: revision 1.64
	external/mit/xorg/server/Makefile: revision 1.5
	share/mk/bsd.README: revision 1.237
	BUILDING: revision 1.79
	share/mk/bsd.x11.mk: revision 1.71
	share/mk/bsd.own.mk: revision 1.544
	usr.bin/ssh/Makefile.inc: revision 1.18
	distrib/sets/sets.subr: revision 1.72
	share/man/man5/mk.conf.5: revision 1.42
	doc/BUILDING.mdoc: revision 1.68
	etc/Makefile: revision 1.360
	Makefile: revision 1.263
- retire MKXORG from public use
- introduce X11FLAVOUR to choose src/x11 vs src/external/mit/xorg
  for the X11 to build if MKX11=yes is set.  it takes the values
  of either Xorg or XFree86.
- default to Xorg on alpha, i386, macppc, shark, sparc and sparc64
- remove MKXORG_WITH_XSRC_XSERVER, unused and never useful

- retire MKXORG from public use
- introduce X11FLAVOUR to choose src/x11 vs src/external/mit/xorg
  for the X11 to build if MKX11=yes is set.  it takes the values
  of either Xorg or XFree86.
- default to Xorg on alpha, i386, macppc, shark, sparc and sparc64
- remove MKXORG_WITH_XSRC_XSERVER, unused and never useful

Use ${TOOL_SED} instead if plain sed in Makefiles.

Use ${TOOL_AWK} instead of ${AWK} or plain "awk" in make commands.
Pass AWK=${TOOL_AWK:Q} to shell scripts that use awk.

Rework the way manual pages are handled.

 - .man.pre files are treated just like .man files.
 - Makefiles are offered the choice of using sed or cpp for the
   transformation.  MKXORG will default to sed, MKX11 to cpp.
 - At least for now, versions of packages are not tracked individually.

Sync with HEAD.

Merge in changes between wrstuden-revivesa-base-2 and
wrstuden-revivesa-base-3.

Sync with wrstuden-revivesa-base-2.

Play it safe and change the sed script so that -E isn't needed.

replace XTHREAD_CFLAGS with _REENTRANT instead of _POSIX_THREAD_SAFE_FUNCTIONS
as is done in pkgsrc.

Make sure pkgconfig files we install have RPATH directives.

${TOOL_SED} -E is authorized, right?  Right?

Add logic to install pkgconfig files from X.Org sources.  Initial idea from
Tyler Retzlaff.

No, this is not code I am going to be proud of.  Meanwhile, anyone is
welcome to work on a mknative-xorg script and make sure that outputs across
all archs are consistent, and use it to generate a bunch of other stuff such
as the Imake config file and so on.  That will do for now though.

Define __appmansuffix__=1 in the man page cpp(1) translation.

add XLOCALE.DEFINES for locale path defs, easier to manage them here
than deep in the reachover.

Force a failure if both MKX11 and MKXORG are set to != "no".

xorg server is version 1.4.2

add X11FLAGS.DIX and X11INCS.DIX for use with Xorg.
fix the version to 1.4.2.

begin to add support for cross-built Xorg:

- add MKXORG
- default to DRI-on for Xorg
- add paths for 192 Xorg packages that will exist in
  xsrc/external/mit/<package>/dist
- add some more X11FLAGS.* variables if MKXORG.

this is somewhat based on the xorg work rtr@ did a couple of years ago.

XXX: seriously need to fix the XORG_RELEASE value, it is still set to
XXX: 6.8.1 from when rtr was working on this.

sync with head.

sync with HEAD

file bsd.x11.mk was added on branch mjf-devfs2 on 2008-10-05 20:11:24 +0000

Make XFree86 compile for ofppc.
Approved by garbled.

Sync w/ NetBSD-4-RC_1

Support MAKEVERBOSE when installing APPDEFS.

file bsd.x11.mk was added on branch matt-mips64 on 2007-08-06 04:25:58 +0000

Support MAKEVERBOSE when installing APPDEFS.

Pull up following revision(s) (requested by 710):
	share/mk/bsd.x11.mk: revision 1.55
Don't use alloca(3) inside the X11 libraries if we compile with
stack protection. XFree86 can now be buildt fine with "USE_SSP=3Dyes".

Don't use alloca(3) inside the X11 libraries if we compile with
stack protection. XFree86 can now be buildt fine with "USE_SSP=yes".

Pull up following revision(s) (requested by ghen in ticket #1655):
	distrib/sets/lists/xserver/md.amd64: revision 1.18
	share/mk/bsd.x11.mk: revision 1.51
	distrib/sets/lists/xserver/md.i386: revision 1.35
	distrib/sets/lists/xserver/md.cats: revision 1.14
	x11/Xserver/Xserver/XFree86/Makefile: revision 1.13
	x11/Xserver/hw/xfree86/input/Makefile: revision 1.5
	distrib/sets/lists/xserver/md.sparc64: revision 1.14
	distrib/sets/lists/xserver/md.macppc: revision 1.26
	x11/Xserver/hw/xfree86/xf86/Makefile: revision 1.10
	x11/Xserver/hw/xfree86/input/usbtablet/Makefile: revision 1.1
Enable build.sh -x building for the usbtablet driver new in xsrc
distrib/sets/lists/xserver/md.* to list the additional files for XFree86
using ports
share/mk/bsd.x11.mk and x11/... for the actual building
Contributes to closing PR xsrc/23964
Reviewed by tron@NetBSD.org

Pull up following revision(s) (requested by macallan in ticket #354):
	share/mk/bsd.x11.mk: revision 1.54
	x11/Xserver/Makefile.common: revision 1.33
	distrib/sets/lists/xserver/md.shark: revision 1.7
	x11/Xserver/hw/xfree86/drivers/Makefile: revision 1.16
	x11/Xserver/hw/xfree86/xf86_os/Makefile: revision 1.14
build XFree86 on shark

build XFree86 on shark

netwinder uses loadable server modules.

(Oops, forgot to commit this change along with other netwinder
X server commits.  Unbreaks builds.)

sync with head

Now that we have real build system support for syspkgs, remove someone's
half-implemented idea of building `syspkgs' (really a few giant blobs of the
same granularity of the old sets) using install(1).

Enable build.sh -x building for the usbtablet driver new in xsrc

distrib/sets/lists/xserver/md.* to list the additional files for XFree86
using ports
share/mk/bsd.x11.mk and x11/... for the actual building

Contributes to closing PR xsrc/23964
Reviewed by tron@NetBSD.org

Build XFree86 on NetBSD/sparc.
Tested on Krups and a SPARCbook 3GX
Works only with wscons kernels, currently there's official support on Krups
with igsfb and more or less official support for SPARCbooks with pnozz and
SPARCstations with cgsix.

Pull up revision 1.46 (requested by hira in ticket #133):
Update __vendorversion__ to 4.5.0.

Pull up revision 1.48 (requested by jmc in ticket #114):
sparc64 needs LOADABLE flags too

Pull up revision 1.49 (requested by jmc in ticket #114):
Add -fno-merge-constants (as the xsrc build does too) to make the module
loader work with the gcc versions we use now. No idea why i386 apparently
was not affected by this.

Pull up revision 1.47 (requested by jmc in ticket #114):
Compile "src/x11" with "-fno-strict-aliasing" because that's what the
native build does.

Add -fno-merge-constants (as the xsrc build does too) to make the module
loader work with the gcc versions we use now. No idea why i386 apparently
was not affected by this.

sparc64 needs LOADABLE flags too

Compile "src/x11" with "-fno-strict-aliasing" because that's what the
native build does.

Update __vendorversion__ to 4.5.0.

Pull up revision 1.42 (requested by fredb in ticket #1017):
Mirror Rev 1.6 in Imake.rules, addressing PR misc/28444. This implements
Thomas Dickey's idea to work around a standards mandated change to the
C pre-processor to avoid having to change dozens of ancient X man pages,
appending a space to any line in a man page that ends in backslash "\".

+ cleanup removal of -DUSE_NBSD_THREADLIB usage

Don't define "USE_NBSD_THREADLIB" because "threadlib.h" was removed.

Only compile in IPv6 support if ${USE_INET6} != "no"

MKINET6 is for providing IPv6 infrastructure.
USE_INET6 is for compiling IPv6 support into the programs (needs MKINET6).

Mirror Rev 1.6 in Imake.rules, addressing PR misc/28444. This implements
Thomas Dickey's idea to work around a standards mandated change to the
C pre-processor to avoid having to change dozens of ancient X man pages,
appending a space to any line in a man page that ends in backslash "\".

static & xorg src/x11

Pullup rev 1.41 (requested by sekiya in ticket #745)

Enable loadable module support for the sgimips X server

Enable "loadable module" dlopen() scheme.  Necessary to crossbuild the XFree86
server on platforms that are not supported by the Metrolink module loader
(i.e., MIPS).

Enabled for sgimips in bsd.x11.mk.

Pull up revision 1.39 (requested by drochner in ticket #302):
always #define __AMD64__ on and64 -- xfree86 depends on it

Pullup rev 1.40 (requested by lukem in ticket #225)

When creating man pages, provide a defintion for __adminmansuffix__.

When creating man pages, provide a defintion for __adminmansuffix__.
(This is a new feature in XFree86 4.4.x)

always #define __AMD64__ on and64 -- xfree86 depends on it

Update ${X11TOOL_UNXCOMM} to XFree86 4.4.0's "CppSedMagic". From the comments
in Imake.rules:

 * Allow XCOMM to be preceded by whitespace and provide a means of generating
 * output lines with trailing backslashes.
 * Allow XHASH to always be substituted, even in cases where XCOMM isn't.

In particular, this fixes an issue pointed out by wiz on tech-x11, where "@@"
remains unsubstituted for "\" in "startx".

Enable IPv6 in XFree86 4.4.0 reachover build. Usage is describe
in "/usr/X11R6/lib/X11/doc/RELNOTES". Note particularly that "tcp",
as in "X -nolisten tcp" or "xhost +tcp/host:0", now means *both*
IP transport protocols. Use "inet" or "inet6", instead, to specify
only one or the other.

XDMCP support for IPv6 -- such as it is -- is disabled, just as
it is in the native, out-of-the-box build. XDM-AUTHORIZATION-1
does not really support IPv6 addresses, in any case. (It is
possible to build "xdm" with -DIPv6, but that presumes support
for IPv6-mapped IPv4 addresses in the default installation, for
one thing, and there are unexplored issues with all that.)

Handle XHASH properly -- from Nicolas Joly

Don't use loadable modules for sgimips.  XF86 doesn't understand mips
relocs at this time.

Make the sgimips XF86 server use loadable modules.

We're now using XFree86 4.4.0; update manual page generation accordingly.
Noted by Kouichirou Hiratsuka in PR misc/24725.

Update reachover to build XSUN for sun3

+ += extension flags for dri components if X11DRI != "no"

oops, FOOBAR= foo shouldn't be in here

PRINTX11VERSION contains command for automated extraction of
major,minor,patch,snap passed to some sourc during build.

fix thinko in previous

add some missing .PHONYs

We always build glx ext, so for 64-bit archs we define -D__GLX_ALIGN64

Fix typo: XFree86XDGA -> XFreeXDGA.  This adds support for DGA (as intended).

+ escape new lines
+ remove extra ||

Change _XSERVER64 to depend on MACHINE_ARCH, not MACHINE.
Disable XF86VIDMODE for vax.
Format MACHINE .if's nicer (and alphabetize).

Don't build XDGA, VIDMODE and XINPUT extensions for alpha, pmax, acorn32.
XXX There should probably be more archs/machines that do not build these.

+ no vid mode ext or dga for amiga
+ amd64 & alpha need X11FLAGS.SERVER+=	_XSERVER64
+ pass loadable defines for amd64 & cats

control undefine of DDXTIME through Xserver/Makefile.common vars

Don't define DDXTIME on mac68k. This will let us use GetTimeInMillis()
of ".../Xserver/os/utils.c", instead of supplying our own home-rolled
(yet identical) function.

back out hpcmips changes accidently committed in prev. noticed by lukem@

grr typo .manN -> .man.N

section 4 and 5 man/cat pages do get installed

correct __vendorversion__ to match xsrc/xfree

remove endian selection hack - from lukem

endian table for X_BYTE_ORDER=

sparc64 defines

Remove duplicate -DPIXPRIV from X11FLAGS.SERVER
Don't define -DXINPUT -DXFree86XDGA -DXF86VIDMODE -DDXTIME for sparc
Add X11FLAGS.LOADABLE for for module control/module flags.

No such thing as NONBINOWN, use NONBINMODE instead.

APPDEF files should be installed with mode ${NONBINMODE}, not mode ${BINMODE}.

Picked up via /etc/security:

Checking setuid files and devices:
Setuid additions:
-r-sr-xr-x 1 root wheel 252016 Nov 26 02:27:32 2003 /home/NetBSD/build/dest/i386/usr/X11R6/bin/xterm
-r-sr-xr-x 1 root wheel 4822 Nov 25 23:36:45 2003 /home/NetBSD/build/dest/i386/usr/X11R6/lib/X11/app-defaults/XTerm
-r-sr-xr-x 1 root wheel 828 Nov 25 23:36:45 2003 /home/NetBSD/build/dest/i386/usr/X11R6/lib/X11/app-defaults/XTerm-color

Provide X11FLAGS.OS_DEFINES.
Add some comments

Rework how MAKEVERBOSE operates:

    *	Don't bother prefixing commands with a line of  ${_MKCMD}\
	and instead rely upon "make -s".  This is less intrusive on
	all the Makefiles than the former.  Idea from David Laight.

    *	Rename the variables use to print messages.  The scheme now is:
	    _MKMSG_FOO		Run  _MKMSG 'foo'
	    _MKTARGET_FOO	Run  _MKMSG_FOO ${.TARGET}
	From discussion with Alistair Crooks.

Provide _MKMSG{BUILD,CREATE,COMPILE,FORMAT,INSTALL,LINK,LEX,YACC} to display
${_MKMSG} "  ...  {$.TARGET}"  and use appropriately.

Provide _MKMSGLINK.m to provide "link" message by itself (without ${.TARGET})

Replace _MKSHCMD with _MKSHECHO

implement MAKEVERBOSE

in cleanx11man, support "MAN defaults to ${PROG}.1"

explicitly set  BINDIR LIBDIR MANDIR  here

sanitise ${DESTDIR}${SOMEOTHERVAR}

<bsd.x11.mk>: infrastructure to support reach-over builds of xsrc