Use OPSYSVARS.

39 files changed, 108 insertions, 232 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index b5aca178850..d3bc4674b58 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2015/04/25 14:20:32 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2016/02/25 12:12:47 jperkin Exp $
 
 DISTNAME=	allegro-4.4.2
 PKGREVISION=	3
@@ -17,15 +17,11 @@ USE_LANGUAGES=	c c++
 INFO_FILES=	yes
 CMAKE_ARGS+=	-DINFODIR=${PKGINFODIR:Q}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		ossmidi
+SUBST_CLASSES.NetBSD+=	ossmidi
 SUBST_STAGE.ossmidi=	pre-configure
 SUBST_MESSAGE.ossmidi=	NetBSD's OSS midi emulation is non-existent.
 SUBST_FILES.ossmidi=	CMakeLists.txt
 SUBST_SED.ossmidi=	-e 's/ALLEGRO_WITH_OSSMIDI 1/ALLEGRO_WITH_OSSMIDI 0/'
-.endif
 
 PKGCONFIG_OVERRIDE+=	misc/logg.pc.in
 PKGCONFIG_OVERRIDE+=	misc/loadpng.pc.in
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index c547099d931..b3ad3c3c073 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/01/03 01:33:59 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2016/02/25 12:12:47 jperkin Exp $
 
 DISTNAME=		bcc
 PKGREVISION=		1
@@ -34,9 +34,7 @@ LDFLAGS+=		-m32
 .endif
 .endfor
 
-.if ${OPSYS} == "DragonFly"
-CPPFLAGS+=	-D_POSIX_SOURCE
-.endif
+CPPFLAGS.DragonFly+=	-D_POSIX_SOURCE
 
 post-extract:
 	set -e; \
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index b5bb1f30644..293aae7a4e1 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2015/06/30 21:39:09 richard Exp $
+# $NetBSD: Makefile,v 1.102 2016/02/25 12:12:47 jperkin Exp $
 
 DISTNAME=	bison-3.0.4
 PKGREVISION=	2
