diff options
author | reed <reed> | 2006-04-06 06:21:32 +0000 |
---|---|---|
committer | reed <reed> | 2006-04-06 06:21:32 +0000 |
commit | 7091841754a8a638d0a670a1c736986077d4d43c (patch) | |
tree | b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /mk | |
parent | d42a5d51fa206e34bd9b954c36d21398c8b846cb (diff) | |
download | pkgsrc-7091841754a8a638d0a670a1c736986077d4d43c.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 'mk')
-rw-r--r-- | mk/apache.mk | 6 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 14 | ||||
-rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 28 | ||||
-rw-r--r-- | mk/buildlink3/bsd.builtin.mk | 4 | ||||
-rw-r--r-- | mk/db1.builtin.mk | 4 | ||||
-rw-r--r-- | mk/defaults/mk.conf | 12 | ||||
-rw-r--r-- | mk/java-vm.mk | 26 | ||||
-rw-r--r-- | mk/oss.builtin.mk | 4 | ||||
-rw-r--r-- | mk/pthread.buildlink3.mk | 4 | ||||
-rw-r--r-- | mk/solaris-pam.builtin.mk | 4 | ||||
-rw-r--r-- | mk/tex.buildlink3.mk | 14 | ||||
-rw-r--r-- | mk/tools/replace.mk | 6 |
12 files changed, 63 insertions, 63 deletions
diff --git a/mk/apache.mk b/mk/apache.mk index 821788503c3..d15f9dc8713 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.9 2005/04/21 23:05:41 sketch Exp $ +# $NetBSD: apache.mk,v 1.10 2006/04/06 06:23:05 reed Exp $ # # This Makefile fragment handles Apache dependencies and make variables, # and is meant to be included by packages that require Apache either at @@ -108,8 +108,8 @@ PKG_FAIL_REASON= "no acceptable apache found" _PKG_APACHE= "none" .endif -BUILDLINK_DEPENDS.apache13?= apache-1.3* -BUILDLINK_DEPENDS.apache2?= apache-2* +BUILDLINK_API_DEPENDS.apache13?= apache-1.3* +BUILDLINK_API_DEPENDS.apache2?= apache-2* .if ${_PKG_APACHE} == "apache13" _APACHE_PKGSRCDIR= ../../www/apache diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index cb55acb3dcd..fe29c0e7b9d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1812 2006/03/20 01:48:57 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1813 2006/04/06 06:23:05 reed Exp $ # # This file is in the public domain. # @@ -760,11 +760,11 @@ USE_LANGUAGES?= # empty .include "../../mk/wrapper/bsd.wrapper.mk" -.if defined(RECOMMENDED) -. if !empty(IGNORE_RECOMMENDED:M[nN][oO]) -DEPENDS+= ${RECOMMENDED} +.if defined(ABI_DEPENDS) +. if !empty(USE_ABI_DEPENDS:M[yY][eE][sS]) +DEPENDS+= ${ABI_DEPENDS} . else -BUILD_DEFS+= IGNORE_RECOMMENDED +BUILD_DEFS+= USE_ABI_DEPENDS . endif .endif @@ -1806,8 +1806,8 @@ real-su-package: ${PLIST} ${DESCR} @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ${PKGNAME} may not be made available through FTP:" @${ECHO_MSG} "${_PKGSRC_IN}> " ${NO_BIN_ON_FTP:Q} . endif -. if defined(RECOMMENDED) && !empty(IGNORE_RECOMMENDED:M[yY][eE][sS]) - @${ECHO_MSG} "${_PKGSRC_IN}> Warning: dependency recommendations are being ignored!" +. if defined(ABI_DEPENDS) && !empty(USE_ABI_DEPENDS:M[Nn][Oo]) + @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ABI dependency recommendations are being ignored!" @${ECHO_MSG} "${_PKGSRC_IN}> ${PKGNAME} should not be uploaded nor" @${ECHO_MSG} "${_PKGSRC_IN}> otherwise be used as a binary package!" . endif diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index d7f07449d35..e75d5d4ef96 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.172 2005/12/09 16:16:41 hira Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.173 2006/04/06 06:23:06 reed Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -48,8 +48,8 @@ # BUILDLINK_PACKAGES+= foo # # .if !empty(FOO_BUILDLINK3_MK:M+) -# BUILDLINK_DEPENDS.foo+= foo-lib>=1.0 -# BUILDLINK_RECOMMENDED.foo?= foo-lib>=1.0nb1 +# BUILDLINK_API_DEPENDS.foo+= foo-lib>=1.0 +# BUILDLINK_ABI_DEPENDS.foo?= foo-lib>=1.0nb1 # BUILDLINK_PKGSRCDIR.foo?= ../../category/foo-lib # # # We want "-lbar" to eventually resolve to "-lfoo". @@ -184,33 +184,33 @@ _BLNK_DEPENDS_LIST= ${_BLNK_DEPENDS} # _BLNK_ADD_TO.DEPENDS= # empty _BLNK_ADD_TO.BUILD_DEPENDS= # empty -_BLNK_ADD_TO.RECOMMENDED= # empty +_BLNK_ADD_TO.ABI_DEPENDS= # empty .for _pkg_ in ${_BLNK_DEPENDS_LIST} . if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull) _BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.DEPENDS -_BLNK_RECMETHOD.${_pkg_}= _BLNK_ADD_TO.RECOMMENDED +_BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.ABI_DEPENDS . elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mbuild) _BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS -_BLNK_RECMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS +_BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS . endif -. if defined(BUILDLINK_DEPENDS.${_pkg_}) && \ +. if defined(BUILDLINK_API_DEPENDS.${_pkg_}) && \ defined(BUILDLINK_PKGSRCDIR.${_pkg_}) -. for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}} +. for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}} . if empty(${_BLNK_DEPMETHOD.${_pkg_}}:M${_depend_}\:*) ${_BLNK_DEPMETHOD.${_pkg_}}+= ${_depend_}:${BUILDLINK_PKGSRCDIR.${_pkg_}} . endif . endfor . endif -. if defined(BUILDLINK_RECOMMENDED.${_pkg_}) && \ +. if defined(BUILDLINK_ABI_DEPENDS.${_pkg_}) && \ defined(BUILDLINK_PKGSRCDIR.${_pkg_}) -. for _rec_ in ${BUILDLINK_RECOMMENDED.${_pkg_}} -. if empty(${_BLNK_RECMETHOD.${_pkg_}}:M${_rec_}\:*) -${_BLNK_RECMETHOD.${_pkg_}}+= ${_rec_}:${BUILDLINK_PKGSRCDIR.${_pkg_}} +. for _abi_ in ${BUILDLINK_ABI_DEPENDS.${_pkg_}} +. if empty(${_BLNK_ABIMETHOD.${_pkg_}}:M${_abi_}\:*) +${_BLNK_ABIMETHOD.${_pkg_}}+= ${_abi_}:${BUILDLINK_PKGSRCDIR.${_pkg_}} . endif . endfor . endif .endfor -.for _depmethod_ in DEPENDS BUILD_DEPENDS RECOMMENDED +.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS . if !empty(_BLNK_ADD_TO.${_depmethod_}) ${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}} . endif @@ -280,7 +280,7 @@ BUILDLINK_PREFIX.${_pkg_}?= /usr # . if !defined(_BLNK_PKG_DBDIR.${_pkg_}) _BLNK_PKG_DBDIR.${_pkg_}?= # empty -. for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}} +. for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}} . if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found) _BLNK_PKG_DBDIR.${_pkg_}!= \ dir=""; \ diff --git a/mk/buildlink3/bsd.builtin.mk b/mk/buildlink3/bsd.builtin.mk index e3eea895d45..ec5cba53da2 100644 --- a/mk/buildlink3/bsd.builtin.mk +++ b/mk/buildlink3/bsd.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.builtin.mk,v 1.6 2005/06/20 05:44:17 jlam Exp $ +# $NetBSD: bsd.builtin.mk,v 1.7 2006/04/06 06:23:06 reed Exp $ # # Copyright (c) 2004-2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -85,7 +85,7 @@ # . if defined(BUILTIN_PKG.wibble) && \ # !empty(IS_BUILTIN.wibble:M[yY][eE][sS]) # USE_BUILTIN.wibble= yes -# . for _dep_ in ${BUILDLINK_DEPENDS.wibble} +# . for _dep_ in ${BUILDLINK_API_DEPENDS.wibble} # . if !empty(USE_BUILTIN.wibble:M[yY][eE][sS]) # USE_BUILTIN.wibble!= \ # if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.wibble:Q}; then \ diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk index f695258038c..0a9cdc8470e 100644 --- a/mk/db1.builtin.mk +++ b/mk/db1.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: db1.builtin.mk,v 1.14 2005/08/11 20:25:20 cube Exp $ +# $NetBSD: db1.builtin.mk,v 1.15 2006/04/06 06:23:06 reed Exp $ BUILTIN_PKG:= db1 @@ -41,7 +41,7 @@ USE_BUILTIN.db1= no USE_BUILTIN.db1= ${IS_BUILTIN.db1} . if defined(BUILTIN_PKG.db1) && !empty(IS_BUILTIN.db1:M[yY][eE][sS]) USE_BUILTIN.db1= yes -. for _dep_ in ${BUILDLINK_DEPENDS.db1} +. for _dep_ in ${BUILDLINK_API_DEPENDS.db1} . if !empty(USE_BUILTIN.db1:M[yY][eE][sS]) USE_BUILTIN.db1!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.db1:Q}; then \ diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 0db2f643ad5..48574e38002 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.114 2006/03/30 04:57:45 jlam Exp $ +# $NetBSD: mk.conf,v 1.115 2006/04/06 06:23:06 reed Exp $ # # This file provides default values for variables that may be overridden @@ -100,17 +100,17 @@ PKGSRC_SLEEPSECS?= 5 # Possible: defined, not defined # Default: not defined -IGNORE_RECOMMENDED?= no -# Ignore package prerequisite recommendations. If this is set to -# "no", all entries in RECOMMENDED will be added to DEPENDS. -# If set to "yes", a warning will be printed if recommendations +USE_ABI_DEPENDS?= yes +# Honor package prerequisite ABI recommendations. If this is set +# to "yes", all entries in ABI_DEPENDS will be added to DEPENDS. +# If set to "no", a warning will be printed if recommendations # are possibly ignored. # # WARNING: This should only be set if you know what you're doing. # Please read pkgsrc/doc/pkgsrc.txt for details. # # Possible: yes, no -# Default: no +# Default: yes #PKG_REGISTER_SHELLS= YES # Automatically register shells in /etc/shells diff --git a/mk/java-vm.mk b/mk/java-vm.mk index d61d9a274cc..a27190a987f 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.44 2005/12/12 14:43:26 joerg Exp $ +# $NetBSD: java-vm.mk,v 1.45 2006/04/06 06:23:06 reed Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -199,18 +199,18 @@ PKG_SKIP_REASON= "no acceptable JVM found" _PKG_JVM= "none" .endif -BUILDLINK_DEPENDS.blackdown-jdk13?= blackdown-jdk13-[0-9]* -BUILDLINK_DEPENDS.blackdown-jre13?= blackdown-jre13-[0-9]* -BUILDLINK_DEPENDS.jdk?= jdk-[0-9]* -BUILDLINK_DEPENDS.jdk14?= jdk14-[0-9]* -BUILDLINK_DEPENDS.kaffe?= kaffe>=1.1.4 -BUILDLINK_DEPENDS.sun-jdk13?= sun-jdk13-[0-9]* -BUILDLINK_DEPENDS.sun-jre13?= sun-jre13-[0-9]* -BUILDLINK_DEPENDS.sun-jdk14?= sun-jdk14-[0-9]* -BUILDLINK_DEPENDS.sun-jre14?= sun-jre14-[0-9]* -BUILDLINK_DEPENDS.sun-jdk15?= sun-jdk15-[0-9]* -BUILDLINK_DEPENDS.sun-jre15?= sun-jre15-[0-9]* -#BUILDLINK_DEPENDS.win32-jdk?= win32-jdk>=0.1 +BUILDLINK_API_DEPENDS.blackdown-jdk13?= blackdown-jdk13-[0-9]* +BUILDLINK_API_DEPENDS.blackdown-jre13?= blackdown-jre13-[0-9]* +BUILDLINK_API_DEPENDS.jdk?= jdk-[0-9]* +BUILDLINK_API_DEPENDS.jdk14?= jdk14-[0-9]* +BUILDLINK_API_DEPENDS.kaffe?= kaffe>=1.1.4 +BUILDLINK_API_DEPENDS.sun-jdk13?= sun-jdk13-[0-9]* +BUILDLINK_API_DEPENDS.sun-jre13?= sun-jre13-[0-9]* +BUILDLINK_API_DEPENDS.sun-jdk14?= sun-jdk14-[0-9]* +BUILDLINK_API_DEPENDS.sun-jre14?= sun-jre14-[0-9]* +BUILDLINK_API_DEPENDS.sun-jdk15?= sun-jdk15-[0-9]* +BUILDLINK_API_DEPENDS.sun-jre15?= sun-jre15-[0-9]* +#BUILDLINK_API_DEPENDS.win32-jdk?= win32-jdk>=0.1 _JRE.blackdown-jdk13= blackdown-jre13 _JRE.jdk= jdk diff --git a/mk/oss.builtin.mk b/mk/oss.builtin.mk index b658542fb36..0bb5d4d6e7b 100644 --- a/mk/oss.builtin.mk +++ b/mk/oss.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: oss.builtin.mk,v 1.1 2006/03/09 20:23:13 jlam Exp $ +# $NetBSD: oss.builtin.mk,v 1.2 2006/04/06 06:23:06 reed Exp $ BUILTIN_PKG:= oss @@ -37,7 +37,7 @@ USE_BUILTIN.oss= ${IS_BUILTIN.oss} . if defined(BUILTIN_PKG.oss) && \ !empty(IS_BUILTIN.oss:M[yY][eE][sS]) USE_BUILTIN.oss= yes -. for _dep_ in ${BUILDLINK_DEPENDS.oss} +. for _dep_ in ${BUILDLINK_API_DEPENDS.oss} . if !empty(USE_BUILTIN.oss:M[yY][eE][sS]) USE_BUILTIN.oss!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.oss:Q}; then \ diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk index 1eccb987cd9..657dab28d4f 100644 --- a/mk/pthread.buildlink3.mk +++ b/mk/pthread.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink3.mk,v 1.21 2005/11/04 14:36:23 rillig Exp $ +# $NetBSD: pthread.buildlink3.mk,v 1.22 2006/04/06 06:23:06 reed Exp $ # # The pthreads strategy for pkgsrc is to "bless" a particular pthread # package as the Official Pthread Replacement (OPR). The following @@ -116,7 +116,7 @@ BUILDLINK_AUTO_VARS.pthread?= ${PTHREAD_AUTO_VARS} .elif ${PTHREAD_TYPE} == "${_PKG_PTHREAD}" . if exists(${_PKG_PTHREAD_BUILDLINK3_MK}) . if !empty(_PKG_PTHREAD_DEPENDS) -BUILDLINK_DEPENDS.${_PKG_PTHREAD}+= ${_PKG_PTHREAD_DEPENDS} +BUILDLINK_API_DEPENDS.${_PKG_PTHREAD}+= ${_PKG_PTHREAD_DEPENDS} . endif . include "${_PKG_PTHREAD_BUILDLINK3_MK}" BUILDLINK_PREFIX.pthread= ${BUILDLINK_PREFIX.${_PKG_PTHREAD}} diff --git a/mk/solaris-pam.builtin.mk b/mk/solaris-pam.builtin.mk index 277e9243eaa..025a4da5d97 100644 --- a/mk/solaris-pam.builtin.mk +++ b/mk/solaris-pam.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: solaris-pam.builtin.mk,v 1.3 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: solaris-pam.builtin.mk,v 1.4 2006/04/06 06:23:06 reed Exp $ BUILTIN_PKG:= solaris-pam @@ -32,7 +32,7 @@ USE_BUILTIN.solaris-pam= ${IS_BUILTIN.solaris-pam} . if defined(BUILTIN_PKG.solaris-pam) && \ !empty(IS_BUILTIN.solaris-pam:M[yY][eE][sS]) USE_BUILTIN.solaris-pam= yes -. for _dep_ in ${BUILDLINK_DEPENDS.solaris-pam} +. for _dep_ in ${BUILDLINK_API_DEPENDS.solaris-pam} . if !empty(USE_BUILTIN.solaris-pam:M[yY][eE][sS]) USE_BUILTIN.solaris-pam!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.solaris-pam:Q}; then \ diff --git a/mk/tex.buildlink3.mk b/mk/tex.buildlink3.mk index d098d09b655..212f9366992 100644 --- a/mk/tex.buildlink3.mk +++ b/mk/tex.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: tex.buildlink3.mk,v 1.12 2006/02/27 12:14:50 rxg Exp $ +# $NetBSD: tex.buildlink3.mk,v 1.13 2006/04/06 06:23:06 reed Exp $ # # A Makefile fragment for TeX and LaTeX packages # @@ -88,11 +88,11 @@ TEX_ACCEPTED?= teTeX2 teTeX3 # set up variables for buildlink or depends # -BUILDLINK_DEPENDS.teTeX1= teTeX-bin-1.[0-9]* +BUILDLINK_API_DEPENDS.teTeX1= teTeX-bin-1.[0-9]* BUILDLINK_PKGSRCDIR.teTeX1= ../../print/teTeX1-bin -BUILDLINK_DEPENDS.teTeX2= teTeX-bin-2.[0-9]* +BUILDLINK_API_DEPENDS.teTeX2= teTeX-bin-2.[0-9]* BUILDLINK_PKGSRCDIR.teTeX2= ../../print/teTeX-bin -BUILDLINK_DEPENDS.teTeX3= teTeX-bin-3.[0-9]* +BUILDLINK_API_DEPENDS.teTeX3= teTeX-bin-3.[0-9]* BUILDLINK_PKGSRCDIR.teTeX3= ../../print/teTeX3-bin # Determine the TeX version to be used. @@ -110,13 +110,13 @@ TEX_TYPE= none # Set version specifics. # .if ${TEX_TYPE} == "teTeX3" -_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX3} +_TEX_DEPENDENCY= ${BUILDLINK_API_DEPENDS.teTeX3} _TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX3} .elif ${TEX_TYPE} == "teTeX2" -_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX2} +_TEX_DEPENDENCY= ${BUILDLINK_API_DEPENDS.teTeX2} _TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX2} .elif ${TEX_TYPE} == "teTeX1" -_TEX_DEPENDENCY= ${BUILDLINK_DEPENDS.teTeX1} +_TEX_DEPENDENCY= ${BUILDLINK_API_DEPENDS.teTeX1} _TEX_PKGSRCDIR= ${BUILDLINK_PKGSRCDIR.teTeX1} .endif diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index e1b59ab1da7..5a8d897923a 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.163 2006/03/19 23:40:07 jlam Exp $ +# $NetBSD: replace.mk,v 1.164 2006/04/06 06:23:06 reed Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -322,7 +322,7 @@ MAKEFLAGS+= TOOLS_IGNORE.flex= . elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS]) . include "../../devel/flex/buildlink3.mk" _TOOLS_DEPENDS.flex= # empty -. for _dep_ in ${BUILDLINK_DEPENDS.flex} +. for _dep_ in ${BUILDLINK_API_DEPENDS.flex} _TOOLS_DEPENDS.flex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex} . endfor TOOLS_DEPENDS.flex?= ${_TOOLS_DEPENDS.flex} @@ -459,7 +459,7 @@ MAKEFLAGS+= TOOLS_IGNORE.lex= . elif !empty(_TOOLS_USE_PKGSRC.lex:M[yY][eE][sS]) . include "../../devel/flex/buildlink3.mk" _TOOLS_DEPENDS.lex= # empty -. for _dep_ in ${BUILDLINK_DEPENDS.flex} +. for _dep_ in ${BUILDLINK_API_DEPENDS.flex} _TOOLS_DEPENDS.lex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex} . endfor TOOLS_DEPENDS.lex?= ${_TOOLS_DEPENDS.lex} |