Add dir_DEFAULT setting used by EVAL_PREFIX logic to set the default

installation directory in case the package isn't installed.

13 files changed, 26 insertions, 13 deletions

diff --git a/x11/Xaw3d/buildlink.mk b/x11/Xaw3d/buildlink.mk
index 6e65d35d0e2..99a7afda381 100644
--- a/x11/Xaw3d/buildlink.mk
+++ b/x11/Xaw3d/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Xaw3d.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS.Xaw3d?=	Xaw3d-1.5
 DEPENDS+=	${BUILDLINK_DEPENDS.Xaw3d}:../../x11/Xaw3d
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.Xaw3d=Xaw3d
+BUILDLINK_PREFIX.Xaw3d_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.Xaw3d=		include/X11/X11/Xaw3d/*	# for OpenWindows
 BUILDLINK_FILES.Xaw3d+=		include/X11/Xaw3d/*
 BUILDLINK_FILES.Xaw3d+=		lib/libXaw3d.*
diff --git a/x11/fltk/buildlink.mk b/x11/fltk/buildlink.mk
index 0ed48be40ac..0e82dd69a40 100644
--- a/x11/fltk/buildlink.mk
+++ b/x11/fltk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use FLTK.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS.fltk?=	fltk>=1.0.9
 DEPENDS+=	${BUILDLINK_DEPENDS.fltk}:../../x11/fltk
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.fltk=fltk
+BUILDLINK_PREFIX.fltk_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.fltk=	include/FL/*
 BUILDLINK_FILES.fltk+=	lib/libfltk.*
 
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index 8aa0690c6ff..fd271875678 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:53 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS.gnome-libs?=	gnome-libs>=1.0.53
 DEPENDS+=	${BUILDLINK_DEPENDS.gnome-libs}:../../x11/gnome-libs
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-libs=gnome-libs
+BUILDLINK_PREFIX.gnome-libs_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.gnome-libs=	include/gnome.h
 BUILDLINK_FILES.gnome-libs+=	include/gtk-xmhtml/*
 BUILDLINK_FILES.gnome-libs+=	include/libart_lgpl/*
diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk
index 3fc3bf09231..3defafc412d 100644
--- a/x11/gtk/buildlink.mk
+++ b/x11/gtk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gtk.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS.gtk?=	gtk+>=1.2.8
 DEPENDS+=		${BUILDLINK_DEPENDS.gtk}:../../x11/gtk
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk=gtk
+BUILDLINK_PREFIX.gtk_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.gtk=	include/gdk/*
 BUILDLINK_FILES.gtk+=	include/gtk/*
 BUILDLINK_FILES.gtk+=	include/gtk-*/*/*
diff --git a/x11/kdebase2/buildlink.mk b/x11/kdebase2/buildlink.mk
index c09e88a1e72..3258eca1bc4 100644
--- a/x11/kdebase2/buildlink.mk
+++ b/x11/kdebase2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/27 13:33:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdebase2.
 #
@@ -23,6 +23,7 @@ DEPENDS+=	${BUILDLINK_DEPENDS.kdebase2}:../../x11/kdebase2
 .include "../../mk/bsd.prefs.mk"
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.kdebase2=kdebase
+BUILDLINK_PREFIX.kdebase2_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.kdebase2!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdebase2/pkg/PLIST
 
 .include "../../x11/kdelibs2/buildlink.mk"
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index fae7b4822be..3801fb38c30 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdelibs2.
 #
@@ -23,6 +23,7 @@ DEPENDS+=	${BUILDLINK_DEPENDS.kdelibs2}:../../x11/kdelibs2
 .include "../../mk/bsd.prefs.mk"
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.kdelibs2=kdelibs
+BUILDLINK_PREFIX.kdelibs2_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.kdelibs2!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdelibs2/pkg/PLIST
 BUILDLINK_FILES.kdelibs2+=	bin/dcopserver
 
diff --git a/x11/lesstif/buildlink.mk b/x11/lesstif/buildlink.mk
index 00085c0e4dd..da54bffddc9 100644
--- a/x11/lesstif/buildlink.mk
+++ b/x11/lesstif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:54 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lesstif.
 #
@@ -51,6 +51,7 @@ MOTIFBASE?=	${X11BASE}
 .endif
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.lesstif=lesstif
+BUILDLINK_PREFIX.lesstif_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.lesstif=	include/Mrm/*
 BUILDLINK_FILES.lesstif+=	include/Xm/*
 BUILDLINK_FILES.lesstif+=	include/uil/*
diff --git a/x11/lesstif12/buildlink.mk b/x11/lesstif12/buildlink.mk
index 62c5b30372b..e1a98bf382e 100644
--- a/x11/lesstif12/buildlink.mk
+++ b/x11/lesstif12/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lesstif12.
 #
@@ -57,6 +57,7 @@ MOTIFBASE?=	${X11BASE}
 .endif
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.lesstif12=lesstif12
+BUILDLINK_PREFIX.lesstif12_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.lesstif12=	include/Mrm/*
 BUILDLINK_FILES.lesstif12+=	include/Xm/*
 BUILDLINK_FILES.lesstif12+=	include/Xm/*
diff --git a/x11/qt2-designer/buildlink.mk b/x11/qt2-designer/buildlink.mk
index efc80c5b8b5..e68bad0bc41 100644
--- a/x11/qt2-designer/buildlink.mk
+++ b/x11/qt2-designer/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use qt2-designer.
 #
@@ -22,6 +22,7 @@ BUILDLINK_DEPENDS.qt2-designer?= \
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-designer}:../../x11/qt2-designer
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt2-designer=qt2-designer
+BUILDLINK_PREFIX.qt2-designer_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.qt2-designer=	qt2/bin/designer
 BUILDLINK_FILES.qt2-designer=	qt2/bin/uic
 BUILDLINK_FILES.qt2-designer+=	qt2/lib/libqutil.*
diff --git a/x11/qt2-libs/buildlink.mk b/x11/qt2-libs/buildlink.mk
index 2d68e8aaa95..a5a335efdcd 100644
--- a/x11/qt2-libs/buildlink.mk
+++ b/x11/qt2-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use qt2-libs.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS.qt2-libs?=	qt2-libs>=2.2.4
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-libs}:../../x11/qt2-libs
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt2-libs=qt2-libs
+BUILDLINK_PREFIX.qt2-libs_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.qt2-libs=	qt2/bin/moc
 BUILDLINK_FILES.qt2-libs+=	qt2/include/*.h
 BUILDLINK_FILES.qt2-libs+=	qt2/lib/libqt.*
diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk
index 95d1f6fc546..e314e78f7bf 100644
--- a/x11/tk/buildlink.mk
+++ b/x11/tk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/23 12:34:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:39 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tk.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS.tk?=	tk>=8.3.2
 DEPENDS+=		${BUILDLINK_DEPENDS.tk}:../../x11/tk
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.tk=tk
+BUILDLINK_PREFIX.tk_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.tk=	include/tk.h
 BUILDLINK_FILES.tk+=	include/tkInt.h
 BUILDLINK_FILES.tk+=	include/tkDecls.h
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index 9ddb190297f..725ac83489b 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:39 jlam Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.2.2
 DEPENDS+=			${BUILDLINK_DEPENDS.wxGTK}:../../x11/wxGTK
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.wxGTK=wxGTK
+BUILDLINK_PREFIX.wxGTK_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.wxGTK=		include/wx/*
 BUILDLINK_FILES.wxGTK+=		include/wx/*/*
 BUILDLINK_FILES.wxGTK+=		lib/wx/include/wx/gtk/*
diff --git a/x11/xforms/buildlink.mk b/x11/xforms/buildlink.mk
index 2a4399de593..e5f745d7b20 100644
--- a/x11/xforms/buildlink.mk
+++ b/x11/xforms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/27 13:33:39 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xforms.
 #
@@ -21,6 +21,7 @@ BUILDLINK_DEPENDS.xforms?=	xforms>=0.88nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.xforms}:../../x11/xforms
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.xforms=xforms
+BUILDLINK_PREFIX.xforms_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.xforms=		include/X11/forms.h
 BUILDLINK_FILES.xforms+=	lib/libforms.*
 BUILDLINK_FILES.xforms+=	lib/libxforms.*