[pkgsrc/trunk]: pkgsrc/x11/XFree86-libs Remove XFree86/Makefile.common which ...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c5f43ed8b61
branches:  trunk
changeset: 471767:8c5f43ed8b61
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Mar 30 21:45:10 2004 +0000

description:
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).

diffstat:

 x11/XFree86-libs/buildlink2.mk |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r b4e37b7249a8 -r 8c5f43ed8b61 x11/XFree86-libs/buildlink2.mk
--- a/x11/XFree86-libs/buildlink2.mk    Tue Mar 30 21:41:32 2004 +0000
+++ b/x11/XFree86-libs/buildlink2.mk    Tue Mar 30 21:45:10 2004 +0000
@@ -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