Use OPSYSVARS.

34 files changed, 142 insertions, 240 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 66cb697bb6b..0631b5e2cee 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2015/09/25 15:15:58 fhajny Exp $
+# $NetBSD: Makefile,v 1.73 2016/02/25 14:42:55 jperkin Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}
 PKGNAME=		${DISTNAME:S/otp_src_/erlang-/}
@@ -66,9 +66,8 @@ REPLACE_PERL+=		make/make_emakefile
 
 SMF_NAME=		epmd
 
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-sctp
-.endif
+CONFIGURE_ARGS.DragonFly+=	--disable-sctp
+
 ###
 ### XXX There may be others here.
 ###
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index c50fa4c18d1..e7719ebd876 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2015/11/25 12:51:16 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.28 2016/02/25 14:42:55 jperkin Exp $
 #
 # used by lang/gcc3/language.mk
 # used by lang/gcc3-c/Makefile
@@ -59,9 +59,7 @@ GCC_PLATFORM=		${MACHINE_GNU_PLATFORM}
 CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 PLIST_SUBST+=		GCC_PLATFORM=${GCC_PLATFORM:Q}
 
-.if ${OPSYS} == "AIX"
-CONFIGURE_ARGS+=    --disable-aix64
-.endif
+CONFIGURE_ARGS.AIX+=	--disable-aix64
 
 .if ${OPSYS} == "NetBSD"
 .  if !defined(USE_BINUTILS)
diff --git a/lang/gcc34/options.mk b/lang/gcc34/options.mk
index 3016d935d33..d8bc55c739e 100644
--- a/lang/gcc34/options.mk
+++ b/lang/gcc34/options.mk
@@ -1,13 +1,11 @@
-# $NetBSD: options.mk,v 1.5 2013/04/06 14:58:19 rodent Exp $
+# $NetBSD: options.mk,v 1.6 2016/02/25 14:42:55 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc34
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc gcc-ada
 PKG_SUGGESTED_OPTIONS=	gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
-.endif
+
+PKG_SUGGESTED_OPTIONS.NetBSD+=	nls
+PKG_SUGGESTED_OPTIONS.SunOS+=	gcc-inplace-math
 
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_CXX:gcc-c++
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_F77:gcc-fortran
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 61c730396c9..821e9a0e0b9 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2016/01/24 16:14:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2016/02/25 14:42:55 jperkin Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc44-${GCC_VERSION}
@@ -69,13 +69,12 @@ CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--disable-libssp
 CONFIGURE_ARGS+=	--enable-threads=posix
-.if ${OPSYS} == "Darwin"
+
 # See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to
 # create a stub library, not just to remove symbols, so we must not
 # let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the
 # build fails for missing files.
-CONFIGURE_ARGS+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
-.endif
+CONFIGURE_ARGS.Darwin+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
 
 CONFIGURE_ENV+=		CONFIG_SHELL=${CONFIG_SHELL}
 
diff --git a/lang/gcc44/options.mk b/lang/gcc44/options.mk
index 1d7cf02c370..7d8a642e79a 100644
--- a/lang/gcc44/options.mk
+++ b/lang/gcc44/options.mk
@@ -1,13 +1,11 @@
-# $NetBSD: options.mk,v 1.11 2012/04/13 11:01:32 hans Exp $
+# $NetBSD: options.mk,v 1.12 2016/02/25 14:42:55 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc44
 PKG_SUPPORTED_OPTIONS=	gcc-inplace-math nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-java gcc-objc
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
-.endif
+
+PKG_SUGGESTED_OPTIONS.NetBSD+=	nls
+PKG_SUGGESTED_OPTIONS.SunOS+=	gcc-inplace-math
 
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_CXX:gcc-c++
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_FORTRAN:gcc-fortran
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index c472d3f78dc..897311f8453 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/01/24 16:14:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2016/02/25 14:42:55 jperkin Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc45-${GCC_VERSION}
@@ -79,16 +79,14 @@ CONFIGURE_ARGS+=	--with-ld=${PREFIX}/gnu/bin/ld
 CONFIGURE_ARGS+=	--with-libelf=${PREFIX}
 MAKE_ENV+=		ac_cv_func_clock_gettime=yes
 .endif
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--disable-libquadmath --disable-libquadmath-support
-.endif
-.if ${OPSYS} == "Darwin"
+
+CONFIGURE_ARGS.Linux+=	--disable-libquadmath --disable-libquadmath-support
+
 # See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to
 # create a stub library, not just to remove symbols, so we must not
 # let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the
 # build fails for missing files.
