Home | History | Annotate | Download | only in mk
History log of /src/share/mk/bsd.x11.mk
RevisionDateAuthorComments
 1.162  24-Jun-2025  mrg bump for xorg-server 21.1.18.
 1.161  09-Mar-2025  mrg actually, since Xtrans needs them, add the new -DHAVE_GETADDRINFO,
-DHAVE_INET_NTOP, and -DHAVE_STRUCT_SOCKADDR_STORAGE to X11FLAGS.CONNECTION.

xdm/xinit gains -DHAVE_ASPRINTF.

libX11 gets xim_trans.c compiled properly.
 1.160  26-Feb-2025  mrg note xorg-srever 21.1.16 in current.
 1.159  30-Oct-2024  mrg update for xorg-server 21.1.14
 1.158  04-Jul-2024  mrg bump xorg-server version.
 1.157  03-Jul-2024  mrg avoid an error in the previous with unexpected inputs.
 1.156  03-Jul-2024  mrg add some more transformations for man pages, needed by new appres.
 1.155  09-May-2024  nia 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.
 1.154  29-Apr-2024  mrg 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.
 1.153  07-Apr-2024  tsutsui Use default X11FLAGS to build Xorg servers on vax.

It looks necessary on HAVE_XORG_SERVER_VER=120.
 1.152  02-Apr-2024  christos PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
 1.151  25-Oct-2023  mrg bump xorg server version.
 1.150  30-Mar-2023  mrg bump XORG_SERVER_TEENY.
 1.149  07-Feb-2023  mrg bump xorg-server version.
 1.148  08-Jan-2023  mrg bump xorg-server version here.
 1.147  21-Dec-2022  mrg 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
 1.146  19-Dec-2022  mrg bump xorg-server version.
 1.145  15-Jul-2022  mrg branches: 1.145.2;
update for xorg-server 21.1.4.
 1.144  15-Jul-2022  mrg update for xorg-server 21.1.3.
 1.143  01-May-2022  uwe bsd.x11.mk: Add xlocaledir substitution.
 1.142  06-Dec-2021  abs 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
 1.141  24-Aug-2021  mrg xorg-server is now at 1.20.13.
 1.140  11-Jul-2021  mrg xorg-server is now 1.20.12.
 1.139  03-Jun-2021  rin 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).
 1.138  27-Apr-2021  mrg branches: 1.138.4;
xorg-server 1.20.11 is now current.
 1.137  05-Dec-2020  mrg bump version for xorg-server 1.20.10.
 1.136  10-Aug-2020  mrg 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.
 1.135  20-Jul-2020  tsutsui Fix typos in ${X11INCS.DIX} include paths. PR/55500
 1.134  23-Feb-2020  mrg update for xorg-server 1.20.6.
 1.133  13-Sep-2019  maya Allow overriding the default man substitutions with X11EXTRAMANTRANSFORMS
 1.132  10-Jul-2019  mrg branches: 1.132.2;
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.
 1.131  01-Jun-2019  mrg xorg-server 1.20.5 is now current.
 1.130  11-Mar-2019  mrg fix a bunch of man page transforms.

XXX X11MANCPP=yes has only one use left, maybe it can go away!
 1.129  03-Mar-2019  mrg xorg-server 1.20.4 is now current.
 1.128  21-Jan-2019  christos 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.
 1.127  03-Jan-2019  mrg move some defines from xorg-server dix-config.h back into makefiles,
so that Xx68k can build.
 1.126  31-Dec-2018  mrg updates for xorg-server 1.20. don't define stuff here for it.
 1.125  04-Mar-2018  christos branches: 1.125.2; 1.125.4;
last I checked powerpc64 was 64 bits, so it needs _XSERVER64..
 1.124  14-Dec-2016  scole branches: 1.124.6;
Make ia64 considered 64bit for the _XSERVER64 define so a release with x11 will at least build.
 1.123  14-Oct-2016  joerg Consider aarch64 a 64bit architecture for the purpose of crappy long use
in X.
 1.122  30-Aug-2016  mrg move some flags from dix-config.h into X11FLAGS.DIX
 1.121  20-Aug-2016  mrg fix up X11FLAGS.LOADABLE for modern xorg.
 1.120  16-Aug-2016  mrg add a HAVE_XORG_SERVER_VER for use in sets. clean up the x11
defines a little for modern xorg, particularly the version.
 1.119  29-May-2016  nakayama branches: 1.119.2;
