diff options
| author | abs <abs@pkgsrc.org> | 2011-09-08 21:04:59 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2011-09-08 21:04:59 +0000 |
| commit | 0357752505512b55fdad28ba9c9da570fd90a7a6 (patch) | |
| tree | 5e7c923064888d269cf162b403c864733de1d831 /mk | |
| parent | a6a16dcdb8e6e68f76a862c383b65df22e244ab9 (diff) | |
| download | pkgsrc-0357752505512b55fdad28ba9c9da570fd90a7a6.tar.gz | |
Default NetBSD-5.99.50 and later to SUSE_PREFER 11.3 else 10.0
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/defaults/mk.conf | 6 | ||||
| -rw-r--r-- | mk/emulator/linux.mk | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index f7d6fc91fbe..e9e4fc9ccac 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.201 2011/05/11 01:59:45 obache Exp $ +# $NetBSD: mk.conf,v 1.202 2011/09/08 21:04:59 abs Exp $ # # This file provides default values for variables that may be overridden @@ -1665,10 +1665,10 @@ SSYNC_PAWD?= pwd # Possible: pawd, pwd # Default: pwd -SUSE_PREFER?= 10.0 +#SUSE_PREFER?= 10.0 # Which version of the suse packages to prefer. # Possible: 11.3, 10.0 -# Default: 10.0 +# Default: depends on operating system version TEX_DEFAULT?= teTeX3 # Specify the user's favorite latex implementation diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk index ecd812f8ed4..b29d5a8bac9 100644 --- a/mk/emulator/linux.mk +++ b/mk/emulator/linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: linux.mk,v 1.9 2011/09/06 17:48:24 abs Exp $ +# $NetBSD: linux.mk,v 1.10 2011/09/08 21:04:59 abs Exp $ # # Linux binary emulation framework # @@ -7,6 +7,15 @@ EMUL_TYPE.linux?= native .else +# NetBSD 5.99.50 or later default to 11.3, otherwise 10.0 +.if ${OPSYS} == "NetBSD" && (empty(OS_VERSION:M[0-5].*) || \ + !empty(OS_VERSION:M5.99.[5-9][0-9]) || \ + !empty(OS_VERSION:M5.99.[0-9][0-9][0-9]*)) +SUSE_PREFER?= 11.3 +.else +SUSE_PREFER?= 10.0 +.endif + .for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//} SUSE_VERSION_REQD?= ${_version_} .endfor |