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)
since ito makes using package tools hard, is marked as FATAL by
portlint and otherwise doesn't affect the port, fix it silently.
Approved by: marcus (mentor)
USE_MOTIF and generates a LIB_DEPENDS to x11-toolkits/open-motif. As
before, it implies USE_XPM (and therefore USE_XLIB). Motif-dummy is
removed from PKG_IGNORE_DEPENDS, whose sole resident is now XFree86-3.
Most of the simple ".if defined(HAVE_MOTIF)"s are removed to always
have USE_MOTIF. ftp/moxftp will define USE_MOTIF unless
WANT_ATHENA_VERSION (new variable) is defined. I merged the X cases
in cad/mars, so USE_MOTIF is used iff WITHOUT_X11 is not defined.
I will remove x11-toolkits/Motif-dummy (which has been repo copied to
open-motif) in a few days.
XFree86 (3 or 4) to depend to when USE_XLIB is set.
XFREE86_VERSION defaults to 3 for now, but adventurous users can
override it in /etc/make.conf. When XFREE86_VERSION=3, USE_XLIB
will add a dependency to x11/XFree86; when it is set to 4, the
dependency will be to x11/XFree86-4-libraries. When
XFREE86_VERSION=4, the PKG_IGNORE_DEPENDS and ALWAYS_BUILD_DEPENDS
hacks to avoid messing with XFree86 are turned off.
Since XFree86 version 4 includes some software that used to be
separate ports, when XFREE86_VERSION=3 the following variables are
provided:
USE_DGS LIB_DEPENDS on x11/dgs
USE_FREETYPE LIB_DEPENDS on print/freetype
USE_MESA LIB_DEPENDS on graphics/Mesa3
USE_XPM LIB_DEPENDS on graphics/xpm
When XFREE86_VERSION=4, these variables have no effect. The
LIB_DEPENDS in the tree for the above four ports have all been
converted to the USE_* counterparts. For your information, this
is the count of the number of ports:
USE_DGS 0
USE_FREETYPE 16
USE_MESA 36
USE_XPM 236
There is a new variable, XAWVER, which is set to 6 when
XFREE86_VERSION=3 and 7 when XFREE86_VERSION=4. This is also
passed to PLIST_SUB so ports that build Xaw based shared libraries
can use this variable to substitute the shlib version number.
There is also a provision of using a separate mtree file for
XFREE86_VERSION=4, but that part is not enabled yet.
Reviewed by: the ports list
Tested by: make index (XFREE86_VERSION=3 only)
(2) Add hebrew to list of valid categories.
Submitted by: nbm
cbb ical korganizer kproject offix-trash plan teapot xcalendar xinvest
xmaddressbook xmdiary xopps zorro" from misc to deskutils.
I'll fix up the dependencies later.
