Remove manual OPSYSVARS additions which are now part of the default set.

30 files changed, 33 insertions, 80 deletions

diff --git a/devel/ecore/Makefile b/devel/ecore/Makefile
index 87ff5b07573..0bb104eb1a2 100644
--- a/devel/ecore/Makefile
+++ b/devel/ecore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/04/23 09:18:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/25 08:27:02 jperkin Exp $
 #
 
 DISTNAME=	ecore-1.7.7
@@ -16,8 +16,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
-OPSYSVARS+=	CONFIGURE_ARGS
-
 CONFIGURE_ARGS+=	--disable-ecore-directfb \
 			--enable-ecore-desktop \
 			--disable-ecore-evas-sdl
diff --git a/devel/libev/Makefile b/devel/libev/Makefile
index f8ff2a6badf..1a0d35b543c 100644
--- a/devel/libev/Makefile
+++ b/devel/libev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/10/17 09:53:31 adam Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/25 08:27:03 jperkin Exp $
 
 DISTNAME=	libev-4.20
 CATEGORIES=	devel
@@ -17,7 +17,4 @@ CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/ev
 CONFIGURE_ENV.SunOS+=	ac_cv_header_sys_inotify_h=no
 #TEST_TARGET=	verify
 
-OPSYSVARS+=	CONFIGURE_ENV
-
-#.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmowgli/Makefile b/devel/libmowgli/Makefile
index 70d15d95677..b043f7393bf 100644
--- a/devel/libmowgli/Makefile
+++ b/devel/libmowgli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/04/23 09:24:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/25 08:27:03 jperkin Exp $
 #
 
 DISTNAME=	libmowgli-0.7.1
@@ -18,8 +18,6 @@ USE_TOOLS+=	pkg-config
 
 PKGCONFIG_OVERRIDE+=	libmowgli.pc.in
 
-OPSYSVARS+=	CONFIGURE_ENV
-
 # Explicitly disable epoll on illumos, provided for Linux compat only.
 CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_ctl=no
 
diff --git a/devel/p5-EV/Makefile b/devel/p5-EV/Makefile
index 4144af6cc82..f9636218e7e 100644
--- a/devel/p5-EV/Makefile
+++ b/devel/p5-EV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/07/27 14:30:34 mef Exp $
+# $NetBSD: Makefile,v 1.20 2016/02/25 08:27:03 jperkin Exp $
 
 DISTNAME=	EV-4.21
 PKGNAME=	p5-${DISTNAME}
@@ -16,8 +16,6 @@ DEPENDS+=	p5-Canary-Stability-[0-9]*:../../devel/p5-Canary-Stability
 MAKE_ENV+=	PERL_MM_USE_DEFAULT=1
 PERL5_PACKLIST=	auto/EV/.packlist
 
-OPSYSVARS+=	MAKE_ENV
-
 # Explicitly disable epoll and inotify on illumos, assumes Linux statfs.
 MAKE_ENV.SunOS+=	EV_EPOLL=0 EV_INOTIFY=0
 
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 0cf575809ed..bd9d31fb071 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/04/25 14:20:43 tnn Exp $
+# $NetBSD: Makefile,v 1.25 2016/02/25 08:27:03 jperkin Exp $
 #
 
 DISTNAME=	scite339
@@ -20,8 +20,6 @@ USE_TOOLS+=	gmake pkg-config
 MAKE_FILE=	makefile
 INSTALLATION_DIRS= share/applications share/pixmaps
 
-OPSYSVARS+=	BUILDLINK_TRANSFORM
-
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=lua.vers
 
 post-extract:
diff --git a/games/tanked/Makefile b/games/tanked/Makefile
index 886e7d51375..4f81e56ed71 100644
--- a/games/tanked/Makefile
+++ b/games/tanked/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/09/23 18:55:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2016/02/25 08:27:03 jperkin Exp $
 #
 
 DISTNAME=		tanked-0.90
@@ -16,7 +16,6 @@ USE_TOOLS=		imake
 SETGIDGAME=		yes
 INSTALLATION_DIRS+=	bin
 
