Use OPSYSVARS.

44 files changed, 175 insertions, 324 deletions

diff --git a/sysutils/855resolution/Makefile b/sysutils/855resolution/Makefile
index a12e6893cff..95d33281657 100644
--- a/sysutils/855resolution/Makefile
+++ b/sysutils/855resolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/23 19:50:50 asau Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/26 10:24:10 jperkin Exp $
 #
 
 DISTNAME=	855resolution-0.4
@@ -16,11 +16,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64 Linux-*-i386
 WRKSRC=		${WRKDIR}/855resolution
 USE_TOOLS+=	gmake
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-MAKE_ENV+=	EXTRA_LIBS=-l${MACHINE_ARCH}
-.endif
+MAKE_ENV.NetBSD+=	EXTRA_LIBS=-l${MACHINE_ARCH}
 
 INSTALLATION_DIRS=	sbin share/doc/855resolution
 
diff --git a/sysutils/915resolution/Makefile b/sysutils/915resolution/Makefile
index c55dc7c2178..c3e54d4ce4f 100644
--- a/sysutils/915resolution/Makefile
+++ b/sysutils/915resolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 19:50:50 asau Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/26 10:24:10 jperkin Exp $
 #
 
 DISTNAME=	915resolution-0.5.3
@@ -15,11 +15,7 @@ ONLY_FOR_PLATFORM+=	FreeBSD-*-i386 FreeBSD-*-x86_64 DragonFly-*-i386
 
 USE_TOOLS+=	gmake
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-MAKE_ENV+=	LDLIBS=-l${MACHINE_ARCH}
-.endif
+MAKE_ENV.NetBSD+=	LDLIBS=-l${MACHINE_ARCH}
 
 INSTALLATION_DIRS=	sbin share/doc/915resolution
 
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 0b228546903..a355a7de22d 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2016/01/28 15:51:34 prlw1 Exp $
+# $NetBSD: Makefile,v 1.81 2016/02/26 10:24:10 jperkin Exp $
 
 DISTNAME=		apcupsd-3.14.13r2365
 CATEGORIES=		sysutils
