diff options
| -rw-r--r-- | emulators/suse_linux/Makefile.application | 7 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 32 |
2 files changed, 25 insertions, 14 deletions
diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application index 58039deb6d3..b6b06789229 100644 --- a/emulators/suse_linux/Makefile.application +++ b/emulators/suse_linux/Makefile.application @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.application,v 1.12 2004/04/23 23:52:42 kristerw Exp $ +# $NetBSD: Makefile.application,v 1.13 2004/11/05 13:46:39 wiz Exp $ .include "../../mk/bsd.prefs.mk" @@ -16,8 +16,13 @@ LINUX_KERNEL_OSRELEASE!= (/sbin/sysctl -n ${_LINUX_SYSCTL_OSRELEASE} 2>/dev/null SUSE_DIR_PREFIX= suse64 SUSE_VERSION= 6.4 . else +. if !empty(SUSE_PREFER:M9.1) +SUSE_DIR_PREFIX= suse91 +SUSE_VERSION= 9.1 +. else SUSE_DIR_PREFIX= suse SUSE_VERSION= 7.3 +. endif . endif . if defined(RPMFILES) diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index b213585f427..0b6e2118184 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.11 2004/10/26 21:22:51 xtraeme Exp $ +# $NetBSD: mk.conf,v 1.12 2004/11/05 13:46:39 wiz Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -1918,18 +1918,6 @@ SILC_CLIENT_WITH_PERL?= YES # --enable-ipf-transparent # --enable-snmp -SUN_JRE14_USE_JCE?= NO -# Whether to include the Java Cryptography Extension (JCE) Unlimited Strength -# Jurisdiction Policy Files in the sun-jre14 package -# Possible: YES or NO. -# Default: NO - -SUN_JRE15_USE_JCE?= NO -# Whether to include the Java Cryptography Extension (JCE) Unlimited Strength -# Jurisdiction Policy Files in the sun-jre15 package -# Possible: YES or NO. -# Default: NO - SSH_RSHPATH?= ${RSH} # Used in ssh to specify standard rsh path # Possible: path to rsh binary @@ -1946,6 +1934,24 @@ SSYNC_PAWD?= pwd # Possible: pawd, pwd # Default: pwd +SUN_JRE14_USE_JCE?= NO +# Whether to include the Java Cryptography Extension (JCE) Unlimited Strength +# Jurisdiction Policy Files in the sun-jre14 package +# Possible: YES or NO. +# Default: NO + +SUN_JRE15_USE_JCE?= NO +# Whether to include the Java Cryptography Extension (JCE) Unlimited Strength +# Jurisdiction Policy Files in the sun-jre15 package +# Possible: YES or NO. +# Default: NO + +SUSE_PREFER?= 7.3 +# Which version of the suse packages to prefer. +# Decides if you want to use 7.3 (default) or 9.1 by default. +# Possible: 7.3, 9.1 +# Default: 7.3 + TIN_USE_INN_SPOOL?= NO # Used to enable reading directly in an inn spool. # Possible: YES, or NO. |