-OPSYSVARS+=		MAKE_ENV
 MAKE_ENV.SunOS+=	EXTRALIBS="-lsocket -lnsl"
 
 SPECIAL_PERMS=		bin/tanked ${SETGID_GAMES_PERMS}
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 6abbf426881..086b8fe1eea 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2015/02/08 23:04:22 snj Exp $
+# $NetBSD: Makefile,v 1.41 2016/02/25 08:27:03 jperkin Exp $
 
 DISTNAME=	jasper-1.900.1
 PKGREVISION=	10
@@ -18,7 +18,6 @@ CONFIGURE_ARGS+=	--enable-shared --without-x --disable-opengl
 
 # The solaris stdbool.h requires c99 which is fine for jasper, but
 # not so good for things that depend upon jasper.  See PR#43901
-OPSYSVARS+=		CONFIGURE_ENV
 CONFIGURE_ENV.SunOS+=	ac_cv_header_stdbool_h=no
 
 INSTALLATION_DIRS+=	share/doc/jasper
diff --git a/graphics/opencv-contrib-face/Makefile b/graphics/opencv-contrib-face/Makefile
index 1d79a626d3c..c25c2a1dcaf 100644
--- a/graphics/opencv-contrib-face/Makefile
+++ b/graphics/opencv-contrib-face/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/02/24 17:33:48 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/25 08:27:03 jperkin Exp $
 
 DISTNAME=	opencv_contrib-3.1.0
 PKGNAME=	${DISTNAME:S/_contrib/-contrib-face/}
@@ -34,7 +34,6 @@ CMAKE_ARGS+=	-D BUILD_DOCS=OFF
 CXXFLAGS+=		-std=c++11
 .endif
 
-OPSYSVARS+=		CMAKE_ARGS
 CMAKE_ARGS+=		-DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
 CMAKE_ARGS.SunOS+=	-DENABLE_PRECOMPILED_HEADERS=NO
 
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 48df7c73dda..65aeba59619 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2016/02/21 14:10:46 fhajny Exp $
+# $NetBSD: Makefile,v 1.61 2016/02/25 08:27:03 jperkin Exp $
 
 DISTNAME=	opencv-3.1.0
 CATEGORIES=	graphics devel
@@ -34,7 +34,6 @@ CHECK_WRKREF_SKIP=	${PREFIX}/lib/libopencv_core.*
 CXXFLAGS+=		-std=c++11
 .endif
 
-OPSYSVARS+=		CMAKE_ARGS
 CMAKE_ARGS+=		-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
 CMAKE_ARGS+=		-DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
 CMAKE_ARGS.SunOS+=	-DENABLE_PRECOMPILED_HEADERS=NO
diff --git a/graphics/opencv2/Makefile b/graphics/opencv2/Makefile
index ab58c5ab07c..11119aa3a3f 100644
--- a/graphics/opencv2/Makefile
+++ b/graphics/opencv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/11/18 14:19:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2016/02/25 08:27:03 jperkin Exp $
 
 DISTNAME=	opencv-2.4.11
 PKGREVISION=	1
@@ -37,7 +37,6 @@ CHECK_WRKREF_SKIP=	${PREFIX}/lib/libopencv_core.*
 CXXFLAGS+=	-std=c++11
 .endif
 
-OPSYSVARS+=		CMAKE_ARGS
 CMAKE_ARGS+=		-DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
 CMAKE_ARGS.SunOS+=	-DENABLE_PRECOMPILED_HEADERS=NO
 
diff --git a/inputmethod/qt5-uim/Makefile b/inputmethod/qt5-uim/Makefile
index d3a0e199d10..0bc5ffcccef 100644
--- a/inputmethod/qt5-uim/Makefile
+++ b/inputmethod/qt5-uim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/10/10 01:58:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/25 08:27:03 jperkin Exp $
 
 .include "../../x11/qt5/Makefile.common"
 
@@ -26,8 +26,6 @@ USE_LANGUAGES=	c c++
 PKGCONFIG_OVERRIDE+=	uim.pc.in
 
 CONFIGURE_ENV+=		QMAKE5=${QTPREFIX}/bin/qmake