Add missing transform for xpresent.pc.
 1.118  13-Mar-2016  christos Add NO{SSP,FORTIFY}
 1.117  23-Jul-2015  mrg 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.)
 1.116  24-Jun-2015  matt 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}
 1.115  23-Feb-2015  jmcneill Build and install Mesa GBM buffer management library (libgbm).
 1.114  30-Dec-2014  mrg move xorg-server.pc's SDK_REQUIRED_MODULES into the local Makefile.
 1.113  16-Jul-2014  nakayama Add new transform for gl.pc.
Now GLX_TLS is "no" since GLX_USE_TLS is not defined.
 1.112  31-Mar-2014  mrg branches: 1.112.2;
make pkg-config files be cleaned by "make clean"
 1.111  23-Mar-2014  mrg 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.)
 1.110  23-Mar-2014  tron Fix generation of pkg-config(1) files. Patch from Ryo ONODERA via
"current-users" mailing list.
 1.109  20-Mar-2014  mrg 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," \
 1.108  05-Jun-2013  mrg 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.
 1.107  03-Jun-2013  mrg update to xorg-server 1.10.6.
 1.106  04-Apr-2012  joerg branches: 1.106.2;
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.
 1.105  17-Jan-2012  njoly branches: 1.105.2;
For xkb_base, do not use ${libdir} (xkeyboard-config.pc does not define
it) but its value ${prefix}/lib instead.
 1.104  29-Sep-2011  dholland branches: 1.104.2;
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.
 1.103  10-Sep-2011  apb Move all "clean" and "cleandir" processing to a new bsd.clean.mk
file, as proposed in tech-toolchain.
 1.102  01-Sep-2011  plunky pcc cpp(1) does not understand the '-undef' and '-traditional' long form
arguments, use $(CC) -E instead of $(CPP) for these
 1.101  02-Aug-2011  mrg updates for xorg-server 1.10.3
 1.100  24-Jul-2011  mrg update to xorg-server 1.9.5
 1.99  24-Jul-2011  mrg updates for freetype 2.4.5
 1.98  03-Jul-2011  dholland 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.
 1.97  11-Apr-2011  joerg 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.
 1.96  11-Apr-2011  joerg GCC 4.1 doesn't have the support code for -I =... yet, so don't use it
for now.
 1.95  10-Apr-2011  joerg For USETOOLS=yes, use the --sysroot support of the compiler to cut down
the number of hard-coded pathes and magic invocations.
 1.94  12-Mar-2011  plunky 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)
 1.93  08-Dec-2010  joerg Don't depend on ${CC} passing down -R to ld, use -Wl,-rpath explicitly.
 1.92  23-Nov-2010  mrg - always include <xorg-config.h> for DIX components
- update stuff to xorg-server 1.9.2
 1.91  23-Nov-2010  mrg add transforms for dri.pc.
 1.90  22-Oct-2010  yhardy Fix pkg-config substitution for glu
 1.89  17-Aug-2010  christos PR/43772: enami tsugutomo: __XCONFIGFILEMAN__ is left unexpaneded in
xinit(1)/startx(1)
 1.88  15-Aug-2010  mrg add/fix some transforms for some font, GL and xcb .pc files.

XXX: xcb still has pythondir=@pythondir@ in it.
 1.87  18-Jul-2010  mrg 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.
 1.86  12-Jul-2010  kiyohara Support xserver for prep.
It tested only s3(864).
 1.85  17-Jun-2010  mrg 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
 1.84  03-Jun-2010  joerg Needs additional single quotes to keep the double qoutes. Magic...
 1.83  02-Jun-2010  joerg XORGVERSION should be a single quoted expression as it represents a
single argument for .TH
 1.82  23-May-2010  veego Remove a / between a ${DESTDIR}${X11USRLIBDIR} which would result in a
double /
 1.81  13-Dec-2009  nonaka The support of X for zaurus is added.
 1.80  11-Nov-2009  tron 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).
 1.79  09-Nov-2009  mrg update for xorg-server 1.6.5
 1.78  22-Aug-2009  mrg update for xorg-server 1.6.3.
 1.77  24-Jul-2009  mrg we have xorg 1.6.2 now.
 1.76  09-Jul-2009  mrg XORG_CURRENT_VERSION is now 1.6.2.
 1.75  23-Jun-2009  mrg add transforms for new GLU, GLUT and xorg-server pkgconfig files.
 1.74  11-Jun-2009  mrg 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.
 1.73  10-Jun-2009  mrg don't define FONTCACHE here any more, for Xorg.
 1.72  24-Jan-2009  bouyer 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.
 1.71  09-Nov-2008  mrg - 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
 1.70  25-Oct-2008  apb branches: 1.70.2;
