COMMENT typos and surrounding whitespace fixes. A few Makefiles where not
included as they contain Latin-1 characters that break the Phabricator
workflow. Category M.
CR: D306
Approved by: portmgr (bapt)
1) Move -a from XMKMF command variable to a new XMKMF_ARGS variable.
For ports that don't need -a introduce USES=imake:notall.
This way ports no longer have to redefine XMKMF.
2) xmkmf -a runs imake with the flags in IMAKECPPFLAGS as extra arguments
to set CPP, CC and CXX. This creates the top Makefile, and then xmkmf
runs make Makefiles. This Makefiles target runs imake for each
subdirectory but these imake invocations did not have the flags from
IMAKECPPFLAGS so the resulting makefiles used the wrong C preprocessor
when clang is used (/usr/bin/cpp instead of /usr/local/bin/tradcpp).
Instead of letting xmkmf pass IMAKECPPFLAGS from the environment to
imake let imake handle IMAKECPPFLAGS itself just like it handles
IMAKEINCLUDE.
This exposed configure errors in x11-clocks/mouseclock and x11-wm/fvwm.
Approved by: portmgr (bapt)
This uses accept 'env' as an argument for ports that do use their own or a different do-configure target.
Modify xmkmf so it accept IMAKECPPFLAGS as default flags for imake and pass it to the called imake.
Modify xorg-cf-files (the FreeBSD.cf configuration file) to allow CppCmd to be overwritten.
Pass CppCmd CcCmd and CplusplusCmd via command line to each call of imake via IMAKECPPFLAGS
Pass IMAKE_DEFINE with the above arguments to MAKE_ARGS so that imake spawned from Makefile generated by a previous
imake also inherit the defined CppCmd CcCmd and CplusplusCmd.
Make imake use devel/tradcpp all the time, so that when buidling with clang we do not depend on gcc's cpp.
Make imake respect CC and CXX
Make imake respect USE_GCC (if set imake will use gcc's cpp).
While here:
- Remove a couple of indefinite articles from comments
- Trim headers
- Fix a couple of ports to build with clang or use: USE_GCC=any
- Fix a now useless redefinition of the extraction chain
- Fix a typo in japanese/Wnn7-lib bundled imake template definitions
- Fix some XMKMF execution with no env specified
- Use options helper in x11/xautolock to simplify the port
modular xorg.
- supply corresponding USE_XORG for all imake-using ports that need it
- USE_IMAKE no longer implies USE_XLIB in absence of USE_XORG
- retire USE_X_PREFIX which is not really used anywhere after the
above change
- a few minor nits like whitespace and SF macro
Tested by: 2 tinderbox runs by pav
Approved by: portmgr (pav)
into misc/magicpoint. The Japanese support is now based on
FreeType library, not VFlib, as the non-Japanese vector font support is.
Approved by: dinoex (maintainer)
Release notes are available at
http://www.x.org/X11R6.8.2/doc/RELNOTES.html
Thanks to kris and krion for running several cluster test builds,
maintainers of GNOME for prompt responses, portmgr for postponing ports
freeze for this update, testers on FreeBSD-X11@ list and others that I
might have mised here.
Also included:
- fix for ATI Mobility on Dell Inspiron 7500 (obtained from Marc Aurele La
France; obtained and tested by julian)
- fix for kbd driver on Sparc64 (tested by Aaron Dudek, Michael G. Jung and
Matthias Muthmann), which still appears to have problems with some
keyboards - so
- fix for kbd driver on PC98 (reported and tested by NAKAJI Hiroyuki; PR
ports/77217)
- fix for i810 on HP D530 (obtained from Egbert Eich; obtained and tested
by Anders Nor Berle; PR ports/74757)