diff options
author | reed <reed@pkgsrc.org> | 2006-04-06 06:21:32 +0000 |
---|---|---|
committer | reed <reed@pkgsrc.org> | 2006-04-06 06:21:32 +0000 |
commit | 5abef9be142e900cceace758044a1b2ee493daf3 (patch) | |
tree | b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /devel/gettext-lib | |
parent | d4d013cda2a033b026f37936932a1fbee6613fbc (diff) | |
download | pkgsrc-5abef9be142e900cceace758044a1b2ee493daf3.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 'devel/gettext-lib')
-rw-r--r-- | devel/gettext-lib/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/gettext-lib/builtin.mk | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index d4f037aafd3..ba4c45fbe9e 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2006/02/05 22:45:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2006/04/06 06:21:49 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngettext} BUILDLINK_PACKAGES+= gettext .if !empty(GETTEXT_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.14.5 +BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5 BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib .endif # GETTEXT_BUILDLINK3_MK diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk index 3e84044b1fb..8503d268d27 100644 --- a/devel/gettext-lib/builtin.mk +++ b/devel/gettext-lib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.30 2006/03/30 18:38:19 jlam Exp $ +# $NetBSD: builtin.mk,v 1.31 2006/04/06 06:21:49 reed Exp $ BUILTIN_PKG:= gettext @@ -49,7 +49,7 @@ USE_BUILTIN.gettext= ${IS_BUILTIN.gettext} . if defined(BUILTIN_PKG.gettext) && \ !empty(IS_BUILTIN.gettext:M[yY][eE][sS]) USE_BUILTIN.gettext= yes -. for _dep_ in ${BUILDLINK_DEPENDS.gettext} +. for _dep_ in ${BUILDLINK_API_DEPENDS.gettext} . if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) USE_BUILTIN.gettext!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gettext:Q}; then \ @@ -143,7 +143,7 @@ _BLTN_LIBINTL= -lintl _BLTN_GETTEXT_ICONV_DEPENDS= gettext-lib>=0.11.5nb1 . if !defined(_BLTN_GETTEXT_NEEDS_ICONV) _BLTN_GETTEXT_NEEDS_ICONV?= no -. for _dep_ in ${BUILDLINK_DEPENDS.gettext} +. for _dep_ in ${BUILDLINK_API_DEPENDS.gettext} . if !empty(_BLTN_GETTEXT_NEEDS_ICONV:M[nN][oO]) _BLTN_GETTEXT_NEEDS_ICONV!= \ pkg=`${PKG_BEST_EXISTS} ${_dep_:Q}`; \ @@ -165,7 +165,7 @@ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ . sinclude "../../converters/libiconv/${_mkfile_}" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} . endfor -BUILDLINK_DEPENDS.gettext+= ${_BLTN_GETTEXT_ICONV_DEPENDS} +BUILDLINK_API_DEPENDS.gettext+= ${_BLTN_GETTEXT_ICONV_DEPENDS} _BLTN_LIBINTL+= ${BUILDLINK_LDADD.iconv} . endif . endif |