-CONFIGURE_ARGS+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
-.endif
+CONFIGURE_ARGS.Darwin+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
 
 .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
 CONFIGURE_ARGS+=	--with-dwarf2
diff --git a/lang/gcc45/options.mk b/lang/gcc45/options.mk
index d3cf3fce950..e56c3755f2b 100644
--- a/lang/gcc45/options.mk
+++ b/lang/gcc45/options.mk
@@ -1,13 +1,11 @@
-# $NetBSD: options.mk,v 1.3 2014/05/16 12:01:17 pho Exp $
+# $NetBSD: options.mk,v 1.4 2016/02/25 14:42:55 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc45
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc gcc-objc++ #gcc-ada
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
-.endif
+
+PKG_SUGGESTED_OPTIONS.NetBSD+=	nls
+PKG_SUGGESTED_OPTIONS.SunOS+=	gcc-inplace-math
 
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_CXX:gcc-c++
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_FORTRAN:gcc-fortran
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 46edb2d329c..d50201f573d 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/01/24 16:14:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/25 14:42:55 jperkin Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc46-${GCC_VERSION}
@@ -78,21 +78,18 @@ CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-libssp
 CONFIGURE_ARGS+=	--enable-threads=posix
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV+=		ac_cv_func_clock_gettime=yes
-.endif
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--disable-libquadmath --disable-libquadmath-support
-.endif
-.if ${OPSYS} == "Darwin"
+
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
+
+CONFIGURE_ARGS.Linux+=	--disable-libquadmath --disable-libquadmath-support
+
 # See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to
 # create a stub library, not just to remove symbols, so we must not
 # let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the
 # build fails for missing files.
-CONFIGURE_ARGS+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
-.endif
+CONFIGURE_ARGS.Darwin+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
 
 CONFIGURE_ENV+=		CONFIG_SHELL=${CONFIG_SHELL}
 
diff --git a/lang/gcc46/options.mk b/lang/gcc46/options.mk
index 34dba59b6e0..e226cc50e84 100644
--- a/lang/gcc46/options.mk
+++ b/lang/gcc46/options.mk
@@ -1,13 +1,11 @@
-# $NetBSD: options.mk,v 1.9 2014/02/25 21:24:51 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2016/02/25 14:42:55 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc46
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
-.endif
+
+PKG_SUGGESTED_OPTIONS.NetBSD+=	nls
+PKG_SUGGESTED_OPTIONS.SunOS+=	gcc-inplace-math
 
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_CXX:gcc-c++
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_FORTRAN:gcc-fortran
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 904e22db011..1f0b2e42173 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2016/01/21 11:55:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2016/02/25 14:42:56 jperkin Exp $
 
 GCC_PKGNAME=		gcc47
 .include		"version.mk"
@@ -75,22 +75,19 @@ CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-libssp
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV+=		ac_cv_func_clock_gettime=yes
-MAKE_ENV+=		ac_cv_func_gethostbyname_r=no
-.endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-bootstrap
-.endif
-.if ${OPSYS} == "Darwin"
+
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
+MAKE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r=no
+
+CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
+
 # See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to
 # create a stub library, not just to remove symbols, so we must not
 # let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the
 # build fails for missing files.
-CONFIGURE_ARGS+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
-.endif
+CONFIGURE_ARGS.Darwin+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=	--with-arch=i486 --with-tune=i486
diff --git a/lang/gcc47/options.mk b/lang/gcc47/options.mk
index 98e16e0ca2e..6fe428576f4 100644
--- a/lang/gcc47/options.mk
+++ b/lang/gcc47/options.mk
@@ -1,19 +1,15 @@
-# $NetBSD: options.mk,v 1.11 2014/07/24 12:43:20 jperkin Exp $
+# $NetBSD: options.mk,v 1.12 2016/02/25 14:42:56 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
 			gcc-go gcc-objc gcc-objc++
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	nls gcc-java
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-go gcc-inplace-math
-.else
-PKG_SUGGESTED_OPTIONS+= gcc-java
-.endif
+PKG_SUGGESTED_OPTIONS.DragonFly+=	nls
+PKG_SUGGESTED_OPTIONS.Linux+=		nls gcc-java
+PKG_SUGGESTED_OPTIONS.NetBSD+=		nls gcc-java
+PKG_SUGGESTED_OPTIONS.SunOS+=		gcc-go gcc-inplace-math
+PKG_SUGGESTED_OPTIONS.*+= 		gcc-java
 
 ###
 ### Determine if multilib is avalible.
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index f2fc22356e9..c52780a92f1 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2015/11/03 13:59:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2016/02/25 14:42:56 jperkin Exp $
 
 GCC_PKGNAME=	gcc48
 .include	"version.mk"
