Commit graph

4 commits

Author SHA1 Message Date
cube
403e256ff6 Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.
2008-10-05 21:36:32 +00:00
joerg
0988643082 For reasons beyond my compressions, (b)make handles
.if foo || bar
BAZ=	no
.else
BAZ=	yes
.endif

different from

.if foo
BAZ=	no
.elif bar
BAZ=	no
.else
BAZ=	yes
.endif

in some situations exposed in this builtin.mk. Workaround this for now.
2006-12-16 01:04:43 +00:00
joerg
1662e47171 Don't assume that we have a builtin version of the X11 proto packages,
if LOCALBASE and X11BASE are identical.
2006-12-15 20:43:00 +00:00
reed
4d28f1b9a7 Add builtin.mk. It is needed by x11-links. Also this works
so native XFree86 and Xorg and packaged xorg-libs will be used instead.
2006-04-19 12:19:47 +00:00