diff options
| -rw-r--r-- | lang/php/phpversion.mk | 6 | ||||
| -rw-r--r-- | lang/python/pyversion.mk | 6 | ||||
| -rw-r--r-- | lang/ruby/rubyversion.mk | 6 | ||||
| -rw-r--r-- | mk/apache.mk | 6 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 9 |
5 files changed, 28 insertions, 5 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk index 83ba94ce5c1..f68b855fdf3 100644 --- a/lang/php/phpversion.mk +++ b/lang/php/phpversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: phpversion.mk,v 1.13 2010/09/23 07:38:05 taca Exp $ +# $NetBSD: phpversion.mk,v 1.14 2011/03/12 14:07:13 wiz Exp $ # # This file selects a PHP version, based on the user's preferences and # the installed packages. It does not add a dependency on the PHP @@ -136,6 +136,10 @@ _PHP_VERSION= ${PHP_VERSION_DEFAULT} _PHP_VERSION= ${_PHP_VERSION_FIRSTACCEPTED} .endif +# +# Variable assignment for multi-PHP packages +MULTI+= PHP_VERSION_REQD=${_PHP_VERSION} + # export some of internal variables PKG_PHP_VERSION:= ${_PHP_VERSION:C/\.[0-9]//} PKG_PHP:= PHP${_PHP_VERSION:C/([0-9])([0-9])/\1.\2/} diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 18154d6726d..956e4abf219 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.86 2011/02/25 09:47:24 wiz Exp $ +# $NetBSD: pyversion.mk,v 1.87 2011/03/12 14:07:13 wiz Exp $ # This file determines which Python version is used as a dependency for # a package. @@ -112,6 +112,10 @@ _PYTHON_VERSION?= ${pv} . endif .endif +# +# Variable assignment for multi-python packages +MULTI+= PYTHON_VERSION_REQD=${_PYTHON_VERSION} + # No supported version found, annotate to simplify statements below. .if !defined(_PYTHON_VERSION) _PYTHON_VERSION= none diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index d42e29f6aa6..201b311531a 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.59 2011/02/21 15:00:34 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.60 2011/03/12 14:07:13 wiz Exp $ # .if !defined(_RUBYVERSION_MK) @@ -61,6 +61,10 @@ RUBY_VERSION_SUFFIX= ${RUBY_VERSION}${RUBY_PATCH_LEVEL} RUBY_ABI_VERSION= ${RUBY19_API_VERSION} .endif +# +# Variable assignment for multi-ruby packages +MULTI+= RUBY_VERSION_REQD=${RUBY_VERSION_REQD:U${_RUBY_VERSION_DEFAULT}} + # RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is # supported by the package. It should be defined by the packages # for specific Ruby versions. diff --git a/mk/apache.mk b/mk/apache.mk index f815df51f7e..0d7972f5e98 100644 --- a/mk/apache.mk +++ b/mk/apache.mk @@ -1,4 +1,4 @@ -# $NetBSD: apache.mk,v 1.25 2007/12/17 22:09:58 tron Exp $ +# $NetBSD: apache.mk,v 1.26 2011/03/12 14:07:13 wiz Exp $ # # This file is meant to be included by packages that require an apache # web server. @@ -135,4 +135,8 @@ APACHE_PKG_PREFIX= ${_APACHE_PKG_PREFIX.${PKG_APACHE}} . include "../../devel/apr-util/buildlink3.mk" .endif +# +# Variable assignment for multi-apache packages +MULTI+= PKG_APACHE=${PKG_APACHE} + .endif # APACHE_MK diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 3317ed1d970..8fdbf22308d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1976 2011/02/07 10:32:32 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1977 2011/03/12 14:07:13 wiz Exp $ # # This file is in the public domain. # @@ -205,6 +205,13 @@ _BUILD_DEFS+= PKG_OPTIONS PKG_FAIL_REASON+= "DEPOT_SUBDIR may not be empty." .endif +# Store the build options for multi-packages, i.e. packages that can +# be built with multiple versions of Apache, Python, Ruby, PHP etc. +# +.if defined(MULTI) +_BUILD_DEFS+= MULTI +.endif + # ZERO_FILESIZE_P exits with a successful return code if the given file # has zero length. # NONZERO_FILESIZE_P exits with a successful return code if the given file |