@@ -77,14 +77,13 @@ CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-libssp
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV+=		ac_cv_func_clock_gettime=yes
-.endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-bootstrap
-.endif
+
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
+
+CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
+
 .if ${OPSYS} == "Darwin" && !empty(OSX_SDK_PATH)
 CONFIGURE_ARGS+=	--with-native-system-header-dir=${OSX_SDK_PATH}/usr/include
 # From FreeBSD, avoids compare issues with clang
diff --git a/lang/gcc48/options.mk b/lang/gcc48/options.mk
index ee7dbcaaa7a..0122b11514e 100644
--- a/lang/gcc48/options.mk
+++ b/lang/gcc48/options.mk
@@ -1,21 +1,15 @@
-# $NetBSD: options.mk,v 1.8 2015/01/27 04:46:06 dbj Exp $
+# $NetBSD: options.mk,v 1.9 2016/02/25 14:42:56 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
 			gcc-go gcc-objc gcc-objc++ gcc-graphite
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++ gcc-graphite
 
-.if ${OPSYS} == "NetBSD" 
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	nls gcc-java
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
-.else
-PKG_SUGGESTED_OPTIONS+= gcc-java
-.endif
+PKG_SUGGESTED_OPTIONS.DragonFly+=	nls
+PKG_SUGGESTED_OPTIONS.Linux+=		nls gcc-java
+PKG_SUGGESTED_OPTIONS.NetBSD+=		nls
+PKG_SUGGESTED_OPTIONS.SunOS+=		gcc-inplace-math
+PKG_SUGGESTED_OPTIONS.*+=		gcc-java
 
 ###
 ### Determine if multilib is avalible.
@@ -132,13 +126,11 @@ PLIST_SRC+=		PLIST.java
 PLIST_SUBST+=		JAVA_NAME=${JAVA_NAME:Q}
 PLIST_SUBST+=		JAVA_ARCH=${JAVA_ARCH:Q}
 
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=			fix-dylib
+SUBST_CLASSES.Darwin+=		fix-dylib
 SUBST_STAGE.fix-dylib=		pre-configure
 SUBST_MESSAGE.fix-dylib=	Fixing java dylib symlink
 SUBST_FILES.fix-dylib=		libjava/Makefile.in
 SUBST_SED.fix-dylib=		-e 's,libjvm.so,libjvm.dylib,g'
-.endif
 
 # Create a JPackage compatible SDK environment.
 CONFIGURE_ARGS+=	--enable-java-home
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index 1272e17cc59..b191970e4e0 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/01/21 11:53:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2016/02/25 14:42:56 jperkin Exp $
 
 GCC_PKGNAME=	gcc49
 .include	"version.mk"
@@ -77,22 +77,19 @@ CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-libssp
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV+=		ac_cv_func_clock_gettime=yes
-MAKE_ENV+=		ac_cv_func_gethostbyname_r=no
-.endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-bootstrap
-.endif
-.if ${OPSYS} == "Darwin"
+
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
+MAKE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r=no
+
+CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
+
 # See ${WRKSRC}/libgcc/config/t-slibgcc-darwin: It uses strip(1) to
 # create a stub library, not just to remove symbols, so we must not
 # let strip(1) be a no-op regardless of ${INSTALL_UNSTRIPPED} or the
 # build fails for missing files.
-CONFIGURE_ARGS+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
-.endif
+CONFIGURE_ARGS.Darwin+=	STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
 
 .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
 CONFIGURE_ARGS+=       --with-dwarf2
