summaryrefslogtreecommitdiff
path: root/fonts/fontconfig
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 /fonts/fontconfig
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 'fonts/fontconfig')
-rw-r--r--fonts/fontconfig/Makefile4
-rw-r--r--fonts/fontconfig/buildlink3.mk6
-rw-r--r--fonts/fontconfig/builtin.mk8
3 files changed, 9 insertions, 9 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index dd80518e81a..735e0a04b90 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/06 06:21:59 reed Exp $
#
DISTNAME= fontconfig-2.3.2
@@ -12,7 +12,7 @@ COMMENT= Library for configuring and customizing font access
# This can use 2.0.5 but things which use it (ala pango) require 2.0.9 so make
# sure to keep in step
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.0.9
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.0.9
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index 5fd9568b855..0d28f5de2b8 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:09:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:21:59 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfontconfig}
BUILDLINK_PACKAGES+= fontconfig
.if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=1.0.1
-BUILDLINK_RECOMMENDED.fontconfig+= fontconfig>=2.3.2nb2
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=1.0.1
+BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.3.2nb2
BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig
.endif # FONTCONFIG_BUILDLINK3_MK
diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk
index 16bb9522ae1..d046f36709a 100644
--- a/fonts/fontconfig/builtin.mk
+++ b/fonts/fontconfig/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:59 reed Exp $
BUILTIN_PKG:= fontconfig
@@ -66,7 +66,7 @@ USE_BUILTIN.fontconfig= ${IS_BUILTIN.fontconfig}
. if defined(BUILTIN_PKG.fontconfig) && \
!empty(IS_BUILTIN.fontconfig:M[yY][eE][sS])
USE_BUILTIN.fontconfig= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.fontconfig}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.fontconfig}
. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
USE_BUILTIN.fontconfig!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fontconfig:Q}; then \
@@ -89,8 +89,8 @@ CHECK_BUILTIN.fontconfig?= no
.if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
. if !empty(USE_BUILTIN.fontconfig:M[nN][oO])
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1nb2
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1nb2
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
. endif
. if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])