summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-04-06 06:21:32 +0000
committerreed <reed@pkgsrc.org>2006-04-06 06:21:32 +0000
commit5abef9be142e900cceace758044a1b2ee493daf3 (patch)
treeb6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /editors
parentd4d013cda2a033b026f37936932a1fbee6613fbc (diff)
downloadpkgsrc-5abef9be142e900cceace758044a1b2ee493daf3.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 'editors')
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/gconf-editor/Makefile4
-rw-r--r--editors/gedit/Makefile10
-rw-r--r--editors/gedit/buildlink3.mk4
-rw-r--r--editors/mule-ucs/Makefile4
-rw-r--r--editors/pico/Makefile4
-rw-r--r--editors/pico/buildlink3.mk4
-rw-r--r--editors/sam/buildlink3.mk6
8 files changed, 20 insertions, 20 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index a7ff624edc6..423e45aed6b 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2006/04/05 22:22:16 markd Exp $
+# $NetBSD: Makefile,v 1.93 2006/04/06 06:21:58 reed Exp $
DISTNAME= emacs-${EMACSVERSION}a
PKGREVISION= 3
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-jpeg
.include "../../graphics/tiff/buildlink3.mk"
CONFIGURE_ARGS+= --with-tiff
# need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
-BUILDLINK_DEPENDS.libungif+= libungif>=4.1.0.1
+BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1
.include "../../graphics/libungif/buildlink3.mk"
CONFIGURE_ARGS+= --with-gif
.include "../../graphics/png/buildlink3.mk"
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 55d4f112a95..9f220be10e3 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/03/30 21:28:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2006/04/06 06:21:58 reed Exp $
#
DISTNAME= gconf-editor-2.14.0
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xm
GCONF2_SCHEMAS= gconf-editor.schemas
-BUILDLINK_DEPENDS.GConf2+= GConf2>=2.14.0
+BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.14.0
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index a2765baafbd..6629bd2cb22 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/03/30 21:29:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.60 2006/04/06 06:21:58 reed Exp $
#
DISTNAME= gedit-2.14.0
@@ -25,10 +25,10 @@ GCONF2_SCHEMAS= gedit.schemas
CONFIGURE_ARGS+= --enable-schemas-install
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
-BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.13.0
-BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.13.4
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.13.4
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index 0c239ec2a31..9668e85b801 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/03/14 14:22:36 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:58 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngedit}
BUILDLINK_PACKAGES+= gedit
.if !empty(GEDIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gedit+= gedit>=2.12.1nb4
+BUILDLINK_API_DEPENDS.gedit+= gedit>=2.12.1nb4
BUILDLINK_PKGSRCDIR.gedit?= ../../editors/gedit
.endif # GEDIT_BUILDLINK3_MK
diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile
index 8c78c9405ea..dbc0c4f4229 100644
--- a/editors/mule-ucs/Makefile
+++ b/editors/mule-ucs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:21:58 reed Exp $
DISTNAME= Mule-UCS-0.84
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT= Another encoding conversion mechanism for Emacs
# Mule 4.1 feature required by Mule-UCS was added to 20.7nb1.
EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20
-BUILDLINK_DEPENDS.emacs20+= emacs>=20.7nb1
+BUILDLINK_API_DEPENDS.emacs20+= emacs>=20.7nb1
do-build:
@cd ${WRKSRC}; \
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index fe785efb16b..838fa2e1728 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.68 2006/03/04 21:29:32 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2006/04/06 06:21:58 reed Exp $
#
# NOTE:
# When updating, it is necessary to change the shlib version, located in
# several files in patches/. If you do not KNOW that the new version is
# backwards ABI compatible (usually not), bump the major version,
-# and then bump the BUILDLINK_DEPENDS in buildlink3.mk.
+# and then bump the BUILDLINK_API_DEPENDS in buildlink3.mk.
DISTNAME= pine4.64
PKGNAME= pico-4.10
diff --git a/editors/pico/buildlink3.mk b/editors/pico/buildlink3.mk
index 8297929c906..86a2bf29be1 100644
--- a/editors/pico/buildlink3.mk
+++ b/editors/pico/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/01/12 21:00:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PICO_BUILDLINK3_MK:= ${PICO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npico}
BUILDLINK_PACKAGES+= pico
.if !empty(PICO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pico+= pico>=4.10
+BUILDLINK_API_DEPENDS.pico+= pico>=4.10
BUILDLINK_PKGSRCDIR.pico?= ../../editors/pico
.endif # PICO_BUILDLINK3_MK
diff --git a/editors/sam/buildlink3.mk b/editors/sam/buildlink3.mk
index 685cf4aba9b..c2b395f53e5 100644
--- a/editors/sam/buildlink3.mk
+++ b/editors/sam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:58 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SAM_BUILDLINK3_MK:= ${SAM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsam}
BUILDLINK_PACKAGES+= sam
.if !empty(SAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sam+= sam>=4.3nb1
-BUILDLINK_RECOMMENDED.sam?= sam>=4.3nb3
+BUILDLINK_API_DEPENDS.sam+= sam>=4.3nb1
+BUILDLINK_ABI_DEPENDS.sam?= sam>=4.3nb3
BUILDLINK_PKGSRCDIR.sam?= ../../editors/sam
BUILDLINK_DEPMETHOD.sam?= build
.endif # SAM_BUILDLINK3_MK