diff options
author | reed <reed> | 2006-04-06 06:21:32 +0000 |
---|---|---|
committer | reed <reed> | 2006-04-06 06:21:32 +0000 |
commit | 3b50716541c42bd031d14157665a74004901cade (patch) | |
tree | b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /fonts/Xft2 | |
parent | 87fa6a3117eca2724176d2d7eb11a42a1a99df66 (diff) | |
download | pkgsrc-3b50716541c42bd031d14157665a74004901cade.tar.gz |
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).
Diffstat (limited to 'fonts/Xft2')
-rw-r--r-- | fonts/Xft2/Makefile | 6 | ||||
-rw-r--r-- | fonts/Xft2/buildlink3.mk | 6 | ||||
-rw-r--r-- | fonts/Xft2/builtin.mk | 6 |
3 files changed, 9 insertions, 9 deletions
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]) |