diff options
| author | jlam <jlam> | 2002-10-08 09:23:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-10-08 09:23:17 +0000 |
| commit | 0f47830953f74c373c36dfe7bec564042bea8e1c (patch) | |
| tree | 7a83b4cf9be475ffa62ce85d2be697e62a81a111 /pkgtools | |
| parent | 11a342d31374fba42f0c57c6314d02ffe7dced6d (diff) | |
| download | pkgsrc-0f47830953f74c373c36dfe7bec564042bea8e1c.tar.gz | |
Move the _REQUIRE_* definitions from xfree.buildlink2.mk to the x11-links
Makefile so that they won't be defined for other packages that include
xfree.buildlink2.mk.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/x11-links/Makefile | 9 | ||||
| -rw-r--r-- | pkgtools/x11-links/xfree.buildlink2.mk | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 7db14fa28ee..16eed51d6ef 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/10/08 08:04:23 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2002/10/08 09:23:17 jlam Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in mk/buildlink2/bsd.buidlink2.mk to the @@ -20,7 +20,12 @@ WRKSRC= ${WRKDIR} NO_BUILD= # defined NO_MTREE= # defined USE_X11= # defined -USE_X11_LINKS= no + +USE_X11_LINKS= NO +_REQUIRE_BUILTIN_MESALIB= YES +_REQUIRE_BUILTIN_GLU= YES +_REQUIRE_BUILTIN_FREETYPE2= YES +_REQUIRE_BUILTIN_XPM= YES PLIST_SRC= ${WRKDIR}/.PLIST_SRC BUILDLINK_X11_SUBDIR= share/x11-links diff --git a/pkgtools/x11-links/xfree.buildlink2.mk b/pkgtools/x11-links/xfree.buildlink2.mk index 40e6dae7c6a..d2e7bd2f02a 100644 --- a/pkgtools/x11-links/xfree.buildlink2.mk +++ b/pkgtools/x11-links/xfree.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: xfree.buildlink2.mk,v 1.4 2002/09/27 09:23:00 jlam Exp $ +# $NetBSD: xfree.buildlink2.mk,v 1.5 2002/10/08 09:23:17 jlam Exp $ .if !defined(XFREE_BUILDLINK2_MK) XFREE_BUILDLINK2_MK= # defined @@ -530,16 +530,9 @@ BUILDLINK_FILES.XFree+= lib/libxkbui.a BUILDLINK_TARGETS+= XFree-buildlink -_REQUIRE_BUILTIN_MESALIB= YES .include "../../graphics/MesaLib/buildlink2.mk" - -_REQUIRE_BUILTIN_GLU= YES .include "../../graphics/glu/buildlink2.mk" - -_REQUIRE_BUILTIN_FREETYPE2= YES .include "../../graphics/freetype2/buildlink2.mk" - -_REQUIRE_BUILTIN_XPM= YES .include "../../graphics/xpm/buildlink2.mk" XFree-buildlink: _BUILDLINK_USE |