summaryrefslogtreecommitdiff
path: root/security/heimdal
diff options
context:
space:
mode:
authorreed <reed>2006-04-06 06:21:32 +0000
committerreed <reed>2006-04-06 06:21:32 +0000
commit3b50716541c42bd031d14157665a74004901cade (patch)
treeb6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /security/heimdal
parent87fa6a3117eca2724176d2d7eb11a42a1a99df66 (diff)
downloadpkgsrc-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 'security/heimdal')
-rw-r--r--security/heimdal/buildlink3.mk6
-rw-r--r--security/heimdal/builtin.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 05445f58a99..8b0b01bbb8e 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2005/10/26 15:12:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2006/04/06 06:22:40 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nheimdal}
BUILDLINK_PACKAGES+= heimdal
.if !empty(HEIMDAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.heimdal+= heimdal>=0.4e
-BUILDLINK_RECOMMENDED.heimdal+= heimdal>=0.6.3nb2
+BUILDLINK_API_DEPENDS.heimdal+= heimdal>=0.4e
+BUILDLINK_ABI_DEPENDS.heimdal+= heimdal>=0.6.3nb2
BUILDLINK_PKGSRCDIR.heimdal?= ../../security/heimdal
BUILDLINK_INCDIRS.heimdal?= include/krb5
.endif # HEIMDAL_BUILDLINK3_MK
diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk
index e212ea11135..d5e3a871db1 100644
--- a/security/heimdal/builtin.mk
+++ b/security/heimdal/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:22:41 reed Exp $
BUILTIN_PKG:= heimdal
@@ -74,7 +74,7 @@ USE_BUILTIN.heimdal= ${IS_BUILTIN.heimdal}
. if defined(BUILTIN_PKG.heimdal) && \
!empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
USE_BUILTIN.heimdal= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.heimdal}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.heimdal}
. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
USE_BUILTIN.heimdal!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.heimdal:Q}; then \
@@ -97,7 +97,7 @@ CHECK_BUILTIN.heimdal?= no
.if !empty(CHECK_BUILTIN.heimdal:M[nN][oO])
. if !empty(USE_BUILTIN.heimdal:M[nN][oO])
-BUILDLINK_DEPENDS.heimdal+= heimdal>=0.6
+BUILDLINK_API_DEPENDS.heimdal+= heimdal>=0.6
KRB5_CONFIG?= ${BUILDLINK_PREFIX.heimdal}/bin/krb5-config
CONFIGURE_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q}