summaryrefslogtreecommitdiff
path: root/textproc/expat
diff options
context:
space:
mode:
authorreed <reed>2006-04-06 06:21:32 +0000
committerreed <reed>2006-04-06 06:21:32 +0000
commit7091841754a8a638d0a670a1c736986077d4d43c (patch)
treeb6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /textproc/expat
parentd42a5d51fa206e34bd9b954c36d21398c8b846cb (diff)
downloadpkgsrc-7091841754a8a638d0a670a1c736986077d4d43c.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 'textproc/expat')
-rw-r--r--textproc/expat/buildlink3.mk6
-rw-r--r--textproc/expat/builtin.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index a5e623da333..0388cd0f382 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:11:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EXPAT_BUILDLINK3_MK:= ${EXPAT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nexpat}
BUILDLINK_PACKAGES+= expat
.if !empty(EXPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.expat+= expat>=1.95.7
-BUILDLINK_RECOMMENDED.expat+= expat>=2.0.0nb1
+BUILDLINK_API_DEPENDS.expat+= expat>=1.95.7
+BUILDLINK_ABI_DEPENDS.expat+= expat>=2.0.0nb1
BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat
.endif # EXPAT_BUILDLINK3_MK
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index 7c8e5f99a45..0007004d6e3 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:50 reed Exp $
BUILTIN_PKG:= expat
@@ -54,7 +54,7 @@ USE_BUILTIN.expat= ${IS_BUILTIN.expat}
. if defined(BUILTIN_PKG.expat) && \
!empty(IS_BUILTIN.expat:M[yY][eE][sS])
USE_BUILTIN.expat= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.expat}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.expat}
. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
USE_BUILTIN.expat!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then \
@@ -77,7 +77,7 @@ CHECK_BUILTIN.expat?= no
.if !empty(CHECK_BUILTIN.expat:M[nN][oO])
. if !empty(USE_BUILTIN.expat:M[nN][oO])
-BUILDLINK_DEPENDS.expat+= expat>=1.95.4
+BUILDLINK_API_DEPENDS.expat+= expat>=1.95.4
. endif
. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])