-
-OPSYSVARS+=		CONFIGURE_ENV
 CONFIGURE_ENV.SunOS+=	ac_cv_func_strcasecmp=yes
 
 CONFIGURE_ARGS+=	--with-qt5-immodule
diff --git a/inputmethod/scim-python/Makefile b/inputmethod/scim-python/Makefile
index 127afadc964..704dda91650 100644
--- a/inputmethod/scim-python/Makefile
+++ b/inputmethod/scim-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/12/05 21:25:47 adam Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/25 08:27:03 jperkin Exp $
 
 DISTNAME=	scim-python-0.1.13rc1
 PKGREVISION=	23
@@ -20,8 +20,6 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config msgfmt
 
-OPSYSVARS+=	BUILDLINK_TRANSFORM
-
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./scim.version-script
 
 # taken from ${WRKSRC}/python/engine/PinYin/Makefile.in
diff --git a/lang/LuaJIT/Makefile b/lang/LuaJIT/Makefile
index 7a8e38dd49e..ade7bb83fc3 100644
--- a/lang/LuaJIT/Makefile
+++ b/lang/LuaJIT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/01/04 08:03:50 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/25 08:27:03 jperkin Exp $
 #
 
 DISTNAME=	LuaJIT-1.1.5
@@ -18,9 +18,6 @@ USE_TOOLS+=	gmake
 
 MAKE_FLAGS+=	INSTALL_TOP=${PREFIX}
 
-.include "../../mk/bsd.prefs.mk"
-
-OPSYSVARS+=		BUILD_TARGET
 BUILD_TARGET.Linux=	linux
 BUILD_TARGET.FreeBSD=	bsd
 BUILD_TARGET.NetBSD=	bsd
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index f68b8dc914d..332b92f8039 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2015/12/27 12:36:37 adam Exp $
+# $NetBSD: Makefile,v 1.82 2016/02/25 08:27:03 jperkin Exp $
 #
 # when updating to a new release, update ABI depends in
 # the buildlink3.mk file as well, since the plugins' version
@@ -20,8 +20,6 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR}
 
-OPSYSVARS+=	CONFIGURE_ENV
-
 TEST_TARGET=	check
 
 # Explicitly disable inotify on illumos, it is provided for Linux compat only.
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 10316bd00af..084a9715784 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2014/07/18 10:40:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.142 2016/02/25 08:27:04 jperkin Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -34,9 +34,6 @@ MAKE_JOBS_SAFE=	no
 
 .include "../../mk/bsd.prefs.mk"
 
-# Each platform has its own special target in the imap Makefiles.
-OPSYSVARS+=		BUILD_TARGET
-
 .include "../../mk/compiler.mk"
 .  if empty(CC_VERSION:Mgcc-)
 BUILD_TARGET.SunOS=	soc
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index fa7a5eb2790..bdcc7420b43 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2014/10/09 14:06:45 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=	libIDL-0.8.14
 PKGREVISION=	4
@@ -20,7 +20,6 @@ INFO_FILES=		yes
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
-OPSYSVARS+=		CONFIGURE_ENV
 CONFIGURE_ENV.SunOS+=	CPP=/usr/lib/cpp
 .endif
 
diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile
index 03170609651..0f4885ead0d 100644
--- a/net/tnftp/Makefile
+++ b/net/tnftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2015/10/04 14:44:06 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=		tnftp-20151004
 CATEGORIES=		net
@@ -19,9 +19,7 @@ BOOTSTRAP_PKG=		yes
 GNU_CONFIGURE=		yes
 CHECK_PERMS=		no
 
-OPSYSVARS+=		MAKE_ENV
 MAKE_ENV.SunOS+=	CPPFLAGS=""
-
 MAKE_ENV+=		CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
 MAKE_ENV+=		MANINSTALL=${MANINSTALL:Q}
 
diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile
index 84d75a92bba..0d20b150085 100644
--- a/net/tnftpd/Makefile
+++ b/net/tnftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/02/24 08:58:56 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=		tnftpd-20130325
 CATEGORIES=		net
