 @@ -1,14 +1,14 @@
-# $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
 # in the MAKECONF file, which is /etc/mk.conf by default.
+#
 # Note: This file is included after the MAKECONF file, so you cannot query
 # these default values in the MAKECONF using the ".if" and ".for"
 # preprocessing directives.
 # ************************************************************************
 # NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
 # ************************************************************************
 @@ -1642,27 +1642,27 @@ SILC_CLIENT_WITH_PERL?=	YES
 SSH_SUID?= NO
 # Used in ssh to enable setuid installation of "ssh" binary.
 # Possible: YES, or NO.
 # Default: NO
 SSYNC_PAWD?= pwd
 # If you are using amd you'll want to use pawd instead of pwd to derive
 # the current working directory.
 # Possible: pawd, pwd
 # Default: 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
 # Specify the user's favorite latex implementation
 # Possible values: teTeX3
 # Default: teTeX3
 #TEXMFSITE=
 # Used in TeXfamily package which depends on teTeX package to specify
 # site-local texmf configuration.
 # Since teTeX package uses ${PREFIX}/share/texmf directory, TeXfamily
 # package uses ${PREFIX}/share/texmf.local.  Therefore, though you can
 # use /usr/local/share/texmf as TEXMFSITE, it causes a conflict if you

 @@ -1,31 +1,28 @@
-# $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
+#
 # When building the SuSE packages, force the Linux type to be the specific
 # version of SuSE that is being built.
+#
 .if defined(SUSE_PKG) && defined(SUSE_VERSION)
 EMUL_TYPE.linux=	suse-${SUSE_VERSION}
 .endif
 # EMUL_TYPE.linux can be "suse" or "suse-[0-9]*".  If the former, then use
 # the default SuSE version, otherwise use the specific version requested.
+#
 .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"
 .else
 EMUL_DISTRO=		suse-0
 PKG_FAIL_REASON+=	"[linux-suse.mk] ${EMUL_TYPE.linux} is not a supported EMUL_TYPE.linux"
 .endif
 # XXX There should be a check here to verify that ${EMUL_DISTRO} satisfies
 # XXX suse>=${SUSE_VERSION_REQD}.

 @@ -1,33 +1,30 @@
-# $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
+#
 .if ${OPSYS} == "Linux"
 .  if ${EMUL_ARCH} == ${MACHINE_ARCH}
 EMUL_TYPE.linux?=	native
 .  else
 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
 .for _version_ in ${EMUL_REQD:Msuse>=*:S/suse>=//}
 SUSE_VERSION_REQD?=	${_version_}
 .endfor
 .if !defined(SUSE_VERSION_REQD) || ${SUSE_PREFER} > ${SUSE_VERSION_REQD}
 SUSE_VERSION_REQD=	${SUSE_PREFER}
 .endif
 EMUL_TYPE.linux?=	suse-${SUSE_VERSION_REQD}
 .endif