Over 1200 files touched but no revisions bumped :)

RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).

30 files changed, 78 insertions, 78 deletions

diff --git a/print/a2ps/buildlink3.mk b/print/a2ps/buildlink3.mk
index 7eb9d99d0e9..2afb2b7f023 100644
--- a/print/a2ps/buildlink3.mk
+++ b/print/a2ps/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 A2PS_BUILDLINK3_MK:=	${A2PS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Na2ps}
 BUILDLINK_PACKAGES+=	a2ps
 
 .if !empty(A2PS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.a2ps+=	a2ps>=4.13.0.2nb4
-BUILDLINK_RECOMMENDED.a2ps?=	a2ps>=4.13.0.2nb10
+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
 
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index db8a4265467..d4681e41ff7 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:10:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CUPS_BUILDLINK3_MK:=	${CUPS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncups}
 BUILDLINK_PACKAGES+=	cups
 
 .if !empty(CUPS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cups+=	cups>=1.1.19nb3
-BUILDLINK_RECOMMENDED.cups+=	cups>=1.1.23nb6
+BUILDLINK_API_DEPENDS.cups+=	cups>=1.1.19nb3
+BUILDLINK_ABI_DEPENDS.cups+=	cups>=1.1.23nb6
 BUILDLINK_PKGSRCDIR.cups?=	../../print/cups
 .endif	# CUPS_BUILDLINK3_MK
 
diff --git a/print/dvipng/Makefile b/print/dvipng/Makefile
index 618c1de7d00..7a82b444801 100644
--- a/print/dvipng/Makefile
+++ b/print/dvipng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/04/06 03:33:28 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:22:36 reed Exp $
 
 DISTNAME=	dvipng-1.7
 CATEGORIES=	textproc converters
@@ -14,7 +14,7 @@ GNU_CONFIGURE=		yes
 
 INFO_FILES=		dvipng.info
 
-BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.3
+BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.3
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
diff --git a/print/gimp-print-lib/buildlink3.mk b/print/gimp-print-lib/buildlink3.mk
index b7d450e5d1f..155c70b0b30 100644
--- a/print/gimp-print-lib/buildlink3.mk
+++ b/print/gimp-print-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GIMP_PRINT_LIB_BUILDLINK3_MK:=	${GIMP_PRINT_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngimp-print-lib}
 BUILDLINK_PACKAGES+=	gimp-print-lib
 
 .if !empty(GIMP_PRINT_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp-print-lib+=	gimp-print-lib>=4.2.5nb1
-BUILDLINK_RECOMMENDED.gimp-print-lib+=	gimp-print-lib>=4.2.7nb2
+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
 
diff --git a/print/gnome-print/buildlink3.mk b/print/gnome-print/buildlink3.mk
index 7f8fdbdd6b0..9101b0fe646 100644
--- a/print/gnome-print/buildlink3.mk
+++ b/print/gnome-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PRINT_BUILDLINK3_MK:=	${GNOME_PRINT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-print}
 BUILDLINK_PACKAGES+=	gnome-print
 
 .if !empty(GNOME_PRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-print+=	gnome-print>=0.36nb4
-BUILDLINK_RECOMMENDED.gnome-print+=	gnome-print>=0.37nb1
+BUILDLINK_API_DEPENDS.gnome-print+=	gnome-print>=0.36nb4
+BUILDLINK_ABI_DEPENDS.gnome-print+=	gnome-print>=0.37nb1
 BUILDLINK_PKGSRCDIR.gnome-print?=	../../print/gnome-print
 .endif	# GNOME_PRINT_BUILDLINK3_MK
 
diff --git a/print/ijs/buildlink3.mk b/print/ijs/buildlink3.mk
index f591a6d9adc..88eb24a1585 100644
--- a/print/ijs/buildlink3.mk
+++ b/print/ijs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IJS_BUILDLINK3_MK:=	${IJS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nijs}
 BUILDLINK_PACKAGES+=	ijs
 
 .if !empty(IJS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ijs+=	ijs>=0.34
-BUILDLINK_RECOMMENDED.ijs+=	ijs>=0.34nb2
+BUILDLINK_API_DEPENDS.ijs+=	ijs>=0.34
+BUILDLINK_ABI_DEPENDS.ijs+=	ijs>=0.34nb2
 BUILDLINK_PKGSRCDIR.ijs?=	../../print/ijs
 .endif	# IJS_BUILDLINK3_MK
 
diff --git a/print/ja-vflib-lib/buildlink3.mk b/print/ja-vflib-lib/buildlink3.mk
index 90aadd6fed8..2a846a9333a 100644
--- a/print/ja-vflib-lib/buildlink3.mk
+++ b/print/ja-vflib-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 JA_VFLIB_LIB_BUILDLINK3_MK:=	${JA_VFLIB_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nja-vflib-lib}
 BUILDLINK_PACKAGES+=	ja-vflib-lib
 
 .if !empty(JA_VFLIB_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ja-vflib-lib+=	ja-vflib-lib>=2.24.2
-BUILDLINK_RECOMMENDED.ja-vflib-lib+=	ja-vflib-lib>=2.24.2nb2
+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
 
diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile
index 7ebd7dea2c1..06fb8cb3103 100644
--- a/print/ja-vflib-utils/Makefile
+++ b/print/ja-vflib-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:37 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:22:36 reed Exp $
 
 .include "../../print/ja-vflib-lib/Makefile.common"
 
@@ -6,7 +6,7 @@ PKGNAME=	ja-vflib-utils-${VFLIB_VERSION}
 PKGREVISION=	2
 COMMENT=	Utilities for manipulating VFlib vector font files
 
-BUILDLINK_DEPENDS.vflib+=	ja-vflib-lib>=${VFLIB_VERSION}
+BUILDLINK_API_DEPENDS.vflib+=	ja-vflib-lib>=${VFLIB_VERSION}
 
 CONFIGURE_ARGS+=	--enable-tools --with-x
 
diff --git a/print/libgnomecups/buildlink3.mk b/print/libgnomecups/buildlink3.mk
index 54974e9a11f..d581676d18b 100644
--- a/print/libgnomecups/buildlink3.mk
+++ b/print/libgnomecups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMECUPS_BUILDLINK3_MK:=	${LIBGNOMECUPS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecups}
 BUILDLINK_PACKAGES+=	libgnomecups
 
 .if !empty(LIBGNOMECUPS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecups+=	libgnomecups>=0.2.0
-BUILDLINK_RECOMMENDED.libgnomecups?=	libgnomecups>=0.2.2nb2
+BUILDLINK_API_DEPENDS.libgnomecups+=	libgnomecups>=0.2.0
+BUILDLINK_ABI_DEPENDS.libgnomecups?=	libgnomecups>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.libgnomecups?=	../../print/libgnomecups
 .endif	# LIBGNOMECUPS_BUILDLINK3_MK
 
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 76b1d9a5be6..ae3bc07a4cb 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/06 06:22:36 reed Exp $
 #
 
 DISTNAME=	libgnomeprint-2.12.1
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
-BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.4
+BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.4
 
 PKGCONFIG_OVERRIDE=	libgnomeprint/libgnomeprint-2.2.pc.in
 
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 5d1a350dca1..daf8521c960 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINT_BUILDLINK3_MK:=	${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeprint}
 BUILDLINK_PACKAGES+=	libgnomeprint
 
 .if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeprint+=	libgnomeprint>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeprint+=	libgnomeprint>=2.12.1nb2
 BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
 .endif	# LIBGNOMEPRINT_BUILDLINK3_MK
 
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index a503f706ba0..14e512f2e6b 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/04/06 06:22:36 reed Exp $
 #
 
 DISTNAME=	libgnomeprintui-2.12.1
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE=	libgnomeprintui/libgnomeprintui-2.2.pc.in
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.12.1
+BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.12.1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index a4a755eb36e..25541d92942 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINTUI_BUILDLINK3_MK:=	${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeprintui}
 BUILDLINK_PACKAGES+=	libgnomeprintui
 
 .if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeprintui+=	libgnomeprintui>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.12.1nb2
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 .endif	# LIBGNOMEPRINTUI_BUILDLINK3_MK
 
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 1aabba3a319..ff6cc902fe0 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/03/21 06:00:48 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/04/06 06:22:36 reed Exp $
 #
 
 DISTNAME=	lilypond-2.4.3
@@ -13,7 +13,7 @@ COMMENT=	GNU Music Typesetter
 DEPENDS+=	ec-fonts-mftraced-[0-9]*:../../fonts/ec-fonts-mftraced
 BUILD_DEPENDS+=	bison>=1.875nb1:../../devel/bison
 
-BUILDLINK_DEPENDS.mftrace+=	mftrace>=1.1.0
+BUILDLINK_API_DEPENDS.mftrace+=	mftrace>=1.1.0
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk
index 940c7347316..5eecff49d99 100644
--- a/print/pdflib/buildlink3.mk
+++ b/print/pdflib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PDFLIB_BUILDLINK3_MK:=	${PDFLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npdflib}
 BUILDLINK_PACKAGES+=	pdflib
 
 .if !empty(PDFLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pdflib+=	pdflib>=4.0.3nb2
-BUILDLINK_RECOMMENDED.pdflib+=	pdflib>=4.0.3nb6
+BUILDLINK_API_DEPENDS.pdflib+=	pdflib>=4.0.3nb2
+BUILDLINK_ABI_DEPENDS.pdflib+=	pdflib>=4.0.3nb6
 BUILDLINK_PKGSRCDIR.pdflib?=	../../print/pdflib
 .endif	# PDFLIB_BUILDLINK3_MK
 
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index e052d16cd13..c103bf8b393 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/01 17:23:14 reed Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:36 reed Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -36,7 +36,7 @@ post-install:
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}nb1
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}nb1
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-glib/buildlink3.mk b/print/poppler-glib/buildlink3.mk
index 8dc3b845196..b8cbca4a2b2 100644
--- a/print/poppler-glib/buildlink3.mk
+++ b/print/poppler-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/30 21:30:25 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POPPLER_GLIB_BUILDLINK3_MK:=	${POPPLER_GLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npoppler-glib}
 BUILDLINK_PACKAGES+=	poppler-glib
 
 .if !empty(POPPLER_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler-glib+=	poppler-glib>=0.5.1
+BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.1
 BUILDLINK_PKGSRCDIR.poppler-glib?=	../../print/poppler-glib
 .endif	# POPPLER_GLIB_BUILDLINK3_MK
 
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index bb2e9200c9f..68eeaa176a8 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/01 13:59:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:37 reed Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -31,7 +31,7 @@ do-install:
 		${PREFIX}/include/poppler
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/lib/pkgconfig
 
-BUILDLINK_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}nb1
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}nb1
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-qt/buildlink3.mk b/print/poppler-qt/buildlink3.mk
index ec4d2bccfda..d21c90673b5 100644
--- a/print/poppler-qt/buildlink3.mk
+++ b/print/poppler-qt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/09 01:29:46 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POPPLER_QT_BUILDLINK3_MK:=	${POPPLER_QT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npoppler-qt}
 BUILDLINK_PACKAGES+=	poppler-qt
 
 .if !empty(POPPLER_QT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler-qt+=	poppler-qt>=0.4.5nb1
+BUILDLINK_API_DEPENDS.poppler-qt+=	poppler-qt>=0.4.5nb1
 BUILDLINK_PKGSRCDIR.poppler-qt?=	../../print/poppler-qt
 .endif	# POPPLER_QT_BUILDLINK3_MK
 
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 361201cb714..19a88b27b75 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 21:30:25 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 POPPLER_BUILDLINK3_MK:=	${POPPLER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npoppler}
 BUILDLINK_PACKAGES+=	poppler
 
 .if !empty(POPPLER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler+=	poppler>=0.5.1
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 .endif	# POPPLER_BUILDLINK3_MK
 
diff --git a/print/pslib/buildlink3.mk b/print/pslib/buildlink3.mk
index 11621778010..f7a2efeddfa 100644
--- a/print/pslib/buildlink3.mk
+++ b/print/pslib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:37 reed Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.9.
 # XXX After this file has been verified as correct, the comment lines
@@ -21,8 +21,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npslib}
 BUILDLINK_PACKAGES+=	pslib
 
 .if !empty(PSLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pslib+=	pslib>=0.2.6
-BUILDLINK_RECOMMENDED.pslib?=	pslib>=0.2.6nb3
+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
 
diff --git a/print/py-reportlab-renderPM/buildlink3.mk b/print/py-reportlab-renderPM/buildlink3.mk
index eb75a01daa2..051facf492b 100644
--- a/print/py-reportlab-renderPM/buildlink3.mk
+++ b/print/py-reportlab-renderPM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
 PYRLRENDERPM_BUILDLINK3_MK:=	${PYRLRENDERPM_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyrlrenderpm}
 BUILDLINK_PACKAGES+=	pyrlrenderpm
 
 .if !empty(PYRLRENDERPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyrlrenderpm+=	${PYPKGPREFIX}-reportlab-renderPM-[0-9]*
-BUILDLINK_RECOMMENDED.pyrlrenderpm?=	${PYPKGPREFIX}-reportlab-renderPM>=0.9nb2
+BUILDLINK_API_DEPENDS.pyrlrenderpm+=	${PYPKGPREFIX}-reportlab-renderPM-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyrlrenderpm?=	${PYPKGPREFIX}-reportlab-renderPM>=0.9nb2
 BUILDLINK_PKGSRCDIR.pyrlrenderpm?=	../../print/py-reportlab-renderPM
 .endif	# PYRLRENDERPM_BUILDLINK3_MK
 
diff --git a/print/py-reportlab/buildlink3.mk b/print/py-reportlab/buildlink3.mk
index a4bbb3bb3b9..880b22551c9 100644
--- a/print/py-reportlab/buildlink3.mk
+++ b/print/py-reportlab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PYREPORTLAB_BUILDLINK3_MK:=	${PYREPORTLAB_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyreportlab}
 BUILDLINK_PACKAGES+=	pyreportlab
 
 .if !empty(PYREPORTLAB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyreportlab+=		${PYPKGPREFIX}-reportlab-[0-9]*
-BUILDLINK_RECOMMENDED.pyreportlab?=	${PYPKGPREFIX}-reportlab>=1.20nb2
+BUILDLINK_API_DEPENDS.pyreportlab+=		${PYPKGPREFIX}-reportlab-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyreportlab?=	${PYPKGPREFIX}-reportlab>=1.20nb2
 BUILDLINK_PKGSRCDIR.pyreportlab?=	../../print/py-reportlab
 .endif	# PYREPORTLAB_BUILDLINK3_MK
 
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index c8bdc95492d..0c88be4bd47 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:22:37 reed Exp $
 
 .include "../../print/pdflib/Makefile.common"
 
@@ -6,7 +6,7 @@ PKGNAME=		tcl-pdflib-${PDFLIB_BASE_VERS}
 PKGREVISION=		4
 COMMENT=		Tcl interface to PDFlib for generating PDF files
 
-BUILDLINK_DEPENDS.pdflib+=	pdflib>=${PDFLIB_BASE_VERS}
+BUILDLINK_API_DEPENDS.pdflib+=	pdflib>=${PDFLIB_BASE_VERS}
 
 CONFIGURE_ARGS+=	--with-tcl=${TCLSH:Q}
 CONFIGURE_ARGS+=        --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
diff --git a/print/teTeX-bin/buildlink3.mk b/print/teTeX-bin/buildlink3.mk
index 1b7da0911b3..b1f1871a3ae 100644
--- a/print/teTeX-bin/buildlink3.mk
+++ b/print/teTeX-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NteTeX-bin}
 BUILDLINK_PACKAGES+=	teTeX-bin
 
 .if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin-2.[0-9]*
-BUILDLINK_RECOMMENDED.teTeX-bin?=	teTeX-bin>=2.0.2nb6
+BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin-2.[0-9]*
+BUILDLINK_ABI_DEPENDS.teTeX-bin?=	teTeX-bin>=2.0.2nb6
 BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX-bin
 .endif	# TETEX_BIN_BUILDLINK3_MK
 
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk
index 2aaf3b48c5e..9d0710ed087 100644
--- a/print/teTeX/module.mk
+++ b/print/teTeX/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.12 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: module.mk,v 1.13 2006/04/06 06:22:37 reed Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It takes care of rebuilding the ls-R database
@@ -19,7 +19,7 @@ TEXMFDIRS?=		${PKG_LOCALTEXMFPREFIX}
 TEX_FONTMAPS?=		# empty
 
 .if !empty(TEX_FONTMAPS)
-BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb4
+BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb4
 .endif
 
 FILES_SUBST+=		MKTEXLSR="${LOCALBASE}/bin/mktexlsr"
diff --git a/print/teTeX1-bin/buildlink3.mk b/print/teTeX1-bin/buildlink3.mk
index 2ea19d95187..e59075a7ef1 100644
--- a/print/teTeX1-bin/buildlink3.mk
+++ b/print/teTeX1-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NteTeX-bin}
 BUILDLINK_PACKAGES+=	teTeX-bin
 
 .if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin-1.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin-1.[0-9]*
 BUILDLINK_DEPMETHOD.teTeX-bin?=	build
-BUILDLINK_RECOMMENDED.teTeX-bin?=	teTeX-bin>=1.0.7nb6
+BUILDLINK_ABI_DEPENDS.teTeX-bin?=	teTeX-bin>=1.0.7nb6
 BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX1-bin
 .endif	# TETEX_BIN_BUILDLINK3_MK
 
diff --git a/print/teTeX3-bin/buildlink3.mk b/print/teTeX3-bin/buildlink3.mk
index ccbdb86b943..02e6313c1b8 100644
--- a/print/teTeX3-bin/buildlink3.mk
+++ b/print/teTeX3-bin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TETEX_BIN_BUILDLINK3_MK:=	${TETEX_BIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NteTeX-bin}
 BUILDLINK_PACKAGES+=	teTeX-bin
 
 .if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb2
-BUILDLINK_RECOMMENDED.teTeX-bin?=	teTeX-bin>=3.0nb7
+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
 
diff --git a/print/transfig/buildlink3.mk b/print/transfig/buildlink3.mk
index 8aa19fac529..18b00291c6e 100644
--- a/print/transfig/buildlink3.mk
+++ b/print/transfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TRANSFIG_BUILDLINK3_MK:=	${TRANSFIG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntransfig}
 BUILDLINK_PACKAGES+=	transfig
 
 .if !empty(TRANSFIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.transfig+=	transfig>=3.2.4
-BUILDLINK_RECOMMENDED.transfig?=	transfig>=3.2.5alpha7nb1
+BUILDLINK_API_DEPENDS.transfig+=	transfig>=3.2.4
+BUILDLINK_ABI_DEPENDS.transfig?=	transfig>=3.2.5alpha7nb1
 BUILDLINK_PKGSRCDIR.transfig?=	../../print/transfig
 .endif	# TRANSFIG_BUILDLINK3_MK
 
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index 8bf249022ae..de1bad7716c 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PRINT_BUILDLINK3_MK:=	${XFCE4_PRINT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-print}
 BUILDLINK_PACKAGES+=	xfce4-print
 
 .if !empty(XFCE4_PRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-print+=	xfce4-print>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-print?=	xfce4-print>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-print+=	xfce4-print>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-print?=	xfce4-print>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-print?=	../../print/xfce4-print
 .endif	# XFCE4_PRINT_BUILDLINK3_MK