summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
Diffstat (limited to 'print')
-rw-r--r--print/a2ps/buildlink3.mk19
-rw-r--r--print/auctex/buildlink3.mk19
-rw-r--r--print/cups/buildlink3.mk19
-rw-r--r--print/evince/buildlink3.mk19
-rw-r--r--print/ghostscript/buildlink3.mk19
-rw-r--r--print/gimp-print-lib/buildlink3.mk19
-rw-r--r--print/gutenprint-lib/buildlink3.mk19
-rw-r--r--print/ijs/buildlink3.mk19
-rw-r--r--print/ja-vflib-lib/buildlink3.mk19
-rw-r--r--print/kpathsea/buildlink3.mk19
-rw-r--r--print/libgnomecups/buildlink3.mk19
-rw-r--r--print/libgnomeprint/buildlink3.mk19
-rw-r--r--print/libgnomeprintui/buildlink3.mk19
-rw-r--r--print/libpaper/buildlink3.mk19
-rw-r--r--print/libspectre/buildlink3.mk19
-rw-r--r--print/pdflib-lite/buildlink3.mk19
-rw-r--r--print/pdflib/buildlink3.mk19
-rw-r--r--print/poppler-glib/buildlink3.mk19
-rw-r--r--print/poppler-includes/buildlink3.mk19
-rw-r--r--print/poppler-qt/buildlink3.mk19
-rw-r--r--print/poppler-qt4/buildlink3.mk19
-rw-r--r--print/poppler/buildlink3.mk19
-rw-r--r--print/pslib/buildlink3.mk19
-rw-r--r--print/py-cups/buildlink3.mk19
-rw-r--r--print/ruby-gnome2-gnomeprint/buildlink3.mk19
-rw-r--r--print/teTeX3-bin/buildlink3.mk19
-rw-r--r--print/transfig/buildlink3.mk19
-rw-r--r--print/xfce4-print/buildlink3.mk19
28 files changed, 168 insertions, 364 deletions
diff --git a/print/a2ps/buildlink3.mk b/print/a2ps/buildlink3.mk
index b960e22c42f..4d40bf26478 100644
--- a/print/a2ps/buildlink3.mk
+++ b/print/a2ps/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:13 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-A2PS_BUILDLINK3_MK:= ${A2PS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= a2ps
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= a2ps
-.endif
+.if !defined(A2PS_BUILDLINK3_MK)
+A2PS_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Na2ps}
-BUILDLINK_PACKAGES+= a2ps
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}a2ps
-
-.if !empty(A2PS_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.a2ps+= a2ps>=4.13.0.2nb4
BUILDLINK_ABI_DEPENDS.a2ps?= a2ps>=4.13.0.2nb10
BUILDLINK_PKGSRCDIR.a2ps?= ../../print/a2ps
-.endif # A2PS_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
+.endif # A2PS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -a2ps
diff --git a/print/auctex/buildlink3.mk b/print/auctex/buildlink3.mk
index 1a878e06050..44c2d932427 100644
--- a/print/auctex/buildlink3.mk
+++ b/print/auctex/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 04:44:04 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:13 joerg Exp $
#
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-AUCTEX_BUILDLINK3_MK:= ${AUCTEX_BUILDLINK3_MK}+
+BUILDLINK_TREE+= auctex
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= auctex
-.endif
+.if !defined(AUCTEX_BUILDLINK3_MK)
+AUCTEX_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nauctex}
-BUILDLINK_PACKAGES+= auctex
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}auctex
-
-.if ${AUCTEX_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.auctex+= ${EMACS_PKGNAME_PREFIX}auctex>=11
BUILDLINK_PKGSRCDIR.auctex?= ../../print/auctex
-.endif # AUCTEX_BUILDLINK3_MK
BUILDLINK_CONTENTS_FILTER.auctex= ${EGREP} '.*\.el$$|.*\.elc$$'
+.endif # AUCTEX_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -auctex
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index 9ae87773968..332e94aeb7f 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.20 2008/03/01 14:14:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-CUPS_BUILDLINK3_MK:= ${CUPS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= cups
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= cups
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncups}
-BUILDLINK_PACKAGES+= cups
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cups
+.if !defined(CUPS_BUILDLINK3_MK)
+CUPS_BUILDLINK3_MK:=
-.if !empty(CUPS_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3
BUILDLINK_ABI_DEPENDS.cups+= cups>=1.2.12nb3
BUILDLINK_PKGSRCDIR.cups?= ../../print/cups
-.endif # CUPS_BUILDLINK3_MK
pkgbase := cups
.include "../../mk/pkg-build-options.mk"
@@ -27,5 +19,6 @@ pkgbase := cups
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.endif # CUPS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -cups
diff --git a/print/evince/buildlink3.mk b/print/evince/buildlink3.mk
index 5e6273a5b3d..9b3e4545b16 100644
--- a/print/evince/buildlink3.mk
+++ b/print/evince/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/03/18 12:54:14 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-EVINCE_BUILDLINK3_MK:= ${EVINCE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= evince
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= evince
-.endif
+.if !defined(EVINCE_BUILDLINK3_MK)
+EVINCE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nevince}
-BUILDLINK_PACKAGES+= evince
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}evince
-
-.if ${EVINCE_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.evince+= evince>=2.26.0
BUILDLINK_PKGSRCDIR.evince?= ../../print/evince
-.endif # EVINCE_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.endif # EVINCE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -evince
diff --git a/print/ghostscript/buildlink3.mk b/print/ghostscript/buildlink3.mk
index 2003a0c9a7a..251f45d5203 100644
--- a/print/ghostscript/buildlink3.mk
+++ b/print/ghostscript/buildlink3.mk
@@ -1,20 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2008/09/03 21:31:12 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GHOSTSCRIPT_BUILDLINK3_MK:= ${GHOSTSCRIPT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= ghostscript
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= ghostscript
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nghostscript}
-BUILDLINK_PACKAGES+= ghostscript
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ghostscript
+.if !defined(GHOSTSCRIPT_BUILDLINK3_MK)
+GHOSTSCRIPT_BUILDLINK3_MK:=
-.if ${GHOSTSCRIPT_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.ghostscript+= ghostscript>=8.63nb1
BUILDLINK_PKGSRCDIR.ghostscript?= ../../print/ghostscript
-.endif # GHOSTSCRIPT_BUILDLINK3_MK
.include "../../graphics/png/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
@@ -35,5 +27,6 @@ pkgbase := ghostscript
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.endif
+.endif # GHOSTSCRIPT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -ghostscript
diff --git a/print/gimp-print-lib/buildlink3.mk b/print/gimp-print-lib/buildlink3.mk
index f3a44034402..0e94532fec8 100644
--- a/print/gimp-print-lib/buildlink3.mk
+++ b/print/gimp-print-lib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GIMP_PRINT_LIB_BUILDLINK3_MK:= ${GIMP_PRINT_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gimp-print-lib
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gimp-print-lib
-.endif
+.if !defined(GIMP_PRINT_LIB_BUILDLINK3_MK)
+GIMP_PRINT_LIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp-print-lib}
-BUILDLINK_PACKAGES+= gimp-print-lib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gimp-print-lib
-
-.if !empty(GIMP_PRINT_LIB_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.gimp-print-lib+= gimp-print-lib>=4.2.5nb1
BUILDLINK_ABI_DEPENDS.gimp-print-lib+= gimp-print-lib>=4.2.7nb2
BUILDLINK_PKGSRCDIR.gimp-print-lib?= ../../print/gimp-print-lib
-.endif # GIMP_PRINT_LIB_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
+.endif # GIMP_PRINT_LIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gimp-print-lib
diff --git a/print/gutenprint-lib/buildlink3.mk b/print/gutenprint-lib/buildlink3.mk
index b520dc6ea9e..4f992005616 100644
--- a/print/gutenprint-lib/buildlink3.mk
+++ b/print/gutenprint-lib/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/01/11 12:39:47 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GUTENPRINT_LIB_BUILDLINK3_MK:= ${GUTENPRINT_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gutenprint-lib
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= gutenprint-lib
-.endif
+.if !defined(GUTENPRINT_LIB_BUILDLINK3_MK)
+GUTENPRINT_LIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngutenprint-lib}
-BUILDLINK_PACKAGES+= gutenprint-lib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gutenprint-lib
-
-.if ${GUTENPRINT_LIB_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.gutenprint-lib+= gutenprint-lib>=5.0.1
BUILDLINK_PKGSRCDIR.gutenprint-lib?= ../../print/gutenprint-lib
-.endif # GUTENPRINT_LIB_BUILDLINK3_MK
+.endif # GUTENPRINT_LIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gutenprint-lib
diff --git a/print/ijs/buildlink3.mk b/print/ijs/buildlink3.mk
index 9e92f313e11..313d7bf5214 100644
--- a/print/ijs/buildlink3.mk
+++ b/print/ijs/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-IJS_BUILDLINK3_MK:= ${IJS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= ijs
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= ijs
-.endif
+.if !defined(IJS_BUILDLINK3_MK)
+IJS_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nijs}
-BUILDLINK_PACKAGES+= ijs
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ijs
-
-.if !empty(IJS_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.ijs+= ijs>=0.34
BUILDLINK_ABI_DEPENDS.ijs+= ijs>=0.34nb2
BUILDLINK_PKGSRCDIR.ijs?= ../../print/ijs
-.endif # IJS_BUILDLINK3_MK
+.endif # IJS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -ijs
diff --git a/print/ja-vflib-lib/buildlink3.mk b/print/ja-vflib-lib/buildlink3.mk
index 4a58a10d241..bfd8d3d0251 100644
--- a/print/ja-vflib-lib/buildlink3.mk
+++ b/print/ja-vflib-lib/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-JA_VFLIB_LIB_BUILDLINK3_MK:= ${JA_VFLIB_LIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= ja-vflib-lib
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= ja-vflib-lib
-.endif
+.if !defined(JA_VFLIB_LIB_BUILDLINK3_MK)
+JA_VFLIB_LIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nja-vflib-lib}
-BUILDLINK_PACKAGES+= ja-vflib-lib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ja-vflib-lib
-
-.if !empty(JA_VFLIB_LIB_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.ja-vflib-lib+= ja-vflib-lib>=2.24.2
BUILDLINK_ABI_DEPENDS.ja-vflib-lib+= ja-vflib-lib>=2.24.2nb2
BUILDLINK_PKGSRCDIR.ja-vflib-lib?= ../../print/ja-vflib-lib
-.endif # JA_VFLIB_LIB_BUILDLINK3_MK
.include "../../graphics/freetype-lib/buildlink3.mk"
+.endif # JA_VFLIB_LIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -ja-vflib-lib
diff --git a/print/kpathsea/buildlink3.mk b/print/kpathsea/buildlink3.mk
index dd72c5a546c..f7fc4f13cb5 100644
--- a/print/kpathsea/buildlink3.mk
+++ b/print/kpathsea/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/03 22:12:42 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-KPATHSEA_BUILDLINK3_MK:= ${KPATHSEA_BUILDLINK3_MK}+
+BUILDLINK_TREE+= kpathsea
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= kpathsea
-.endif
+.if !defined(KPATHSEA_BUILDLINK3_MK)
+KPATHSEA_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkpathsea}
-BUILDLINK_PACKAGES+= kpathsea
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kpathsea
-
-.if ${KPATHSEA_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=3.5.7
BUILDLINK_PKGSRCDIR.kpathsea?= ../../print/kpathsea
BUILDLINK_FILES.kpathsea+= bin/kpsewhich
-.endif # KPATHSEA_BUILDLINK3_MK
+.endif # KPATHSEA_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -kpathsea
diff --git a/print/libgnomecups/buildlink3.mk b/print/libgnomecups/buildlink3.mk
index d0683e9339a..ded2682d912 100644
--- a/print/libgnomecups/buildlink3.mk
+++ b/print/libgnomecups/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/01/18 05:08:55 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:14 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBGNOMECUPS_BUILDLINK3_MK:= ${LIBGNOMECUPS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libgnomecups
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libgnomecups
-.endif
+.if !defined(LIBGNOMECUPS_BUILDLINK3_MK)
+LIBGNOMECUPS_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecups}
-BUILDLINK_PACKAGES+= libgnomecups
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomecups
-
-.if !empty(LIBGNOMECUPS_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libgnomecups+= libgnomecups>=0.2.0
BUILDLINK_ABI_DEPENDS.libgnomecups?= libgnomecups>=0.2.2nb5
BUILDLINK_PKGSRCDIR.libgnomecups?= ../../print/libgnomecups
-.endif # LIBGNOMECUPS_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../print/cups/buildlink3.mk"
+.endif # LIBGNOMECUPS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libgnomecups
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index df78a08ecc6..04f8bf6ab88 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,23 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/01/18 05:08:55 tnn Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBGNOMEPRINT_BUILDLINK3_MK:= ${LIBGNOMEPRINT_BUILDLINK3_MK}+
+# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:14 joerg Exp $
.include "../../mk/bsd.fast.prefs.mk"
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libgnomeprint
-.endif
+BUILDLINK_TREE+= libgnomeprint
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprint}
-BUILDLINK_PACKAGES+= libgnomeprint
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeprint
+.if !defined(LIBGNOMEPRINT_BUILDLINK3_MK)
+LIBGNOMEPRINT_BUILDLINK3_MK:=
-.if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.0
BUILDLINK_ABI_DEPENDS.libgnomeprint+= libgnomeprint>=2.18.2nb2
BUILDLINK_PKGSRCDIR.libgnomeprint?= ../../print/libgnomeprint
-.endif # LIBGNOMEPRINT_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
@@ -32,5 +24,6 @@ pkgbase := libgnomeprint
.if !empty(PKG_BUILD_OPTIONS.libgnomeprint:Mcups)
. include "../../print/libgnomecups/buildlink3.mk"
.endif
+.endif # LIBGNOMEPRINT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libgnomeprint
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index 6e892a90063..4a24e0bfaf0 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/01/18 05:08:55 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBGNOMEPRINTUI_BUILDLINK3_MK:= ${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libgnomeprintui
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libgnomeprintui
-.endif
+.if !defined(LIBGNOMEPRINTUI_BUILDLINK3_MK)
+LIBGNOMEPRINTUI_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeprintui}
-BUILDLINK_PACKAGES+= libgnomeprintui
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomeprintui
-
-.if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.8.0
BUILDLINK_ABI_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.18.1nb2
BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
-.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
.include "../../devel/GConf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
@@ -27,5 +19,6 @@ BUILDLINK_PKGSRCDIR.libgnomeprintui?= ../../print/libgnomeprintui
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
+.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libgnomeprintui
diff --git a/print/libpaper/buildlink3.mk b/print/libpaper/buildlink3.mk
index c756d28f2fd..34b72f67163 100644
--- a/print/libpaper/buildlink3.mk
+++ b/print/libpaper/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/04 20:10:12 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBPAPER_BUILDLINK3_MK:= ${LIBPAPER_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libpaper
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libpaper
-.endif
+.if !defined(LIBPAPER_BUILDLINK3_MK)
+LIBPAPER_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpaper}
-BUILDLINK_PACKAGES+= libpaper
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpaper
-
-.if ${LIBPAPER_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.libpaper+= libpaper>=1.1.22
BUILDLINK_PKGSRCDIR.libpaper?= ../../print/libpaper
-.endif # LIBPAPER_BUILDLINK3_MK
+.endif # LIBPAPER_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libpaper
diff --git a/print/libspectre/buildlink3.mk b/print/libspectre/buildlink3.mk
index 26b3d584be8..d53ec248aee 100644
--- a/print/libspectre/buildlink3.mk
+++ b/print/libspectre/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/03 21:36:46 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBSPECTRE_BUILDLINK3_MK:= ${LIBSPECTRE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libspectre
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= libspectre
-.endif
+.if !defined(LIBSPECTRE_BUILDLINK3_MK)
+LIBSPECTRE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibspectre}
-BUILDLINK_PACKAGES+= libspectre
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libspectre
-
-.if ${LIBSPECTRE_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.libspectre+= libspectre>=0.2.1
BUILDLINK_PKGSRCDIR.libspectre?= ../../print/libspectre
-.endif # LIBSPECTRE_BUILDLINK3_MK
.include "../../print/ghostscript/buildlink3.mk"
+.endif # LIBSPECTRE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libspectre
diff --git a/print/pdflib-lite/buildlink3.mk b/print/pdflib-lite/buildlink3.mk
index 0dfe9009819..2ed8ad7b250 100644
--- a/print/pdflib-lite/buildlink3.mk
+++ b/print/pdflib-lite/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/05/15 20:06:03 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PDFLIB_LITE_BUILDLINK3_MK:= ${PDFLIB_LITE_BUILDLINK3_MK}+
+BUILDLINK_TREE+= pdflib-lite
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= pdflib-lite
-.endif
+.if !defined(PDFLIB_LITE_BUILDLINK3_MK)
+PDFLIB_LITE_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npdflib-lite}
-BUILDLINK_PACKAGES+= pdflib-lite
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pdflib-lite
-
-.if ${PDFLIB_LITE_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.pdflib-lite+= pdflib-lite>=7.0.3
BUILDLINK_PKGSRCDIR.pdflib-lite?= ../../print/pdflib-lite
-.endif # PDFLIB_LITE_BUILDLINK3_MK
+.endif # PDFLIB_LITE_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -pdflib-lite
diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk
index b1a1c128241..c3cc61b61fb 100644
--- a/print/pdflib/buildlink3.mk
+++ b/print/pdflib/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PDFLIB_BUILDLINK3_MK:= ${PDFLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= pdflib
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= pdflib
-.endif
+.if !defined(PDFLIB_BUILDLINK3_MK)
+PDFLIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npdflib}
-BUILDLINK_PACKAGES+= pdflib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pdflib
-
-.if !empty(PDFLIB_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.pdflib+= pdflib>=4.0.3nb2
BUILDLINK_ABI_DEPENDS.pdflib+= pdflib>=4.0.3nb7
BUILDLINK_PKGSRCDIR.pdflib?= ../../print/pdflib
-.endif # PDFLIB_BUILDLINK3_MK
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
+.endif # PDFLIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -pdflib
diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk
index 7a95e830904..774b294bac5 100644
--- a/print/poppler-glib/buildlink3.mk
+++ b/print/poppler-glib/buildlink3.mk
@@ -1,25 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/01/06 22:58:49 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-POPPLER_GLIB_BUILDLINK3_MK:= ${POPPLER_GLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= poppler-glib
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= poppler-glib
-.endif
+.if !defined(POPPLER_GLIB_BUILDLINK3_MK)
+POPPLER_GLIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-glib}
-BUILDLINK_PACKAGES+= poppler-glib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler-glib
-
-.if !empty(POPPLER_GLIB_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.1
BUILDLINK_ABI_DEPENDS.poppler-glib+= poppler-glib>=0.10.0
BUILDLINK_PKGSRCDIR.poppler-glib?= ../../print/poppler-glib
-.endif # POPPLER_GLIB_BUILDLINK3_MK
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../print/poppler/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.endif # POPPLER_GLIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -poppler-glib
diff --git a/print/poppler-includes/buildlink3.mk b/print/poppler-includes/buildlink3.mk
index 9c4c3dfbd1d..bd0c6ed5596 100644
--- a/print/poppler-includes/buildlink3.mk
+++ b/print/poppler-includes/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/20 14:32:19 dillo Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-POPPLER_INCLUDES_BUILDLINK3_MK:= ${POPPLER_INCLUDES_BUILDLINK3_MK}+
+BUILDLINK_TREE+= poppler-includes
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= poppler-includes
-.endif
+.if !defined(POPPLER_INCLUDES_BUILDLINK3_MK)
+POPPLER_INCLUDES_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-includes}
-BUILDLINK_PACKAGES+= poppler-includes
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler-includes
-
-.if !empty(POPPLER_INCLUDES_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.10.0
BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes
-.endif # POPPLER_INCLUDES_BUILDLINK3_MK
+.endif # POPPLER_INCLUDES_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -poppler-includes
diff --git a/print/poppler-qt/buildlink3.mk b/print/poppler-qt/buildlink3.mk
index 3f90380ae71..81387994a85 100644
--- a/print/poppler-qt/buildlink3.mk
+++ b/print/poppler-qt/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-POPPLER_QT_BUILDLINK3_MK:= ${POPPLER_QT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= poppler-qt
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= poppler-qt
-.endif
+.if !defined(POPPLER_QT_BUILDLINK3_MK)
+POPPLER_QT_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-qt}
-BUILDLINK_PACKAGES+= poppler-qt
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler-qt
-
-.if !empty(POPPLER_QT_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.poppler-qt+= poppler-qt>=0.4.5nb1
BUILDLINK_PKGSRCDIR.poppler-qt?= ../../print/poppler-qt
-.endif # POPPLER_QT_BUILDLINK3_MK
.include "../../print/poppler/buildlink3.mk"
+.endif # POPPLER_QT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -poppler-qt
diff --git a/print/poppler-qt4/buildlink3.mk b/print/poppler-qt4/buildlink3.mk
index 825de32eea8..f9639ebc467 100644
--- a/print/poppler-qt4/buildlink3.mk
+++ b/print/poppler-qt4/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/12/12 01:29:22 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-POPPLER_QT4_BUILDLINK3_MK:= ${POPPLER_QT4_BUILDLINK3_MK}+
+BUILDLINK_TREE+= poppler-qt4
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= poppler-qt4
-.endif
+.if !defined(POPPLER_QT4_BUILDLINK3_MK)
+POPPLER_QT4_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler-qt4}
-BUILDLINK_PACKAGES+= poppler-qt4
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler-qt4
-
-.if ${POPPLER_QT4_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.6.1
BUILDLINK_PKGSRCDIR.poppler-qt4?= ../../print/poppler-qt4
-.endif # POPPLER_QT4_BUILDLINK3_MK
.include "../../print/poppler/buildlink3.mk"
+.endif # POPPLER_QT4_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -poppler-qt4
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index fd032e6fd26..05938ccf642 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/02/12 20:55:07 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:25:15 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-POPPLER_BUILDLINK3_MK:= ${POPPLER_BUILDLINK3_MK}+
+BUILDLINK_TREE+= poppler
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= poppler
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npoppler}
-BUILDLINK_PACKAGES+= poppler
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}poppler
+.if !defined(POPPLER_BUILDLINK3_MK)
+POPPLER_BUILDLINK3_MK:=
-.if !empty(POPPLER_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1
BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.10.0
BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler
@@ -19,7 +12,6 @@ BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler
PRINT_PLIST_AWK+= /^@exec ..MKDIR. %D\/include\/poppler$$/ { next; }
PRINT_PLIST_AWK+= /^@dirrm include\/poppler$$/ \
{ print "@comment in poppler: " $$0; next; }
-.endif # POPPLER_BUILDLINK3_MK
pkgbase := poppler
.include "../../mk/pkg-build-options.mk"
@@ -29,5 +21,6 @@ pkgbase := poppler
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
+.endif # POPPLER_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -poppler
diff --git a/print/pslib/buildlink3.mk b/print/pslib/buildlink3.mk
index cbd82b22355..f5c5ce558d8 100644
--- a/print/pslib/buildlink3.mk
+++ b/print/pslib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:16 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PSLIB_BUILDLINK3_MK:= ${PSLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= pslib
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= pslib
-.endif
+.if !defined(PSLIB_BUILDLINK3_MK)
+PSLIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npslib}
-BUILDLINK_PACKAGES+= pslib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pslib
-
-.if !empty(PSLIB_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.pslib+= pslib>=0.2.6
BUILDLINK_ABI_DEPENDS.pslib?= pslib>=0.2.6nb3
BUILDLINK_PKGSRCDIR.pslib?= ../../print/pslib
-.endif # PSLIB_BUILDLINK3_MK
+.endif # PSLIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -pslib
diff --git a/print/py-cups/buildlink3.mk b/print/py-cups/buildlink3.mk
index b3808e3a2f5..2e551d2a63f 100644
--- a/print/py-cups/buildlink3.mk
+++ b/print/py-cups/buildlink3.mk
@@ -1,21 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/10 20:13:29 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:16 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PY_CUPS_BUILDLINK3_MK:= ${PY_CUPS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= py-cups
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= py-cups
-.endif
+.if !defined(PY_CUPS_BUILDLINK3_MK)
+PY_CUPS_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npy-cups}
-BUILDLINK_PACKAGES+= py-cups
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-cups
-
-.if ${PY_CUPS_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.py-cups+= ${PYPKGPREFIX}-cups>=1.9.44
BUILDLINK_PKGSRCDIR.py-cups?= ../../print/py-cups
-.endif # PY_CUPS_BUILDLINK3_MK
#.include "../../print/cups/buildlink3.mk"
+.endif # PY_CUPS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -py-cups
diff --git a/print/ruby-gnome2-gnomeprint/buildlink3.mk b/print/ruby-gnome2-gnomeprint/buildlink3.mk
index e8feca43b71..174305f2d5a 100644
--- a/print/ruby-gnome2-gnomeprint/buildlink3.mk
+++ b/print/ruby-gnome2-gnomeprint/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/01/19 04:12:55 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:16 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK:= ${RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= ruby-gnome2-gnomeprint
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= ruby-gnome2-gnomeprint
-.endif
+.if !defined(RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK)
+RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nruby-gnome2-gnomeprint}
-BUILDLINK_PACKAGES+= ruby-gnome2-gnomeprint
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ruby-gnome2-gnomeprint
-
-.if ${RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK} == "+"
.include "../../lang/ruby/rubyversion.mk"
BUILDLINK_API_DEPENDS.ruby-gnome2-gnomeprint+= ${RUBY_PKGPREFIX}-gnome2-gnomeprint>=0.17.0
BUILDLINK_PKGSRCDIR.ruby-gnome2-gnomeprint?= ../../print/ruby-gnome2-gnomeprint
-.endif # RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK
+.endif # RUBY_GNOME2_GNOMEPRINT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -ruby-gnome2-gnomeprint
diff --git a/print/teTeX3-bin/buildlink3.mk b/print/teTeX3-bin/buildlink3.mk
index cbe5d90aaa6..c704e51bf4b 100644
--- a/print/teTeX3-bin/buildlink3.mk
+++ b/print/teTeX3-bin/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/12/07 06:40:47 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:16 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TETEX_BIN_BUILDLINK3_MK:= ${TETEX_BIN_BUILDLINK3_MK}+
+BUILDLINK_TREE+= teTeX-bin
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= teTeX-bin
-.endif
+.if !defined(TETEX_BIN_BUILDLINK3_MK)
+TETEX_BIN_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NteTeX-bin}
-BUILDLINK_PACKAGES+= teTeX-bin
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}teTeX-bin
-
-.if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.teTeX-bin+= teTeX-bin>=3.0nb2
BUILDLINK_ABI_DEPENDS.teTeX-bin?= teTeX-bin>=3.0nb7
BUILDLINK_PKGSRCDIR.teTeX-bin?= ../../print/teTeX3-bin
-.endif # TETEX_BIN_BUILDLINK3_MK
TEXMFDIST= ${PREFIX}/share/texmf-dist
PLIST_SUBST+= TEXMFDIST=${TEXMFDIST:C|^${PREFIX}/||}
@@ -27,5 +19,6 @@ PKG_TEXMFPREFIX= ${PREFIX}/share/texmf
PKG_LOCALTEXMFPREFIX= ${PREFIX}/share/texmf-local
PLIST_SUBST+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||}
PLIST_SUBST+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||}
+.endif # TETEX_BIN_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -teTeX-bin
diff --git a/print/transfig/buildlink3.mk b/print/transfig/buildlink3.mk
index 0d1f051c3df..413e8e005ed 100644
--- a/print/transfig/buildlink3.mk
+++ b/print/transfig/buildlink3.mk
@@ -1,23 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:00 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:16 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TRANSFIG_BUILDLINK3_MK:= ${TRANSFIG_BUILDLINK3_MK}+
+BUILDLINK_TREE+= transfig
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= transfig
-.endif
+.if !defined(TRANSFIG_BUILDLINK3_MK)
+TRANSFIG_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntransfig}
-BUILDLINK_PACKAGES+= transfig
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}transfig
-
-.if !empty(TRANSFIG_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.transfig+= transfig>=3.2.4
BUILDLINK_ABI_DEPENDS.transfig?= transfig>=3.2.5alpha7nb2
BUILDLINK_PKGSRCDIR.transfig?= ../../print/transfig
-.endif # TRANSFIG_BUILDLINK3_MK
.include "../../graphics/png/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
+.endif # TRANSFIG_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -transfig
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index c2d12b6d9aa..382011ac57b 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.24 2008/12/18 16:46:29 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2009/03/20 19:25:16 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= xfce4-print
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4-print
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-print}
-BUILDLINK_PACKAGES+= xfce4-print
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-print
+.if !defined(XFCE4_PRINT_BUILDLINK3_MK)
+XFCE4_PRINT_BUILDLINK3_MK:=
-.if ${XFCE4_PRINT_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.xfce4-print+= xfce4-print>=4.4.3nb1
BUILDLINK_ABI_DEPENDS.xfce4-print?= xfce4-print>=4.4.3nb1
BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print
-.endif # XFCE4_PRINT_BUILDLINK3_MK
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../print/a2ps/buildlink3.mk"
@@ -29,5 +21,6 @@ pkgbase := xfce4-print
.if !empty(PKG_BUILD_OPTIONS.xfce4-print:Mcups)
. include "../../print/cups/buildlink3.mk"
.endif
+.endif # XFCE4_PRINT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -xfce4-print