Use ${TOOL_SED} instead if plain sed in Makefiles.
 1.69  19-Oct-2008  apb Use ${TOOL_AWK} instead of ${AWK} or plain "awk" in make commands.
Pass AWK=${TOOL_AWK:Q} to shell scripts that use awk.
 1.68  14-Oct-2008  cube 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.
 1.67  15-Sep-2008  cube Play it safe and change the sed script so that -E isn't needed.
 1.66  15-Sep-2008  rtr replace XTHREAD_CFLAGS with _REENTRANT instead of _POSIX_THREAD_SAFE_FUNCTIONS
as is done in pkgsrc.
 1.65  15-Sep-2008  cube Make sure pkgconfig files we install have RPATH directives.

${TOOL_SED} -E is authorized, right? Right?
 1.64  13-Sep-2008  cube 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.
 1.63  07-Sep-2008  lukem Define __appmansuffix__=1 in the man page cpp(1) translation.
 1.62  07-Sep-2008  rtr add XLOCALE.DEFINES for locale path defs, easier to manage them here
than deep in the reachover.
 1.61  28-Aug-2008  lukem Force a failure if both MKX11 and MKXORG are set to != "no".
 1.60  28-Aug-2008  mrg xorg server is version 1.4.2
 1.59  02-Aug-2008  mrg add X11FLAGS.DIX and X11INCS.DIX for use with Xorg.
fix the version to 1.4.2.
 1.58  29-Jul-2008  mrg 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.
 1.57  08-Mar-2008  phx branches: 1.57.2; 1.57.6;
Make XFree86 compile for ofppc.
Approved by garbled.
 1.56  06-Aug-2007  lukem branches: 1.56.2; 1.56.6; 1.56.8;
Support MAKEVERBOSE when installing APPDEFS.
 1.55  07-Jun-2007  tron 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".
 1.54  21-Dec-2006  macallan build XFree86 on shark
 1.53  17-Apr-2006  uwe branches: 1.53.4;
netwinder uses loadable server modules.

(Oops, forgot to commit this change along with other netwinder
X server commits. Unbreaks builds.)
 1.52  16-Mar-2006  jwise 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).
 1.51  12-Nov-2005  spz 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
 1.50  01-Oct-2005  macallan 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.
 1.49  06-Apr-2005  martin 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.
 1.48  26-Mar-2005  martin sparc64 needs LOADABLE flags too
 1.47  21-Mar-2005  tron Compile "src/x11" with "-fno-strict-aliasing" because that's what the
native build does.
 1.46  19-Mar-2005  hira Update __vendorversion__ to 4.5.0.
 1.45  21-Jan-2005  rtr branches: 1.45.2;
+ cleanup removal of -DUSE_NBSD_THREADLIB usage
 1.44  11-Jan-2005  tron Don't define "USE_NBSD_THREADLIB" because "threadlib.h" was removed.
 1.43  10-Jan-2005  lukem 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).
 1.42  02-Dec-2004  fredb 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 "\".
 1.41  13-Jul-2004  sekiya branches: 1.41.2;
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.
 1.40  29-Apr-2004  lukem When creating man pages, provide a defintion for __adminmansuffix__.
(This is a new feature in XFree86 4.4.x)
 1.39  15-Apr-2004  drochner always #define __AMD64__ on and64 -- xfree86 depends on it
 1.38  27-Mar-2004  fredb branches: 1.38.2;
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".
 1.37  26-Mar-2004  fredb 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.)
 1.36  16-Mar-2004  perry Handle XHASH properly -- from Nicolas Joly
 1.35  14-Mar-2004  matt Don't use loadable modules for sgimips. XF86 doesn't understand mips
relocs at this time.
 1.34  14-Mar-2004  matt Make the sgimips XF86 server use loadable modules.
 1.33  10-Mar-2004  lukem We're now using XFree86 4.4.0; update manual page generation accordingly.
Noted by Kouichirou Hiratsuka in PR misc/24725.
 1.32  10-Mar-2004  rtr Update reachover to build XSUN for sun3
 1.31  04-Mar-2004  rtr + += extension flags for dri components if X11DRI != "no"
 1.30  11-Feb-2004  rtr oops, FOOBAR= foo shouldn't be in here
 1.29  06-Feb-2004  rtr PRINTX11VERSION contains command for automated extraction of