@@ -65,13 +65,12 @@ CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${REAL_ROOT_US
 CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 
 RCD_SCRIPTS=	apcupsd
-PLATFORM_SUBDIR=${OPSYS:tl}
-.if ${OPSYS} == "DragonFly"
-PLATFORM_SUBDIR=netbsd
-.endif
-.if ${OPSYS} == "SunOS"
-PLATFORM_SUBDIR=sun
-.endif
+
+OPSYSVARS+=			PLATFORM_SUBDIR
+PLATFORM_SUBDIR.DragonFly=	netbsd
+PLATFORM_SUBDIR.SunOS=		sun
+PLATFORM_SUBDIR.*=		${OPSYS:tl}
+
 RCD_SCRIPT_SRC.apcupsd=	${WRKSRC}/platforms/${PLATFORM_SUBDIR}/apcupsd
 
 EGFILES= ${PLATFORM_SUBDIR}/apccontrol etc/changeme etc/commfailure etc/commok \
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index f1cf93b820e..f046d8a2e59 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.66 2015/06/22 16:50:38 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.67 2016/02/26 10:24:10 jperkin Exp $
 #
 # used by sysutils/bacula-clientonly/Makefile
 # used by sysutils/bacula-tray-monitor/Makefile
@@ -68,12 +68,9 @@ CONFIGURE_ARGS+=	--with-working-dir=${BACULA_WORKINGDIR}
 CONFIGURE_ARGS+=	--with-pid-dir=${BACULA_PIDDIR}
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline
 
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--enable-smartalloc
-.endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	--disable-xattr
-.endif
+CONFIGURE_ARGS.Linux+=	--enable-smartalloc
+
+CONFIGURE_ARGS.DragonFly+=	--disable-xattr
 
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile
index 13005f2522f..a25a7608daf 100644
--- a/sysutils/bbsload/Makefile
+++ b/sysutils/bbsload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:39 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2016/02/26 10:24:10 jperkin Exp $
 #
 
 DISTNAME=	bbsload-0.2.6
@@ -15,11 +15,7 @@ USE_LANGUAGES=		c c++
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
-MAKE_ENV+=	LIBS.pkgsrc=-lkinfo
-.endif
+MAKE_ENV.DragonFly+=	LIBS.pkgsrc=-lkinfo
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/bbsload.1
diff --git a/sysutils/bsign/Makefile b/sysutils/bsign/Makefile
index 7922ab06d1b..bdab31049e9 100644
--- a/sysutils/bsign/Makefile
+++ b/sysutils/bsign/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/23 19:50:53 asau Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/26 10:24:10 jperkin Exp $
 
 DISTNAME=	bsign_0.4.5
 PKGNAME=	bsign-0.4.5
@@ -20,10 +20,7 @@ USE_LANGUAGES+=	c c++
 USE_TOOLS+=	gmake
 USE_FEATURES+=	fts_open
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-static
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-static
 
 CFLAGS.SunOS+=	-DMAP_FILE=0
 
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index c189883802f..3e20f230d48 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/06/12 10:51:11 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2016/02/26 10:24:11 jperkin Exp $
 
 DISTNAME=		cdbkup-1.0
 PKGREVISION=		11
@@ -29,9 +29,7 @@ CDBKUP_SNARDIR?=	/var/db/${PKGBASE}
 CDBKUP_DUMPGRP?=	operator
 .endif
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=		MOUNT=/sbin/mount UMOUNT=/sbin/umount
-.endif
+CONFIGURE_ENV.NetBSD+=	MOUNT=/sbin/mount UMOUNT=/sbin/umount
 
 CONFIGURE_ARGS+=	--with-snardir=${CDBKUP_SNARDIR:Q} \
 			--with-dumpgrp=${CDBKUP_DUMPGRP:Q}
diff --git a/sysutils/cdrdao/Makefile.common b/sysutils/cdrdao/Makefile.common
index 4d63ec50e45..da7dc27430d 100644
--- a/sysutils/cdrdao/Makefile.common
+++ b/sysutils/cdrdao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2015/12/29 05:06:06 dholland Exp $
+# $NetBSD: Makefile.common,v 1.14 2016/02/26 10:24:11 jperkin Exp $
 #
 # used by sysutils/cdrdao/Makefile
 # used by sysutils/gcdmaster/Makefile
@@ -27,10 +27,9 @@ CONFIGURE_ARGS+=	--with-gtkmm-exec-prefix=/dev/null
 LDFLAGS+=		-L../paranoia
 LDFLAGS.SunOS=		-lvolmgt -lnsl
 
+CONFIGURE_ARGS.SunOS+=	--with-scglib
+
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=--with-scglib
-.endif
 
 .if !empty(CC:M*gcc*)
 MAKE_ENV+=	CCOM=gcc
diff --git a/sysutils/checkperms/Makefile b/sysutils/checkperms/Makefile
index a83f4b15a45..fa997d456be 100644
--- a/sysutils/checkperms/Makefile
+++ b/sysutils/checkperms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/01/20 11:49:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/26 10:24:11 jperkin Exp $
 #
 
 DISTNAME=	checkperms-1.11
@@ -28,9 +28,7 @@ CHECK_PERMS=		no
 IGNORE_CCACHE=		yes
 IGNORE_DISTCC=		yes
 
-.if ${OPSYS} == "Linux"
-MAKE_ENV+=	NOGCCERROR=yes		# see PR 35930
-.endif
+MAKE_ENV.Linux+=	NOGCCERROR=yes		# see PR 35930
 
 # Avoid catpage regeneration
 post-extract:
diff --git a/sysutils/clex/Makefile b/sysutils/clex/Makefile
index 89cd25047d2..8710da9e632 100644
--- a/sysutils/clex/Makefile
+++ b/sysutils/clex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/08/17 17:11:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/26 10:24:11 jperkin Exp $
 #
 
 DISTNAME=		clex-4.6.4
@@ -18,12 +18,8 @@ GNU_CONFIGURE=		yes
 post-extract:
 	cd ${WRKSRC} && ${RM} -f src/*.orig
 
-.include "../../mk/bsd.prefs.mk"
-
 # libtinfo in DragonFly is linked with libncurses
-.if ${OPSYS} == "DragonFly"
-BUILDLINK_TRANSFORM+=	rm:-ltinfo
-.endif
+BUILDLINK_TRANSFORM.DragonFly+=	rm:-ltinfo
 
 .include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/collectd/options.mk b/sysutils/collectd/options.mk
index 465303de59c..117adde782e 100644
--- a/sysutils/collectd/options.mk
+++ b/sysutils/collectd/options.mk
@@ -1,33 +1,24 @@
-# $NetBSD: options.mk,v 1.6 2015/09/12 19:04:56 he Exp $
+# $NetBSD: options.mk,v 1.7 2016/02/26 10:24:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.collectd
 PKG_SUPPORTED_OPTIONS=	cpu df interface load memory syslog uptime
 PKG_SUGGESTED_OPTIONS+=	cpu df interface load memory syslog uptime
 
-.if ${OPSYS} == "NetBSD"
-PKG_SUPPORTED_OPTIONS+=	contextswitch disk entropy irq pf netstat_udp
-PKG_SUPPORTED_OPTIONS+= processes swap tcpconns users
-
-PKG_SUGGESTED_OPTIONS+=	contextswitch disk entropy irq pf netstat_udp
-PKG_SUGGESTED_OPTIONS+= processes swap tcpconns users
-.endif
-
-.if ${OPSYS} == "FreeBSD"
-PKG_SUPPORTED_OPTIONS+=	contextswitch pf processes swap tcpconns zfs-arc
-PKG_SUGGESTED_OPTIONS+=	contextswitch pf processes swap tcpconns zfs-arc
-.endif
-
-.if ${OPSYS} == "Darwin"
-PKG_SUPPORTED_OPTIONS+=	apple-sensors battery contextswitch disk processes swap	\
-			tcpconns users
-PKG_SUGGESTED_OPTIONS+=	apple-sensors battery contextswitch disk processes swap	\
-			tcpconns users
-.endif
-
-.if ${OPSYS} == "SunOS"
-PKG_SUPPORTED_OPTIONS+=	disk nfs swap users zfs-arc
-PKG_SUGGESTED_OPTIONS+=	disk nfs swap users zfs-arc
-.endif
+PKG_SUPPORTED_OPTIONS.NetBSD+=	contextswitch disk entropy irq pf netstat_udp
+PKG_SUPPORTED_OPTIONS.NetBSD+=	processes swap tcpconns users
+PKG_SUGGESTED_OPTIONS.NetBSD+=	contextswitch disk entropy irq pf netstat_udp
+PKG_SUGGESTED_OPTIONS.NetBSD+=	processes swap tcpconns users
+
+PKG_SUPPORTED_OPTIONS.FreeBSD+=	contextswitch pf processes swap tcpconns zfs-arc
+PKG_SUGGESTED_OPTIONS.FreeBSD+=	contextswitch pf processes swap tcpconns zfs-arc
+
+PKG_SUPPORTED_OPTIONS.Darwin+=	apple-sensors battery contextswitch disk
+PKG_SUPPORTED_OPTIONS.Darwin+=	processes swap tcpconns users
+PKG_SUGGESTED_OPTIONS.Darwin+=	apple-sensors battery contextswitch disk
+PKG_SUGGESTED_OPTIONS.Darwin+=	processes swap tcpconns users
+
+PKG_SUPPORTED_OPTIONS.SunOS+=	disk nfs swap users zfs-arc
+PKG_SUGGESTED_OPTIONS.SunOS+=	disk nfs swap users zfs-arc
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 3814f1d0d6e..4903ceec4b2 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/08/18 07:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2016/02/26 10:24:11 jperkin Exp $
 #
 
 DISTNAME=	conky-1.9.0
@@ -29,11 +29,7 @@ OWN_DIRS=	${PKG_SYSCONFDIR}/conky
 CONF_FILES=	${EGDIR}/conky.conf ${PKG_SYSCONFDIR}/conky/conky.conf
 CONF_FILES+=	${EGDIR}/conky_no_x11.conf ${PKG_SYSCONFDIR}/conky/conky_no_x11.conf
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS+=	-D_KMEMUSER
-.endif
+CPPFLAGS.NetBSD+=	-D_KMEMUSER
 
 # conky segfaults on system's curses
 PREFER_PKGSRC+=	ncurses
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 6d3ddeabbd4..6451ab2b379 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/09/24 23:50:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2016/02/26 10:24:11 jperkin Exp $
 
 CONSOLEKIT_VER=		0.4.6
 DISTNAME=		ConsoleKit-${CONSOLEKIT_VER}
@@ -32,6 +32,8 @@ USE_LIBTOOL=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
+CONFIGURE_ARGS.SunOS+=	--enable-rbac-shutdown=solaris.system.shutdown
+
 # TODO
 #CONFIGURE_ARGS+=	--enable-pam-module
 #.include "../../mk/pam.buildlink3.mk"
@@ -52,10 +54,6 @@ post-install:
 		${DESTDIR}${PREFIX}/libexec/ck-get-x11-server-pid
 .endif
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--enable-rbac-shutdown=solaris.system.shutdown
-.endif
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/policykit/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index fa745a54315..0fdb239ec2b 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2016/01/31 09:20:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2016/02/26 10:24:11 jperkin Exp $
 
 .include "../../sysutils/coreutils/Makefile.common"
 
@@ -35,12 +35,10 @@ PLIST.stdbuf=		yes
 
 # Ensure libstdbuf.so has a valid library name otherwise REQUIRES will
 # record the relative path of the object output file.
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=		libname
+SUBST_CLASSES.Darwin+=	libname
 SUBST_STAGE.libname=	pre-configure
 SUBST_FILES.libname=	Makefile.in
 SUBST_SED.libname=	-e '/^src_libstdbuf_so_LDFLAGS/s,$$, -install_name ${PREFIX}/libexec/coreutils/glibstdbuf.so,'
-.endif
 
 PROGS=	[ base64 basename cat chcon chgrp chmod chown chroot cksum comm \
 	cp csplit cut date dd df dir dircolors dirname du hostid echo env \
diff --git a/sysutils/coreutils/Makefile.common b/sysutils/coreutils/Makefile.common
index ea0723e739c..b23bf14edbc 100644
--- a/sysutils/coreutils/Makefile.common
+++ b/sysutils/coreutils/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2016/02/16 11:54:12 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.15 2016/02/26 10:24:11 jperkin Exp $
 # used by sysutils/coreutils/Makefile
 # used by misc/gnuls/Makefile
 
@@ -35,13 +35,9 @@ TEST_TARGET=		check
 # Otherwise configure aborts when ran by root
 CONFIGURE_ENV+=		FORCE_UNSAFE_CONFIGURE=yes
 
-.if ${OPSYS} == "Interix"
-CONFIGURE_ENV+=		ac_list_mounted_fs=found
-.endif
+CONFIGURE_ENV.Interix+=	ac_list_mounted_fs=found
 
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ENV+= 	gl_cv_search_pthread_join=-lpthread
-.endif
+CONFIGURE_ENV.DragonFly+= 	gl_cv_search_pthread_join=-lpthread
 
 # Various tests rely on GCC's -O2 behaviour (e.g. -D__NO_INLINE__) and
 # without it we run into undefined symbol issues.
@@ -50,9 +46,7 @@ CFLAGS+=		-O2
 .endif
 
 # Explicitly disable inotify support whilst it is Linux-specific.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_func_inotify_init=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_func_inotify_init=no
 
 .if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
 CONFIGURE_ENV+=		ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes
diff --git a/sysutils/dbus-python-common/Makefile b/sysutils/dbus-python-common/Makefile
index 95ae7a8d7e1..96a4e65b1eb 100644
--- a/sysutils/dbus-python-common/Makefile
+++ b/sysutils/dbus-python-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/12/05 21:25:58 adam Exp $
+# $NetBSD: Makefile,v 1.9 2016/02/26 10:24:12 jperkin Exp $
 
 DISTNAME=	dbus-python-1.2.0
 PKGNAME=	dbus-python-common-1.2.0
@@ -22,10 +22,7 @@ USE_TOOLS+=	pkg-config gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --disable-html-docs --disable-api-docs
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-std=c9x
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-std=c9x
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/dbus-1.0/dbus
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index f4dc2e47eb8..b36d40b4898 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2016/02/09 15:24:07 mef Exp $
+# $NetBSD: Makefile,v 1.98 2016/02/26 10:24:12 jperkin Exp $
 
 DISTNAME=	dbus-1.10.6
 CATEGORIES=	sysutils
@@ -94,9 +94,7 @@ BUILDLINK_TRANSFORM+=	rm:-Wl,--gc-sections
 BUILDLINK_TRANSFORM+=	rm:-fPIE
 BUILDLINK_TRANSFORM+=	rm:-pie
 
-.if ${OPSYS} == "OpenBSD"
-BUILDLINK_TRANSFORM+=	rm:-lrt
-.endif
+BUILDLINK_TRANSFORM.OpenBSD+=	rm:-lrt
 
 .include "options.mk"
 
diff --git a/sysutils/dbus/options.mk b/sysutils/dbus/options.mk
index e00c3211165..967e78e0385 100644
--- a/sysutils/dbus/options.mk
+++ b/sysutils/dbus/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2015/09/07 23:24:46 gdt Exp $
+# $NetBSD: options.mk,v 1.10 2016/02/26 10:24:12 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbus
 PKG_SUPPORTED_OPTIONS+=	debug x11
@@ -13,11 +13,9 @@ PKG_SUPPORTED_OPTIONS+=	kqueue
 PKG_SUGGESTED_OPTIONS+=	kqueue
 .endif
 
-.if ${OPSYS} == "Darwin"
 # We may want to make it SUGGESTED once we have a framework for
 # launchd support. See PR/49591.
-PKG_SUPPORTED_OPTIONS+=	launchd
-.endif
+PKG_SUPPORTED_OPTIONS.Darwin+=	launchd
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index e0e0952b2e0..5a6792529af 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2014/10/09 14:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2016/02/26 10:24:12 jperkin Exp $
 #
 
 DISTNAME=		fam-2.7.0
@@ -58,9 +58,7 @@ MESSAGE_SRC=		${.CURDIR}/MESSAGE ${.CURDIR}/MESSAGE.kqueue
 CPPFLAGS.Darwin+=	-DNDEBUG
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
-.if ${OPSYS} == "SunOS"
-
-SUBST_CLASSES+=		sunfix
+SUBST_CLASSES.SunOS+=	sunfix
 SUBST_MESSAGE.sunfix=	Fixing ${OPSYS} namespace collision.
 SUBST_STAGE.sunfix=	pre-configure
 SUBST_FILES.sunfix+=	lib/Client.c++
@@ -70,7 +68,7 @@ SUBST_FILES.sunfix+=	src/Listener.c++
 SUBST_FILES.sunfix+=	src/TCP_Client.h
 SUBST_SED.sunfix=	-e 's/sun\([^_]\)/sa_un\1/g'
 
-SUBST_CLASSES+=		dirent
+SUBST_CLASSES.SunOS+=	dirent
 SUBST_MESSAGE.dirent=	Fixing old sys/dir.h usage.
 SUBST_STAGE.dirent=	pre-configure
 SUBST_FILES.dirent+=	src/Directory.c++
@@ -84,8 +82,6 @@ SUBST_SED.dirent+=	-e 's/struct direct/struct dirent/g'
 BUILDLINK_TRANSFORM+=	rm:-lstdc++
 .endif
 
-.endif
-
 post-extract:
 	${CP} ${FILESDIR}/IMonKQueue.c++ ${WRKSRC}/src
 	${CP} ${FILESDIR}/imon-compat.h ${WRKSRC}/src
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index a76fe628b5d..006de4dc866 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/05/23 13:11:07 bsiegert Exp $
+# $NetBSD: Makefile,v 1.36 2016/02/26 10:24:12 jperkin Exp $
 
 DISTNAME=		file-5.22
 PKGREVISION=		1
@@ -32,9 +32,7 @@ BUILDLINK_TRANSFORM+=	opt:-Wextra:-W
 BUILDLINK_TRANSFORM+=  rm:-Wunused-parameter
 .endif
 
-.if ${LOWER_OPSYS} == "aix"
-CFLAGS+=	-D_LINUX_SOURCE_COMPAT
-.endif
+CFLAGS.AIX+=	-D_LINUX_SOURCE_COMPAT
 
 .include "../../devel/zlib/buildlink3.mk"
 
diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile
index 9ca00a76032..67acc88b1bc 100644
--- a/sysutils/flashrom/Makefile
+++ b/sysutils/flashrom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/02/26 10:31:40 wiedi Exp $
+# $NetBSD: Makefile,v 1.9 2016/02/26 10:24:12 jperkin Exp $
 #
 
 DISTNAME=	flashrom-0.9.7
@@ -20,24 +20,21 @@ USE_TOOLS+= gmake pkg-config
 DEPENDS+=	dmidecode-[0-9]*:../../sysutils/dmidecode
 .endif
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
-
-SUBST_CLASSES+=	pciutils
+SUBST_CLASSES.NetBSD+=	pciutils
+SUBST_CLASSES.SunOS+=	pciutils
 SUBST_FILES.pciutils=	Makefile
 SUBST_FILES.pciutils+=	hwaccess.h
 SUBST_MESSAGE.pciutils=	adjusting pciutils headers
 SUBST_STAGE.pciutils=	pre-configure
 SUBST_SED.pciutils+= -e 's,<pci/pci.h>,<pciutils/pci.h>,g'
 
-LDFLAGS+= -lpci
-CPPFLAGS+= -I/${PREFIX}/include
-
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+LDFLAGS+=	-lpci
+CPPFLAGS+=	-I/${PREFIX}/include
 .endif
 
-LDFLAGS.SunOS+=	-lsocket -lnsl
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	WARNERROR=0
-.endif
+LDFLAGS.SunOS+=		-lsocket -lnsl
+MAKE_ENV.SunOS+=	WARNERROR=0
 
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
diff --git a/sysutils/genpasswd/Makefile b/sysutils/genpasswd/Makefile
index 058d7fc3946..e7c3027996c 100644
--- a/sysutils/genpasswd/Makefile
+++ b/sysutils/genpasswd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/03/14 14:19:52 kim Exp $
+# $NetBSD: Makefile,v 1.9 2016/02/26 10:24:12 jperkin Exp $
 #
 
 DISTNAME=		genpasswd-1.5
@@ -15,10 +15,6 @@ INSTALL_TARGET=		install install.man		\
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-BUILD_TARGET=	gcc
-.endif
+BUILD_TARGET.Darwin=	gcc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gio-fam/Makefile b/sysutils/gio-fam/Makefile
index 938e9555ff5..a9276efa63c 100644
--- a/sysutils/gio-fam/Makefile
+++ b/sysutils/gio-fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/06/12 10:51:13 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/26 10:24:12 jperkin Exp $
 
 PKGREVISION= 1
 .include "../../devel/glib2/Makefile.common"
@@ -20,12 +20,8 @@ CONFIGURE_ARGS+=	--enable-fam
 BUILD_DIRS=		gio/fam
 INSTALL_DIRS=		${BUILD_DIRS}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "IRIX"
-MAKE_FLAGS+=		FAM_LIBS="-lfam -lC"
-BUILDLINK_TRANSFORM+=	l:fam:fam:C
-.endif
+MAKE_FLAGS.IRIX+=		FAM_LIBS="-lfam -lC"
+BUILDLINK_TRANSFORM.IRIX+=	l:fam:fam:C
 
 .include "../../devel/glib2/modules.mk"
 .include "../../mk/fam.buildlink3.mk"
diff --git a/sysutils/gnome-vfs/options.mk b/sysutils/gnome-vfs/options.mk
index faac479c0c4..53bb0201fc8 100644
--- a/sysutils/gnome-vfs/options.mk
+++ b/sysutils/gnome-vfs/options.mk
@@ -1,16 +1,12 @@
-# $NetBSD: options.mk,v 1.6 2013/10/12 04:39:01 richard Exp $
+# $NetBSD: options.mk,v 1.7 2016/02/26 10:24:12 jperkin Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-vfs
 PKG_SUPPORTED_OPTIONS=	fam gssapi hal inet6 avahi
 PKG_SUGGESTED_OPTIONS=	fam hal inet6
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == NetBSD
 # Kerberos is built in - no additional dependency
-PKG_SUGGESTED_OPTIONS+= gssapi
-.endif
+PKG_SUGGESTED_OPTIONS.NetBSD+=	gssapi
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile
index d2bc88fc949..c09647704af 100644
--- a/sysutils/krusader/Makefile
+++ b/sysutils/krusader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2015/06/12 10:51:13 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2016/02/26 10:24:12 jperkin Exp $
 #
 
 DISTNAME=	krusader-1.90.0
@@ -18,11 +18,7 @@ SET_LIBDIR=	YES
 
 SHLIBTOOL_OVERRIDE=	# empty
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= --without-acl
-.endif
+CONFIGURE_ARGS.DragonFly+= --without-acl
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
index 55b91ddc3a5..29f93ce6aa7 100644
--- a/sysutils/libgtop/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2015/06/12 10:51:14 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2016/02/26 10:24:13 jperkin Exp $
 
 DISTNAME=		libgtop-2.28.4
 PKGREVISION=		8
@@ -42,13 +42,11 @@ PRINT_PLIST_AWK+=	/^bin\/libgtop_server2$$/ \
 PRINT_PLIST_AWK+=	/^include\/libgtop-2.0\/glibtop_suid.h$$/ \
 				{ print "$${LIBGTOP_SUID_H}" $$0; next }
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == NetBSD
-CONFIGURE_ENV+=	fu_cv_sys_mounted_getmntinfo=yes
+CONFIGURE_ENV.NetBSD+=	fu_cv_sys_mounted_getmntinfo=yes
 # needed since about 6.99.16
-CPPFLAGS+=	-D_KMEMUSER
-.endif
+CPPFLAGS.NetBSD+=	-D_KMEMUSER
+
+.include "../../mk/bsd.prefs.mk"
 
 INSTALL_MAKE_FLAGS+=	libgtop_postinstall=true
 PLIST_VARS+=	server suid.h
diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index b76b7528a56..361e6e57ca6 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/02/15 00:51:13 msaitoh Exp $
+# $NetBSD: Makefile,v 1.27 2016/02/26 10:24:13 jperkin Exp $
 
 DISTNAME=	pciutils-3.4.1
 PKGREVISION=	1
@@ -21,13 +21,9 @@ REPLACE_SH=		*.sh
 
 PKGCONFIG_OVERRIDE=	lib/libpci.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-PCIUTILS_LIBNAME=	pciutils
-.else
-PCIUTILS_LIBNAME=	pci
-.endif
+OPSYSVARS+=			PCIUTILS_LIBNAME
+PCIUTILS_LIBNAME.NetBSD=	pciutils
+PCIUTILS_LIBNAME.*=		pci
 
 PLIST_SUBST+=		PCIUTILS_LIBNAME=${PCIUTILS_LIBNAME}
 
@@ -37,12 +33,10 @@ SUBST_MESSAGE.pc=	Fixing library link specification in pkg-config file.
 SUBST_STAGE.pc=		pre-configure
 SUBST_VARS.pc=		PCIUTILS_LIBNAME
 
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES=		dns
+SUBST_CLASSES.SunOS+=	dns
 SUBST_MESSAGE.dns=	Disabling DNS support on Solaris
 SUBST_STAGE.dns=	pre-configure
 SUBST_FILES.dns=	Makefile
 SUBST_SED.dns=		-e 's/^DNS=/DNS=no/'
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-dbus/Makefile b/sysutils/py-dbus/Makefile
index 3c5876f7537..d55f692bcdf 100644
--- a/sysutils/py-dbus/Makefile
+++ b/sysutils/py-dbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:21 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/26 10:24:13 jperkin Exp $
 
 DISTNAME=	dbus-python-1.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python//}
@@ -19,10 +19,7 @@ PY_PATCHPLIST=			YES
 # py-expat is only needed at runtime
 DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-std=c9x
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-std=c9x
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index 24c36e27277..490d09a28e5 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2016/01/26 15:20:33 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.18 2016/02/26 10:24:13 jperkin Exp $
 # used by sysutils/rsyslog/Makefile
 # used by sysutils/rsyslog-dbi/Makefile
 # used by sysutils/rsyslog-elasticsearch/Makefile
@@ -27,9 +27,7 @@ PATCHDIR=		${.CURDIR}/../../sysutils/rsyslog/patches
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 CONFIGURE_ARGS+=	RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	ac_cv_func_epoll_create=no ac_cv_func_epoll_create1=no
-.endif
+CONFIGURE_ARGS.SunOS+=	ac_cv_func_epoll_create=no ac_cv_func_epoll_create1=no
 
 GNU_CONFIGURE=		yes
 
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index 162baf01ca3..4b1f9f2d5db 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/01/04 04:15:21 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2016/02/26 10:24:13 jperkin Exp $
 #
 
 DISTNAME=	skill-4.1.4
@@ -12,32 +12,22 @@ COMMENT=	Signal processes given user names, ttys, commands, or pids
 
 BROKEN_ON_PLATFORM+= Interix-*-* # currently no machdep support
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-MAKE_ENV+=	OSTYPE=nbsd-44
-.elif ${OPSYS} == "Darwin"
-MAKE_ENV+=	OSTYPE=nbsd-44
-.elif ${OPSYS} == "DragonFly"
-MAKE_ENV+=	OSTYPE=nbsd-44
-CPPFLAGS+=	-DHAS_STRERROR=1
-.elif ${OPSYS} == "SunOS"
-BINMODE=	02555
-MAKE_ENV+=	OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS=
-.elif ${OPSYS} == "FreeBSD"
-MAKE_ENV+=	OSTYPE=nbsd-44
-.elif ${OPSYS} == "Linux"
-MAKE_ENV+=	OSTYPE=linux-1
-CPPFLAGS+=	-DHAS_STRERROR=1
-.elif ${OPSYS} == "IRIX"
-MAKE_ENV+=	OSTYPE=irix5
-.elif ${OPSYS} == "OSF"
-MAKE_ENV+=	OSTYPE=mach-3
-.elif ${OPSYS} == "AIX"
-MAKE_ENV+=	OSTYPE=aix-3
-.elif ${OPSYS} == "HPUX"
-MAKE_ENV+=	OSTYPE=hpux-10
-.endif
+MAKE_ENV.AIX+=		OSTYPE=aix-3
+MAKE_ENV.Darwin+=	OSTYPE=nbsd-44
+MAKE_ENV.DragonFly+=	OSTYPE=nbsd-44
+MAKE_ENV.FreeBSD+=	OSTYPE=nbsd-44
+MAKE_ENV.HPUX+=		OSTYPE=hpux-10
+MAKE_ENV.IRIX+=		OSTYPE=irix5
+MAKE_ENV.Linux+=	OSTYPE=linux-1
+MAKE_ENV.NetBSD+=	OSTYPE=nbsd-44
+MAKE_ENV.OSF+=		OSTYPE=mach-3
+MAKE_ENV.SunOS+=	OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS=
+
+CPPFLAGS.DragonFly+=	-DHAS_STRERROR=1
+CPPFLAGS.Linux+=	-DHAS_STRERROR=1
+
+OPSYSVARS+=		BINMODE
+BINMODE.SunOS=		02555
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index 07ff38a0948..abda7259380 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/04/06 21:07:35 rodent Exp $
+# $NetBSD: Makefile,v 1.17 2016/02/26 10:24:13 jperkin Exp $
 #
 
 DISTNAME=		su2-1.3
@@ -25,14 +25,9 @@ SUBST_FILES.preproc=	su2.c
 SUBST_SED.preproc=	-e 's,^\(\# *else\).*,\1,'
 SUBST_SED.preproc=	-e 's,^\(\# *endif\).*,\1,'
 
+OPSYSVARS+=		LDLIBS
 LDLIBS=			-lcrypt
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-LDLIBS+=		-lcompat
-.endif
-
+LDLIBS.NetBSD+=		-lcompat
 MAKE_ENV+=		LDLIBS=${LDLIBS:Q}
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 0c09a290755..e9f0c1ca903 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/10/29 16:34:13 fhajny Exp $
+# $NetBSD: Makefile,v 1.24 2016/02/26 10:24:13 jperkin Exp $
 
 .include "../../sysutils/syslog-ng/Makefile.common"
 
@@ -6,11 +6,9 @@ CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ARGS+=	--enable-stomp
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--enable-dynamic-linking
-CONFIGURE_ARGS+=	--enable-sun-streams
-CPPFLAGS+=		-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
-.endif
+CONFIGURE_ARGS.SunOS+=	--enable-dynamic-linking
+CONFIGURE_ARGS.SunOS+=	--enable-sun-streams
+CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 
 .include "options.mk"
 
diff --git a/sysutils/syslog-ng/Makefile.common b/sysutils/syslog-ng/Makefile.common
index 04eaced834a..df609887f5d 100644
--- a/sysutils/syslog-ng/Makefile.common
+++ b/sysutils/syslog-ng/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.2 2016/02/26 10:24:13 jperkin Exp $
 # used by sysutils/syslog-ng/Makefile
 # used by sysutils/syslog-ng/Makefile.module
 
@@ -45,12 +45,8 @@ CONFIGURE_ARGS+=	--with-libmongo-client=no
 CONFIGURE_ARGS+=	--with-librabbitmq-client=no
 CONFIGURE_ARGS+=	--with-pidfile-dir=${VARBASE}/run
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--enable-dynamic-linking
-CPPFLAGS+=		-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
-.endif
+CONFIGURE_ARGS.SunOS+=	--enable-dynamic-linking
+CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 
 SUBST_CLASSES+=		unamepath
 SUBST_STAGE.unamepath=	post-configure
diff --git a/sysutils/systester/Makefile b/sysutils/systester/Makefile
index d3e00ff429e..91ef9caef1b 100644
--- a/sysutils/systester/Makefile
+++ b/sysutils/systester/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/25 14:24:55 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/26 10:24:13 jperkin Exp $
 
 DISTNAME=	systester-1.5.1
 PKGREVISION=	1
@@ -15,12 +15,8 @@ USE_LANGUAGES=	c c++
 
 MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR:Q}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
 # ftime()
-LDFLAGS+=	-lcompat
-.endif
+LDFLAGS.NetBSD+=	-lcompat
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile
index edf376e047a..17b927ba676 100644
--- a/sysutils/top/Makefile
+++ b/sysutils/top/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/03/03 00:38:08 pho Exp $
+# $NetBSD: Makefile,v 1.42 2016/02/26 10:24:14 jperkin Exp $
 
 DISTNAME=	top-3.6.1
 PKGREVISION=	1
@@ -20,13 +20,9 @@ CONFIGURE_ENV+=		SET_MODE=${BINMODE}
 BROKEN_ON_PLATFORM+=	Darwin-9.*-*
 BROKEN_ON_PLATFORM+=	Darwin-[1-9][0-9]*-*
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
 # ${WRKSRC}/configure emits an error saying "macosx module
 # unsupported" without this option.
-CONFIGURE_ARGS+=	--with-module=macosx
-.endif
+CONFIGURE_ARGS.Darwin+=	--with-module=macosx
 
 post-extract:
 	${CP} ${FILESDIR}/m_dragonfly.c ${WRKSRC}/machine
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 570494779fa..fc99c1a5b52 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/07/23 10:55:17 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2016/02/26 10:24:14 jperkin Exp $
 
 DISTNAME=	upower-0.99.3
 CATEGORIES=	sysutils
@@ -28,11 +28,8 @@ CONF_FILES+=		${EGDIR}/org.freedesktop.UPower.conf \
 PKGCONFIG_OVERRIDE+=	upower-glib.pc.in
 USE_PKGLOCALEDIR=	yes
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	opt:-Wl,--no-as-needed:-Wl,-zrecord
-BUILDLINK_TRANSFORM+=	opt:-Wl,--as-needed:-Wl,-zignore
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,--no-as-needed:-Wl,-zrecord
+BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,--as-needed:-Wl,-zignore
 
 TEST_TARGET=	check
 
diff --git a/sysutils/wipe/Makefile b/sysutils/wipe/Makefile
index 0527ac3d955..c453d2135f1 100644
--- a/sysutils/wipe/Makefile
+++ b/sysutils/wipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/10/09 14:06:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/02/26 10:24:14 jperkin Exp $
 #
 
 DISTNAME=		wipe-2.2.0
@@ -13,10 +13,6 @@ LICENSE=		gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	DEFINES="-Du_int32_t=uint32_t"
-.endif
+MAKE_ENV.SunOS+=	DEFINES="-Du_int32_t=uint32_t"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index 9e6c42fee36..27f134335d4 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/12/05 21:26:00 adam Exp $
+# $NetBSD: Makefile,v 1.29 2016/02/26 10:24:14 jperkin Exp $
 
 VERSION=		3.1.4
 DISTNAME=		xen-${VERSION}
@@ -64,13 +64,9 @@ SUBST_FILES.prefix=	python/xen/util/auxbin.py
 SUBST_FILES.prefix=	ioemu/vl.c
 SUBST_SED.prefix=	-e "s,@PREFIX@,${PREFIX},g"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-PROCPATH=		/kern
-.else
-PROCPATH=		/proc
-.endif
+OPSYSVARS+=		PROCPATH
+PROCPATH.NetBSD=	/kern
+PROCPATH.*=		/proc
 
 CONF_FILES_PERMS+=	${EGDIR}/qemu-ifup ${PKG_SYSCONFDIR}/scripts/qemu-ifup \
 			${ROOT_USER} ${ROOT_GROUP} 0755
diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile
index 6125ef9c0ce..f0d11f6de2f 100644
--- a/sysutils/xentools3/Makefile
+++ b/sysutils/xentools3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2015/12/05 21:26:00 adam Exp $
+# $NetBSD: Makefile,v 1.46 2016/02/26 10:24:14 jperkin Exp $
 
 VERSION=	3.1.4
 DISTNAME=	xen-${VERSION}
@@ -110,18 +110,15 @@ SUBST_FILES.prefix+=	python/xen/xend/osdep.py
 SUBST_FILES.prefix+=	misc/xen-python-path
 SUBST_SED.prefix=	-e "s,@PREFIX@,${PREFIX},g"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		proc
+SUBST_CLASSES.NetBSD+=	proc
 SUBST_STAGE.proc=	pre-configure
 SUBST_FILES.proc=	python/xen/xend/XendVnet.py
 SUBST_FILES.proc+=	xenstore/xs_lib.c
 SUBST_SED.proc=		-e "s|/proc|/kern|g"
-PROCPATH=		/kern
-.else
-PROCPATH=		/proc
-.endif
+
+OPSYSVARS+=		PROCPATH
+PROCPATH.NetBSD=	/kern
+PROCPATH.*=		/proc
 
 RCD_SCRIPTS=		xend xenbackendd xendomains
 FILES_SUBST+=		RCD_INTERPRETER=${PYTHONBIN:Q}
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile
index d6806f16485..c9719fc5f93 100644
--- a/sysutils/xentools33/Makefile
+++ b/sysutils/xentools33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2015/12/05 21:26:00 adam Exp $
+# $NetBSD: Makefile,v 1.49 2016/02/26 10:24:14 jperkin Exp $
 
 VERSION=	3.3.2
 DISTNAME=	xen-${VERSION}
@@ -115,17 +115,14 @@ SUBST_SED.prefix=	-e "s,@PREFIX@,${PREFIX},g"
 
 REPLACE_PYTHON+=	misc/xsview
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		proc
+SUBST_CLASSES.NetBSD+=	proc
 SUBST_STAGE.proc=	pre-configure
 SUBST_FILES.proc=	python/xen/xend/XendVnet.py
 SUBST_SED.proc=		-e "s|/proc|/kern|g"
-PROCPATH=		/kern
-.else
-PROCPATH=		/proc
-.endif
+
+OPSYSVARS+=		PROCPATH
+PROCPATH.NetBSD=	/kern
+PROCPATH.*=		/proc
 
 RCD_SCRIPTS=		xend xenbackendd xendomains
 FILES_SUBST+=		RCD_INTERPRETER=${PYTHONBIN:Q}
diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile
index 001ee91a659..e8bfa83636a 100644
--- a/sysutils/xentools41/Makefile
+++ b/sysutils/xentools41/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2016/01/07 17:55:55 bouyer Exp $
+# $NetBSD: Makefile,v 1.60 2016/02/26 10:24:14 jperkin Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include		"version.mk"
@@ -107,20 +107,19 @@ SUBST_FILES.conf+=	python/xen/xm/create.py
 SUBST_FILES.conf+=	ocaml/xenstored/define.ml
 SUBST_SED.conf=		-e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
 
-.include "../../mk/bsd.prefs.mk"
-
 XEND_SCRIPTS=		block vif-bridge vif-ip qemu-ifup hotplugpath.sh
 
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		proc
+SUBST_CLASSES.NetBSD+=	proc
 SUBST_STAGE.proc=	pre-configure
 SUBST_FILES.proc=	python/xen/xend/XendVnet.py
 SUBST_FILES.proc+=	ocaml/xenstored/define.ml
 SUBST_SED.proc=		-e "s|/proc|/kern|g"
-PROCPATH=		/kern
-.else
-PROCPATH=		/proc
-.endif
+
+OPSYSVARS+=		PROCPATH
+PROCPATH.NetBSD=	/kern
+PROCPATH.*=		/proc
+
+.include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		procdev
 SUBST_STAGE.procdev=	pre-configure
diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile
index 6178be1ecfb..bda70a27a6e 100644
--- a/sysutils/xentools42/Makefile
+++ b/sysutils/xentools42/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2016/01/07 17:53:58 bouyer Exp $
+# $NetBSD: Makefile,v 1.42 2016/02/26 10:24:14 jperkin Exp $
 
 VERSION=	4.2.5
 VERSION_IPXE=	1.0.0
@@ -142,20 +142,19 @@ SUBST_FILES.conf+=	python/xen/xm/create.py
 SUBST_FILES.conf+=	ocaml/xenstored/define.ml
 SUBST_SED.conf=		-e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
 
-.include "../../mk/bsd.prefs.mk"
-
 XEND_SCRIPTS=		block vif-bridge vif-ip qemu-ifup hotplugpath.sh
 
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		proc
+SUBST_CLASSES.NetBSD+=	proc
 SUBST_STAGE.proc=	pre-configure
 SUBST_FILES.proc=	python/xen/xend/XendVnet.py
 SUBST_FILES.proc+=	ocaml/xenstored/define.ml
 SUBST_SED.proc=		-e "s|/proc|/kern|g"
-PROCPATH=		/kern
-.else
-PROCPATH=		/proc
-.endif
+
+OPSYSVARS+=		PROCPATH
+PROCPATH.NetBSD=	/kern
+PROCPATH.*=		/proc
+
+.include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		procdev
 SUBST_STAGE.procdev=	pre-configure
diff --git a/sysutils/xentools45/Makefile b/sysutils/xentools45/Makefile
index 52c848e0034..3d1ba01d005 100644
--- a/sysutils/xentools45/Makefile
+++ b/sysutils/xentools45/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/02/08 21:23:09 abs Exp $
+# $NetBSD: Makefile,v 1.26 2016/02/26 10:24:14 jperkin Exp $
 
 VERSION=	4.5.2
 PKGREVISION=	1
@@ -109,19 +109,18 @@ SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf+=	ocaml/xenstored/define.ml
 SUBST_SED.conf=		-e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
 
-.include "../../mk/bsd.prefs.mk"
-
 XEND_SCRIPTS=		block vif-bridge vif-ip qemu-ifup hotplugpath.sh
 
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		proc
+SUBST_CLASSES.NetBSD+=	proc
 SUBST_STAGE.proc=	pre-configure
 SUBST_FILES.proc+=	ocaml/xenstored/define.ml
 SUBST_SED.proc=		-e "s|/proc|/kern|g"
-PROCPATH=		/kern
-.else
-PROCPATH=		/proc
-.endif
+
+OPSYSVARS+=		PROCPATH
+PROCPATH.NetBSD=	/kern
+PROCPATH.*=		/proc
+
+.include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		procdev
 SUBST_STAGE.procdev=	pre-configure
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index d3d84c746bc..dd34b2179ac 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2015/04/25 14:24:56 tnn Exp $
+# $NetBSD: Makefile,v 1.41 2016/02/26 10:24:14 jperkin Exp $
 
 PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -10,11 +10,7 @@ MASTER_SITES=	http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/
 HOMEPAGE=	http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
 COMMENT=	Xfce system load plugin
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
-MAKE_ENV+=	OS_LIBS=-lkinfo
-.endif
+MAKE_ENV.DragonFly+=	OS_LIBS=-lkinfo
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"