diff options
| author | jlam <jlam@pkgsrc.org> | 2002-06-26 05:46:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-06-26 05:46:23 +0000 |
| commit | 1dcac4b18dfc53490c91158d4e5441dd034ed609 (patch) | |
| tree | 0c9d5339314b1c56e97bf09a48899656bc8beaa4 | |
| parent | e54da451c1fd84b7dc0fa3710f739c8e8d1b7551 (diff) | |
| download | pkgsrc-1dcac4b18dfc53490c91158d4e5441dd034ed609.tar.gz | |
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.
| -rw-r--r-- | pkgtools/x11-links/DESCR | 2 | ||||
| -rw-r--r-- | pkgtools/x11-links/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/x11-links/buildlink.mk | 14 |
3 files changed, 16 insertions, 4 deletions
diff --git a/pkgtools/x11-links/DESCR b/pkgtools/x11-links/DESCR index aa3bc897bad..5bbdd19a91c 100644 --- a/pkgtools/x11-links/DESCR +++ b/pkgtools/x11-links/DESCR @@ -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 diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 8720666bc2a..d40e2bcc5b8 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -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 diff --git a/pkgtools/x11-links/buildlink.mk b/pkgtools/x11-links/buildlink.mk index b4b9bff8a55..c752e3e3753 100644 --- a/pkgtools/x11-links/buildlink.mk +++ b/pkgtools/x11-links/buildlink.mk @@ -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 |