major,minor,patch,snap passed to some sourc during build.
 1.28  29-Jan-2004  lukem fix thinko in previous
 1.27  29-Jan-2004  lukem add some missing .PHONYs
 1.26  25-Jan-2004  rtr We always build glx ext, so for 64-bit archs we define -D__GLX_ALIGN64
 1.25  20-Jan-2004  jmmv Fix typo: XFree86XDGA -> XFreeXDGA. This adds support for DGA (as intended).
 1.24  18-Jan-2004  rtr + escape new lines
+ remove extra ||
 1.23  18-Jan-2004  matt Change _XSERVER64 to depend on MACHINE_ARCH, not MACHINE.
Disable XF86VIDMODE for vax.
Format MACHINE .if's nicer (and alphabetize).
 1.22  18-Jan-2004  rtr 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.
 1.21  13-Jan-2004  rtr + no vid mode ext or dga for amiga
+ amd64 & alpha need X11FLAGS.SERVER+= _XSERVER64
+ pass loadable defines for amd64 & cats
 1.20  10-Jan-2004  rtr control undefine of DDXTIME through Xserver/Makefile.common vars
 1.19  10-Jan-2004  fredb 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.
 1.18  01-Jan-2004  rtr back out hpcmips changes accidently committed in prev. noticed by lukem@
 1.17  01-Jan-2004  rtr grr typo .manN -> .man.N
 1.16  01-Jan-2004  rtr section 4 and 5 man/cat pages do get installed
 1.15  01-Jan-2004  lukem correct __vendorversion__ to match xsrc/xfree
 1.14  26-Dec-2003  rtr remove endian selection hack - from lukem
 1.13  23-Dec-2003  rtr endian table for X_BYTE_ORDER=
 1.12  23-Dec-2003  rtr sparc64 defines
 1.11  20-Dec-2003  rtr Remove duplicate -DPIXPRIV from X11FLAGS.SERVER
Don't define -DXINPUT -DXFree86XDGA -DXF86VIDMODE -DDXTIME for sparc
Add X11FLAGS.LOADABLE for for module control/module flags.
 1.10  08-Dec-2003  rtr No such thing as NONBINOWN, use NONBINMODE instead.
 1.9  26-Nov-2003  jwise 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
 1.8  17-Nov-2003  lukem Provide X11FLAGS.OS_DEFINES.
Add some comments
 1.7  21-Oct-2003  lukem 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.
 1.6  19-Oct-2003  lukem 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
 1.5  18-Oct-2003  lukem implement MAKEVERBOSE
 1.4  13-Sep-2003  lukem in cleanx11man, support "MAN defaults to ${PROG}.1"
 1.3  13-Sep-2003  lukem explicitly set BINDIR LIBDIR MANDIR here
 1.2  13-Sep-2003  lukem sanitise ${DESTDIR}${SOMEOTHERVAR}
 1.1  12-Sep-2003  lukem <bsd.x11.mk>: infrastructure to support reach-over builds of xsrc
 1.38.2.3  12-Aug-2004  jmc branches: 1.38.2.3.2;