@@ -25,7 +25,6 @@ CONF_FILES+=		${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers
 
 .include "options.mk"
 
-OPSYSVARS+=		MAKE_ENV
 MAKE_ENV.SunOS+=	CPPFLAGS=""
 
 EXAMPLEDIR=		${PREFIX}/share/examples/tnftpd
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 1154b952ffa..10072b6279e 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2015/10/10 01:57:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.117 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=	heimdal-1.5.3
 PKGREVISION=	10
@@ -53,7 +53,6 @@ CFLAGS.Darwin+=		-DBIND_8_COMPAT
 
 # Though Solaris has a <vis.h> header, it does something very unrelated
 # to the BSD <vis.h> header.
-OPSYSVARS+=		CONFIGURE_ENV
 CONFIGURE_ENV.SunOS+=	ac_cv_header_vis_h=no
 
 .include "../../mk/readline.buildlink3.mk"
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 64e7c4f7135..09911f2b7ff 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2015/09/25 16:26:15 richard Exp $
+# $NetBSD: Makefile,v 1.76 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=		hal-0.5.14
 PKGREVISION=		17
@@ -74,7 +74,6 @@ PLIST_SRC=		PLIST
 
 CFLAGS.SunOS+=		-Du_int32_t=uint32_t
 
-OPSYSVARS+=	BUILDLINK_TRANSFORM
 BUILDLINK_TRANSFORM.Darwin+=	rm:-Wl,--as-needed
 BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,--as-needed:-Wl,-zignore
 
diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index 51af8361690..d1f01ff6668 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/10/09 14:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/02/25 08:27:04 jperkin Exp $
 #
 
 DISTNAME=		ipmitool-1.8.11
@@ -13,10 +13,9 @@ COMMENT=		Command-line utility for managing IPMI devices
 GNU_CONFIGURE=		yes
 INSTALLATION_DIRS+=	share/examples/ipmitool share/doc/ipmitool
 
-OPSYSVARS+=		CONFIGURE_ARGS
-CONFIGURE_ARGS.NetBSD+=	--disable-intf-open --disable-intf-imb
-CONFIGURE_ARGS.DragonFly+= --disable-intf-open --disable-intf-imb
-CONFIGURE_ARGS.SunOS+=	--enable-solaris-opt
+CONFIGURE_ARGS.NetBSD+=		--disable-intf-open --disable-intf-imb
+CONFIGURE_ARGS.DragonFly+=	--disable-intf-open --disable-intf-imb
+CONFIGURE_ARGS.SunOS+=		--enable-solaris-opt
 
 # ipmitool uses rl_event_hook
 .include "../../devel/readline/buildlink3.mk"
diff --git a/sysutils/logrot/Makefile b/sysutils/logrot/Makefile
index 4fa5568b1a2..1498ed9622a 100644
--- a/sysutils/logrot/Makefile
+++ b/sysutils/logrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/02/24 08:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=	logrot-1.7
 CATEGORIES=	sysutils
@@ -10,7 +10,6 @@ COMMENT=	Rotate log files in a safe and configurable manner
 
 GNU_CONFIGURE=	YES
 
-OPSYSVARS+=		CONFIGURE_ARGS
 CONFIGURE_ARGS.NetBSD+=	--with-pidfile=/var/run/syslogd.pid
 
 INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin \
diff --git a/textproc/libpinyin/Makefile b/textproc/libpinyin/Makefile
index 4bace70438f..34472b3372c 100644
--- a/textproc/libpinyin/Makefile
+++ b/textproc/libpinyin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/03/15 19:51:08 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=	libpinyin-1.0.0
 CATEGORIES=	textproc chinese
@@ -16,8 +16,6 @@ USE_LIBTOOL=	yes
 
 PKGCONFIG_OVERRIDE+=	libpinyin.pc.in
 
-OPSYSVARS+=	BUILDLINK_TRANSFORM
-
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./libpinyin.ver
 
 .include "../../databases/db4/buildlink3.mk"
diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index b6a88e93991..6d3c4a9d2f9 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/02/21 12:39:35 khorben Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=	Surfer-0.2.10
 PKGNAME=	deforaos-surfer-0.2.10
@@ -22,7 +22,6 @@ MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 AUTO_MKDIRS=	yes
 
-OPSYSVARS+=		MAKE_ENV
 MAKE_ENV.SunOS+=	LDFLAGSF="-lnsl -lresolv"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/libproxy/Makefile b/www/libproxy/Makefile
index fb5b11802df..4802e1f9c23 100644
--- a/www/libproxy/Makefile
+++ b/www/libproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/02/01 15:02:16 leot Exp $
+# $NetBSD: Makefile,v 1.26 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=	libproxy-0.4.12
 CATEGORIES=	www gnome
@@ -16,8 +16,6 @@ USE_LANGUAGES=	c99 c++
 CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=OFF
 CMAKE_ARGS+=	-DWITH_KDE4=OFF
 
-OPSYSVARS+=	CMAKE_ARGS
-
 # Need socket libraries on SunOS for both the shared library and test programs.
 CMAKE_ARGS.SunOS+=	-DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib"
 CMAKE_ARGS.SunOS+=	-DCMAKE_SHARED_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib"
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 373edf4d66e..8e9477839f8 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.180 2016/02/22 16:13:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.181 2016/02/25 08:27:04 jperkin Exp $
 
 DISTNAME=		gnome-panel-2.32.1
 PKGREVISION=		45
@@ -53,7 +53,6 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-panel
 PKG_SUPPORTED_OPTIONS=	evolution
 PKG_SUGGESTED_OPTIONS=	evolution
 
-OPSYSVARS+=		SUBST_CLASSES
 SUBST_CLASSES.Darwin+=	noundef
 SUBST_STAGE.noundef=	pre-configure
 SUBST_FILES.noundef=	bonobo/panel-module/Makefile.in
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index 6579a2540e7..1ec12d9a78e 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2016/02/22 19:59:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2016/02/25 08:27:05 jperkin Exp $
 
 DISTNAME=	kactivities-4.13.3
 PKGREVISION=	2
@@ -11,7 +11,6 @@ MASTER_SITES=	${MASTER_SITE_KDE:=4.13.3/src/}
 # Needs C++11 features for kactivitymanager
 GCC_REQD+=	4.5
 
-OPSYSVARS+=	CMAKE_ARGS
 CMAKE_ARGS+=	-DWITH_NepomukCore:BOOL=OFF
 
 # The default MACOSX_DEPLOYMENT_TARGET is incompatible with the C++11 tests.
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index e30cab7b901..a7aa94cd29d 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/12/02 09:53:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/25 08:27:05 jperkin Exp $
 
 DISTNAME=	libxkbcommon-0.5.0
 CATEGORIES=	x11
@@ -16,8 +16,6 @@ USE_LIBTOOL=	yes
 
 PKGCONFIG_OVERRIDE+=	xkbcommon.pc.in
 
-OPSYSVARS+=	BUILDLINK_TRANSFORM
-
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./xkbcommon.map
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./xkbcommon-x11.map
 
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index bbde0812122..6c17d9a48ff 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2015/07/04 16:18:42 joerg Exp $
+# $NetBSD: Makefile.common,v 1.41 2016/02/25 08:27:05 jperkin Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -38,7 +38,6 @@ CONFIGURE_ARGS+=	-prefix "${QTPREFIX}"
 CONFIGURE_ARGS+=	${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
 CONFIGURE_ARGS+=	-opensource -confirm-license
 CONFIGURE_ARGS+=	-sysconfdir "${PKG_SYSCONFDIR}/xdg"
-OPSYSVARS+=		CONFIGURE_ARGS
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile
index 4aee411072c..fd6f41110c5 100644
--- a/x11/qt5-qtbase/Makefile
+++ b/x11/qt5-qtbase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/02/04 10:41:12 markd Exp $
+# $NetBSD: Makefile,v 1.31 2016/02/25 08:27:05 jperkin Exp $
 
 DISTNAME=	qtbase-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtbase-${QTVERSION}
@@ -43,7 +43,6 @@ CONFIGURE_ARGS+=	-system-libpng
 CONFIGURE_ARGS+=	-system-pcre
 CONFIGURE_ARGS+=	-system-sqlite
 CONFIGURE_ARGS+=	-system-zlib
-OPSYSVARS+=		CONFIGURE_ARGS
 
 .include "../../mk/bsd.prefs.mk"