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 /mk/bsd.pkg.mk | |
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 'mk/bsd.pkg.mk')
-rw-r--r-- | mk/bsd.pkg.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index cb55acb3dcd..fe29c0e7b9d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1812 2006/03/20 01:48:57 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1813 2006/04/06 06:23:05 reed Exp $ # # This file is in the public domain. # @@ -760,11 +760,11 @@ USE_LANGUAGES?= # empty .include "../../mk/wrapper/bsd.wrapper.mk" -.if defined(RECOMMENDED) -. if !empty(IGNORE_RECOMMENDED:M[nN][oO]) -DEPENDS+= ${RECOMMENDED} +.if defined(ABI_DEPENDS) +. if !empty(USE_ABI_DEPENDS:M[yY][eE][sS]) +DEPENDS+= ${ABI_DEPENDS} . else -BUILD_DEFS+= IGNORE_RECOMMENDED +BUILD_DEFS+= USE_ABI_DEPENDS . endif .endif @@ -1806,8 +1806,8 @@ real-su-package: ${PLIST} ${DESCR} @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ${PKGNAME} may not be made available through FTP:" @${ECHO_MSG} "${_PKGSRC_IN}> " ${NO_BIN_ON_FTP:Q} . endif -. if defined(RECOMMENDED) && !empty(IGNORE_RECOMMENDED:M[yY][eE][sS]) - @${ECHO_MSG} "${_PKGSRC_IN}> Warning: dependency recommendations are being ignored!" +. if defined(ABI_DEPENDS) && !empty(USE_ABI_DEPENDS:M[Nn][Oo]) + @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ABI dependency recommendations are being ignored!" @${ECHO_MSG} "${_PKGSRC_IN}> ${PKGNAME} should not be uploaded nor" @${ECHO_MSG} "${_PKGSRC_IN}> otherwise be used as a binary package!" . endif |