summaryrefslogtreecommitdiff
path: root/pkgtools/x11-links
diff options
context:
space:
mode:
Diffstat (limited to 'pkgtools/x11-links')
-rw-r--r--pkgtools/x11-links/Makefile9
-rw-r--r--pkgtools/x11-links/xfree.buildlink2.mk9
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