Simply and speed up buildlink3.mk files and processing.

This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.

16 files changed, 96 insertions, 208 deletions

diff --git a/editors/emacs-nox11/buildlink3.mk b/editors/emacs-nox11/buildlink3.mk
index 4d203b93838..29efa0e0e24 100644
--- a/editors/emacs-nox11/buildlink3.mk
+++ b/editors/emacs-nox11/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EMACS_NOX11_BUILDLINK3_MK:=	${EMACS_NOX11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	emacs-nox11
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	emacs-nox11
-.endif
+.if !defined(EMACS_NOX11_BUILDLINK3_MK)
+EMACS_NOX11_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nemacs-nox11}
-BUILDLINK_PACKAGES+=	emacs-nox11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11
-
-.if ${EMACS_NOX11_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.emacs-nox11+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.emacs-nox11?=	${_EMACS_PKGDIR}
-.endif	# EMACS_NOX11_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs-nox11=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # EMACS_NOX11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-emacs-nox11
diff --git a/editors/emacs/buildlink3.mk b/editors/emacs/buildlink3.mk
index 02b5e681ab4..da53e6597d3 100644
--- a/editors/emacs/buildlink3.mk
+++ b/editors/emacs/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EMACS_BUILDLINK3_MK:=	${EMACS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	emacs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	emacs
-.endif
+.if !defined(EMACS_BUILDLINK3_MK)
+EMACS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nemacs}
-BUILDLINK_PACKAGES+=	emacs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs
-
-.if ${EMACS_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_PKGDIR}
-.endif	# EMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # EMACS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-emacs
diff --git a/editors/emacs20/buildlink3.mk b/editors/emacs20/buildlink3.mk
index abb41b1e09b..273598e06c7 100644
--- a/editors/emacs20/buildlink3.mk
+++ b/editors/emacs20/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/10/13 14:00:28 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:31 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EMACS_BUILDLINK3_MK:=	${EMACS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	emacs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	emacs
-.endif
+.if !defined(EMACS_BUILDLINK3_MK)
+EMACS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nemacs}
-BUILDLINK_PACKAGES+=	emacs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs
-
-.if ${EMACS_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_PKGDIR}
-.endif	# EMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # EMACS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-emacs
diff --git a/editors/emacs21-nox11/buildlink3.mk b/editors/emacs21-nox11/buildlink3.mk
index 4d203b93838..29efa0e0e24 100644
--- a/editors/emacs21-nox11/buildlink3.mk
+++ b/editors/emacs21-nox11/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EMACS_NOX11_BUILDLINK3_MK:=	${EMACS_NOX11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	emacs-nox11
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	emacs-nox11
-.endif
+.if !defined(EMACS_NOX11_BUILDLINK3_MK)
+EMACS_NOX11_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nemacs-nox11}
-BUILDLINK_PACKAGES+=	emacs-nox11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11
-
-.if ${EMACS_NOX11_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.emacs-nox11+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.emacs-nox11?=	${_EMACS_PKGDIR}
-.endif	# EMACS_NOX11_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs-nox11=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # EMACS_NOX11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-emacs-nox11
diff --git a/editors/emacs21/buildlink3.mk b/editors/emacs21/buildlink3.mk
index 02b5e681ab4..da53e6597d3 100644
--- a/editors/emacs21/buildlink3.mk
+++ b/editors/emacs21/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EMACS_BUILDLINK3_MK:=	${EMACS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	emacs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	emacs
-.endif
+.if !defined(EMACS_BUILDLINK3_MK)
+EMACS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nemacs}
-BUILDLINK_PACKAGES+=	emacs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs
-
-.if ${EMACS_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.emacs+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.emacs?=	${_EMACS_PKGDIR}
-.endif	# EMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.emacs=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # EMACS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-emacs
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index afaf889a459..b52e8d121ad 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/04/15 18:37:22 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:31 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GEDIT_BUILDLINK3_MK:=	${GEDIT_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	gedit
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gedit
-.endif
+.if !defined(GEDIT_BUILDLINK3_MK)
+GEDIT_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngedit}
-BUILDLINK_PACKAGES+=	gedit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gedit
-
-.if !empty(GEDIT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gedit+=	gedit>=2.12.1nb4
 BUILDLINK_ABI_DEPENDS.gedit?=	gedit>=2.20.4nb2
 BUILDLINK_PKGSRCDIR.gedit?=	../../editors/gedit
-.endif	# GEDIT_BUILDLINK3_MK
 
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../x11/gtksourceview2/buildlink3.mk"
+.endif # GEDIT_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-gedit
diff --git a/editors/mule-ucs/buildlink3.mk b/editors/mule-ucs/buildlink3.mk
index 1fad14e30e7..abb0cc15a55 100644
--- a/editors/mule-ucs/buildlink3.mk
+++ b/editors/mule-ucs/buildlink3.mk
@@ -1,9 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MULE_UCS_BUILDLINK3_MK:=	${MULE_UCS_BUILDLINK3_MK}+
-
 #
 # Only for older GNU Emacs.  Emacs 22 or later doesn't need this because it
 # incorporated Unicode support.
@@ -12,21 +9,17 @@ MULE_UCS_BUILDLINK3_MK:=	${MULE_UCS_BUILDLINK3_MK}+
 .include "../../editors/emacs/modules.mk"
 .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} < 22
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	mule-ucs
-.endif
+BUILDLINK_TREE+=	mule-ucs
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmule-ucs}
-BUILDLINK_PACKAGES+=	mule-ucs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mule-ucs
+.if !defined(MULE_UCS_BUILDLINK3_MK)
+MULE_UCS_BUILDLINK3_MK:=
 
-.if ${MULE_UCS_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.mule-ucs+=	${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84
 BUILDLINK_PKGSRCDIR.mule-ucs?=	../../editors/mule-ucs
-.endif	# MULE_UCS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.mule-ucs=	${EGREP} '.*\.el$$|.*\.elc$$'
 
 .endif
+.endif # MULE_UCS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-mule-ucs
diff --git a/editors/obby/buildlink3.mk b/editors/obby/buildlink3.mk
index 2b906ccbd92..aaa318b2352 100644
--- a/editors/obby/buildlink3.mk
+++ b/editors/obby/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/03/06 14:53:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-OBBY_BUILDLINK3_MK:=	${OBBY_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	obby
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	obby
-.endif
+.if !defined(OBBY_BUILDLINK3_MK)
+OBBY_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nobby}
-BUILDLINK_PACKAGES+=	obby
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}obby
-
-.if ${OBBY_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.obby+=	obby>=0.4.4
 BUILDLINK_ABI_DEPENDS.obby?=	obby>=0.4.4nb1
 BUILDLINK_PKGSRCDIR.obby?=	../../editors/obby
-.endif	# OBBY_BUILDLINK3_MK
 
 .include "../../devel/libsigc++/buildlink3.mk"
 .include "../../net/net6/buildlink3.mk"
+.endif # OBBY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-obby
diff --git a/editors/pico/buildlink3.mk b/editors/pico/buildlink3.mk
index 80240f596d5..e277293f29c 100644
--- a/editors/pico/buildlink3.mk
+++ b/editors/pico/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:32 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-PICO_BUILDLINK3_MK:=	${PICO_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	pico
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pico
-.endif
+.if !defined(PICO_BUILDLINK3_MK)
+PICO_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npico}
-BUILDLINK_PACKAGES+=	pico
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pico
-
-.if !empty(PICO_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.pico+=	pico>=4.10
 BUILDLINK_PKGSRCDIR.pico?=	../../editors/pico
-.endif	# PICO_BUILDLINK3_MK
+.endif # PICO_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-pico
diff --git a/editors/sam/buildlink3.mk b/editors/sam/buildlink3.mk
index 28aa8947326..05b8491d41f 100644
--- a/editors/sam/buildlink3.mk
+++ b/editors/sam/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:32 joerg Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SAM_BUILDLINK3_MK:=	${SAM_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	sam
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sam
-.endif
+.if !defined(SAM_BUILDLINK3_MK)
+SAM_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsam}
-BUILDLINK_PACKAGES+=	sam
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sam
-
-.if !empty(SAM_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.sam+=	sam>=4.3nb1
 BUILDLINK_ABI_DEPENDS.sam?=	sam>=4.3nb3
 BUILDLINK_PKGSRCDIR.sam?=	../../editors/sam
 BUILDLINK_DEPMETHOD.sam?=	build
-.endif	# SAM_BUILDLINK3_MK
+.endif # SAM_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-sam
diff --git a/editors/speedbar/buildlink3.mk b/editors/speedbar/buildlink3.mk
index db4e8a24d07..40a64530823 100644
--- a/editors/speedbar/buildlink3.mk
+++ b/editors/speedbar/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:18 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:32 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-SPEEDBAR_BUILDLINK3_MK:=	${SPEEDBAR_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	speedbar
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	speedbar
-.endif
+.if !defined(SPEEDBAR_BUILDLINK3_MK)
+SPEEDBAR_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspeedbar}
-BUILDLINK_PACKAGES+=	speedbar
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speedbar
-
-.if ${SPEEDBAR_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.speedbar+=	${EMACS_PKGNAME_PREFIX}speedbar>=0.14rc0
 BUILDLINK_PKGSRCDIR.speedbar?=	../../editors/speedbar
-.endif	# SPEEDBAR_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.speedbar=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # SPEEDBAR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-speedbar
diff --git a/editors/xemacs-current-nox11/buildlink3.mk b/editors/xemacs-current-nox11/buildlink3.mk
index 45e76f5fc57..ed72a9af3af 100644
--- a/editors/xemacs-current-nox11/buildlink3.mk
+++ b/editors/xemacs-current-nox11/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:32 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XEMACS_NOX11_BUILDLINK3_MK:=	${XEMACS_NOX11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xemacs-nox11
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xemacs-nox11
-.endif
+.if !defined(XEMACS_NOX11_BUILDLINK3_MK)
+XEMACS_NOX11_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxemacs-nox11}
-BUILDLINK_PACKAGES+=	xemacs-nox11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11
-
-.if ${XEMACS_NOX11_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.xemacs-nox11+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.xemacs-nox11?=	${_EMACS_PKGDIR}
-.endif	# XEMACS_NOX11_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.xemacs-nox11=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # XEMACS_NOX11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xemacs-nox11
diff --git a/editors/xemacs-current/buildlink3.mk b/editors/xemacs-current/buildlink3.mk
index 86aa1539510..c67b61843d7 100644
--- a/editors/xemacs-current/buildlink3.mk
+++ b/editors/xemacs-current/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:32 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XEMACS_BUILDLINK3_MK:=	${XEMACS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xemacs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xemacs
-.endif
+.if !defined(XEMACS_BUILDLINK3_MK)
+XEMACS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxemacs}
-BUILDLINK_PACKAGES+=	xemacs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs
-
-.if ${XEMACS_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.xemacs+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.xemacs?=	${_EMACS_PKGDIR}
-.endif	# XEMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.xemacs=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # XEMACS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xemacs
diff --git a/editors/xemacs-nox11/buildlink3.mk b/editors/xemacs-nox11/buildlink3.mk
index 45e76f5fc57..ed72a9af3af 100644
--- a/editors/xemacs-nox11/buildlink3.mk
+++ b/editors/xemacs-nox11/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:32 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XEMACS_NOX11_BUILDLINK3_MK:=	${XEMACS_NOX11_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xemacs-nox11
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xemacs-nox11
-.endif
+.if !defined(XEMACS_NOX11_BUILDLINK3_MK)
+XEMACS_NOX11_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxemacs-nox11}
-BUILDLINK_PACKAGES+=	xemacs-nox11
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs-nox11
-
-.if ${XEMACS_NOX11_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.xemacs-nox11+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.xemacs-nox11?=	${_EMACS_PKGDIR}
-.endif	# XEMACS_NOX11_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.xemacs-nox11=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # XEMACS_NOX11_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xemacs-nox11
diff --git a/editors/xemacs/buildlink3.mk b/editors/xemacs/buildlink3.mk
index 86aa1539510..c67b61843d7 100644
--- a/editors/xemacs/buildlink3.mk
+++ b/editors/xemacs/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:32 joerg Exp $
 #
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-XEMACS_BUILDLINK3_MK:=	${XEMACS_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xemacs
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xemacs
-.endif
+.if !defined(XEMACS_BUILDLINK3_MK)
+XEMACS_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxemacs}
-BUILDLINK_PACKAGES+=	xemacs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xemacs
-
-.if ${XEMACS_BUILDLINK3_MK} == "+"
 .include "../../editors/emacs/modules.mk"
 BUILDLINK_API_DEPENDS.xemacs+=	${_EMACS_REQD}
 BUILDLINK_PKGSRCDIR.xemacs?=	${_EMACS_PKGDIR}
-.endif	# XEMACS_BUILDLINK3_MK
 
 BUILDLINK_CONTENTS_FILTER.xemacs=	${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # XEMACS_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xemacs
diff --git a/editors/xfce4-mousepad/buildlink3.mk b/editors/xfce4-mousepad/buildlink3.mk
index 8cfc69e6d4b..4cf6d60503a 100644
--- a/editors/xfce4-mousepad/buildlink3.mk
+++ b/editors/xfce4-mousepad/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:32 joerg Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-XFCE4_MOUSEPAD_BUILDLINK3_MK:=	${XFCE4_MOUSEPAD_BUILDLINK3_MK}+
+BUILDLINK_TREE+=	xfce4-mousepad
 
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+=	xfce4-mousepad
-.endif
+.if !defined(XFCE4_MOUSEPAD_BUILDLINK3_MK)
+XFCE4_MOUSEPAD_BUILDLINK3_MK:=
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mousepad}
-BUILDLINK_PACKAGES+=	xfce4-mousepad
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mousepad
-
-.if ${XFCE4_MOUSEPAD_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.xfce4-mousepad+=	xfce4-mousepad>=0.2.14nb1
 BUILDLINK_PKGSRCDIR.xfce4-mousepad?=	../../editors/xfce4-mousepad
-.endif	# XFCE4_MOUSEPAD_BUILDLINK3_MK
 
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_MOUSEPAD_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+=	-xfce4-mousepad