diff --git a/lang/gcc49/options.mk b/lang/gcc49/options.mk
index 64aef408fec..d470d94085d 100644
--- a/lang/gcc49/options.mk
+++ b/lang/gcc49/options.mk
@@ -1,19 +1,15 @@
-# $NetBSD: options.mk,v 1.1 2014/09/04 18:43:11 jperkin Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/25 14:42:56 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
 			gcc-go gcc-objc gcc-objc++
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	nls gcc-java
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-go gcc-inplace-math
-.else
-PKG_SUGGESTED_OPTIONS+= gcc-java
-.endif
+PKG_SUGGESTED_OPTIONS.DragonFly+=	nls
+PKG_SUGGESTED_OPTIONS.Linux+=		nls gcc-java
+PKG_SUGGESTED_OPTIONS.NetBSD+=		nls gcc-java
+PKG_SUGGESTED_OPTIONS.SunOS+=		gcc-go gcc-inplace-math
+PKG_SUGGESTED_OPTIONS.*+=		gcc-java
 
 ###
 ### Determine if multilib is avalible.
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index 17c3846addf..6bf09b57ad8 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/02/06 22:19:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2016/02/25 14:42:56 jperkin Exp $
 
 GCC_PKGNAME=		gcc5
 .include		"version.mk"
@@ -98,20 +98,16 @@ CONFIGURE_ARGS+=	--enable-libssp
 .endif
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS+=	--with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV+=		ac_cv_func_clock_gettime=yes
-MAKE_ENV+=		ac_cv_func_gethostbyname_r=no
-MAKE_ENV+=		ac_cv_func_freelocale=no
-MAKE_ENV+=		ac_cv_func_newlocale=no
-MAKE_ENV+=		ac_cv_func_uselocale=no
-.endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-bootstrap
-.endif
 
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS.NetBSD+=	--with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
+MAKE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r=no
+MAKE_ENV.NetBSD+=	ac_cv_func_freelocale=no
+MAKE_ENV.NetBSD+=	ac_cv_func_newlocale=no
+MAKE_ENV.NetBSD+=	ac_cv_func_uselocale=no
 
+CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=	--with-arch=i486 --with-tune=i486
diff --git a/lang/gcc5/options.mk b/lang/gcc5/options.mk
index 6b221a96157..eaa1ae3fbca 100644
--- a/lang/gcc5/options.mk
+++ b/lang/gcc5/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/07/16 12:03:36 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/25 14:42:56 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -6,16 +6,10 @@ PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-c++ gcc-fortran \
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
 			gcc-graphite gcc-inplace-math
 
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	nls
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
-.else
-.endif
+PKG_SUGGESTED_OPTIONS.DragonFly+=	nls
+PKG_SUGGESTED_OPTIONS.Linux+=		nls
+PKG_SUGGESTED_OPTIONS.NetBSD+=		nls
+PKG_SUGGESTED_OPTIONS.SunOS+=		gcc-inplace-math
 
 ###
 ### Determine if multilib is avalible.
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 860ce978893..8c141ff214b 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2013/11/13 22:49:31 joerg Exp $
+# $NetBSD: Makefile,v 1.105 2016/02/25 14:42:56 jperkin Exp $
 
 DISTNAME=		guile-1.8.8
 PKGREVISION=		6
@@ -48,9 +48,7 @@ post-patch:
 	${ECHO} "(define-module (ice-9 slib))" > ${WRKSRC}/ice-9/slib.scm
 	${ECHO} "(load-from-path \"slib/guile.init\")" >> ${WRKSRC}/ice-9/slib.scm
 
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	ac_cv_type_complex_double=no
-.endif
+CONFIGURE_ARGS.DragonFly+=	ac_cv_type_complex_double=no
 
 .if ${OPSYS} == "Darwin"
 #This define has been reported to break builds on 10.8.
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index 3aaa3473b00..ff26e15dc89 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/05/12 14:00:21 wen Exp $
+# $NetBSD: Makefile,v 1.31 2016/02/25 14:42:56 jperkin Exp $
 
 DISTNAME=	mawk-1.3.4-20150503
 PKGNAME=	${DISTNAME:S/-20/.20/}