@@ -24,11 +24,7 @@ TEST_TARGET=		check
 REPLACE_PERL+=		examples/extexi
 REPLACE_SH+=		examples/test examples/*/*.test
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Cygwin"
-CONFIGURE_ARGS+=	ac_cv_func___fpending=yes
-.endif
+CONFIGURE_ARGS.Cygwin+=	ac_cv_func___fpending=yes
 
 # Avoid rebuilding manpage
 pre-build:
diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index b3b40129b54..15a8815e4a9 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2016/01/24 16:14:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.73 2016/02/25 12:12:47 jperkin Exp $
 
 DISTNAME=	bmake-20150505
 CATEGORIES=	devel
@@ -39,9 +39,7 @@ CONFIGURE_ARGS+=	--with-defshell=/usr/bin/bash
 DEPENDS+=		pdksh-[0-9]*:../../shells/pdksh
 CONFIGURE_ARGS+=	--with-defshell=${PREFIX}/bin/pdksh
 .endif
-.if ${OPSYS} == "Interix"
-MAKE_ENV+=		XDEFS=-DUSE_SELECT
-.endif
+MAKE_ENV.Interix+=	XDEFS=-DUSE_SELECT
 
 do-extract:
 	${CP} -R ${FILESDIR} ${WRKSRC}
diff --git a/devel/boehm-gc/options.mk b/devel/boehm-gc/options.mk
index 5d04b4a715d..ddd9b4f2e69 100644
--- a/devel/boehm-gc/options.mk
+++ b/devel/boehm-gc/options.mk
@@ -1,13 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2014/05/02 07:28:00 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2016/02/25 12:12:47 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.boehm-gc
 PKG_SUPPORTED_OPTIONS=	threads
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS=	threads
-.endif
+PKG_SUGGESTED_OPTIONS.Darwin+=	threads
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index f075db0d3b7..b28caead468 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/02/20 09:57:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2016/02/25 12:12:47 jperkin Exp $
 
 PKGREVISION= 3
 .include "Makefile.common"
@@ -13,14 +13,12 @@ PKGCONFIG_OVERRIDE+=	client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
 BUILDLINK_TRANSFORM+=	rm:-ldl
 .endif
 
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=		libname
+SUBST_CLASSES.Darwin+=	libname
 SUBST_STAGE.libname=	pre-configure
 SUBST_FILES.libname=	client/Makefile.in dbus-1/Makefile.in
 SUBST_FILES.libname+=	gsettings/Makefile.in
 SUBST_SED.libname=	-e "s|-Wl,-soname=|-install_name ${PREFIX}/lib/|g"
 SUBST_SED.libname+=	-e "/^libdconfsettings_so_LDFLAGS/s,$$, -install_name ${PREFIX}/lib/gio/modules/libdconfsettings.so,g"
-.endif
 
 BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index fc68a3e9b68..e7f2ae75684 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/10/09 14:06:08 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2016/02/25 12:12:47 jperkin Exp $
 #
 
 DISTNAME=		diffutils-3.3
@@ -14,28 +14,22 @@ LICENSE=		gnu-gpl-v2
 GNU_CONFIGURE=		YES
 INFO_FILES=		YES # PLIST
 
-CONFIGURE_ENV+=	gt_cv_func_gnugettext1_libintl=yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	ac_cv_sys_xsi_stack_overflow_heuristic=no
-.endif
+CONFIGURE_ARGS+=	--program-prefix=g
+CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
+CONFIGURE_ENV.SunOS+=	ac_cv_sys_xsi_stack_overflow_heuristic=no
 
 AUTO_MKDIRS=		yes
 
+SUBST_CLASSES+=		diff
+SUBST_STAGE.diff=	pre-configure
+SUBST_FILES.diff=	src/Makefile.in
+SUBST_SED.diff=		-e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;'
+
 post-install:
 .for f in cmp diff diff3 sdiff
 	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
 	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor
 
-CONFIGURE_ARGS+=	--program-prefix=g
-
-SUBST_CLASSES+=		diff
-SUBST_STAGE.diff=	pre-configure
-SUBST_FILES.diff=	src/Makefile.in
-SUBST_SED.diff=		-e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;'
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 318ec6d81c4..3e7ee240a6b 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2015/12/05 21:25:34 adam Exp $
+# $NetBSD: Makefile,v 1.123 2016/02/25 12:12:47 jperkin Exp $
 
 DISTNAME=	doxygen-1.8.9.1.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -69,9 +69,7 @@ PLIST.ci=		yes	# case-insensitive
 PLIST.cs=		yes	# case-sensitive
 .endif
 
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	-platform freebsd-g++
-.endif
+CONFIGURE_ARGS.DragonFly+=	-platform freebsd-g++
 
 LDFLAGS+=		${BUILDLINK_LDADD.iconv}
 
diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index 4b593b09692..4804e844395 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2016/01/08 11:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2016/02/25 12:12:47 jperkin Exp $
 
 DISTNAME=	flex-2.6.0
 CATEGORIES=	lang
@@ -21,9 +21,7 @@ LIBS.SunOS+=		-lm
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${LOWER_OPSYS} == "aix"
-CFLAGS+=		-D_LINUX_SOURCE_COMPAT
-.endif
+CFLAGS.AIX+=		-D_LINUX_SOURCE_COMPAT
 
 .if ${OS_VARIANT} == "SCOOSR5"
 LDFLAGS.SCO_SV+=	-lsocket
diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index 76f904d47c6..26c81480ec3 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2016/02/15 09:06:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2016/02/25 12:12:47 jperkin Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -31,15 +31,10 @@ INFO_FILES=		yes
 BROKEN_GETTEXT_DETECTION=	yes
 USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Cygwin"
-BUILDLINK_TRANSFORM+=	rm:-Wl,--disable-auto-import
-.endif
+BUILDLINK_TRANSFORM.Cygwin+=	rm:-Wl,--disable-auto-import
 
-.if ${OPSYS} == "AIX"
 #bug 20453 in bug-gzip list, passed onto gnulib
-CONFIGURE_ENV+= ac_cv_header_wctype_h=no
-.endif
+CONFIGURE_ENV.AIX+=	ac_cv_header_wctype_h=no
 
 post-install:
 	cd ${WRKSRC}/gettext-tools/misc && ${MAKE} install DESTDIR=${DESTDIR}
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 97017b3591c..7a76a336000 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2016/02/15 11:42:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.91 2016/02/25 12:12:47 jperkin Exp $
 
 DISTNAME=		glib-1.2.10
 PKGREVISION=		11
@@ -30,9 +30,7 @@ PTHREAD_OPTS+=		require
 
 # Force the result of this configure test, because the testing technique
 # breaks with NetBSD's native libpthread.so.
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=		glib_cv_rtldglobal_broken=no
-.endif
+CONFIGURE_ENV.NetBSD+=	glib_cv_rtldglobal_broken=no
 
 # Tests are insufficient, override with correct values.
 .if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER} == "clang"
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index c398ec2e614..432f2d7486b 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2015/06/10 23:00:05 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.46 2016/02/25 12:12:47 jperkin Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -68,17 +68,10 @@ SUBST_MESSAGE.thr=	Fixing libgthread.
 CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
 .endif
 
-.if ${OPSYS} == "Darwin"
-BUILDLINK_TRANSFORM+=	rm:-Werror=missing-prototypes
-.endif
-
-.if ${OPSYS} == "HPUX"
-CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
-.endif
+BUILDLINK_TRANSFORM.Darwin+=	rm:-Werror=missing-prototypes
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Werror=format=2
 
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-Werror=format=2
-.endif
+CONFIGURE_ENV.HPUX+=		ac_cv_func_mmap_fixed_mapped=yes
 
 .include "../../mk/dlopen.buildlink3.mk"
 
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 7e14d5e5aae..d5872c7e2c6 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2016/01/01 01:42:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.93 2016/02/25 12:12:48 jperkin Exp $
 
 DISTNAME=	make-4.1
 PKGNAME=	g${DISTNAME}
@@ -23,21 +23,17 @@ INFO_FILES=		yes
 # dependency
 TEST_TARGET=		check
 
-.include "../../mk/bsd.prefs.mk"
-
 CONFIGURE_ARGS+=	--program-prefix=g
 
+# workaround for broken strndup
+CONFIGURE_ARGS.MirBSD+=	ac_cv_func_strndup=no
+
 AUTO_MKDIRS=		yes
 
 PLIST_SRC=		${PKGDIR}/PLIST
 
 .include "options.mk"
 
-.if ${OPSYS} == "MirBSD"
-# workaround for broken strndup
-CONFIGURE_ARGS+=	ac_cv_func_strndup=no
-.endif
-
 post-install:
 	${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/gmake
 	${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/gmake
diff --git a/devel/gtexinfo/options.mk b/devel/gtexinfo/options.mk
index 98b6332f5e0..d0c7f39a294 100644
--- a/devel/gtexinfo/options.mk
+++ b/devel/gtexinfo/options.mk
@@ -1,11 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2013/07/04 16:19:41 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2016/02/25 12:12:48 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtexinfo
 PKG_SUPPORTED_OPTIONS=	nls
 PKG_SUGGESTED_OPTIONS=	# blank
-.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+=	nls
-.endif
+PKG_SUGGESTED_OPTIONS.NetBSD+=	nls
 
 PKG_OPTIONS_LEGACY_VARS=	TEXINFO_LOCALE
 
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index aaf03a3620a..a7c7bd1cf64 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2013/07/05 13:29:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2016/02/25 12:12:48 jperkin Exp $
 
 DISTNAME=	libast-0.7
 PKGREVISION=	12
@@ -14,11 +14,8 @@ GNU_CONFIGURE=		YES
 TEST_TARGET=		test
 
 .include "options.mk"
-.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-LDFLAGS+=-lresolv
-.endif
+LDFLAGS.SunOS+=	-lresolv
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 4e60a564bc5..50d25b437fc 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2015/04/23 09:23:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.49 2016/02/25 12:12:48 jperkin Exp $
 
 .include "../../devel/libevent/Makefile.common"
 
@@ -28,9 +28,7 @@ CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 .include "../../mk/bsd.prefs.mk"
 
 # Explicitly disable epoll on illumos, provided for Linux compat only.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_func_epoll_ctl=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_ctl=no
 
 .if !empty(MACHINE_PLATFORM:MHPUX-11.11-*)
 CONFIGURE_ENV+=		ac_cv_func_strtoll=yes
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index f0512219b38..32110ca0ab7 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2016/02/04 11:57:50 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2016/02/25 12:12:48 jperkin Exp $
 
 DISTNAME=	libgphoto2-2.5.8
 PKGREVISION=	1
@@ -27,14 +27,12 @@ REPLACE_SH=		packaging/generic/check-ptp-camera
 
 PLIST_VARS+=	libusb
 
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	opt:-Wl,--version-script=./libgphoto2_port.ver:-Wl,-M./libgphoto2_port.ver
+BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,--version-script=./libgphoto2_port.ver:-Wl,-M./libgphoto2_port.ver
 
-SUBST_CLASSES+=	mapfile
+SUBST_CLASSES.SunOS+=	mapfile
 SUBST_STAGE.mapfile=	post-patch
 SUBST_FILES.mapfile=	libgphoto2_port/libgphoto2_port/libgphoto2_port.ver
 SUBST_SED.mapfile=	-e '/gpi_gphoto_port_type_map/d'
-.endif
 
 # remove symbolic link
 post-install:
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 1da3182043d..a80313bc149 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2015/08/06 07:54:57 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2016/02/25 12:12:48 jperkin Exp $
 
 DISTNAME=	libidn-1.32
 CATEGORIES=	devel
@@ -21,11 +21,7 @@ CONFIGURE_ARGS+=	--disable-csharp --disable-java
 CONFIGURE_ARGS+=	--with-packager=pkgsrc
 CONFIGURE_ARGS+=	--with-packager-bug-reports=http://www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-CONFIGURE_ARGS+=	--disable-ld-version-script
-.endif
+CONFIGURE_ARGS.Interix+=	--disable-ld-version-script
 
 PKGCONFIG_OVERRIDE+=	libidn.pc.in
 TEST_TARGET=		check
diff --git a/devel/libjit/Makefile b/devel/libjit/Makefile
index 7295adfbc80..5b90bc78932 100644
--- a/devel/libjit/Makefile
+++ b/devel/libjit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/12/26 23:47:48 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/25 12:12:48 jperkin Exp $
 #
 
 DISTNAME=	libjit-0.1.2
@@ -18,11 +18,7 @@ USE_TOOLS+=		gmake lex yacc makeinfo
 GNU_CONFIGURE=		yes
 INFO_FILES=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	ac_cv_header_tgmath_h=no
-.endif
+CONFIGURE_ARGS.NetBSD+=	ac_cv_header_tgmath_h=no
 
 # this is supposed to be generated, not shipped
 post-extract:
diff --git a/devel/libmemcached/options.mk b/devel/libmemcached/options.mk
index 9ed7d12b5fb..026d2814c15 100644
--- a/devel/libmemcached/options.mk
+++ b/devel/libmemcached/options.mk
@@ -1,12 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2013/09/12 14:21:27 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/25 12:12:48 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libmemcached
 PKG_SUPPORTED_OPTIONS=	sasl
 PKG_SUGGESTED_OPTIONS=	sasl
 
-#.if ${OPSYS} == "SunOS"
-#PKG_SUGGESTED_OPTIONS+=	dtrace
-#.endif
+#PKG_SUGGESTED_OPTIONS.SunOS+=	dtrace
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index a7a58416675..f416be18276 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2016/02/23 15:17:42 joerg Exp $
+# $NetBSD: Makefile,v 1.115 2016/02/25 12:12:48 jperkin Exp $
 
 ###########################################################################
 ###########################################################################
@@ -36,23 +36,17 @@ TEST_TARGET=	check
 
 OVERRIDE_DIRDEPTH.install-sh=	1
 
-.if ${OPSYS} == "AIX"
-
-# always build libraries and executables that use the runtime linker.
+# Always build libraries and executables that use the runtime linker.
 # in addition, disable libtool locking, as the test is broken on AIX,
 # and results in files being locked indefinitely.
-LDFLAGS+=		-Wl,-brtl
-CONFIGURE_ARGS+=	--disable-libtool-lock
-
-.elif ${OPSYS} == "IRIX"
+LDFLAGS.AIX+=		-Wl,-brtl
+CONFIGURE_ARGS.AIX+=	--disable-libtool-lock
 
 # The MIPSpro compiler doesn't support -c with -o, but the locking
 # workaround is itself broken.  Disable it unconditionally.
-CONFIGURE_ARGS+=	--disable-libtool-lock
+CONFIGURE_ARGS.IRIX+=	--disable-libtool-lock
 
-.elif ${OPSYS} == "SunOS"
-CFLAGS+=	${_COMPILER_ABI_FLAG.${ABI}}
-.endif
+CFLAGS.SunOS+=	${_COMPILER_ABI_FLAG.${ABI}}
 
 # We are going to want libtool to find the same versions of the C, C++,
 # and Fortran compilers.
diff --git a/devel/libtool-fortran/Makefile b/devel/libtool-fortran/Makefile
index a42c59bda3e..758f11229de 100644
--- a/devel/libtool-fortran/Makefile
+++ b/devel/libtool-fortran/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/10/09 13:44:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/25 12:12:48 jperkin Exp $
 
 ###########################################################################
 ###########################################################################
@@ -38,23 +38,17 @@ TEST_TARGET=	check
 
 OVERRIDE_DIRDEPTH.install-sh=	1
 
-.if ${OPSYS} == "AIX"
-
-# always build libraries and executables that use the runtime linker.
+# Always build libraries and executables that use the runtime linker.
 # in addition, disable libtool locking, as the test is broken on AIX,
 # and results in files being locked indefinitely.
-LDFLAGS+=		-Wl,-brtl
-CONFIGURE_ARGS+=	--disable-libtool-lock
-
-.elif ${OPSYS} == "IRIX"
+LDFLAGS.AIX+=		-Wl,-brtl
+CONFIGURE_ARGS.AIX+=	--disable-libtool-lock
 
 # The MIPSpro compiler doesn't support -c with -o, but the locking
 # workaround is itself broken.  Disable it unconditionally.
-CONFIGURE_ARGS+=	--disable-libtool-lock
+CONFIGURE_ARGS.IRIX+=	--disable-libtool-lock
 
-.elif ${OPSYS} == "SunOS"
-CFLAGS+=	${_COMPILER_ABI_FLAG.${ABI}}
-.endif
+CFLAGS.SunOS+=	${_COMPILER_ABI_FLAG.${ABI}}
 
 # We are going to want libtool to find the same versions of the C, C++,
 # and Fortran compilers.
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 29e1d7a4e36..594da39e55a 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2014/10/09 14:06:10 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2016/02/25 12:12:48 jperkin Exp $
 
 DISTNAME=	m4-1.4.17
 CATEGORIES=	devel
@@ -15,14 +15,9 @@ INFO_FILES=		yes
 TEST_TARGET=		check
 
 CONFIGURE_ARGS+=	--program-prefix=g
+CONFIGURE_ARGS.Cygwin+=	ac_cv_func___fpending=yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${LOWER_OPSYS} == "aix"
-CFLAGS+=	-D_LINUX_SOURCE_COMPAT
-.elif ${OPSYS} == "Cygwin"
-CONFIGURE_ARGS+=	ac_cv_func___fpending=yes
-.endif
+CFLAGS.AIX+=	-D_LINUX_SOURCE_COMPAT
 
 AUTO_MKDIRS=		yes
 
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common
index 8794cc2bf13..ca484a39733 100644
--- a/devel/ncurses/Makefile.common
+++ b/devel/ncurses/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2015/11/04 13:30:06 richard Exp $
+# $NetBSD: Makefile.common,v 1.32 2016/02/25 12:12:48 jperkin Exp $
 #
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
@@ -38,9 +38,7 @@ SUBST_MESSAGE.rpath=	Fixing rpath in ncurses-config.
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-mixed-case
-.endif
+CONFIGURE_ARGS.Darwin+=	--disable-mixed-case
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 TOOL_DEPENDS+=		ncurses-${NC_VERS}:../../devel/ncurses
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index c18eef27044..9844c25a9de 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2016/02/23 12:42:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.83 2016/02/25 12:12:49 jperkin Exp $
 
 DISTNAME=	nspr-${NSPR_RELEASE:S/.0$//}
 NSPR_RELEASE=	4.12.0
@@ -41,13 +41,11 @@ SUBST_SED.nspr-config=		-e 's|-L$$libdir|"${COMPILER_RPATH_FLAG}$$libdir -L$$lib
 CHECK_SHLIBS_SUPPORTED= no
 .endif
 
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=			exec_path
+SUBST_CLASSES.Darwin+=		exec_path
 SUBST_STAGE.exec_path=		pre-configure
 SUBST_MESSAGE.exec_path=	Fixing @executable_path
 SUBST_FILES.exec_path=		nspr/configure.in
 SUBST_SED.exec_path=		-e 's,@executable_path,${PREFIX}/lib/nspr,g'
-.endif
 
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=		so
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index b93b424555b..275a5bbb527 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2016/02/17 22:00:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.108 2016/02/25 12:12:49 jperkin Exp $
 
 DISTNAME=		nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=		3.22.1
@@ -20,17 +20,13 @@ USE_TOOLS+=		gmake perl pax pkg-config
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=			exec_path
+SUBST_CLASSES.Darwin+=		exec_path
 SUBST_STAGE.exec_path=		pre-configure
 SUBST_MESSAGE.exec_path=	Fixing @executable_path
 SUBST_FILES.exec_path=		nss/coreconf/Darwin.mk
 SUBST_SED.exec_path=		-e 's,@executable_path,${PREFIX}/lib/nss,g'
-.endif
 
-.if ${OPSYS} == "Linux"
-MAKE_ENV+=	FREEBL_NO_DEPEND=0
-.endif
+MAKE_ENV.Linux+=	FREEBL_NO_DEPEND=0
 
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=		so
diff --git a/devel/p5-Data-UUID/Makefile b/devel/p5-Data-UUID/Makefile
index c85542cb5f4..4c01efce2fd 100644
--- a/devel/p5-Data-UUID/Makefile
+++ b/devel/p5-Data-UUID/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2015/08/15 12:46:07 mef Exp $
+# $NetBSD: Makefile,v 1.37 2016/02/25 12:12:49 jperkin Exp $
 
 DISTNAME=	Data-UUID-1.221
 PKGNAME=	p5-${DISTNAME}
@@ -15,11 +15,8 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=		c
 PERL5_PACKLIST=		auto/Data/UUID/.packlist
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-MAKE_PARAMS+=		DEFINE=-D_POSIX_C_SOURCE
-.endif
+OPSYSVARS+=		MAKE_PARAMS
+MAKE_PARAMS.Darwin+=	DEFINE=-D_POSIX_C_SOURCE
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index e8430b13fc8..15fb0f851a0 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/12/04 11:32:40 hauke Exp $
+# $NetBSD: Makefile,v 1.35 2016/02/25 12:12:49 jperkin Exp $
 
 DISTNAME=	pkg-config-0.29
 CATEGORIES=	devel
@@ -20,10 +20,8 @@ CONFLICTS=		pkgconfig-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "IRIX"
 # configure bails out in subdir after re-parsing the cache
-CONFIGURE_ARGS+=	--cache-file=/dev/null
-.endif
+CONFIGURE_ARGS.IRIX+=	--cache-file=/dev/null
 
 .if ${OPSYS} == "NetBSD"
 .if ${MACHINE_ARCH} == "i386" && !empty(OS_VERSION:M[12345].*)
@@ -41,10 +39,8 @@ post-configure:
 CONFIGURE_ENV+=		glib_cv_value_AF_INET6=yes
 .endif
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--disable-dtrace
-CFLAGS+=		-DENABLE_NLS # required due to __EXTENSIONS__
-.endif
+CONFIGURE_ARGS.SunOS+=	--disable-dtrace
+CFLAGS.SunOS+=		-DENABLE_NLS # required due to __EXTENSIONS__
 
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=gnu
diff --git a/devel/poco/Makefile.common b/devel/poco/Makefile.common
index 59ca11bb4d1..d3a852b5884 100644
--- a/devel/poco/Makefile.common
+++ b/devel/poco/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2016/01/16 12:15:12 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.13 2016/02/25 12:12:49 jperkin Exp $
 #
 # used by devel/poco/Makefile
 # used by databases/poco-data/Makefile
@@ -40,11 +40,9 @@ CONFIGURE_ARGS+=	--unbundled
 CONFIGURE_ARGS+=	--config=FreeBSD
 .endif
 
-.if ${OPSYS} == "NetBSD"
 # NetBSD doesn't have fenv.h. We should add one.
-CONFIGURE_ARGS+=	--no-fpenvironment
-CONFIGURE_ARGS+=	--no-sharedmemory
-.endif
+CONFIGURE_ARGS.NetBSD+=	--no-fpenvironment
+CONFIGURE_ARGS.NetBSD+=	--no-sharedmemory
 
 .if ${OPSYS} == "SunOS"
 .include "../../mk/compiler.mk"
diff --git a/devel/py-pysvn/Makefile b/devel/py-pysvn/Makefile
index d5b8a0daa66..4ffea8771de 100644
--- a/devel/py-pysvn/Makefile
+++ b/devel/py-pysvn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/10/10 01:58:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/25 12:12:49 jperkin Exp $
 #
 
 VERS=			1.7.6
@@ -17,11 +17,7 @@ DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 USE_LANGUAGES=		c
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
-BUILDLINK_TRANSFORM+=	rm:-lresolv
-.endif
+BUILDLINK_TRANSFORM.DragonFly+=	rm:-lresolv
 
 SUBST_CLASSES+=		rpath-flg
 SUBST_STAGE.rpath-flg=	pre-configure
diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile
index 3eb0c322772..bdd5e6e5f3d 100644
--- a/devel/py-tryton/Makefile
+++ b/devel/py-tryton/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/11/22 08:05:07 richard Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/25 12:12:49 jperkin Exp $
 TRYTON_MODULE_NAME=	tryton
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	devel python
@@ -16,11 +16,9 @@ PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "options.mk"
 
-DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
-
-.if ${OPSYS} == "Darwin"
-DEPENDS+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
-.endif
+OPSYSVARS+=		DEPENDS
+DEPENDS+=		${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
+DEPENDS.Darwin+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/tryton \
diff --git a/devel/py-trytond/Makefile b/devel/py-trytond/Makefile
index 3d5aae2be84..28545c876bd 100644
--- a/devel/py-trytond/Makefile
+++ b/devel/py-trytond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/08/24 14:49:41 richard Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/25 12:12:49 jperkin Exp $
 TRYTON_MODULE_NAME=	trytond
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	devel python
@@ -37,9 +37,8 @@ PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "options.mk"
 
-.if ${OPSYS} == "Darwin"
-DEPENDS+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
-.endif
+OPSYSVARS+=		DEPENDS
+DEPENDS.Darwin+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/trytond \
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 651dddfee44..f267a99bb12 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2015/02/14 06:51:33 riastradh Exp $
+# $NetBSD: Makefile,v 1.62 2016/02/25 12:12:49 jperkin Exp $
 
 READLINE_VERSION=	6.3
 
@@ -19,9 +19,7 @@ INFO_FILES=		yes
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=		bash_cv_wcwidth_broken=no
-.endif
+CONFIGURE_ENV.NetBSD+=	bash_cv_wcwidth_broken=no
 .endif
 
 BUILD_TARGET=		all-libtool examples
diff --git a/devel/scmcvs/Makefile b/devel/scmcvs/Makefile
index 3ed2f9a033e..5ef549a283a 100644
--- a/devel/scmcvs/Makefile
+++ b/devel/scmcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/04/12 07:43:42 dsainty Exp $
+# $NetBSD: Makefile,v 1.15 2016/02/25 12:12:49 jperkin Exp $
 
 DISTNAME=	cvs-1.12.13
 PKGREVISION=	3
@@ -21,11 +21,7 @@ CHECK_INTERPRETER_SKIP=	share/cvs/contrib/*
 INFO_FILES=		yes
 TEXINFO_REQD+=		4.0
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--enable-case-sensitivity
-.endif
+CONFIGURE_ARGS.Darwin+=	--enable-case-sensitivity
 
 .include "options.mk"
 
diff --git a/devel/xulrunner10/mozilla-common.mk b/devel/xulrunner10/mozilla-common.mk
index fa65488a237..8e5758f7a5e 100644
--- a/devel/xulrunner10/mozilla-common.mk
+++ b/devel/xulrunner10/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2015/12/05 21:25:41 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2016/02/25 12:12:49 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -68,11 +68,9 @@ create-rm-wrapper:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
 # The configure test for __thread succeeds, but later we end up with:
 # dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+=	ac_cv_thread_keyword=no
-.endif
+CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyword=no
 
 .if ${OPSYS} == "SunOS"
 # native libbz2.so hides BZ2_crc32Table
diff --git a/devel/xulrunner17/mozilla-common.mk b/devel/xulrunner17/mozilla-common.mk
index 654a441bd4d..91bbe0bc848 100644
--- a/devel/xulrunner17/mozilla-common.mk
+++ b/devel/xulrunner17/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2015/12/05 21:25:41 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2016/02/25 12:12:49 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -75,11 +75,9 @@ create-rm-wrapper:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
 # The configure test for __thread succeeds, but later we end up with:
 # dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+=	ac_cv_thread_keyword=no
-.endif
+CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyword=no
 
 .if ${OPSYS} == "SunOS"
 # native libbz2.so hides BZ2_crc32Table
diff --git a/devel/xulrunner192/mozilla-common.mk b/devel/xulrunner192/mozilla-common.mk
index 4b1afdd26f8..960f50a04cf 100644
--- a/devel/xulrunner192/mozilla-common.mk
+++ b/devel/xulrunner192/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2015/12/05 21:25:41 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2016/02/25 12:12:49 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -63,11 +63,9 @@ create-rm-wrapper:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
 # The configure test for __thread succeeds, but later we end up with:
 # dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+=	ac_cv_thread_keyword=no
-.endif
+CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyword=no
 
 .if ${OPSYS} == "SunOS"
 # native libbz2.so hides BZ2_crc32Table
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index e387114c0ac..992662a17ee 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/31 11:19:55 asau Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/25 12:12:50 jperkin Exp $
 #
 
 DISTNAME=	xxgdb-1.12
@@ -12,11 +12,7 @@ COMMENT=	Graphical X11 interface for gdb
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_IMAKE=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	CPPFLAGS=
-.endif
+MAKE_ENV.SunOS+=	CPPFLAGS=
 
 INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man1
 
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index a67099fb560..a1307347184 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2014/08/17 16:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2016/02/25 12:12:50 jperkin Exp $
 
 DISTNAME=	yasm-1.3.0
 CATEGORIES=	devel
@@ -18,13 +18,11 @@ TEST_TARGET=		check
 
 # Commit message suggests this is Darwin-specific.  Won't work to
 # cross-compile to Darwin, but that doesn't work at all anyway.
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=		link
+SUBST_CLASSES.Darwin+=	link
 SUBST_STAGE.link=	pre-configure
 SUBST_MESSAGE.link=	Fix linking command.
 SUBST_FILES.link=	Makefile.in
 SUBST_SED.link=		-e 's,$$(CCLD_FOR_BUILD) -o $$@,$$(LINK) -o $$@,'
-.endif
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 CONFIGURE_ENV+=		CC_FOR_BUILD=${NATIVE_CC:Q}