summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjoerg <joerg>2009-03-20 19:23:50 +0000
committerjoerg <joerg>2009-03-20 19:23:50 +0000
commit405c61d80251d8e80401aed2264d4bede218cb22 (patch)
tree647e974495c5d41703d41ca2e71c9b6063b9153a /textproc
parentf0f715d4dd4a290c5c6ae716c774f59caf5aa61c (diff)
downloadpkgsrc-405c61d80251d8e80401aed2264d4bede218cb22.tar.gz
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.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/aiksaurus/buildlink3.mk19
-rw-r--r--textproc/aspell/buildlink3.mk19
-rw-r--r--textproc/btparse/buildlink3.mk19
-rw-r--r--textproc/chasen-base/buildlink3.mk19
-rw-r--r--textproc/chasen/buildlink3.mk19
-rw-r--r--textproc/eb/buildlink3.mk19
-rw-r--r--textproc/ebook-tools/buildlink3.mk19
-rw-r--r--textproc/enca/buildlink3.mk19
-rw-r--r--textproc/enchant/buildlink3.mk19
-rw-r--r--textproc/expat/buildlink3.mk19
-rw-r--r--textproc/gdome2/buildlink3.mk19
-rw-r--r--textproc/gnome-doc-utils/buildlink3.mk19
-rw-r--r--textproc/gnome-spell/buildlink3.mk19
-rw-r--r--textproc/gtk-doc/buildlink3.mk19
-rw-r--r--textproc/gtkspell/buildlink3.mk19
-rw-r--r--textproc/hre/buildlink3.mk19
-rw-r--r--textproc/hunspell/buildlink3.mk19
-rw-r--r--textproc/hyperestraier/buildlink3.mk19
-rw-r--r--textproc/icu/buildlink3.mk19
-rw-r--r--textproc/iso-codes/buildlink3.mk19
-rw-r--r--textproc/jade/buildlink3.mk19
-rw-r--r--textproc/json-glib/buildlink3.mk19
-rw-r--r--textproc/kakasi/buildlink3.mk19
-rw-r--r--textproc/libclucene/buildlink3.mk19
-rw-r--r--textproc/libcroco/buildlink3.mk19
-rw-r--r--textproc/liblinebreak/buildlink3.mk19
-rw-r--r--textproc/liblrdf/buildlink3.mk19
-rw-r--r--textproc/libpathan/buildlink3.mk19
-rw-r--r--textproc/libunicode/buildlink3.mk19
-rw-r--r--textproc/libxml++/buildlink3.mk19
-rw-r--r--textproc/libxml++1/buildlink3.mk19
-rw-r--r--textproc/libxml/buildlink3.mk19
-rw-r--r--textproc/libxml2/buildlink3.mk19
-rw-r--r--textproc/libxslt/buildlink3.mk19
-rw-r--r--textproc/link-grammar/buildlink3.mk19
-rw-r--r--textproc/mecab-base/buildlink3.mk19
-rw-r--r--textproc/mecab/buildlink3.mk19
-rw-r--r--textproc/mxml/buildlink3.mk19
-rw-r--r--textproc/oniguruma/buildlink3.mk19
-rw-r--r--textproc/opensp/buildlink3.mk19
-rw-r--r--textproc/py-elementtree/buildlink3.mk19
-rw-r--r--textproc/py-libxml2/buildlink3.mk19
-rw-r--r--textproc/py-xml/buildlink3.mk19
-rw-r--r--textproc/raptor/buildlink3.mk19
-rw-r--r--textproc/rarian/buildlink3.mk21
-rw-r--r--textproc/rasqal/buildlink3.mk19
-rw-r--r--textproc/redland/buildlink3.mk19
-rw-r--r--textproc/ruby-eruby/buildlink3.mk19
-rw-r--r--textproc/ruby-rdtool/buildlink3.mk19
-rw-r--r--textproc/sablotron/buildlink3.mk19
-rw-r--r--textproc/sary/buildlink3.mk19
-rw-r--r--textproc/soprano/buildlink3.mk19
-rw-r--r--textproc/sublib/buildlink3.mk19
-rw-r--r--textproc/tokyodystopia/buildlink3.mk19
-rw-r--r--textproc/uriparser/buildlink3.mk19
-rw-r--r--textproc/wbxml2/buildlink3.mk19
-rw-r--r--textproc/xalan-c/buildlink3.mk19
-rw-r--r--textproc/xapian/buildlink3.mk19
-rw-r--r--textproc/xerces-c/buildlink3.mk19
-rw-r--r--textproc/xfce4-dict-plugin/buildlink3.mk19
-rw-r--r--textproc/xmlcatmgr/buildlink3.mk20
-rw-r--r--textproc/xmlrpc-c/buildlink3.mk19
62 files changed, 371 insertions, 810 deletions
diff --git a/textproc/aiksaurus/buildlink3.mk b/textproc/aiksaurus/buildlink3.mk
index e32fe0c48ab..dcad0d5b0d5 100644
--- a/textproc/aiksaurus/buildlink3.mk
+++ b/textproc/aiksaurus/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-AIKSAURUS_BUILDLINK3_MK:= ${AIKSAURUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= aiksaurus
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= aiksaurus
-.endif
+.if !defined(AIKSAURUS_BUILDLINK3_MK)
+AIKSAURUS_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naiksaurus}
-BUILDLINK_PACKAGES+= aiksaurus
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}aiksaurus
-
-.if !empty(AIKSAURUS_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.aiksaurus+= aiksaurus>=1.2.1
BUILDLINK_PKGSRCDIR.aiksaurus?= ../../textproc/aiksaurus
-.endif # AIKSAURUS_BUILDLINK3_MK
+.endif # AIKSAURUS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -aiksaurus
diff --git a/textproc/aspell/buildlink3.mk b/textproc/aspell/buildlink3.mk
index d69a126dead..a814ef4bda3 100644
--- a/textproc/aspell/buildlink3.mk
+++ b/textproc/aspell/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/01/06 22:07:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ASPELL_BUILDLINK3_MK:= ${ASPELL_BUILDLINK3_MK}+
+BUILDLINK_TREE+= aspell
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= aspell
-.endif
+.if !defined(ASPELL_BUILDLINK3_MK)
+ASPELL_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naspell}
-BUILDLINK_PACKAGES+= aspell
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}aspell
-
-.if ${ASPELL_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.aspell+= aspell>=0.50.3
BUILDLINK_ABI_DEPENDS.aspell+= aspell>=0.60.4nb1
BUILDLINK_PKGSRCDIR.aspell?= ../../textproc/aspell
-.endif # ASPELL_BUILDLINK3_MK
BUILDLINK_FILES.aspell= bin/aspell bin/prezip-bin bin/word-list-compress
+.endif # ASPELL_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -aspell
diff --git a/textproc/btparse/buildlink3.mk b/textproc/btparse/buildlink3.mk
index d365e55313e..d5c2582361b 100644
--- a/textproc/btparse/buildlink3.mk
+++ b/textproc/btparse/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-BTPARSE_BUILDLINK3_MK:= ${BTPARSE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= btparse
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= btparse
-.endif
+.if !defined(BTPARSE_BUILDLINK3_MK)
+BTPARSE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbtparse}
-BUILDLINK_PACKAGES+= btparse
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}btparse
-
-.if !empty(BTPARSE_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.btparse+= btparse>=0.34
BUILDLINK_PKGSRCDIR.btparse?= ../../textproc/btparse
-.endif # BTPARSE_BUILDLINK3_MK
+.endif # BTPARSE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -btparse
diff --git a/textproc/chasen-base/buildlink3.mk b/textproc/chasen-base/buildlink3.mk
index ffa8bda6091..259e0248f27 100644
--- a/textproc/chasen-base/buildlink3.mk
+++ b/textproc/chasen-base/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:28 joerg Exp $
#
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-CHASEN_BASE_BUILDLINK3_MK:= ${CHASEN_BASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= chasen-base
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= chasen-base
-.endif
+.if !defined(CHASEN_BASE_BUILDLINK3_MK)
+CHASEN_BASE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchasen-base}
-BUILDLINK_PACKAGES+= chasen-base
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}chasen-base
-
-.if !empty(CHASEN_BASE_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.chasen-base+= chasen-base>=2.3.3
BUILDLINK_ABI_DEPENDS.chasen-base+= chasen-base>=2.3.3nb1
BUILDLINK_PKGSRCDIR.chasen-base?= ../../textproc/chasen-base
-.endif # CHASEN_BASE_BUILDLINK3_MK
.include "../../devel/darts/buildlink3.mk"
+.endif # CHASEN_BASE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -chasen-base
diff --git a/textproc/chasen/buildlink3.mk b/textproc/chasen/buildlink3.mk
index 787d893639b..f1e048f622e 100644
--- a/textproc/chasen/buildlink3.mk
+++ b/textproc/chasen/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-CHASEN_BUILDLINK3_MK:= ${CHASEN_BUILDLINK3_MK}+
+BUILDLINK_TREE+= chasen
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= chasen
-.endif
+.if !defined(CHASEN_BUILDLINK3_MK)
+CHASEN_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchasen}
-BUILDLINK_PACKAGES+= chasen
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}chasen
-
-.if !empty(CHASEN_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.chasen+= chasen>=2.0
BUILDLINK_PKGSRCDIR.chasen?= ../../textproc/chasen
BUILDLINK_FILES.chasen= include/chasen.h
BUILDLINK_FILES.chasen+= lib/libchasen.*
-.endif # CHASEN_BUILDLINK3_MK
+.endif # CHASEN_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -chasen
diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk
index 52605be5407..e16917a2381 100644
--- a/textproc/eb/buildlink3.mk
+++ b/textproc/eb/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/04/27 04:08:19 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-EB_BUILDLINK3_MK:= ${EB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= eb
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= eb
-.endif
+.if !defined(EB_BUILDLINK3_MK)
+EB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neb}
-BUILDLINK_PACKAGES+= eb
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eb
-
-.if !empty(EB_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.eb+= eb>=3.3.2nb1
BUILDLINK_ABI_DEPENDS.eb+= eb>=4.1.3nb1
BUILDLINK_PKGSRCDIR.eb?= ../../textproc/eb
-.endif # EB_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.endif # EB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -eb
diff --git a/textproc/ebook-tools/buildlink3.mk b/textproc/ebook-tools/buildlink3.mk
index be261098e5a..045862cf0c9 100644
--- a/textproc/ebook-tools/buildlink3.mk
+++ b/textproc/ebook-tools/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 22:20:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-EBOOK_TOOLS_BUILDLINK3_MK:= ${EBOOK_TOOLS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= ebook-tools
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= ebook-tools
-.endif
+.if !defined(EBOOK_TOOLS_BUILDLINK3_MK)
+EBOOK_TOOLS_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nebook-tools}
-BUILDLINK_PACKAGES+= ebook-tools
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ebook-tools
-
-.if ${EBOOK_TOOLS_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.ebook-tools+= ebook-tools>=0.1.1
BUILDLINK_PKGSRCDIR.ebook-tools?= ../../textproc/ebook-tools
-.endif # EBOOK_TOOLS_BUILDLINK3_MK
.include "../../archivers/libzip/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
+.endif # EBOOK_TOOLS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -ebook-tools
diff --git a/textproc/enca/buildlink3.mk b/textproc/enca/buildlink3.mk
index e496e247c30..8a12f22a120 100644
--- a/textproc/enca/buildlink3.mk
+++ b/textproc/enca/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/03/18 18:56:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ENCA_BUILDLINK3_MK:= ${ENCA_BUILDLINK3_MK}+
+BUILDLINK_TREE+= enca
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= enca
-.endif
+.if !defined(ENCA_BUILDLINK3_MK)
+ENCA_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nenca}
-BUILDLINK_PACKAGES+= enca
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}enca
-
-.if ${ENCA_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.enca+= enca>=1.9
BUILDLINK_PKGSRCDIR.enca?= ../../textproc/enca
-.endif # ENCA_BUILDLINK3_MK
+.endif # ENCA_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -enca
diff --git a/textproc/enchant/buildlink3.mk b/textproc/enchant/buildlink3.mk
index da01847a78f..7546090660f 100644
--- a/textproc/enchant/buildlink3.mk
+++ b/textproc/enchant/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/04/14 11:35:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ENCHANT_BUILDLINK3_MK:= ${ENCHANT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= enchant
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= enchant
-.endif
+.if !defined(ENCHANT_BUILDLINK3_MK)
+ENCHANT_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nenchant}
-BUILDLINK_PACKAGES+= enchant
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}enchant
-
-.if !empty(ENCHANT_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.enchant+= enchant>=1.1.3
BUILDLINK_ABI_DEPENDS.enchant+= enchant>=1.1.6nb1
BUILDLINK_PKGSRCDIR.enchant?= ../../textproc/enchant
-.endif # ENCHANT_BUILDLINK3_MK
# spelling libraries are loaded dynamically and do not need
# to be included here
.include "../../devel/glib2/buildlink3.mk"
+.endif # ENCHANT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -enchant
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index 1eb5c6a7a3b..1630d31c3da 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:28 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-EXPAT_BUILDLINK3_MK:= ${EXPAT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= expat
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= expat
-.endif
+.if !defined(EXPAT_BUILDLINK3_MK)
+EXPAT_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nexpat}
-BUILDLINK_PACKAGES+= expat
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}expat
-
-.if !empty(EXPAT_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.expat+= expat>=1.95.7
BUILDLINK_ABI_DEPENDS.expat+= expat>=2.0.0nb1
BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat
-.endif # EXPAT_BUILDLINK3_MK
+.endif # EXPAT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -expat
diff --git a/textproc/gdome2/buildlink3.mk b/textproc/gdome2/buildlink3.mk
index 38ffe5ddcf4..a539982272d 100644
--- a/textproc/gdome2/buildlink3.mk
+++ b/textproc/gdome2/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GDOME2_BUILDLINK3_MK:= ${GDOME2_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gdome2
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gdome2
-.endif
+.if !defined(GDOME2_BUILDLINK3_MK)
+GDOME2_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdome2}
-BUILDLINK_PACKAGES+= gdome2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gdome2
-
-.if !empty(GDOME2_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.gdome2+= gdome2>=0.8.1nb1
BUILDLINK_ABI_DEPENDS.gdome2?= gdome2>=0.8.1nb2
BUILDLINK_PKGSRCDIR.gdome2?= ../../textproc/gdome2
-.endif # GDOME2_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
+.endif # GDOME2_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gdome2
diff --git a/textproc/gnome-doc-utils/buildlink3.mk b/textproc/gnome-doc-utils/buildlink3.mk
index 3de84313d5f..65c42804d74 100644
--- a/textproc/gnome-doc-utils/buildlink3.mk
+++ b/textproc/gnome-doc-utils/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/09/15 15:05:52 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GNOME_DOC_UTILS_BUILDLINK3_MK:= ${GNOME_DOC_UTILS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gnome-doc-utils
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gnome-doc-utils
-.endif
+.if !defined(GNOME_DOC_UTILS_BUILDLINK3_MK)
+GNOME_DOC_UTILS_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-doc-utils}
-BUILDLINK_PACKAGES+= gnome-doc-utils
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-doc-utils
-
-.if !empty(GNOME_DOC_UTILS_BUILDLINK3_MK:M+)
BUILDLINK_DEPMETHOD.gnome-doc-utils+= build
BUILDLINK_API_DEPENDS.gnome-doc-utils+= gnome-doc-utils>=0.8.0
BUILDLINK_PKGSRCDIR.gnome-doc-utils?= ../../textproc/gnome-doc-utils
-.endif # GNOME_DOC_UTILS_BUILDLINK3_MK
+.endif # GNOME_DOC_UTILS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gnome-doc-utils
diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk
index b636efc3ffb..756fe562065 100644
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/03/06 14:53:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GNOME_SPELL_BUILDLINK3_MK:= ${GNOME_SPELL_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gnome-spell
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gnome-spell
-.endif
+.if !defined(GNOME_SPELL_BUILDLINK3_MK)
+GNOME_SPELL_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-spell}
-BUILDLINK_PACKAGES+= gnome-spell
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-spell
-
-.if !empty(GNOME_SPELL_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.gnome-spell+= gnome-spell>=1.0.5
BUILDLINK_ABI_DEPENDS.gnome-spell+= gnome-spell>=1.0.7nb4
BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
-.endif # GNOME_SPELL_BUILDLINK3_MK
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
@@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.endif # GNOME_SPELL_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gnome-spell
diff --git a/textproc/gtk-doc/buildlink3.mk b/textproc/gtk-doc/buildlink3.mk
index 6c00b765631..264eabe78d7 100644
--- a/textproc/gtk-doc/buildlink3.mk
+++ b/textproc/gtk-doc/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:29 joerg Exp $
# provided mostly for pkg-config
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GTK_DOC_BUILDLINK3_MK:= ${GTK_DOC_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gtk-doc
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gtk-doc
-.endif
+.if !defined(GTK_DOC_BUILDLINK3_MK)
+GTK_DOC_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk-doc}
-BUILDLINK_PACKAGES+= gtk-doc
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk-doc
-
-.if !empty(GTK_DOC_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.gtk-doc+= gtk-doc>=1.4nb1
BUILDLINK_PKGSRCDIR.gtk-doc?= ../../textproc/gtk-doc
-.endif # GTK_DOC_BUILDLINK3_MK
BUILDLINK_DEPMETHOD.gtk-doc?= build
+.endif # GTK_DOC_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gtk-doc
diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk
index b35fdccaf43..fdd510c4f04 100644
--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/05/30 12:28:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GTKSPELL_BUILDLINK3_MK:= ${GTKSPELL_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gtkspell
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gtkspell
-.endif
+.if !defined(GTKSPELL_BUILDLINK3_MK)
+GTKSPELL_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkspell}
-BUILDLINK_PACKAGES+= gtkspell
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkspell
-
-.if !empty(GTKSPELL_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.gtkspell+= gtkspell>=2.0.13
BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell
-.endif # GTKSPELL_BUILDLINK3_MK
.include "../../textproc/enchant/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.endif # GTKSPELL_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gtkspell
diff --git a/textproc/hre/buildlink3.mk b/textproc/hre/buildlink3.mk
index 7a5ba43806e..899d0a6052a 100644
--- a/textproc/hre/buildlink3.mk
+++ b/textproc/hre/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-HRE_BUILDLINK3_MK:= ${HRE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= hre
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= hre
-.endif
+.if !defined(HRE_BUILDLINK3_MK)
+HRE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhre}
-BUILDLINK_PACKAGES+= hre
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hre
-
-.if !empty(HRE_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.hre+= hre>=0.9.7
BUILDLINK_ABI_DEPENDS.hre+= hre>=0.9.8anb1
BUILDLINK_PKGSRCDIR.hre?= ../../textproc/hre
-.endif # HRE_BUILDLINK3_MK
+.endif # HRE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -hre
diff --git a/textproc/hunspell/buildlink3.mk b/textproc/hunspell/buildlink3.mk
index 1a3e299faf4..7dd4f26cc42 100644
--- a/textproc/hunspell/buildlink3.mk
+++ b/textproc/hunspell/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/04/14 09:39:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-HUNSPELL_BUILDLINK3_MK:= ${HUNSPELL_BUILDLINK3_MK}+
+BUILDLINK_TREE+= hunspell
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= hunspell
-.endif
+.if !defined(HUNSPELL_BUILDLINK3_MK)
+HUNSPELL_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhunspell}
-BUILDLINK_PACKAGES+= hunspell
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hunspell
-
-.if ${HUNSPELL_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.hunspell+= hunspell>=1.2.2
BUILDLINK_PKGSRCDIR.hunspell?= ../../textproc/hunspell
-.endif # HUNSPELL_BUILDLINK3_MK
+.endif # HUNSPELL_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -hunspell
diff --git a/textproc/hyperestraier/buildlink3.mk b/textproc/hyperestraier/buildlink3.mk
index 1482ad35b44..b9bc41b9165 100644
--- a/textproc/hyperestraier/buildlink3.mk
+++ b/textproc/hyperestraier/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/11/17 15:11:31 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-HYPERESTRAIER_BUILDLINK3_MK:= ${HYPERESTRAIER_BUILDLINK3_MK}+
+BUILDLINK_TREE+= hyperestraier
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= hyperestraier
-.endif
+.if !defined(HYPERESTRAIER_BUILDLINK3_MK)
+HYPERESTRAIER_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhyperestraier}
-BUILDLINK_PACKAGES+= hyperestraier
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hyperestraier
-
-.if ${HYPERESTRAIER_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.hyperestraier+= hyperestraier>=1.1.2
BUILDLINK_PKGSRCDIR.hyperestraier?= ../../textproc/hyperestraier
-.endif # HYPERESTRAIER_BUILDLINK3_MK
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/lzo/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/qdbm/buildlink3.mk"
+.endif # HYPERESTRAIER_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -hyperestraier
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 1a4a48d2a10..2554e1603fa 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ICU_BUILDLINK3_MK:= ${ICU_BUILDLINK3_MK}+
+BUILDLINK_TREE+= icu
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= icu
-.endif
+.if !defined(ICU_BUILDLINK3_MK)
+ICU_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nicu}
-BUILDLINK_PACKAGES+= icu
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}icu
-
-.if !empty(ICU_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.icu+= icu>=3.4
BUILDLINK_ABI_DEPENDS.icu?= icu>=3.4nb1
BUILDLINK_PKGSRCDIR.icu?= ../../textproc/icu
-.endif # ICU_BUILDLINK3_MK
+.endif # ICU_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -icu
diff --git a/textproc/iso-codes/buildlink3.mk b/textproc/iso-codes/buildlink3.mk
index 6ddbf6340e1..f4f3161906e 100644
--- a/textproc/iso-codes/buildlink3.mk
+++ b/textproc/iso-codes/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ISO_CODES_BUILDLINK3_MK:= ${ISO_CODES_BUILDLINK3_MK}+
+BUILDLINK_TREE+= iso-codes
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= iso-codes
-.endif
+.if !defined(ISO_CODES_BUILDLINK3_MK)
+ISO_CODES_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niso-codes}
-BUILDLINK_PACKAGES+= iso-codes
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}iso-codes
-
-.if !empty(ISO_CODES_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.iso-codes+= iso-codes>=0.50
BUILDLINK_PKGSRCDIR.iso-codes?= ../../textproc/iso-codes
-.endif # ISO_CODES_BUILDLINK3_MK
+.endif # ISO_CODES_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -iso-codes
diff --git a/textproc/jade/buildlink3.mk b/textproc/jade/buildlink3.mk
index 5b5cf724563..db557abd62a 100644
--- a/textproc/jade/buildlink3.mk
+++ b/textproc/jade/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:29 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-JADE_BUILDLINK3_MK:= ${JADE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= jade
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= jade
-.endif
+.if !defined(JADE_BUILDLINK3_MK)
+JADE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njade}
-BUILDLINK_PACKAGES+= jade
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jade
-
-.if !empty(JADE_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.jade+= jade>=1.2.1nb7
BUILDLINK_ABI_DEPENDS.jade+= jade>=1.2.1nb10
BUILDLINK_PKGSRCDIR.jade?= ../../textproc/jade
-.endif # JADE_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
+.endif # JADE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -jade
diff --git a/textproc/json-glib/buildlink3.mk b/textproc/json-glib/buildlink3.mk
index b8aff038507..d713300539b 100644
--- a/textproc/json-glib/buildlink3.mk
+++ b/textproc/json-glib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/05 13:07:14 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $
#
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-JSON_GLIB_BUILDLINK3_MK:= ${JSON_GLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= json-glib
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= json-glib
-.endif
+.if !defined(JSON_GLIB_BUILDLINK3_MK)
+JSON_GLIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njson-glib}
-BUILDLINK_PACKAGES+= json-glib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}json-glib
-
-.if ${JSON_GLIB_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.json-glib+= json-glib>=0.6.2
BUILDLINK_PKGSRCDIR.json-glib?= ../../textproc/json-glib
-.endif # JSON_GLIB_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
+.endif # JSON_GLIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -json-glib
diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk
index 2ec7796089b..b73e6def746 100644
--- a/textproc/kakasi/buildlink3.mk
+++ b/textproc/kakasi/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:30 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-KAKASI_BUILDLINK3_MK:= ${KAKASI_BUILDLINK3_MK}+
+BUILDLINK_TREE+= kakasi
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= kakasi
-.endif
+.if !defined(KAKASI_BUILDLINK3_MK)
+KAKASI_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkakasi}
-BUILDLINK_PACKAGES+= kakasi
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kakasi
-
-.if !empty(KAKASI_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.kakasi+= kakasi>=2.3.0
BUILDLINK_ABI_DEPENDS.kakasi+= kakasi>=2.3.4nb4
BUILDLINK_PKGSRCDIR.kakasi?= ../../textproc/kakasi
-.endif # KAKASI_BUILDLINK3_MK
+.endif # KAKASI_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -kakasi
diff --git a/textproc/libclucene/buildlink3.mk b/textproc/libclucene/buildlink3.mk
index 456f12a7e16..9d198ccf774 100644
--- a/textproc/libclucene/buildlink3.mk
+++ b/textproc/libclucene/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 10:52:53 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBCLUCENE_BUILDLINK3_MK:= ${LIBCLUCENE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libclucene
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libclucene
-.endif
+.if !defined(LIBCLUCENE_BUILDLINK3_MK)
+LIBCLUCENE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibclucene}
-BUILDLINK_PACKAGES+= libclucene
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libclucene
-
-.if ${LIBCLUCENE_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.libclucene+= libclucene>=0.9.21
BUILDLINK_PKGSRCDIR.libclucene?= ../../textproc/libclucene
-.endif # LIBCLUCENE_BUILDLINK3_MK
+.endif # LIBCLUCENE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libclucene
diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk
index f9b83caa12e..c4aec5d6ba8 100644
--- a/textproc/libcroco/buildlink3.mk
+++ b/textproc/libcroco/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/02/20 20:02:30 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:30 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBCROCO_BUILDLINK3_MK:= ${LIBCROCO_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libcroco
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libcroco
-.endif
+.if !defined(LIBCROCO_BUILDLINK3_MK)
+LIBCROCO_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcroco}
-BUILDLINK_PACKAGES+= libcroco
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcroco
-
-.if !empty(LIBCROCO_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.0
BUILDLINK_ABI_DEPENDS.libcroco+= libcroco>=0.6.1nb7
BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco
-.endif # LIBCROCO_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBCROCO_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libcroco
diff --git a/textproc/liblinebreak/buildlink3.mk b/textproc/liblinebreak/buildlink3.mk
index aa38e32199b..c7537dd0414 100644
--- a/textproc/liblinebreak/buildlink3.mk
+++ b/textproc/liblinebreak/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/18 17:38:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBLINEBREAK_BUILDLINK3_MK:= ${LIBLINEBREAK_BUILDLINK3_MK}+
+BUILDLINK_TREE+= liblinebreak
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= liblinebreak
-.endif
+.if !defined(LIBLINEBREAK_BUILDLINK3_MK)
+LIBLINEBREAK_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblinebreak}
-BUILDLINK_PACKAGES+= liblinebreak
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblinebreak
-
-.if ${LIBLINEBREAK_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.liblinebreak+= liblinebreak>=1.0
BUILDLINK_PKGSRCDIR.liblinebreak?= ../../textproc/liblinebreak
-.endif # LIBLINEBREAK_BUILDLINK3_MK
+.endif # LIBLINEBREAK_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -liblinebreak
diff --git a/textproc/liblrdf/buildlink3.mk b/textproc/liblrdf/buildlink3.mk
index 57fbdc82737..21466127136 100644
--- a/textproc/liblrdf/buildlink3.mk
+++ b/textproc/liblrdf/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/08/19 19:07:44 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:30 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBLRDF_BUILDLINK3_MK:= ${LIBLRDF_BUILDLINK3_MK}+
+BUILDLINK_TREE+= liblrdf
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= liblrdf
-.endif
+.if !defined(LIBLRDF_BUILDLINK3_MK)
+LIBLRDF_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliblrdf}
-BUILDLINK_PACKAGES+= liblrdf
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}liblrdf
-
-.if ${LIBLRDF_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.liblrdf+= liblrdf>=0.4.0nb1
BUILDLINK_PKGSRCDIR.liblrdf?= ../../textproc/liblrdf
-.endif # LIBLRDF_BUILDLINK3_MK
.include "../../textproc/raptor/buildlink3.mk"
+.endif # LIBLRDF_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -liblrdf
diff --git a/textproc/libpathan/buildlink3.mk b/textproc/libpathan/buildlink3.mk
index 7d785a2d32b..6a940c8a53d 100644
--- a/textproc/libpathan/buildlink3.mk
+++ b/textproc/libpathan/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:30 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBPATHAN_BUILDLINK3_MK:= ${LIBPATHAN_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libpathan
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libpathan
-.endif
+.if !defined(LIBPATHAN_BUILDLINK3_MK)
+LIBPATHAN_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpathan}
-BUILDLINK_PACKAGES+= libpathan
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpathan
-
-.if !empty(LIBPATHAN_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libpathan+= libpathan>=1.2.2
BUILDLINK_ABI_DEPENDS.libpathan+= libpathan>=1.2.2nb2
BUILDLINK_PKGSRCDIR.libpathan?= ../../textproc/libpathan
-.endif # LIBPATHAN_BUILDLINK3_MK
.include "../../textproc/xerces-c/buildlink3.mk"
+.endif # LIBPATHAN_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libpathan
diff --git a/textproc/libunicode/buildlink3.mk b/textproc/libunicode/buildlink3.mk
index 9c1e25b2838..a02fa5ed53e 100644
--- a/textproc/libunicode/buildlink3.mk
+++ b/textproc/libunicode/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:30 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBUNICODE_BUILDLINK3_MK:= ${LIBUNICODE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libunicode
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libunicode
-.endif
+.if !defined(LIBUNICODE_BUILDLINK3_MK)
+LIBUNICODE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibunicode}
-BUILDLINK_PACKAGES+= libunicode
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libunicode
-
-.if !empty(LIBUNICODE_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libunicode+= libunicode>=0.4
BUILDLINK_ABI_DEPENDS.libunicode+= libunicode>=0.4nb1
BUILDLINK_PKGSRCDIR.libunicode?= ../../textproc/libunicode
-.endif # LIBUNICODE_BUILDLINK3_MK
+.endif # LIBUNICODE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libunicode
diff --git a/textproc/libxml++/buildlink3.mk b/textproc/libxml++/buildlink3.mk
index fc247a43e03..9016002fa19 100644
--- a/textproc/libxml++/buildlink3.mk
+++ b/textproc/libxml++/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/09/20 21:03:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBXMLPP_BUILDLINK3_MK:= ${LIBXMLPP_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libxmlpp
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libxmlpp
-.endif
+.if !defined(LIBXMLPP_BUILDLINK3_MK)
+LIBXMLPP_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxmlpp}
-BUILDLINK_PACKAGES+= libxmlpp
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxmlpp
-
-.if !empty(LIBXMLPP_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libxmlpp+= libxml++>=2.10.0
BUILDLINK_ABI_DEPENDS.libxmlpp+= libxml++>=2.10.0nb1
BUILDLINK_PKGSRCDIR.libxmlpp?= ../../textproc/libxml++
-.endif # LIBXMLPP_BUILDLINK3_MK
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../devel/glibmm/buildlink3.mk"
+.endif # LIBXMLPP_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libxmlpp
diff --git a/textproc/libxml++1/buildlink3.mk b/textproc/libxml++1/buildlink3.mk
index fb4ff633373..f93566926f0 100644
--- a/textproc/libxml++1/buildlink3.mk
+++ b/textproc/libxml++1/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/09/20 21:03:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBXMLPP1_BUILDLINK3_MK:= ${LIBXMLPP1_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libxmlpp1
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libxmlpp1
-.endif
+.if !defined(LIBXMLPP1_BUILDLINK3_MK)
+LIBXMLPP1_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxmlpp1}
-BUILDLINK_PACKAGES+= libxmlpp1
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxmlpp1
-
-.if ${LIBXMLPP1_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.libxmlpp1+= libxml++1>=1.0.5
BUILDLINK_PKGSRCDIR.libxmlpp1?= ../../textproc/libxml++1
-.endif # LIBXMLPP1_BUILDLINK3_MK
.include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBXMLPP1_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libxmlpp1
diff --git a/textproc/libxml/buildlink3.mk b/textproc/libxml/buildlink3.mk
index fad1bf8eab6..0ff9f0b1bbd 100644
--- a/textproc/libxml/buildlink3.mk
+++ b/textproc/libxml/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:30 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBXML_BUILDLINK3_MK:= ${LIBXML_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libxml
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libxml
-.endif
+.if !defined(LIBXML_BUILDLINK3_MK)
+LIBXML_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml}
-BUILDLINK_PACKAGES+= libxml
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxml
-
-.if !empty(LIBXML_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libxml+= libxml>=1.8.11
BUILDLINK_ABI_DEPENDS.libxml+= libxml>=1.8.17nb3
BUILDLINK_FILES.libxml+= include/gnome-xml/libxml/*.h
BUILDLINK_PKGSRCDIR.libxml?= ../../textproc/libxml
-.endif # LIBXML_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
+.endif # LIBXML_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libxml
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index fa8b727385b..0769e7abb53 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/03/16 23:17:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBXML2_BUILDLINK3_MK:= ${LIBXML2_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libxml2
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libxml2
-.endif
+.if !defined(LIBXML2_BUILDLINK3_MK)
+LIBXML2_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxml2}
-BUILDLINK_PACKAGES+= libxml2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxml2
-
-.if !empty(LIBXML2_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.2
BUILDLINK_ABI_DEPENDS.libxml2+= libxml2>=2.6.23nb1
BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2
@@ -19,9 +12,9 @@ BUILDLINK_PKGSRCDIR.libxml2?= ../../textproc/libxml2
BUILDLINK_FILES.libxml2+= bin/xml2-config
USE_FEATURES+= glob
-.endif # LIBXML2_BUILDLINK3_MK
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.endif # LIBXML2_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libxml2
diff --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk
index 51a160226ca..9dc5976f376 100644
--- a/textproc/libxslt/buildlink3.mk
+++ b/textproc/libxslt/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBXSLT_BUILDLINK3_MK:= ${LIBXSLT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libxslt
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libxslt
-.endif
+.if !defined(LIBXSLT_BUILDLINK3_MK)
+LIBXSLT_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibxslt}
-BUILDLINK_PACKAGES+= libxslt
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxslt
-
-.if !empty(LIBXSLT_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.8
BUILDLINK_ABI_DEPENDS.libxslt+= libxslt>=1.1.15nb1
BUILDLINK_PKGSRCDIR.libxslt?= ../../textproc/libxslt
-.endif # LIBXSLT_BUILDLINK3_MK
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBXSLT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libxslt
diff --git a/textproc/link-grammar/buildlink3.mk b/textproc/link-grammar/buildlink3.mk
index e73fdd67eb9..21718e6d34d 100644
--- a/textproc/link-grammar/buildlink3.mk
+++ b/textproc/link-grammar/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/04/14 22:25:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LINK_GRAMMAR_BUILDLINK3_MK:= ${LINK_GRAMMAR_BUILDLINK3_MK}+
+BUILDLINK_TREE+= link-grammar
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= link-grammar
-.endif
+.if !defined(LINK_GRAMMAR_BUILDLINK3_MK)
+LINK_GRAMMAR_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlink-grammar}
-BUILDLINK_PACKAGES+= link-grammar
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}link-grammar
-
-.if ${LINK_GRAMMAR_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.link-grammar+= link-grammar>=4.3.4
BUILDLINK_PKGSRCDIR.link-grammar?= ../../textproc/link-grammar
-.endif # LINK_GRAMMAR_BUILDLINK3_MK
+.endif # LINK_GRAMMAR_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -link-grammar
diff --git a/textproc/mecab-base/buildlink3.mk b/textproc/mecab-base/buildlink3.mk
index 1f195a86996..e396fc8ce0f 100644
--- a/textproc/mecab-base/buildlink3.mk
+++ b/textproc/mecab-base/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/05/12 13:47:03 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MECAB_BASE_BUILDLINK3_MK:= ${MECAB_BASE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= mecab-base
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= mecab-base
-.endif
+.if !defined(MECAB_BASE_BUILDLINK3_MK)
+MECAB_BASE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmecab-base}
-BUILDLINK_PACKAGES+= mecab-base
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mecab-base
-
-.if ${MECAB_BASE_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.mecab-base+= mecab-base>=0.90
BUILDLINK_PKGSRCDIR.mecab-base?= ../../textproc/mecab-base
BUILDLINK_FILES.mecab-base+= include/mecab.h
BUILDLINK_FILES.mecab-base+= lib/libmecab.*
-.endif # MECAB_BASE_BUILDLINK3_MK
.include "../../mk/pthread.buildlink3.mk"
+.endif # MECAB_BASE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -mecab-base
diff --git a/textproc/mecab/buildlink3.mk b/textproc/mecab/buildlink3.mk
index fda3b775696..e5a56e36801 100644
--- a/textproc/mecab/buildlink3.mk
+++ b/textproc/mecab/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/05/12 13:48:24 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MECAB_BUILDLINK3_MK:= ${MECAB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= mecab
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= mecab
-.endif
+.if !defined(MECAB_BUILDLINK3_MK)
+MECAB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmecab}
-BUILDLINK_PACKAGES+= mecab
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mecab
-
-.if ${MECAB_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.mecab+= mecab>=0.90
BUILDLINK_PKGSRCDIR.mecab?= ../../textproc/mecab
-.endif # MECAB_BUILDLINK3_MK
.include "../../textproc/mecab-base/buildlink3.mk"
+.endif # MECAB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -mecab
diff --git a/textproc/mxml/buildlink3.mk b/textproc/mxml/buildlink3.mk
index 97d2131afce..87a07047e1d 100644
--- a/textproc/mxml/buildlink3.mk
+++ b/textproc/mxml/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/10/12 17:30:04 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MXML_BUILDLINK3_MK:= ${MXML_BUILDLINK3_MK}+
+BUILDLINK_TREE+= mxml
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= mxml
-.endif
+.if !defined(MXML_BUILDLINK3_MK)
+MXML_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmxml}
-BUILDLINK_PACKAGES+= mxml
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mxml
-
-.if ${MXML_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.mxml+= mxml>=2.3
BUILDLINK_PKGSRCDIR.mxml?= ../../textproc/mxml
-.endif # MXML_BUILDLINK3_MK
+.endif # MXML_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -mxml
diff --git a/textproc/oniguruma/buildlink3.mk b/textproc/oniguruma/buildlink3.mk
index 4a0189b3e09..218994e04ab 100644
--- a/textproc/oniguruma/buildlink3.mk
+++ b/textproc/oniguruma/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/08/09 17:52:57 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:31 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-ONIGURUMA_BUILDLINK3_MK:= ${ONIGURUMA_BUILDLINK3_MK}+
+BUILDLINK_TREE+= oniguruma
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= oniguruma
-.endif
+.if !defined(ONIGURUMA_BUILDLINK3_MK)
+ONIGURUMA_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noniguruma}
-BUILDLINK_PACKAGES+= oniguruma
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}oniguruma
-
-.if ${ONIGURUMA_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.oniguruma+= oniguruma>=5.9.1
BUILDLINK_PKGSRCDIR.oniguruma?= ../../textproc/oniguruma
-.endif # ONIGURUMA_BUILDLINK3_MK
+.endif # ONIGURUMA_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -oniguruma
diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk
index fa153c0f7a8..be5210cbd2e 100644
--- a/textproc/opensp/buildlink3.mk
+++ b/textproc/opensp/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-OPENSP_BUILDLINK3_MK:= ${OPENSP_BUILDLINK3_MK}+
+BUILDLINK_TREE+= opensp
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= opensp
-.endif
+.if !defined(OPENSP_BUILDLINK3_MK)
+OPENSP_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopensp}
-BUILDLINK_PACKAGES+= opensp
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}opensp
-
-.if !empty(OPENSP_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.opensp+= opensp>=1.5.1
BUILDLINK_ABI_DEPENDS.opensp+= opensp>=1.5.1nb3
BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp
-.endif # OPENSP_BUILDLINK3_MK
PTHREAD_OPTS+= require
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
+.endif # OPENSP_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -opensp
diff --git a/textproc/py-elementtree/buildlink3.mk b/textproc/py-elementtree/buildlink3.mk
index 8cb0cf6dc34..cfea71408be 100644
--- a/textproc/py-elementtree/buildlink3.mk
+++ b/textproc/py-elementtree/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PY_ELEMENTTREE_BUILDLINK3_MK:= ${PY_ELEMENTTREE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= py-elementtree
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= py-elementtree
-.endif
+.if !defined(PY_ELEMENTTREE_BUILDLINK3_MK)
+PY_ELEMENTTREE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-elementtree}
-BUILDLINK_PACKAGES+= py-elementtree
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-elementtree
-
-.if ${PY_ELEMENTTREE_BUILDLINK3_MK} == "+"
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.py-elementtree+= ${PYPKGPREFIX}-elementtree>=1.2.6nb3
BUILDLINK_PKGSRCDIR.py-elementtree= ../../textproc/py-elementtree
-.endif # PY_ELEMENTTREE_BUILDLINK3_MK
+.endif # PY_ELEMENTTREE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -py-elementtree
diff --git a/textproc/py-libxml2/buildlink3.mk b/textproc/py-libxml2/buildlink3.mk
index 3b4b58c8abe..24746cec185 100644
--- a/textproc/py-libxml2/buildlink3.mk
+++ b/textproc/py-libxml2/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PY_LIBXML2_BUILDLINK3_MK:= ${PY_LIBXML2_BUILDLINK3_MK}+
+BUILDLINK_TREE+= py-libxml2
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= py-libxml2
-.endif
+.if !defined(PY_LIBXML2_BUILDLINK3_MK)
+PY_LIBXML2_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-libxml2}
-BUILDLINK_PACKAGES+= py-libxml2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-libxml2
-
-.if ${PY_LIBXML2_BUILDLINK3_MK} == "+"
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.py-libxml2+= ${PYPKGPREFIX}-libxml2>=2.6.27
BUILDLINK_PKGSRCDIR.py-libxml2?= ../../textproc/py-libxml2
-.endif # PY_LIBXML2_BUILDLINK3_MK
+.endif # PY_LIBXML2_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -py-libxml2
diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk
index 3a8fe4c9b2d..94abda313b3 100644
--- a/textproc/py-xml/buildlink3.mk
+++ b/textproc/py-xml/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 17:30:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+
+BUILDLINK_TREE+= pyxml
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= pyxml
-.endif
+.if !defined(PYXML_BUILDLINK3_MK)
+PYXML_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyxml}
-BUILDLINK_PACKAGES+= pyxml
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyxml
-
-.if !empty(PYXML_BUILDLINK3_MK:M+)
.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1
BUILDLINK_ABI_DEPENDS.pyxml?= ${PYPKGPREFIX}-xml>=0.8.4nb2
BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml
-.endif # PYXML_BUILDLINK3_MK
.include "../../textproc/expat/buildlink3.mk"
+.endif # PYXML_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -pyxml
diff --git a/textproc/raptor/buildlink3.mk b/textproc/raptor/buildlink3.mk
index 45dd8b9b1df..41ebb3c8f55 100644
--- a/textproc/raptor/buildlink3.mk
+++ b/textproc/raptor/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/05/09 21:45:23 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-RAPTOR_BUILDLINK3_MK:= ${RAPTOR_BUILDLINK3_MK}+
+BUILDLINK_TREE+= raptor
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= raptor
-.endif
+.if !defined(RAPTOR_BUILDLINK3_MK)
+RAPTOR_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nraptor}
-BUILDLINK_PACKAGES+= raptor
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}raptor
-
-.if ${RAPTOR_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.raptor?= raptor>=1.0.0
BUILDLINK_ABI_DEPENDS.raptor+= raptor>=1.4.15nb1
BUILDLINK_PKGSRCDIR.raptor?= ../../textproc/raptor
-.endif # RAPTOR_BUILDLINK3_MK
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
+.endif # RAPTOR_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -raptor
diff --git a/textproc/rarian/buildlink3.mk b/textproc/rarian/buildlink3.mk
index 415dc5bee1e..ec0a4ecbfc0 100644
--- a/textproc/rarian/buildlink3.mk
+++ b/textproc/rarian/buildlink3.mk
@@ -1,22 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/11/05 17:06:33 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-RARIAN_BUILDLINK3_MK:= ${RARIAN_BUILDLINK3_MK}+
+BUILDLINK_TREE+= rarian
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= rarian
-.endif
+.if !defined(RARIAN_BUILDLINK3_MK)
+RARIAN_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrarian}
-BUILDLINK_PACKAGES+= rarian
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rarian
-
-.if ${RARIAN_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.rarian+= rarian>=0.6.0
BUILDLINK_PKGSRCDIR.rarian?= ../../textproc/rarian
-.endif # RARIAN_BUILDLINK3_MK
-.if !empty(RARIAN_BUILDLINK3_MK:M+)
BUILDLINK_TARGETS+= rarian-buildlink-fake
rarian-buildlink-fake:
@@ -36,6 +27,6 @@ rarian-buildlink-fake:
${CHMOD} +x ${BUILDLINK_DIR}/bin/$${fake}; \
fi; \
done
-.endif # RARIAN_BUILDLINK3_MK
+.endif # RARIAN_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -rarian
diff --git a/textproc/rasqal/buildlink3.mk b/textproc/rasqal/buildlink3.mk
index c580695ca13..27cb545f26a 100644
--- a/textproc/rasqal/buildlink3.mk
+++ b/textproc/rasqal/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/07 21:33:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-RASQAL_BUILDLINK3_MK:= ${RASQAL_BUILDLINK3_MK}+
+BUILDLINK_TREE+= rasqal
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= rasqal
-.endif
+.if !defined(RASQAL_BUILDLINK3_MK)
+RASQAL_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrasqal}
-BUILDLINK_PACKAGES+= rasqal
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}rasqal
-
-.if ${RASQAL_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.rasqal+= rasqal>=0.9.16
BUILDLINK_PKGSRCDIR.rasqal?= ../../textproc/rasqal
-.endif # RASQAL_BUILDLINK3_MK
.include "../../textproc/raptor/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
+.endif # RASQAL_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -rasqal
diff --git a/textproc/redland/buildlink3.mk b/textproc/redland/buildlink3.mk
index bc010794240..1dac5ba5423 100644
--- a/textproc/redland/buildlink3.mk
+++ b/textproc/redland/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 10:39:40 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-REDLAND_BUILDLINK3_MK:= ${REDLAND_BUILDLINK3_MK}+
+BUILDLINK_TREE+= redland
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= redland
-.endif
+.if !defined(REDLAND_BUILDLINK3_MK)
+REDLAND_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nredland}
-BUILDLINK_PACKAGES+= redland
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}redland
-
-.if ${REDLAND_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.redland+= redland>=1.0.7
BUILDLINK_PKGSRCDIR.redland?= ../../textproc/redland
-.endif # REDLAND_BUILDLINK3_MK
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/raptor/buildlink3.mk"
.include "../../textproc/rasqal/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
+.endif # REDLAND_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -redland
diff --git a/textproc/ruby-eruby/buildlink3.mk b/textproc/ruby-eruby/buildlink3.mk
index f15827c59c7..8e48264499b 100644
--- a/textproc/ruby-eruby/buildlink3.mk
+++ b/textproc/ruby-eruby/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-RUBY_ERUBY_BUILDLINK3_MK:= ${RUBY_ERUBY_BUILDLINK3_MK}+
+BUILDLINK_TREE+= ${RUBY_PKGPREFIX}-eruby
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= ${RUBY_PKGPREFIX}-eruby
-.endif
+.if !defined(RUBY_ERUBY_BUILDLINK3_MK)
+RUBY_ERUBY_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-eruby}
-BUILDLINK_PACKAGES+= ${RUBY_PKGPREFIX}-eruby
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_PKGPREFIX}-eruby
-
-.if !empty(RUBY_ERUBY_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.ruby18-eruby+= ${RUBY_PKGPREFIX}-eruby>=0.9.7
BUILDLINK_PKGSRCDIR.ruby18-eruby?= ../../textproc/ruby-eruby
-.endif # RUBY_ERUBY_BUILDLINK3_MK
+.endif # RUBY_ERUBY_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -${RUBY_PKGPREFIX}-eruby
diff --git a/textproc/ruby-rdtool/buildlink3.mk b/textproc/ruby-rdtool/buildlink3.mk
index 34f6284d626..06e8a8a20e5 100644
--- a/textproc/ruby-rdtool/buildlink3.mk
+++ b/textproc/ruby-rdtool/buildlink3.mk
@@ -1,18 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/19 15:34:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:32 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+BUILDLINK_TREE+= ${RUBY_PKGPREFIX}-rdtool
-RUBY_RDTOOL_BUILDLINK3_MK:= ${RUBY_RDTOOL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= ${RUBY_PKGPREFIX}-rdtool
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-rdtool}
-BUILDLINK_PACKAGES+= ${RUBY_PKGPREFIX}-rdtool
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}${RUBY_PKGPREFIX}-rdtool
-
-.if !empty(RUBY_RDTOOL_BUILDLINK3_MK:M+)
+.if !defined(RUBY_RDTOOL_BUILDLINK3_MK)
+RUBY_RDTOOL_BUILDLINK3_MK:=
RUBY_RD= rd2
RUBY_RD_VERSION = 0.6.18
@@ -27,4 +18,4 @@ BUILDLINK_API_DEPENDS.ruby18-rdtool+= {${RUBY_RD_LIST}}>=0.6.14
BUILDLINK_PKGSRCDIR.ruby18-rdtool?= ../../textproc/ruby-rdtool
.endif # RUBY_RDTOOL_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -${RUBY_PKGPREFIX}-rdtool
diff --git a/textproc/sablotron/buildlink3.mk b/textproc/sablotron/buildlink3.mk
index 4375ed3f31f..109fb438ab8 100644
--- a/textproc/sablotron/buildlink3.mk
+++ b/textproc/sablotron/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SABLOTRON_BUILDLINK3_MK:= ${SABLOTRON_BUILDLINK3_MK}+
+BUILDLINK_TREE+= sablotron
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= sablotron
-.endif
+.if !defined(SABLOTRON_BUILDLINK3_MK)
+SABLOTRON_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsablotron}
-BUILDLINK_PACKAGES+= sablotron
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sablotron
-
-.if !empty(SABLOTRON_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.sablotron+= sablotron>=1.0
BUILDLINK_ABI_DEPENDS.sablotron+= sablotron>=1.0.2nb2
BUILDLINK_PKGSRCDIR.sablotron?= ../../textproc/sablotron
-.endif # SABLOTRON_BUILDLINK3_MK
.include "../../converters/libiconv/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
+.endif # SABLOTRON_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -sablotron
diff --git a/textproc/sary/buildlink3.mk b/textproc/sary/buildlink3.mk
index 9eb9215cebf..eee46436345 100644
--- a/textproc/sary/buildlink3.mk
+++ b/textproc/sary/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/03/01 08:29:07 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SARY_BUILDLINK3_MK:= ${SARY_BUILDLINK3_MK}+
+BUILDLINK_TREE+= sary
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= sary
-.endif
+.if !defined(SARY_BUILDLINK3_MK)
+SARY_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsary}
-BUILDLINK_PACKAGES+= sary
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sary
-
-.if ${SARY_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.sary+= sary>=1.2.0
BUILDLINK_PKGSRCDIR.sary?= ../../textproc/sary
-.endif # SARY_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
+.endif # SARY_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -sary
diff --git a/textproc/soprano/buildlink3.mk b/textproc/soprano/buildlink3.mk
index f541d88ee50..4f40fbb5564 100644
--- a/textproc/soprano/buildlink3.mk
+++ b/textproc/soprano/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 11:01:41 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SOPRANO_BUILDLINK3_MK:= ${SOPRANO_BUILDLINK3_MK}+
+BUILDLINK_TREE+= soprano
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= soprano
-.endif
+.if !defined(SOPRANO_BUILDLINK3_MK)
+SOPRANO_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsoprano}
-BUILDLINK_PACKAGES+= soprano
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}soprano
-
-.if ${SOPRANO_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.soprano+= soprano>=2.0.3
BUILDLINK_PKGSRCDIR.soprano?= ../../textproc/soprano
-.endif # SOPRANO_BUILDLINK3_MK
.include "../../textproc/libclucene/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../x11/qt4-qdbus/buildlink3.mk"
+.endif # SOPRANO_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -soprano
diff --git a/textproc/sublib/buildlink3.mk b/textproc/sublib/buildlink3.mk
index 49e892983ef..6ecbdcea2b0 100644
--- a/textproc/sublib/buildlink3.mk
+++ b/textproc/sublib/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/06 08:54:21 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SUBLIB_BUILDLINK3_MK:= ${SUBLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= sublib
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= sublib
-.endif
+.if !defined(SUBLIB_BUILDLINK3_MK)
+SUBLIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsublib}
-BUILDLINK_PACKAGES+= sublib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sublib
-
-.if ${SUBLIB_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.sublib+= sublib>=0.9
BUILDLINK_PKGSRCDIR.sublib?= ../../textproc/sublib
-.endif # SUBLIB_BUILDLINK3_MK
.include "../../lang/mono/buildlink3.mk"
+.endif # SUBLIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -sublib
diff --git a/textproc/tokyodystopia/buildlink3.mk b/textproc/tokyodystopia/buildlink3.mk
index b7a41279804..ad567cfc2b1 100644
--- a/textproc/tokyodystopia/buildlink3.mk
+++ b/textproc/tokyodystopia/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/12/15 11:18:41 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TOKYODYSTOPIA_BUILDLINK3_MK:= ${TOKYODYSTOPIA_BUILDLINK3_MK}+
+BUILDLINK_TREE+= tokyodystopia
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= tokyodystopia
-.endif
+.if !defined(TOKYODYSTOPIA_BUILDLINK3_MK)
+TOKYODYSTOPIA_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntokyodystopia}
-BUILDLINK_PACKAGES+= tokyodystopia
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tokyodystopia
-
-.if ${TOKYODYSTOPIA_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.tokyodystopia+= tokyodystopia>=0.9.5
BUILDLINK_ABI_DEPENDS.tokyodystopia+= tokyodystopia>=0.9.8nb2
BUILDLINK_PKGSRCDIR.tokyodystopia?= ../../textproc/tokyodystopia
-.endif # TOKYODYSTOPIA_BUILDLINK3_MK
.include "../../databases/tokyocabinet/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../archivers/bzip2/buildlink3.mk"
+.endif # TOKYODYSTOPIA_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -tokyodystopia
diff --git a/textproc/uriparser/buildlink3.mk b/textproc/uriparser/buildlink3.mk
index 514118a0811..b4373345ee1 100644
--- a/textproc/uriparser/buildlink3.mk
+++ b/textproc/uriparser/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/11/08 18:36:14 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-URIPARSER_BUILDLINK3_MK:= ${URIPARSER_BUILDLINK3_MK}+
+BUILDLINK_TREE+= uriparser
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= uriparser
-.endif
+.if !defined(URIPARSER_BUILDLINK3_MK)
+URIPARSER_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nuriparser}
-BUILDLINK_PACKAGES+= uriparser
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}uriparser
-
-.if ${URIPARSER_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.uriparser+= uriparser>=0.6.0
BUILDLINK_PKGSRCDIR.uriparser?= ../../textproc/uriparser
-.endif # URIPARSER_BUILDLINK3_MK
+.endif # URIPARSER_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -uriparser
diff --git a/textproc/wbxml2/buildlink3.mk b/textproc/wbxml2/buildlink3.mk
index eff6449c9af..95b321ef5e9 100644
--- a/textproc/wbxml2/buildlink3.mk
+++ b/textproc/wbxml2/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/12 14:05:17 dillo Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-WBXML2_BUILDLINK3_MK:= ${WBXML2_BUILDLINK3_MK}+
+BUILDLINK_TREE+= wbxml2
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= wbxml2
-.endif
+.if !defined(WBXML2_BUILDLINK3_MK)
+WBXML2_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwbxml2}
-BUILDLINK_PACKAGES+= wbxml2
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wbxml2
-
-.if ${WBXML2_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.wbxml2+= wbxml2>=0.9.2
BUILDLINK_PKGSRCDIR.wbxml2?= ../../textproc/wbxml2
-.endif # WBXML2_BUILDLINK3_MK
.include "../../textproc/expat/buildlink3.mk"
+.endif # WBXML2_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -wbxml2
diff --git a/textproc/xalan-c/buildlink3.mk b/textproc/xalan-c/buildlink3.mk
index dc5ade4b298..e6b58ec6a6a 100644
--- a/textproc/xalan-c/buildlink3.mk
+++ b/textproc/xalan-c/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XALAN_C_BUILDLINK3_MK:= ${XALAN_C_BUILDLINK3_MK}+
+BUILDLINK_TREE+= xalan-c
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= xalan-c
-.endif
+.if !defined(XALAN_C_BUILDLINK3_MK)
+XALAN_C_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxalan-c}
-BUILDLINK_PACKAGES+= xalan-c
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xalan-c
-
-.if !empty(XALAN_C_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.xalan-c+= xalan-c>=1.6nb3
BUILDLINK_ABI_DEPENDS.xalan-c?= xalan-c>=1.6nb4
BUILDLINK_PKGSRCDIR.xalan-c?= ../../textproc/xalan-c
-.endif # XALAN_C_BUILDLINK3_MK
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
+.endif # XALAN_C_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -xalan-c
diff --git a/textproc/xapian/buildlink3.mk b/textproc/xapian/buildlink3.mk
index 781a08c1d7d..d4f0f26b607 100644
--- a/textproc/xapian/buildlink3.mk
+++ b/textproc/xapian/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/07/26 23:35:05 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XAPIAN_BUILDLINK3_MK:= ${XAPIAN_BUILDLINK3_MK}+
+BUILDLINK_TREE+= xapian
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xapian
-.endif
+.if !defined(XAPIAN_BUILDLINK3_MK)
+XAPIAN_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxapian}
-BUILDLINK_PACKAGES+= xapian
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xapian
-
-.if ${XAPIAN_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.xapian+= xapian>=1.0.7
BUILDLINK_PKGSRCDIR.xapian?= ../../textproc/xapian
-.endif # XAPIAN_BUILDLINK3_MK
+.endif # XAPIAN_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -xapian
diff --git a/textproc/xerces-c/buildlink3.mk b/textproc/xerces-c/buildlink3.mk
index c81c2d39e5c..2cd6b0a0400 100644
--- a/textproc/xerces-c/buildlink3.mk
+++ b/textproc/xerces-c/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/08/10 13:44:21 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:33 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XERCES_C_BUILDLINK3_MK:= ${XERCES_C_BUILDLINK3_MK}+
+BUILDLINK_TREE+= xerces-c
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= xerces-c
-.endif
+.if !defined(XERCES_C_BUILDLINK3_MK)
+XERCES_C_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxerces-c}
-BUILDLINK_PACKAGES+= xerces-c
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xerces-c
-
-.if !empty(XERCES_C_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.xerces-c+= xerces-c>=2.7.0
BUILDLINK_ABI_DEPENDS.xerces-c?= xerces-c>=2.7.0
BUILDLINK_PKGSRCDIR.xerces-c?= ../../textproc/xerces-c
-.endif # XERCES_C_BUILDLINK3_MK
.include "../../converters/libiconv/buildlink3.mk"
+.endif # XERCES_C_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -xerces-c
diff --git a/textproc/xfce4-dict-plugin/buildlink3.mk b/textproc/xfce4-dict-plugin/buildlink3.mk
index a8a981890bb..87990ac02c7 100644
--- a/textproc/xfce4-dict-plugin/buildlink3.mk
+++ b/textproc/xfce4-dict-plugin/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:34 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_DICT_PLUGIN_BUILDLINK3_MK:= ${XFCE4_DICT_PLUGIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+= xfce4-dict-plugin
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-dict-plugin
-.endif
+.if !defined(XFCE4_DICT_PLUGIN_BUILDLINK3_MK)
+XFCE4_DICT_PLUGIN_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-dict-plugin}
-BUILDLINK_PACKAGES+= xfce4-dict-plugin
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-dict-plugin
-
-.if ${XFCE4_DICT_PLUGIN_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.xfce4-dict-plugin+= xfce4-dict-plugin>=0.2.1
BUILDLINK_PKGSRCDIR.xfce4-dict-plugin?= ../../textproc/xfce4-dict-plugin
-.endif # XFCE4_DICT_PLUGIN_BUILDLINK3_MK
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../devel/xfce4-dev-tools/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_DICT_PLUGIN_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -xfce4-dict-plugin
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk
index 57416be2337..41f88a5fa1c 100644
--- a/textproc/xmlcatmgr/buildlink3.mk
+++ b/textproc/xmlcatmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:34 joerg Exp $
#
# This Makefile fragment is included by packages that use xmlcatmgr.
#
@@ -12,18 +12,11 @@
# type of tool they are.
#
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XMLCATMGR_BUILDLINK3_MK:= ${XMLCATMGR_BUILDLINK3_MK}+
+BUILDLINK_TREE+= xmlcatmgr
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= xmlcatmgr
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlcatmgr}
-BUILDLINK_PACKAGES+= xmlcatmgr
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmlcatmgr
+.if !defined(XMLCATMGR_BUILDLINK3_MK)
+XMLCATMGR_BUILDLINK3_MK:=
-.if !empty(XMLCATMGR_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1
BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr
@@ -43,7 +36,6 @@ XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/xml/catalog
PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ \
{ print "@comment in xmlcatmgr: " $$0; next }
+.endif # XMLCATMGR_BUILDLINK3_MK
-.endif # XMLCATMGR_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -xmlcatmgr
diff --git a/textproc/xmlrpc-c/buildlink3.mk b/textproc/xmlrpc-c/buildlink3.mk
index 41ea0aecacd..3ec45a46bb3 100644
--- a/textproc/xmlrpc-c/buildlink3.mk
+++ b/textproc/xmlrpc-c/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2008/01/18 05:09:46 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:34 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XMLRPC_C_BUILDLINK3_MK:= ${XMLRPC_C_BUILDLINK3_MK}+
+BUILDLINK_TREE+= xmlrpc-c
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xmlrpc-c
-.endif
+.if !defined(XMLRPC_C_BUILDLINK3_MK)
+XMLRPC_C_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlrpc-c}
-BUILDLINK_PACKAGES+= xmlrpc-c
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmlrpc-c
-
-.if ${XMLRPC_C_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.xmlrpc-c+= xmlrpc-c>=1.09.00
BUILDLINK_ABI_DEPENDS.xmlrpc-c?= xmlrpc-c>=1.09.00nb3
BUILDLINK_PKGSRCDIR.xmlrpc-c?= ../../textproc/xmlrpc-c
-.endif # XMLRPC_C_BUILDLINK3_MK
.include "../../www/libwww/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
+.endif # XMLRPC_C_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -xmlrpc-c