@@ -22,8 +22,6 @@ TEST_TARGET=		mawk_test fpe_test
 # mawk configure fails with -ffast-math
 CFLAGS:=	${CFLAGS:S/-ffast-math//}
 
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=		CPPFLAGS=
-.endif
+MAKE_ENV.SunOS+=	CPPFLAGS=
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/nodejs/Makefile.common b/lang/nodejs/Makefile.common
index 8751b83859d..b2b5a8848fa 100644
--- a/lang/nodejs/Makefile.common
+++ b/lang/nodejs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2016/01/21 11:45:30 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.4 2016/02/25 14:42:56 jperkin Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs4/Makefile
 
@@ -26,10 +26,8 @@ CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--shared-zlib
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=		GYP_DEFINES="OS=netbsd"
-MAKE_ENV+=		GYP_DEFINES="OS=netbsd"
-.endif
+CONFIGURE_ENV.NetBSD+=	GYP_DEFINES="OS=netbsd"
+MAKE_ENV.NetBSD+=	GYP_DEFINES="OS=netbsd"
 
 REPLACE_PYTHON+=	configure
 REPLACE_PYTHON+=	tools/genv8constants.py
diff --git a/lang/objc/hacks.mk b/lang/objc/hacks.mk
index f7fd99b35d0..d47097d78fb 100644
--- a/lang/objc/hacks.mk
+++ b/lang/objc/hacks.mk
@@ -1,7 +1,3 @@
-# $NetBSD: hacks.mk,v 1.1 2012/04/30 02:51:40 dholland Exp $
+# $NetBSD: hacks.mk,v 1.2 2016/02/25 14:42:56 jperkin Exp $
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CFLAGS+=	-D__attribute__\(x\)=
-.endif
+CFLAGS.NetBSD+=	-D__attribute__\(x\)=
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index a2f39cafe8f..d7e20420c3f 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2015/09/08 18:54:41 joerg Exp $
+# $NetBSD: Makefile,v 1.101 2016/02/25 14:42:56 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -70,11 +70,9 @@ PLIST_SRC+=	${PKGDIR}/PLIST
 INSTALL_MAKE_FLAGS+=	SHELL=${SH:Q}
 .endif
 
-.if ${OPSYS} == "NetBSD"
-EXTRA_RT_LIBS=	-lcurses
-.else
-EXTRA_RT_LIBS=
-.endif
+OPSYSVARS+=		EXTRA_RT_LIBS
+EXTRA_RT_LIBS.NetBSD=	-lcurses
+EXTRA_RT_LIBS.*=
 
 SUBST_CLASSES+=		extra-rt-libs
 SUBST_FILES.extra-rt-libs=	bytecomp/bytelink.ml
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 4e2c3c57e31..373cf0adcf3 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2015/12/14 23:05:11 asau Exp $
+# $NetBSD: Makefile,v 1.106 2016/02/25 14:42:56 jperkin Exp $
 
 JDK_MICRO=	80
 DISTNAME=	openjdk-1.7.${JDK_MICRO}-20150609
@@ -97,8 +97,7 @@ SUBST_SED.ccspath=	-e 's/UNIXCCS_PATH/UNIXCOMMAND_PATH/g'
 SUBST_SED.ccspath+=	-e 's,/usr/ccs/bin,/usr/bin,g'
 .endif
 
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+=		mapfix
+SUBST_CLASSES.SunOS+=	mapfix
 SUBST_STAGE.mapfix=	pre-build
 SUBST_FILES.mapfix=	jdk/make/com/sun/java/pack/mapfile-vers
 SUBST_FILES.mapfix+=	jdk/make/java/main/java/mapfile-amd64
@@ -107,11 +106,10 @@ SUBST_SED.mapfix=	-e '/__fsr_init_value/d'
 SUBST_SED.mapfix+=	-e '/__progname/d'
 
 # environ should only be removed from this file (added by patches)
-SUBST_CLASSES+=		mapfix2
+SUBST_CLASSES.SunOS+=	mapfix2
 SUBST_STAGE.mapfix2=	pre-build
 SUBST_FILES.mapfix2=	jdk/make/com/sun/java/pack/mapfile-vers
 SUBST_SED.mapfix2=	-e '/environ/d'
-.endif
 
 CFLAGS+=	-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 CXXFLAGS+=	-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index f21fc22ea27..773c0d96aac 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.118 2015/12/05 17:12:13 adam Exp $
+# $NetBSD: pyversion.mk,v 1.119 2016/02/25 14:42:56 jperkin Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -200,11 +200,9 @@ ALL_ENV+=	PYTHON=${PYTHONBIN}
 .if defined(USE_CMAKE)
 # used by FindPythonInterp.cmake and FindPythonLibs.cmake
 CMAKE_ARGS+=	-DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
-.if ${OPSYS} == "Darwin"
 # set this explicitly, as by default it will prefer the built in framework
-CMAKE_ARGS+=	-DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
-CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
-.endif
+CMAKE_ARGS.Darwin+=	-DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_ARGS.Darwin+=	-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
 .endif
 
 .endif	# PYTHON_PYVERSION_MK
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 034704f5bff..b46fc853274 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2016/02/06 11:25:09 tron Exp $
+# $NetBSD: Makefile,v 1.56 2016/02/25 14:42:56 jperkin Exp $
 
 .include "dist.mk"
 
@@ -136,10 +136,8 @@ BUILDLINK_TRANSFORM+=	rm:-ldb
 .endif
 CFLAGS+=	-DHAVE_DB_185_H
 
-.if ${OPSYS} == "OSF1"
 # configure complains about buggy getaddrinfo()
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
+CONFIGURE_ARGS.OSF1+=	--disable-ipv6
 
 .if defined(BUILDLINK_TRANSFORM)
 MAKE_ENV+=	PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
diff --git a/lang/qore/Makefile b/lang/qore/Makefile
index e0f92f2451b..9942c3bbcf5 100644
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/03/02 19:59:07 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/25 14:42:57 jperkin Exp $
 
 DISTNAME=	qore-0.8.11
 PKGREVISION=	2
@@ -20,9 +20,7 @@ FLEX_REQD=	2.5.31
 
 # make AC_CHECK_FUNC find gethost* etc on smartos
 # http://sourceforge.net/p/qore/code/6980
-.if "${OPSYS}" == "SunOS"
-LIBS+=		-lnsl
-.endif
+LIBS.SunOS+=	-lnsl
 
 PKGCONFIG_OVERRIDE+=	qore.pc.in
 REPLACE_QORE=		doxygen/qdx
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 0f42d8a369d..2a39225990d 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2015/10/14 18:33:08 sevan Exp $
+# $NetBSD: Makefile,v 1.85 2016/02/25 14:42:57 jperkin Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -87,9 +87,7 @@ PLIST.io=	yes
 # Work around for ucontext(3). It was broken in older DragonFly
 # versions and is slow in newer ones.
 #
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ENV+=	ac_cv_header_ucontext_h=no
-.endif
+CONFIGURE_ENV.DragonFly+=	ac_cv_header_ucontext_h=no
 
 #
 # work around for getaddrinfo(3)
diff --git a/lang/ruby200-base/Makefile b/lang/ruby200-base/Makefile
index aa9493a642a..a6495e5fd29 100644
--- a/lang/ruby200-base/Makefile
+++ b/lang/ruby200-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/01/27 12:12:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2016/02/25 14:42:57 jperkin Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -60,14 +60,10 @@ CONFIGURE_ENV+=	LDSHARED="${CC} -G"
 LIBS.SunOS+=	-lm
 .endif
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	OBJCOPY=:
-.endif
+CONFIGURE_ENV.SunOS+=	OBJCOPY=:
 
-.if ${OPSYS} == "MirBSD"
 # if present, an unsupported sysconf call is used
-CONFIGURE_ENV+=	ac_cv_func_getgrnam_r=no
-.endif
+CONFIGURE_ENV.MirBSD+=	ac_cv_func_getgrnam_r=no
 
 .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig"
 USE_TOOLS+= 	bash
diff --git a/lang/ruby21-base/Makefile b/lang/ruby21-base/Makefile
index 6d263ea2a53..942e1c44395 100644
--- a/lang/ruby21-base/Makefile
+++ b/lang/ruby21-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/01/27 12:12:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2016/02/25 14:42:57 jperkin Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -46,14 +46,10 @@ CONFIGURE_ENV+=	LDSHARED="${CC} -G"
 LIBS.SunOS+=	-lm
 .endif
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	OBJCOPY=:
-.endif
+CONFIGURE_ENV.SunOS+=	OBJCOPY=:
 
-.if ${OPSYS} == "MirBSD"
 # if present, an unsupported sysconf call is used
-CONFIGURE_ENV+=	ac_cv_func_getgrnam_r=no
-.endif
+CONFIGURE_ENV.MirBSD+=	ac_cv_func_getgrnam_r=no
 
 # bmake doesn't like the codesign/POSTLINK constructs for Darwin.
 .if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin"
diff --git a/lang/ruby22-base/Makefile b/lang/ruby22-base/Makefile
index 5289059b5b8..6a0ea159975 100644
--- a/lang/ruby22-base/Makefile
+++ b/lang/ruby22-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/01/27 12:12:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2016/02/25 14:42:57 jperkin Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -45,14 +45,10 @@ CONFIGURE_ENV+=	LDSHARED="${CC} -G"
 LIBS.SunOS+=	-lm
 .endif
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	OBJCOPY=:
-.endif
+CONFIGURE_ENV.SunOS+=	OBJCOPY=:
 
-.if ${OPSYS} == "MirBSD"
 # if present, an unsupported sysconf call is used
-CONFIGURE_ENV+=	ac_cv_func_getgrnam_r=no
-.endif
+CONFIGURE_ENV.MirBSD+=	ac_cv_func_getgrnam_r=no
 
 # bmake doesn't like the codesign/POSTLINK constructs for Darwin.
 .if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin"
diff --git a/lang/ruby23-base/Makefile b/lang/ruby23-base/Makefile
index 9de22a7929b..ce6761c8f84 100644
--- a/lang/ruby23-base/Makefile
+++ b/lang/ruby23-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/12/30 14:59:42 taca Exp $
+# $NetBSD: Makefile,v 1.2 2016/02/25 14:42:57 jperkin Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -44,14 +44,10 @@ CONFIGURE_ENV+=	LDSHARED="${CC} -G"
 LIBS.SunOS+=	-lm
 .endif
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	OBJCOPY=:
-.endif
+CONFIGURE_ENV.SunOS+=	OBJCOPY=:
 
-.if ${OPSYS} == "MirBSD"
 # if present, an unsupported sysconf call is used
-CONFIGURE_ENV+=	ac_cv_func_getgrnam_r=no
-.endif
+CONFIGURE_ENV.MirBSD+=	ac_cv_func_getgrnam_r=no
 
 # bmake doesn't like the codesign/POSTLINK constructs for Darwin.
 .if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin"
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index bb52cf921e5..2691fa358cc 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/07/25 15:21:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2016/02/25 14:42:57 jperkin Exp $
 
 DISTNAME=		siod
 PKGNAME=		siod-3.0
@@ -28,11 +28,7 @@ REPLACE.siod.old=	/usr/local/bin/siod
 REPLACE.siod.new=	${PREFIX}/bin/siod
 REPLACE_FILES.siod=	*.scm
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=		CPPFLAGS=
-.endif
+MAKE_ENV.SunOS+=	CPPFLAGS=
 
 post-patch:
 	${MV} ${WRKSRC}/siod.man ${WRKSRC}/prefix-siod.man
diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile
index 18c31224edb..45dbea55ae2 100644
--- a/lang/squeak-vm/Makefile
+++ b/lang/squeak-vm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/04/25 14:23:26 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2016/02/25 14:42:57 jperkin Exp $
 #
 
 SQUEAK_VERSION=	4.10.2.2614
@@ -31,12 +31,8 @@ CMAKE_ARGS+=	-DDEVOSSAUDIO=${DEVOSSAUDIO}
 
 LDFLAGS.SunOS+=	-liconv -lsocket -lnsl -lm
 
-.include "../../mk/bsd.prefs.mk"
-
-.if $(OPSYS) == "NetBSD"
 # UUID routines are in libc:
-BUILDLINK_TRANSFORM+=	rm:-luuid
-.endif
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-luuid
 
 PLIST_SUBST=	SQUEAK_VERSION=${SQUEAK_VERSION}
 
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index d2d40dde0fc..e583c899337 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2016/02/19 15:15:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.88 2016/02/25 14:42:57 jperkin Exp $
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
@@ -36,9 +36,7 @@ TEST_TARGET=		test
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	ac_cv_func_gethostbyname_r=no
-.endif
+CONFIGURE_ARGS.NetBSD+=	ac_cv_func_gethostbyname_r=no
 
 SUBST_CLASSES+=		tcl-config
 SUBST_STAGE.tcl-config=	post-build