Update pkgtool/x11-links to version 0.8:

Use _REQUIRE_BUILTIN_* to specify that the headers/libraries of some parts
of X11 that are available from 3rd parties must be part of the standard X11
distribution or else their symlinks aren't installed as part of x11-links.
This is to allow x11-links to contain all of the parts of the standard X11
distribution.

The problem that prompted this is that newer releases of XFree86-4.x
contain not just new libraries but new inter-library dependencies.  Some
of the X11 libraries present in XF86-4.x that were also in XF86-3.x now
depend on libXpm.so or libfreetype.so, which, from a buildlink
point-of-view, must also be found during the link phase when building
software.
This commit is contained in:
jlam 2002-06-26 05:46:23 +00:00
parent e54da451c1
commit 1dcac4b18d
3 changed files with 16 additions and 4 deletions

View file

@ -5,5 +5,5 @@ from any installed X11 package code files. The X11 hierarchies supported
are:
XFree86-3.3.x
XFree86-4.0.x
XFree86-4.1.0
XFree86-4.1.x
XFree86-4.2.0

View file

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.10 2002/04/14 19:05:56 veego Exp $
# $NetBSD: Makefile,v 1.11 2002/06/26 05:46:23 jlam Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in x11.buildlink.mk to the correct version,
# usually the most recent.
DISTNAME= x11-links-0.7
DISTNAME= x11-links-0.8
CATEGORIES= pkgtools x11
MASTER_SITES= # empty
DISTFILES= # empty

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink.mk,v 1.9 2002/04/14 19:05:56 veego Exp $
# $NetBSD: buildlink.mk,v 1.10 2002/06/26 05:46:23 jlam Exp $
#
# This Makefile fragment is included by packages that use X11.
#
@ -1545,6 +1545,18 @@ BUILDLINK_FILES.X11+= lib/libxview.so.3
BUILDLINK_TARGETS.X11= X11-buildlink
BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.X11}
_REQUIRE_BUILTIN_MESALIB= YES
.include "../../graphics/MesaLib/buildlink.mk"
_REQUIRE_BUILTIN_GLU= YES
.include "../../graphics/glu/buildlink.mk"
_REQUIRE_BUILTIN_FREETYPE2= YES
.include "../../graphics/freetype2/buildlink.mk"
_REQUIRE_BUILTIN_XPM= YES
.include "../../graphics/xpm/buildlink.mk"
pre-configure: ${BUILDLINK_TARGETS.X11}
X11-buildlink: _BUILDLINK_USE