pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Drop support for TOOLS_DEPMETHOD.<tool>. The new way ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/48de83b9a8fa
branches: trunk
changeset: 496918:48de83b9a8fa
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jul 15 20:14:02 2005 +0000
description:
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a
run-time dependency (DEPENDS) on a tool is to append a ":run" modifier
to the tool name, e.g.,
USE_TOOLS+= perl:run
Tools without modifiers or with an explicit ":build" modifier will
cause build dependencies (BUILD_DEPENDS) on those tools to be added.
This makes the notation a bit more compact.
diffstat:
audio/distmp3/Makefile | 5 +-
audio/flac2mp3/Makefile | 5 +-
cad/gnetlist/Makefile | 5 +-
cad/pcb-current/Makefile | 5 +-
devel/autoconf/Makefile | 5 +-
devel/autoconf213/Makefile | 5 +-
devel/automake/Makefile | 5 +-
devel/bison/Makefile | 5 +-
graphics/netpbm/Makefile | 6 +--
lang/perl5/buildlink3.mk | 5 +--
mk/tools/autoconf.mk | 29 ++++++++++-----
mk/tools/automake.mk | 29 ++++++++++-----
mk/tools/defaults.mk | 4 +-
mk/tools/replace.mk | 78 +++++++++++++++++++++++++++++++-----------
net/argus/Makefile | 5 +-
pkgtools/pkglint/Makefile | 5 +-
print/a2ps/Makefile | 6 +--
textproc/aspell/Makefile | 6 +-
textproc/ispell-base/Makefile | 5 +-
textproc/namazu2/Makefile | 5 +-
www/squid/Makefile | 5 +-
21 files changed, 132 insertions(+), 96 deletions(-)
diffs (truncated from 630 to 300 lines):
diff -r 1495c9f085ea -r 48de83b9a8fa audio/distmp3/Makefile
--- a/audio/distmp3/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/audio/distmp3/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 20:14:02 jlam Exp $
#
DISTNAME= distmp3-0.1.9
@@ -10,8 +10,7 @@
COMMENT= Distributed mp3 encoding across multiple hosts
USE_LANGUAGES= # empty
-USE_TOOLS+= perl
-TOOLS_DEPMETHOD.perl= DEPENDS
+USE_TOOLS+= perl:run
USE_PKGINSTALL= yes
NO_BUILD= yes
diff -r 1495c9f085ea -r 48de83b9a8fa audio/flac2mp3/Makefile
--- a/audio/flac2mp3/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/audio/flac2mp3/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/15 20:14:03 jlam Exp $
DISTNAME= flac2mp3
PKGNAME= flac2mp3-20041223
@@ -18,8 +18,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
REPLACE_PERL= flac2mp3.pl
-USE_TOOLS+= perl
-TOOLS_DEPMETHOD.perl= DEPENDS
+USE_TOOLS+= perl:run
WRKSRC= ${WRKDIR}
NO_BUILD= yes
diff -r 1495c9f085ea -r 48de83b9a8fa cad/gnetlist/Makefile
--- a/cad/gnetlist/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/cad/gnetlist/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/22 20:51:45 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
@@ -11,8 +11,7 @@
DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols
# needs GNU m4 for the PCBboard netlister
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
.include "../../cad/geda/Makefile.common"
diff -r 1495c9f085ea -r 48de83b9a8fa cad/pcb-current/Makefile
--- a/cad/pcb-current/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/cad/pcb-current/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:40 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= pcb-${SNAPDATE}
@@ -18,8 +18,7 @@
SNAPDATE= 20050315
GNU_CONFIGURE= yes
-USE_TOOLS+= bison gm4 gmake lex
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= bison gm4:run gmake lex
INFO_FILES= pcb.info
diff -r 1495c9f085ea -r 48de83b9a8fa devel/autoconf/Makefile
--- a/devel/autoconf/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/devel/autoconf/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/06/15 13:27:15 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2005/07/15 20:14:03 jlam Exp $
DISTNAME= autoconf-2.59
PKGREVISION= 2
@@ -10,8 +10,7 @@
HOMEPAGE= http://www.gnu.org/software/autoconf/autoconf.html
COMMENT= Generates automatic source code configuration scripts
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
# The next line is for conflicts with old versions of this package,
# which had autoconf-devel as PKGNAME.
diff -r 1495c9f085ea -r 48de83b9a8fa devel/autoconf213/Makefile
--- a/devel/autoconf213/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/devel/autoconf213/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:51:45 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/15 20:14:03 jlam Exp $
DISTNAME= autoconf-2.13
PKGNAME= autoconf213-2.13
@@ -10,8 +10,7 @@
HOMEPAGE= http://www.gnu.org/software/autoconf/autoconf.html
COMMENT= Generates automatic source code configuration scripts (old version)
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
CONFLICTS= autoconf-devel-[0-9]*
CONFLICTS= autoconf<2.50
diff -r 1495c9f085ea -r 48de83b9a8fa devel/automake/Makefile
--- a/devel/automake/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/devel/automake/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/07/14 02:24:22 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2005/07/15 20:14:03 jlam Exp $
#
DISTNAME= automake-1.9.6
@@ -13,8 +13,7 @@
DEPENDS= autoconf>=2.58:../../devel/autoconf
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
#PKG_INSTALLATION_TYPES= overwrite pkgviews
diff -r 1495c9f085ea -r 48de83b9a8fa devel/bison/Makefile
--- a/devel/bison/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/devel/bison/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/05/22 20:51:45 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2005/07/15 20:14:03 jlam Exp $
DISTNAME= bison-2.0
CATEGORIES= devel
@@ -12,8 +12,7 @@
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= YES
-USE_TOOLS+= gm4
-TOOLS_DEPMETHOD.gm4= DEPENDS
+USE_TOOLS+= gm4:run
INFO_FILES= bison.info
diff -r 1495c9f085ea -r 48de83b9a8fa graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile Fri Jul 15 18:27:48 2005 +0000
+++ b/graphics/netpbm/Makefile Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2005/06/30 15:58:59 minskim Exp $
+# $NetBSD: Makefile,v 1.118 2005/07/15 20:14:03 jlam Exp $
DISTNAME= netpbm-10.26.11
CATEGORIES= graphics
@@ -11,9 +11,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= bash gmake lex perl
-
-TOOLS_DEPMETHOD.bash= DEPENDS
+USE_TOOLS+= bash:run gmake lex perl
INSTALL_TARGET= install-dev install-run
MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" \
diff -r 1495c9f085ea -r 48de83b9a8fa lang/perl5/buildlink3.mk
--- a/lang/perl5/buildlink3.mk Fri Jul 15 18:27:48 2005 +0000
+++ b/lang/perl5/buildlink3.mk Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2005/06/24 06:43:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2005/07/15 20:14:03 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+
@@ -22,9 +22,6 @@
.if defined(USE_PERL5) && !empty(USE_PERL5:Mbuild)
BUILDLINK_DEPMETHOD.perl?= build
.endif
-.if defined(TOOLS_DEPMETHOD.perl) && !empty(TOOLS_DEPMETHOD.perl:MBUILD_DEPENDS)
-BUILDLINK_DEPMETHOD.perl?= build
-.endif
PERL5_OPTIONS?= # empty
.if !empty(PERL5_OPTIONS:Mthreads)
diff -r 1495c9f085ea -r 48de83b9a8fa mk/tools/autoconf.mk
--- a/mk/tools/autoconf.mk Fri Jul 15 18:27:48 2005 +0000
+++ b/mk/tools/autoconf.mk Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.11 2005/06/11 05:22:03 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.12 2005/07/15 20:14:04 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -66,7 +66,8 @@
#
# Only allow one of "autoconf" and "autoconf213" in USE_TOOLS.
-.if !empty(USE_TOOLS:Mautoconf) && !empty(USE_TOOLS:Mautoconf213)
+.if !empty(USE_TOOLS:C/:.*//:Mautoconf) && \
+ !empty(USE_TOOLS:C/:.*//:Mautoconf213)
PKG_FAIL_REASON+= "\`\`autoconf'' and \`\`autoconf213'' conflict in USE_TOOLS."
.endif
@@ -85,16 +86,20 @@
_TOOLS_AC_TYPE.${_t_}?= TOOLS_GNU_MISSING
.endfor _t_
-.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:Mautoconf)
+.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:C/:.*//:Mautoconf)
. if !empty(PKGPATH:Mdevel/autoconf)
MAKEFLAGS+= TOOLS_IGNORE.autoconf=
. else
AUTOCONF_REQD?= 2.50
-TOOLS_DEPMETHOD.autoconf?= BUILD_DEPENDS
+. if !empty(USE_TOOLS:Mautoconf\:run)
+_TOOLS_DEPMETHOD.autoconf= DEPENDS
+. else
+_TOOLS_DEPMETHOD.autoconf= BUILD_DEPENDS
+. endif
TOOLS_DEPENDS.autoconf?= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
-. if empty(${TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf})
-${TOOLS_DEPMETHOD.autoconf}+= ${TOOLS_DEPENDS.autoconf}
+. if empty(${_TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf})
+${_TOOLS_DEPMETHOD.autoconf}+= ${TOOLS_DEPENDS.autoconf}
. endif
EVAL_PREFIX+= _TOOLS_AC_PREFIX=autoconf
@@ -121,16 +126,20 @@
. endif
.endif
-.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:Mautoconf213)
+.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:C/:.*//:Mautoconf213)
. if !empty(PKGPATH:Mdevel/autoconf213)
MAKEFLAGS+= TOOLS_IGNORE.autoconf213=
. else
AUTOCONF_REQD?= 2.13
-TOOLS_DEPMETHOD.autoconf213?= BUILD_DEPENDS
+. if !empty(USE_TOOLS:Mautoconf213\:run)
+_TOOLS_DEPMETHOD.autoconf213= DEPENDS
+. else
+_TOOLS_DEPMETHOD.autoconf213= BUILD_DEPENDS
+. endif
TOOLS_DEPENDS.autoconf213?= autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
-. if empty(${TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213})
-${TOOLS_DEPMETHOD.autoconf213}+= ${TOOLS_DEPENDS.autoconf213}
+. if empty(${_TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213})
+${_TOOLS_DEPMETHOD.autoconf213}+= ${TOOLS_DEPENDS.autoconf213}
. endif
EVAL_PREFIX+= _TOOLS_AC_PREFIX=autoconf213
diff -r 1495c9f085ea -r 48de83b9a8fa mk/tools/automake.mk
--- a/mk/tools/automake.mk Fri Jul 15 18:27:48 2005 +0000
+++ b/mk/tools/automake.mk Fri Jul 15 20:14:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.14 2005/06/11 05:22:03 jlam Exp $
+# $NetBSD: automake.mk,v 1.15 2005/07/15 20:14:04 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -79,7 +79,8 @@
.endif
# Only allow one of "automake" and "automake14" in USE_TOOLS.
-.if !empty(USE_TOOLS:Mautomake) && !empty(USE_TOOLS:Mautomake14)
+.if !empty(USE_TOOLS:C/:.*//:Mautomake) && \
+ !empty(USE_TOOLS:C/:.*//:Mautomake14)
PKG_FAIL_REASON+= "\`\`automake'' and \`\`automake14'' conflict in USE_TOOLS."
.endif
@@ -103,17 +104,21 @@
_TOOLS_AM_TYPE.${_t_}?= TOOLS_GNU_MISSING
.endfor
-.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:Mautomake)
+.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:C/:.*//:Mautomake)
. if !empty(PKGPATH:Mdevel/automake)
MAKEFLAGS+= TOOLS_IGNORE.automake=
. else
AUTOMAKE_REQD?= 1.9
AUTOCONF_REQD?= 2.58
-TOOLS_DEPMETHOD.automake?= BUILD_DEPENDS
+. if !empty(USE_TOOLS:Mautomake\:run)
+_TOOLS_DEPMETHOD.automake= DEPENDS
+. else
+_TOOLS_DEPMETHOD.automake= BUILD_DEPENDS
+. endif
TOOLS_DEPENDS.automake?= automake>=${AUTOMAKE_REQD}:../../devel/automake
-. if empty(${TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake})
-${TOOLS_DEPMETHOD.automake}+= ${TOOLS_DEPENDS.automake}
Home |
Main Index |
Thread Index |
Old Index