From a1fdb089fa3b604f6cecb29d7a5f5d5bae99082a Mon Sep 17 00:00:00 2001 From: xtraeme Date: Tue, 30 Mar 2004 21:45:10 +0000 Subject: Remove XFree86/Makefile.common which was causing strange changes in the targets, and use ${LOCALBASE}/X11R6 instead of ${X11ROOT}, noted by Jeremy C. Reed (fixes building in qt3 when using X11_TYPE=XFree86). --- x11/XFree86-libs/buildlink2.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'x11') diff --git a/x11/XFree86-libs/buildlink2.mk b/x11/XFree86-libs/buildlink2.mk index 9284a95167f..81213bc30df 100644 --- a/x11/XFree86-libs/buildlink2.mk +++ b/x11/XFree86-libs/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2004/03/30 21:26:40 xtraeme Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2004/03/30 21:45:10 xtraeme Exp $ # # This Makefile fragment is included by packages that use XFree86-libs. # @@ -8,14 +8,12 @@ .if !defined(XFREE86_LIBS_BUILDLINK2_MK) XFREE86_LIBS_BUILDLINK2_MK= # defined -.include "../../meta-pkgs/XFree86/Makefile.common" - BUILDLINK_PACKAGES+= XFree86-libs BUILDLINK_DEPENDS.XFree86-libs?= XFree86-libs>=4.4.0 BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../x11/XFree86-libs EVAL_PREFIX+= BUILDLINK_PREFIX.XFree86-libs=XFree86-libs -BUILDLINK_PREFIX.XFree86-libs_DEFAULT= ${X11ROOT} +BUILDLINK_PREFIX.XFree86-libs_DEFAULT= ${LOCALBASE}/X11R6 BUILDLINK_FILES.XFree86-libs+= include/DPS/*.h BUILDLINK_FILES.XFree86-libs+= include/GL/*.h BUILDLINK_FILES.XFree86-libs+= include/X11/*.h -- cgit v1.2.3