summaryrefslogtreecommitdiff
path: root/misc
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 /misc
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 'misc')
-rw-r--r--misc/Addresses/buildlink3.mk6
-rw-r--r--misc/gnome2-utils/Makefile10
-rw-r--r--misc/goffice/Makefile6
-rw-r--r--misc/goffice/buildlink3.mk6
-rw-r--r--misc/kdepim3/Makefile4
-rw-r--r--misc/kdepim3/buildlink3.mk6
-rw-r--r--misc/koffice/buildlink3.mk6
-rw-r--r--misc/libcdio/buildlink3.mk6
-rw-r--r--misc/libutf/buildlink3.mk6
-rw-r--r--misc/proj/buildlink3.mk6
-rw-r--r--misc/rpm/buildlink3.mk6
-rw-r--r--misc/xfce4-weather-plugin/buildlink3.mk6
-rw-r--r--misc/yelp/Makefile6
13 files changed, 40 insertions, 40 deletions
diff --git a/misc/Addresses/buildlink3.mk b/misc/Addresses/buildlink3.mk
index 92e9d476bc0..8fa3f7ac627 100644
--- a/misc/Addresses/buildlink3.mk
+++ b/misc/Addresses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ADDRESSES_BUILDLINK3_MK:= ${ADDRESSES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NAddresses}
BUILDLINK_PACKAGES+= Addresses
.if !empty(ADDRESSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Addresses+= Addresses>=0.4.5
-BUILDLINK_RECOMMENDED.Addresses+= Addresses>=0.4.6nb3
+BUILDLINK_API_DEPENDS.Addresses+= Addresses>=0.4.5
+BUILDLINK_ABI_DEPENDS.Addresses+= Addresses>=0.4.6nb3
BUILDLINK_PKGSRCDIR.Addresses?= ../../misc/Addresses
.include "../../devel/gnustep-make/gnustep.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 68565ed505e..86d9fb9fcf2 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/03/30 21:33:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/06 06:22:23 reed Exp $
#
DISTNAME= gnome-utils-2.14.0
@@ -29,10 +29,10 @@ GCONF2_SCHEMAS+= gnome-screenshot.schemas
GCONF2_SCHEMAS+= gnome-search-tool.schemas
GCONF2_SCHEMAS+= logview.schemas
-BUILDLINK_DEPENDS.glib2+= glib2>=2.9.1
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.4
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.13.7
-BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.13.2
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.4
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7
+BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/GConf2-ui/buildlink3.mk"
diff --git a/misc/goffice/Makefile b/misc/goffice/Makefile
index 3329516c6f3..475ed8fe517 100644
--- a/misc/goffice/Makefile
+++ b/misc/goffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/31 14:54:22 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:23 reed Exp $
#
DISTNAME= goffice-0.2.1
@@ -18,7 +18,7 @@ USE_TOOLS+= gmake pkg-config
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
@@ -26,7 +26,7 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
-BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
+BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/misc/goffice/buildlink3.mk b/misc/goffice/buildlink3.mk
index cd47f645da2..87e1cfd5bec 100644
--- a/misc/goffice/buildlink3.mk
+++ b/misc/goffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GOFFICE_BUILDLINK3_MK:= ${GOFFICE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngoffice}
BUILDLINK_PACKAGES+= goffice
.if !empty(GOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.goffice+= goffice>=0.1.2
-BUILDLINK_RECOMMENDED.goffice?= goffice>=0.2.0nb1
+BUILDLINK_API_DEPENDS.goffice+= goffice>=0.1.2
+BUILDLINK_ABI_DEPENDS.goffice?= goffice>=0.2.0nb1
BUILDLINK_PKGSRCDIR.goffice?= ../../misc/goffice
.endif # GOFFICE_BUILDLINK3_MK
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 440c10a295f..a1149b509ab 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/03/30 02:52:17 markd Exp $
+# $NetBSD: Makefile,v 1.59 2006/04/06 06:22:23 reed Exp $
DISTNAME= kdepim-${_KDE_VERSION}
CATEGORIES= misc
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS= sasl
.include "../../mk/bsd.options.mk"
-BUILDLINK_DEPENDS.gpgme+= gpgme>=0.4.5
+BUILDLINK_API_DEPENDS.gpgme+= gpgme>=0.4.5
REPLACE_PERL+= kmail/kmail-3.1-update-new-mail-notification-settings.pl \
kmail/kmail-3.1-use-UOID-for-identities.pl \
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 80936e9e3e8..d5b5c1ed670 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:10:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdepim}
BUILDLINK_PACKAGES+= kdepim
.if !empty(KDEPIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdepim+= kdepim>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdepim?= kdepim>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdepim+= kdepim>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdepim?= kdepim>=3.5.1nb1
BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3
.endif # KDEPIM_BUILDLINK3_MK
diff --git a/misc/koffice/buildlink3.mk b/misc/koffice/buildlink3.mk
index c3ad5d975d5..73cbb37d82c 100644
--- a/misc/koffice/buildlink3.mk
+++ b/misc/koffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KOFFICE_BUILDLINK3_MK:= ${KOFFICE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkoffice}
BUILDLINK_PACKAGES+= koffice
.if !empty(KOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.koffice?= koffice>=1.4.2nb5
-BUILDLINK_RECOMMENDED.koffice?= koffice>=1.4.2nb8
+BUILDLINK_API_DEPENDS.koffice?= koffice>=1.4.2nb5
+BUILDLINK_ABI_DEPENDS.koffice?= koffice>=1.4.2nb8
BUILDLINK_PKGSRCDIR.koffice?= ../../misc/koffice
.endif # KOFFICE_BUILDLINK3_MK
diff --git a/misc/libcdio/buildlink3.mk b/misc/libcdio/buildlink3.mk
index 917319cc01d..778926d5f85 100644
--- a/misc/libcdio/buildlink3.mk
+++ b/misc/libcdio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:23 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCDIO_BUILDLINK3_MK:= ${LIBCDIO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcdio}
BUILDLINK_PACKAGES+= libcdio
.if !empty(LIBCDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcdio+= libcdio>=0.65
-BUILDLINK_RECOMMENDED.libcdio+= libcdio>=0.76nb1
+BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.65
+BUILDLINK_ABI_DEPENDS.libcdio+= libcdio>=0.76nb1
BUILDLINK_PKGSRCDIR.libcdio?= ../../misc/libcdio
.endif # LIBCDIO_BUILDLINK3_MK
diff --git a/misc/libutf/buildlink3.mk b/misc/libutf/buildlink3.mk
index 221bb05a51b..60b81a70ef9 100644
--- a/misc/libutf/buildlink3.mk
+++ b/misc/libutf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:00 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUTF_BUILDLINK3_MK:= ${LIBUTF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibutf}
BUILDLINK_PACKAGES+= libutf
.if !empty(LIBUTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libutf+= libutf>=2.10nb1
-BUILDLINK_RECOMMENDED.libutf+= libutf>=2.10nb2
+BUILDLINK_API_DEPENDS.libutf+= libutf>=2.10nb1
+BUILDLINK_ABI_DEPENDS.libutf+= libutf>=2.10nb2
BUILDLINK_PKGSRCDIR.libutf?= ../../misc/libutf
.endif # LIBUTF_BUILDLINK3_MK
diff --git a/misc/proj/buildlink3.mk b/misc/proj/buildlink3.mk
index f4d65eca6ca..cad861a629f 100644
--- a/misc/proj/buildlink3.mk
+++ b/misc/proj/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PROJ_BUILDLINK3_MK:= ${PROJ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nproj}
BUILDLINK_PACKAGES+= proj
.if !empty(PROJ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.proj+= proj>=4.4.7nb1
-BUILDLINK_RECOMMENDED.proj?= proj>=4.4.7nb2
+BUILDLINK_API_DEPENDS.proj+= proj>=4.4.7nb1
+BUILDLINK_ABI_DEPENDS.proj?= proj>=4.4.7nb2
BUILDLINK_PKGSRCDIR.proj?= ../../misc/proj
.endif # PROJ_BUILDLINK3_MK
diff --git a/misc/rpm/buildlink3.mk b/misc/rpm/buildlink3.mk
index 169e1d33567..b3a89f53a62 100644
--- a/misc/rpm/buildlink3.mk
+++ b/misc/rpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RPM_BUILDLINK3_MK:= ${RPM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrpm}
BUILDLINK_PACKAGES+= rpm
.if !empty(RPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rpm+= rpm>=2.5.4nb4
-BUILDLINK_RECOMMENDED.rpm?= rpm>=2.5.4nb5
+BUILDLINK_API_DEPENDS.rpm+= rpm>=2.5.4nb4
+BUILDLINK_ABI_DEPENDS.rpm?= rpm>=2.5.4nb5
BUILDLINK_PKGSRCDIR.rpm?= ../../misc/rpm
BUILDLINK_DEPMETHOD.rpm?= build
diff --git a/misc/xfce4-weather-plugin/buildlink3.mk b/misc/xfce4-weather-plugin/buildlink3.mk
index b6b529c7934..8fdf35d95a1 100644
--- a/misc/xfce4-weather-plugin/buildlink3.mk
+++ b/misc/xfce4-weather-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:24 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:= ${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-weather-plugin}
BUILDLINK_PACKAGES+= xfce4-weather-plugin
.if !empty(XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-weather-plugin+= xfce4-weather-plugin>=0.4.9
-BUILDLINK_RECOMMENDED.xfce4-weather-plugin?= xfce4-weather-plugin>=0.4.9nb2
+BUILDLINK_API_DEPENDS.xfce4-weather-plugin+= xfce4-weather-plugin>=0.4.9
+BUILDLINK_ABI_DEPENDS.xfce4-weather-plugin?= xfce4-weather-plugin>=0.4.9nb2
BUILDLINK_PKGSRCDIR.xfce4-weather-plugin?= ../../misc/xfce4-weather-plugin
.endif # XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 4c20b866c86..d1312b424ae 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/30 21:26:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2006/04/06 06:22:24 reed Exp $
#
DISTNAME= yelp-2.14.0
@@ -13,7 +13,7 @@ COMMENT= Help browser for GNOME 2 desktop
DEPENDS+= docbook>=4.2:../../textproc/docbook
BUILD_USES_MSGFMT= yes
-BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.4
+BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4
USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake pkg-config
@@ -31,7 +31,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.yelp
.if !empty(PKG_OPTIONS:Mfirefox)
# Require a version that has the .pc files in it.
-BUILDLINK_DEPENDS.firefox+= firefox>=1.5nb2
+BUILDLINK_API_DEPENDS.firefox+= firefox>=1.5nb2
.endif
.include "../../archivers/bzip2/buildlink3.mk"