summaryrefslogtreecommitdiff
path: root/x11/Xcomposite
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 /x11/Xcomposite
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 'x11/Xcomposite')
-rw-r--r--x11/Xcomposite/buildlink3.mk6
-rw-r--r--x11/Xcomposite/builtin.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index c7423a5371f..a82889bb677 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XCOMPOSITE_BUILDLINK3_MK:= ${XCOMPOSITE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXcomposite}
BUILDLINK_PACKAGES+= Xcomposite
.if !empty(XCOMPOSITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xcomposite+= Xcomposite>=1.0.1
-BUILDLINK_RECOMMENDED.Xcomposite?= Xcomposite>=1.0.1nb2
+BUILDLINK_API_DEPENDS.Xcomposite+= Xcomposite>=1.0.1
+BUILDLINK_ABI_DEPENDS.Xcomposite?= Xcomposite>=1.0.1nb2
BUILDLINK_PKGSRCDIR.Xcomposite?= ../../x11/Xcomposite
.endif # XCOMPOSITE_BUILDLINK3_MK
diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 52d643625b3..8a35aac5247 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:56 reed Exp $
BUILTIN_PKG:= Xcomposite
@@ -34,7 +34,7 @@ USE_BUILTIN.Xcomposite= ${IS_BUILTIN.Xcomposite}
. if defined(BUILTIN_PKG.Xcomposite) && \
!empty(IS_BUILTIN.Xcomposite:M[yY][eE][sS])
USE_BUILTIN.Xcomposite= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.Xcomposite}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.Xcomposite}
. if !empty(USE_BUILTIN.Xcomposite:M[yY][eE][sS])
USE_BUILTIN.Xcomposite!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xcomposite:Q}; then \