CVS log for pkgsrc/x11/renderproto/buildlink3.mk

Up to [NetBSD + pkgsrc-wip] / pkgsrc / x11 / renderproto

Request diff between arbitrary revisions - Display revisions graphically

Keyword substitution: kv
Default branch: MAIN

For the sake of graphics/cairo, which derives the libXrender feature
set from the renderproto version, pick a package with an older version
(renderproto9) for anything < netbsd-5.

This change gets the selection criteria right, and also points the
renderproto9 package to renderproto's builtin.mk, avoiding Xrender
breakage.

Fixes pkg/43969 and should probably be pulled up.

Re-implement check for older native X11 systems to use renderproto9.

(For making the unreasonable assumption that BUILTIN_X11_TYPE.native on
a native NetBSD xorg system would be "xorg" I am awarded the Fail In
Technology prize of... a full set of "Synergy on P/OS" install media.
- - The correct answer was of course "unknown".)

Also make the test a little more robust, if not more attractive.

As further spice for this particular value equation; earlier this week I
switched the only platform I had for which this was relevant (OS X 10.4)
to modular X11, but I take solace from the fact this should make the lives
of those building x11 apps from current pkgsrc on netbsd-4 no less painful
than they were before...

Revert previous, it broke building cairo on NetBSD-current with
builtin X.

Use renderproto9 for X11_TYPE native and! BUILTIN_X11_VERSION.xorg

Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.

Add missing include which is especially important for systems with
XFree86. Bump revision and dependency.

Force version 0.9.4 of renderproto as dependency. Bump revision
of modular-xorg-server to accompany this.

Unbreak build of a lot of X11 packages on systems which use native X11
(e.g. NetBSD with bundled XFree86). Checking whether "X11_TYPE" is "xorg"
is obsolete and *not* equivalent to checking whether we are not using
modular X.org.

Since X11_TYPE cannot be "xorg", there's no point in checking for that
condition. What was really meant is X11_TYPE != "modular".

Replace mk/bsd.prefs.mk includes with bsd.fast.prefs.mk includes.
The redundant parsing of bsd.prefs.mk is mostly avoided now and
parse time e.g. for x11/kdebase3 gets reduced by up to 10%.

Don't use the builtin framework for the various Xorg components
when X11_TYPE=xorg. Let them include x11.buildlink3.mk directly.
Remove the manual USE_BUILTIN declarations from xorg-libs/b3.mk.
This fixes a symmetry in the dependency list depending on whether
xorg-libs is installed already or not.

Discussed with jlam@

Change the format of BUILDLINK_ORDER to contain depth information as well,
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto

Track information in a new variable BUILDLINK_ORDER that informs us
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.

Fixed pkglint warnings. Fixed use of ${LN} -sf, which does not do the
expected thing on Solaris.

Import renderproto from pkgsrc-wip.

This provides the Render extension headers from modular X.org X11
project.

This will replace the renderext package.

Initial revision