From 5abef9be142e900cceace758044a1b2ee493daf3 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 6 Apr 2006 06:21:32 +0000 Subject: 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). --- fonts/Xft2/Makefile | 6 +++--- fonts/Xft2/buildlink3.mk | 6 +++--- fonts/Xft2/builtin.mk | 6 +++--- fonts/fontconfig/Makefile | 4 ++-- fonts/fontconfig/buildlink3.mk | 6 +++--- fonts/fontconfig/builtin.mk | 8 ++++---- fonts/gucharmap/buildlink3.mk | 6 +++--- fonts/mftrace/buildlink3.mk | 6 +++--- fonts/t1lib/buildlink3.mk | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'fonts') diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index f54261ba45f..2a91e9f0257 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2006/03/04 21:29:38 jlam Exp $ +# $NetBSD: Makefile,v 1.46 2006/04/06 06:21:59 reed Exp $ DISTNAME= libXft-2.1.7 PKGNAME= Xft2-2.1.7 @@ -20,8 +20,8 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE= xft.pc.in MAKE_ENV+= EGREP=${EGREP:Q} -BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2 -BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2 +BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8.2 +BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2 .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk index 1aa1aed85a5..e479ee70fd4 100644 --- a/fonts/Xft2/buildlink3.mk +++ b/fonts/Xft2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:09:06 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:21:59 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXft2} BUILDLINK_PACKAGES+= Xft2 .if !empty(XFT2_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1 -BUILDLINK_RECOMMENDED.Xft2+= Xft2>=2.1.7nb2 +BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1 +BUILDLINK_ABI_DEPENDS.Xft2+= Xft2>=2.1.7nb2 BUILDLINK_PKGSRCDIR.Xft2?= ../../fonts/Xft2 .endif # XFT2_BUILDLINK3_MK diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk index 25849ccb8e4..6e44047b21a 100644 --- a/fonts/Xft2/builtin.mk +++ b/fonts/Xft2/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:17 jlam Exp $ +# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:21:59 reed Exp $ BUILTIN_PKG:= Xft2 @@ -67,7 +67,7 @@ USE_BUILTIN.Xft2= ${IS_BUILTIN.Xft2} . if defined(BUILTIN_PKG.Xft2) && \ !empty(IS_BUILTIN.Xft2:M[yY][eE][sS]) USE_BUILTIN.Xft2= yes -. for _dep_ in ${BUILDLINK_DEPENDS.Xft2} +. for _dep_ in ${BUILDLINK_API_DEPENDS.Xft2} . if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS]) USE_BUILTIN.Xft2!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xft2:Q}; then \ @@ -90,7 +90,7 @@ CHECK_BUILTIN.Xft2?= no .if !empty(CHECK_BUILTIN.Xft2:M[nN][oO]) . if !empty(USE_BUILTIN.Xft2:M[nN][oO]) -BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1nb2 +BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1nb2 . endif . if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS]) diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index dd80518e81a..735e0a04b90 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2006/03/04 21:29:38 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2006/04/06 06:21:59 reed Exp $ # DISTNAME= fontconfig-2.3.2 @@ -12,7 +12,7 @@ COMMENT= Library for configuring and customizing font access # This can use 2.0.5 but things which use it (ala pango) require 2.0.9 so make # sure to keep in step -BUILDLINK_DEPENDS.freetype2+= freetype2>=2.0.9 +BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.0.9 PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk index 5fd9568b855..0d28f5de2b8 100644 --- a/fonts/fontconfig/buildlink3.mk +++ b/fonts/fontconfig/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:09:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:21:59 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfontconfig} BUILDLINK_PACKAGES+= fontconfig .if !empty(FONTCONFIG_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.fontconfig+= fontconfig>=1.0.1 -BUILDLINK_RECOMMENDED.fontconfig+= fontconfig>=2.3.2nb2 +BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=1.0.1 +BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.3.2nb2 BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig .endif # FONTCONFIG_BUILDLINK3_MK diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk index 16bb9522ae1..d046f36709a 100644 --- a/fonts/fontconfig/builtin.mk +++ b/fonts/fontconfig/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $ +# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:59 reed Exp $ BUILTIN_PKG:= fontconfig @@ -66,7 +66,7 @@ USE_BUILTIN.fontconfig= ${IS_BUILTIN.fontconfig} . if defined(BUILTIN_PKG.fontconfig) && \ !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS]) USE_BUILTIN.fontconfig= yes -. for _dep_ in ${BUILDLINK_DEPENDS.fontconfig} +. for _dep_ in ${BUILDLINK_API_DEPENDS.fontconfig} . if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) USE_BUILTIN.fontconfig!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fontconfig:Q}; then \ @@ -89,8 +89,8 @@ CHECK_BUILTIN.fontconfig?= no .if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO]) . if !empty(USE_BUILTIN.fontconfig:M[nN][oO]) -BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1nb2 -BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3 +BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1nb2 +BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3 . endif . if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS]) diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk index 2380cc743a9..aefb736a9ab 100644 --- a/fonts/gucharmap/buildlink3.mk +++ b/fonts/gucharmap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:59 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GUCHARMAP_BUILDLINK3_MK:= ${GUCHARMAP_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngucharmap} BUILDLINK_PACKAGES+= gucharmap .if !empty(GUCHARMAP_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.gucharmap+= gucharmap>=1.4.0 -BUILDLINK_RECOMMENDED.gucharmap+= gucharmap>=1.4.4nb3 +BUILDLINK_API_DEPENDS.gucharmap+= gucharmap>=1.4.0 +BUILDLINK_ABI_DEPENDS.gucharmap+= gucharmap>=1.4.4nb3 BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap .endif # GUCHARMAP_BUILDLINK3_MK diff --git a/fonts/mftrace/buildlink3.mk b/fonts/mftrace/buildlink3.mk index 37bf0926901..98b977e7c09 100644 --- a/fonts/mftrace/buildlink3.mk +++ b/fonts/mftrace/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:59 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MFTRACE_BUILDLINK3_MK:= ${MFTRACE_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmftrace} BUILDLINK_PACKAGES+= mftrace .if !empty(MFTRACE_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.mftrace+= mftrace>=1.0.19 -BUILDLINK_RECOMMENDED.mftrace?= mftrace>=1.1.1nb3 +BUILDLINK_API_DEPENDS.mftrace+= mftrace>=1.0.19 +BUILDLINK_ABI_DEPENDS.mftrace?= mftrace>=1.1.1nb3 BUILDLINK_PKGSRCDIR.mftrace?= ../../fonts/mftrace .endif # MFTRACE_BUILDLINK3_MK diff --git a/fonts/t1lib/buildlink3.mk b/fonts/t1lib/buildlink3.mk index 116968c22f5..06a188a3e51 100644 --- a/fonts/t1lib/buildlink3.mk +++ b/fonts/t1lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:59 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ T1LIB_BUILDLINK3_MK:= ${T1LIB_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nt1lib} BUILDLINK_PACKAGES+= t1lib .if !empty(T1LIB_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.t1lib+= t1lib>=5.0.1 -BUILDLINK_RECOMMENDED.t1lib+= t1lib>=5.1.0nb5 +BUILDLINK_API_DEPENDS.t1lib+= t1lib>=5.0.1 +BUILDLINK_ABI_DEPENDS.t1lib+= t1lib>=5.1.0nb5 BUILDLINK_PKGSRCDIR.t1lib?= ../../fonts/t1lib .endif # T1LIB_BUILDLINK3_MK -- cgit v1.2.3