diff options
| author | chs <chs> | 2012-08-18 16:29:59 +0000 |
|---|---|---|
| committer | chs <chs> | 2012-08-18 16:29:59 +0000 |
| commit | 8f36c0bc36493e724e016d77ccbd58b7473b7e1e (patch) | |
| tree | 4cb475c2c41d89b2b35adb5d3d26cb5567664c9f /mk | |
| parent | c16df20378d4f1a41455fcfe0964cd00ea6bed3b (diff) | |
| download | pkgsrc-8f36c0bc36493e724e016d77ccbd58b7473b7e1e.tar.gz | |
remove support for suse 11.3.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/defaults/mk.conf | 4 | ||||
| -rw-r--r-- | mk/emulator/linux-suse.mk | 5 | ||||
| -rw-r--r-- | mk/emulator/linux.mk | 7 |
3 files changed, 5 insertions, 11 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 57adf168c05..5341a1fb2dc 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.215 2012/07/30 07:03:46 sbd Exp $ +# $NetBSD: mk.conf,v 1.216 2012/08/18 16:29:59 chs Exp $ # # This file provides default values for variables that may be overridden @@ -1652,7 +1652,7 @@ SSYNC_PAWD?= pwd #SUSE_PREFER?= 10.0 # Which version of the suse packages to prefer. -# Possible: 12.1, 11.3, 10.0 +# Possible: 12.1, 10.0 # Default: depends on operating system version TEX_DEFAULT?= teTeX3 diff --git a/mk/emulator/linux-suse.mk b/mk/emulator/linux-suse.mk index 55e12911c7a..4c07c1cb9f4 100644 --- a/mk/emulator/linux-suse.mk +++ b/mk/emulator/linux-suse.mk @@ -1,4 +1,4 @@ -# $NetBSD: linux-suse.mk,v 1.6 2012/03/21 13:44:59 obache Exp $ +# $NetBSD: linux-suse.mk,v 1.7 2012/08/18 16:30:00 chs Exp $ # # SuSE Linux # @@ -16,9 +16,6 @@ EMUL_TYPE.linux= suse-${SUSE_VERSION} .if !empty(EMUL_TYPE.linux:Msuse-10.[0x]) . include "${PKGSRCDIR}/emulators/suse100_linux/emulator.mk" -.elif !empty(EMUL_TYPE.linux:Msuse-11.[3x]) -. include "${PKGSRCDIR}/emulators/suse113_linux/emulator.mk" - .elif !empty(EMUL_TYPE.linux:Msuse-12.[1x]) . include "${PKGSRCDIR}/emulators/suse121_linux/emulator.mk" diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk index a7d4ea16972..04430509a26 100644 --- a/mk/emulator/linux.mk +++ b/mk/emulator/linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: linux.mk,v 1.18 2012/06/16 14:21:25 obache Exp $ +# $NetBSD: linux.mk,v 1.19 2012/08/18 16:30:00 chs Exp $ # # Linux binary emulation framework # @@ -11,13 +11,10 @@ EMUL_TYPE.linux?= none . endif .else -# NetBSD 5.99.50 or later default to 11.3, otherwise 10.0 +# NetBSD 6 or later default to 12.1, otherwise 10.0 .if ${OPSYS} == "NetBSD" && ${EMUL_ARCH} != "powerpc" . if empty(OS_VERSION:M[0-5].*) SUSE_PREFER?= 12.1 -. elif !empty(OS_VERSION:M5.99.[5-9][0-9]) || \ - !empty(OS_VERSION:M5.99.[0-9][0-9][0-9]*) -SUSE_PREFER?= 11.3 . endif .endif SUSE_PREFER?= 10.0 |