Commit graph

19 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
tnn
9f2a42bc6b Switch master site to MASTER_SITE_XORG. 2008-05-24 21:45:14 +00:00
tron
5ab01fe2a1 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.
2008-01-07 13:59:35 +00:00
rillig
3842f2df7a Since X11_TYPE cannot be "xorg", there's no point in checking for that
condition. What was really meant is X11_TYPE != "modular".
2008-01-06 16:57:41 +00:00
wiz
601583c320 Whitespace cleanup, courtesy of pkglint.
Patch provided by Sergey Svishchev in private mail.
2007-02-22 19:26:05 +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
joerg
5e43280b23 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%.
2006-12-12 21:52:34 +00:00
rillig
15d1adc729 Removed a trailing empty line, which had disturbed pkglint. 2006-12-01 17:29:44 +00:00
joerg
686d52f4ca Support DESTDIR. Take maintainership. 2006-11-03 17:09:27 +00:00
reed
b82dc7c354 Update to fixesproto-4.0.
Needed for libXfixes in pkgsrc-wip. I tested with x11/Xfixes with
"native" XFree86 on NetBSD too.

From ChangeLog:

2006-3-13   Deron Johnson  <deron.johnson@sun.com>

        * configure.ac
        * xfixesproto.h
        * /xfixeswire.h
        Xfixes Version 4.0: XFixesHideCursor, XFixesShowCursor
2006-10-10 19:05:42 +00:00
rillig
144a1ee175 Added "c" to USE_LANGUAGES for packages that use GNU configure scripts,
since they always need a C compiler, even when the source code is
completely in C++.

For some other packages, stated in the comment that a C compiler is
really not needed.
2006-07-22 04:46:13 +00:00
joerg
19338c63c5 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@
2006-07-11 14:42:03 +00:00
abs
0780228787 Update to fixesproto-3.0.2nb1:
Fix "ERROR: iconv is not installed; can't buildlink files." by
adding libiconv/buildlink3.mk
2006-07-11 12:51:34 +00:00
jlam
c16221a4db 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
2006-07-08 23:10:35 +00:00
jlam
9430e49307 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.
2006-07-08 22:38:58 +00:00
reed
5146481be8 Check before redefining the target for creating symlink.
(Noticed warning that it was redefined in x11-links.)
2006-04-19 12:27:02 +00:00
reed
c0ca0cb59c Add buildlink target so old pkg-config name fixesext.pc will be available. 2006-04-18 18:03:22 +00:00
reed
3b55a3c05b Import fixesproto from pkgsrc-wip.
This will replace the fixesext package.

This provides the Fixes extension headers from modular X.org X11
project.
2006-04-18 17:13:35 +00:00