Pullup rev 1.41 (requested by sekiya in ticket #745)

Enable loadable module support for the sgimips X server
 1.38.2.2  11-May-2004  tron Pull up revision 1.39 (requested by drochner in ticket #302):
always #define __AMD64__ on and64 -- xfree86 depends on it
 1.38.2.1  29-Apr-2004  jmc Pullup rev 1.40 (requested by lukem in ticket #225)

When creating man pages, provide a defintion for __adminmansuffix__.
 1.38.2.3.2.1  16-Mar-2005  tron 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 "\".
 1.41.2.2  02-Apr-2006  rtr sync with head
 1.41.2.1  15-Nov-2004  rtr static & xorg src/x11
 1.45.2.5  23-Jan-2007  tron 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
 1.45.2.4  12-Apr-2005  tron Pull up revision 1.46 (requested by hira in ticket #133):
Update __vendorversion__ to 4.5.0.
 1.45.2.3  06-Apr-2005  tron Pull up revision 1.48 (requested by jmc in ticket #114):
sparc64 needs LOADABLE flags too
 1.45.2.2  06-Apr-2005  tron 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.
 1.45.2.1  06-Apr-2005  tron 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.
 1.53.4.2  07-Jun-2007  liamjfoy 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".
 1.53.4.1  12-Jan-2007  bouyer branches: 1.53.4.1.2;
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
 1.53.4.1.2.1  03-Sep-2007  wrstuden Sync w/ NetBSD-4-RC_1
 1.56.8.2  06-Aug-2007  lukem Support MAKEVERBOSE when installing APPDEFS.
 1.56.8.1  06-Aug-2007  lukem file bsd.x11.mk was added on branch matt-mips64 on 2007-08-06 04:25:58 +0000
 1.56.6.1  24-Mar-2008  keiichi sync with head.
 1.56.2.1  23-Mar-2008  matt sync with HEAD
 1.57.6.2  24-Sep-2008  wrstuden Merge in changes between wrstuden-revivesa-base-2 and
wrstuden-revivesa-base-3.
 1.57.6.1  18-Sep-2008  wrstuden Sync with wrstuden-revivesa-base-2.
 1.57.2.2  05-Oct-2008  mjf Sync with HEAD.
 1.57.2.1  08-Mar-2008  mjf file bsd.x11.mk was added on branch mjf-devfs2 on 2008-10-05 20:11:24 +0000
 1.70.2.3  08-Aug-2011  riz 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.
 1.70.2.2  17-Sep-2009  snj Apply patch (requested by mrg in ticket #958):
Sync X.Org reachover build framework and setlists with the new X.Org.
 1.70.2.1  15-Nov-2008  snj branches: 1.70.2.1.4;
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
 1.70.2.1.4.1  21-Apr-2010  matt sync to netbsd-5
 1.104.2.2  22-May-2014  yamt 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")
 1.104.2.1  17-Apr-2012  yamt sync with head
 1.105.2.1  25-Dec-2014  msaitoh Pullup additional patches requested by mrg in ticket #1178:

share/mk/bsd.x11.mk patch

- Fix unexpanded @@ in .pc files.
 1.106.2.2  20-Aug-2014  tls Rebase to HEAD as of a few days ago.
 1.106.2.1  23-Jun-2013  tls resync from head
 1.112.2.1  10-Aug-2014  tls Rebase.
 1.119.2.2  07-Jan-2017  pgoyette Sync with HEAD. (Note that most of these changes are simply $NetBSD$
tag issues.)
 1.119.2.1  04-Nov-2016  pgoyette Sync with HEAD
 1.124.6.2  17-Apr-2024  martin 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.
 1.124.6.1  23-Apr-2019  martin 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!
 1.125.4.3  13-Apr-2020  martin Mostly merge changes from HEAD upto 20200411
 1.125.4.2  08-Apr-2020  martin Merge changes from current as of 20200406
 1.125.4.1  10-Jun-2019  christos Sync with HEAD
 1.125.2.2  26-Jan-2019  pgoyette Sync with HEAD
 1.125.2.1  18-Jan-2019  pgoyette Synch with HEAD
 1.132.2.3  17-Apr-2024  martin 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.
 1.132.2.2  20-Aug-2020  martin 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.
 1.132.2.1  26-Jul-2020  martin 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.
 1.138.4.4  07-Jun-2021  cjep font library combinations
 1.138.4.3  06-Jun-2021  cjep sync with head
 1.138.4.2  03-Jun-2021  cjep avoid Xt duplication
 1.138.4.1  02-Jun-2021  cjep 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@
 1.145.2.9  27-Jun-2025  martin Pull up following revision(s) (requested by mrg in ticket #1130):

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

bump for xorg-server 21.1.18.
 1.145.2.8  27-Feb-2025  martin Apply patch, requested by mrg in ticket #1067:

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

Bump Xorg server to 21.1.16
 1.145.2.7  02-Nov-2024  martin Apply patch, requested by mrg in ticket #998

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

Bump Xorg server version to 21.1.14
 1.145.2.6  17-Apr-2024  martin 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.
 1.145.2.5  26-Oct-2023  martin Pull up following revision(s) (requested by mrg in ticket #436):

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

bump xorg server version.
 1.145.2.4  30-Jul-2023  martin 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.
 1.145.2.3  01-Apr-2023  martin Pull up following revision(s) (requested by mrg in ticket #135):

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

bump XORG_SERVER_TEENY.
 1.145.2.2  08-Feb-2023  martin Pull up following revision(s) (requested by mrg in ticket #73):

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

bump xorg-server version.
 1.145.2.1  21-Dec-2022  martin Pull up following revision(s) (requested by mrg in ticket #16):

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

bump xorg-server version.

RSS XML Feed