Use OPSYSVARS.

20 files changed, 61 insertions, 121 deletions

diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index b8fc4e0ec92..88305242b99 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.48 2016/02/23 14:40:36 tnn Exp $
+# $NetBSD: options.mk,v 1.49 2016/02/25 13:37:46 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=		llvm dri
@@ -66,9 +66,7 @@ CONFIGURE_ARGS+=	--disable-glx-tls
 .endif
 
 # DRI on Linux needs either sysfs or udev
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--enable-sysfs
-.endif
+CONFIGURE_ARGS.Linux+=	--enable-sysfs
 
 PLIST.dri=	yes
 
diff --git a/graphics/MesaLib7/Makefile b/graphics/MesaLib7/Makefile
index ed958195fee..143a936c1fd 100644
--- a/graphics/MesaLib7/Makefile
+++ b/graphics/MesaLib7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/12/05 21:25:45 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/25 13:37:46 jperkin Exp $
 
 DISTNAME?=	${MESA_DISTNAME}
 PKGNAME=	MesaLib7-${MESA_PKGVERSION}
@@ -54,11 +54,12 @@ MAKE_ENV+=		MAKE=${GMAKE:Q}
 CFLAGS+=	-D__FUNCTION__=__FILE__
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+=	-no-integrated-as -fvisibility=hidden
 .endif
 
+BUILDLINK_TRANSFORM.MirBSD+=	rm:-fvisibility=hidden
+
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 # XXX This is not quite enough: we will need to patch the makefile
 # because it bogusly tries to reuse objects for native tools and target
@@ -123,16 +124,6 @@ post-extract:
 pre-install:
 	${RM} -f ${WRKSRC}/include/GL/glu*.h
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+=	-no-integrated-as -fvisibility=hidden
-.endif
-
-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
-.endif
-
 .include "../../lang/python/tool.mk"
 BUILDLINK_DEPMETHOD.libxml2?=	build
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 7bbcf629df9..19e82341170 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2015/06/07 13:58:08 wiedi Exp $
+# $NetBSD: Makefile,v 1.65 2016/02/25 13:37:46 jperkin Exp $
 #
 
 DISTNAME=		aqsis-1.8.1
@@ -37,10 +37,7 @@ pre-configure:
 # cmake from issuing -ldl.
 #CMAKE_ARGS+=		-D CMAKE_DL_LIBS:STRING='${DL_LIBS}'
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-BUILDLINK_TRANSFORM+=	rm:-ldl
-.endif
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 
 #
 # Forcibly reprogram cmake's rpath substitution.
diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile
index 79d36a6e5bc..8ae6aaa5006 100644
--- a/graphics/asymptote/Makefile
+++ b/graphics/asymptote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/12/12 20:44:13 markd Exp $
+# $NetBSD: Makefile,v 1.21 2016/02/25 13:37:47 jperkin Exp $
 #
 
 DISTNAME=	asymptote-2.15
@@ -44,17 +44,14 @@ SUBST_FILES.python=	Makefile.in
 SUBST_MESSAGE.python=	Fixing path to python interpreter.
 SUBST_SED.python+=	-e "s|/usr/bin/env python|${PYTHONBIN:Q}|g"
 
+# DragonFly has stripped makeinfo in the base - without texi2dvi.
+OPSYSVARS+=			BUILD_DEPENDS
+BUILD_DEPENDS.DragonFly+=	gtexinfo-[0-9]*:../../devel/gtexinfo
+
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xasy.1x \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xasy.1
 
-.include "../../mk/bsd.prefs.mk"
-
-# DragonFly has stripped makeinfo in the base - without texi2dvi.
-.if ${OPSYS} == "DragonFly"
-BUILD_DEPENDS+=         gtexinfo-[0-9]*:../../devel/gtexinfo
-.endif
-
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/cairo/hacks.mk b/graphics/cairo/hacks.mk
index a4d7a97f73e..b08a8079a2d 100644
--- a/graphics/cairo/hacks.mk
+++ b/graphics/cairo/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.6 2012/08/04 04:00:49 riastradh Exp $
+# $NetBSD: hacks.mk,v 1.7 2016/02/25 13:37:47 jperkin Exp $
 
 .if !defined(CAIRO_HACKS_MK)
 CAIRO_HACKS_MK=	defined
@@ -16,9 +16,8 @@ BUILDLINK_TRANSFORM+=	rm:-flto
 .endif
 
 # Workaround so that pthread is found on MirBSD
-.if ${OPSYS} == "MirBSD"
-PTHREAD_CFLAGS=-fhonour-copts
-.endif
+OPSYSVARS+=		PTHREAD_CFLAGS
+PTHREAD_CFLAGS.MirBSD=	-fhonour-copts
 
 #
 # Workaround for "the pixman problem" with netbsd-5 native X. The
diff --git a/graphics/clutter/options.mk b/graphics/clutter/options.mk
index 77f338f1f85..03bad9eb6b3 100644
--- a/graphics/clutter/options.mk
+++ b/graphics/clutter/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2015/08/31 10:59:04 jperkin Exp $
+# $NetBSD: options.mk,v 1.10 2016/02/25 13:37:47 jperkin Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clutter
@@ -38,7 +38,5 @@ BUILDLINK_API_DEPENDS.libXcomposite+=	libXcomposite>=0.4
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
-.  if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--with-quartz-backend
-.  endif
+CONFIGURE_ARGS.Darwin+=	--with-quartz-backend
 .endif
diff --git a/graphics/cogl/options.mk b/graphics/cogl/options.mk
index 73daa56f4a5..d5d4a9bc59f 100644
--- a/graphics/cogl/options.mk
+++ b/graphics/cogl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/01/26 08:43:29 obache Exp $
+# $NetBSD: options.mk,v 1.4 2016/02/25 13:37:47 jperkin Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cogl
@@ -37,9 +37,9 @@ BUILDLINK_API_DEPENDS.libXrandr+=	libXrandr>=1.2
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS.Darwin+=	--with-quartz-image
 .include "../../mk/bsd.prefs.mk"
 .  if ${OPSYS} == Darwin
 PLIST.osx=		yes
-CONFIGURE_ARGS+=	--with-quartz-image
 .  endif
 .endif
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 1cdda6e008c..62ba5fa4c98 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2014/01/11 14:42:03 adam Exp $
+# $NetBSD: Makefile,v 1.43 2016/02/25 13:37:47 jperkin Exp $
 #
 
 DISTNAME=		cqcam-0.91
@@ -12,12 +12,10 @@ COMMENT=		Free Color QuickCam control program
 
 .include "../../mk/bsd.prefs.mk"
 
-#NOT_FOR_UNPRIVILEGED=	yes	# seems to need setuid for everything
-.if ${OPSYS} == "SunOS"
 # Tries to install a device driver with unrestricted access to all
 # hardware ports, which is also specific to i86pc platforms.
-NOT_FOR_UNPRIVILEGED=	yes
-.endif
+OPSYSVARS+=			NOT_FOR_UNPRIVILEGED
+NOT_FOR_UNPRIVILEGED.SunOS=	yes
 
 .if ${MACHINE_ARCH} != "i386"
 CONFIGURE_ARGS+=	--disable-asm
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 5d9ead917cf..9f5fe43b22c 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/10/10 01:58:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2016/02/25 13:37:47 jperkin Exp $
 
 DISTNAME=	darktable-1.2.3
 PKGREVISION=	12
@@ -49,9 +49,7 @@ GCC_REQD+=	4.2
 CFLAGS+=	-mstackrealign -msse2 -march=i686
 .endif
 
-.if ${OPSYS} == "NetBSD"
-CFLAGS+=	-D_NETBSD_SOURCE
-.endif
+CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
 CHECK_PORTABILITY_SKIP+= packaging/macosx/start
 
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 7d7728b95bc..eff68492e92 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/02/14 13:14:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2016/02/25 13:37:47 jperkin Exp $
 
 PKGREVISION=	2
 
@@ -34,10 +34,8 @@ PLIST_SRC+=	PLIST.Darwin
 .endif
 
 # Explicitly select cserve, avoids epoll/inotify.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--enable-evas-cserve
-CONFIGURE_ARGS+=	--disable-evas-cserve2
-.endif
+CONFIGURE_ARGS.SunOS+=	--enable-evas-cserve
+CONFIGURE_ARGS.SunOS+=	--disable-evas-cserve2
 
 LIBS.SunOS+=	-lsocket
 
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 31a64ae4965..6f3242078a0 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2016/01/10 21:16:33 bsiegert Exp $
+# $NetBSD: Makefile,v 1.102 2016/02/25 13:37:47 jperkin Exp $
 
 DISTNAME=	freetype-2.6.2
 PKGNAME=	${DISTNAME:S/-/2-/}
@@ -39,9 +39,7 @@ CFLAGS+=	-fno-strict-aliasing
 .endif
 
 # tell configure not to use unix-specific version of ftsystem.c on OpenBSD
-.if ${OPSYS} == "OpenBSD"
-CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=no
-.endif
+CONFIGURE_ENV.OpenBSD+=	ac_cv_func_mmap_fixed_mapped=no
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 CONFIGURE_ENV+=		CC_BUILD=${NATIVE_CC:Q}
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index 8f54101edb6..f7a857b56be 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:11 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2016/02/25 13:37:47 jperkin Exp $
 
 DISTNAME=	glitz-0.5.6
 PKGREVISION=	3
@@ -21,13 +21,9 @@ PLIST.agl=		yes
 CONFIGURE_ENV+=		AGL_LIBS="-framework AGL"
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-
 # This is for the benefit of the configure test; libglitz-glx already
 # links against libpthread.
-.if ${OPSYS} == "IRIX"
-BUILDLINK_TRANSFORM+=	l:GL:GL:pthread
-.endif
+BUILDLINK_TRANSFORM.IRIX+=	l:GL:GL:pthread
 
 .include "options.mk"
 
diff --git a/graphics/impress/Makefile b/graphics/impress/Makefile
index e9a67c4bae3..c01e7861352 100644
--- a/graphics/impress/Makefile
+++ b/graphics/impress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/09 12:11:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2016/02/25 13:37:47 jperkin Exp $
 #
 
 DISTNAME=	imp1.1b9
@@ -23,11 +23,7 @@ USE_LANGUAGES=	c++
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 INSTALLATION_DIRS+=	bin
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-static
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-static
 
 do-build:
 	cd ${WRKSRC} && make make_impress make_font3d
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 2f0e7b1d450..f15739dd33b 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/09/08 11:57:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2016/02/25 13:37:47 jperkin Exp $
 
 DISTNAME=	libcaca-0.99.beta18
 PKGNAME=	${DISTNAME:S/beta//}
@@ -27,11 +27,7 @@ CONFIG_SUB_OVERRIDE+=	.auto/config.sub
 
 CONFIGURE_ARGS+=	--disable-doc
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-LDFLAGS+=	-ldl
-.endif
+LDFLAGS.Linux+=	-ldl
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index b11a985c4b5..a013ea26df3 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2015/09/27 02:03:54 tnn Exp $
+# $NetBSD: Makefile,v 1.85 2016/02/25 13:37:47 jperkin Exp $
 
 DISTNAME=	librsvg-2.40.9
 PKGREVISION=	2
@@ -29,11 +29,7 @@ TEST_TARGET=		check
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.2.0
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.24.0
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-Bsymbolic
-.endif
+CONFIGURE_ARGS.Darwin+=	--disable-Bsymbolic
 
 BUILDLINK_DEPMETHOD.gobject-introspection+=	build
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 256df795b97..fa1b03251c3 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.204 2015/06/12 10:50:11 wiz Exp $
+# $NetBSD: Makefile,v 1.205 2016/02/25 13:37:47 jperkin Exp $
 
 DISTNAME=	netpbm-10.68.02
 CATEGORIES=	graphics
@@ -51,16 +51,15 @@ SUBST_SED.rgb_txt+=	-e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.t
 # only used if NEED_RUNTIME_PATH is set, so set it unconditionally
 MAKE_FLAGS+=	NETPBMLIB_RUNTIME_PATH=${PREFIX}
 
-.if ${OPSYS} == "NetBSD"
-MAKE_FLAGS+=	NEED_RUNTIME_PATH=Y
-.elif ${OPSYS} == "Darwin"
-MAKE_FLAGS+=	NETPBMLIBTYPE=dylib
-MAKE_FLAGS+=	NETPBMLIBSUFFIX=dylib
-.elif ${OPSYS} == "SunOS"
-MAKE_FLAGS+=	LDSHLIB=-shared
-MAKE_FLAGS+=	NEED_RUNTIME_PATH=Y
-MAKE_FLAGS+=	NETWORKLD="-lsocket -lnsl"
-.elif ${OS_VARIANT} == "SCOOSR5"
+OPSYSVARS+=		MAKE_FLAGS
+MAKE_FLAGS.NetBSD+=	NEED_RUNTIME_PATH=Y
+MAKE_FLAGS.Darwin+=	NETPBMLIBTYPE=dylib
+MAKE_FLAGS.Darwin+=	NETPBMLIBSUFFIX=dylib
+MAKE_FLAGS.SunOS+=	LDSHLIB=-shared
+MAKE_FLAGS.SunOS+=	NEED_RUNTIME_PATH=Y
+MAKE_FLAGS.SunOS+=	NETWORKLD="-lsocket -lnsl"
+
+.if ${OS_VARIANT} == "SCOOSR5"
 MAKE_FLAGS+=	NETWORKLD="-lsocket -lresolv"
 .endif
 
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index 81b29b715f9..21457706276 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/04/25 14:23:17 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/25 13:37:48 jperkin Exp $
 
 DISTNAME=	OpenCSG-1.3.2
 PKGNAME=	${DISTNAME:tl}
@@ -18,17 +18,14 @@ BUILD_DIRS=		src
 
 INSTALLATION_DIRS=	include lib
 
+LDFLAGS.Darwin+=	-framework OpenGL
+LDFLAGS.*+=		-lGL -lGLU -lXmu
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/* ${DESTDIR}${PREFIX}/include/
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/src/libopencsg.la ${DESTDIR}${PREFIX}/lib
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-LDFLAGS+=	-framework OpenGL
-.else
-LDFLAGS+=	-lGL -lGLU -lXmu
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pfstools/options.mk b/graphics/pfstools/options.mk
index c938ade258f..d10be5a7958 100644
--- a/graphics/pfstools/options.mk
+++ b/graphics/pfstools/options.mk
@@ -1,15 +1,11 @@
-# $NetBSD: options.mk,v 1.3 2015/08/25 20:16:31 adam Exp $
+# $NetBSD: options.mk,v 1.4 2016/02/25 13:37:48 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pfstools
 PKG_SUPPORTED_OPTIONS=	imagemagick octave qt opengl
 
-PLIST_VARS+=	im octave qt gl
-
-.include "../../mk/bsd.prefs.mk"
+PKG_SUGGESTED_OPTIONS.Darwin+=	opengl
 
-.if ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS+=	opengl
-.endif
+PLIST_VARS+=	im octave qt gl
 
 .include "../../mk/bsd.options.mk"
 
@@ -48,9 +44,7 @@ CMAKE_ARGS+=	-DWITH_QT=NO
 .include "../../graphics/glut/buildlink3.mk"
 .  endif
 # XXX nasty hack
-.  if ${OPSYS} == "NetBSD"
-CXXFLAGS+=	-lpthread
-.  endif
+CXXFLAGS.NetBSD+=	-lpthread
 PLIST.gl=	yes
 CMAKE_ARGS+=	-DWITH_pfsglview=YES
 .else
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 4c9f9c6e9f9..b7e7ab0a26b 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2015/04/30 11:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.85 2016/02/25 13:37:48 jperkin Exp $
 
 DISTNAME=	tuxpaint-0.9.22
 PKGREVISION=	1
@@ -39,11 +39,7 @@ CONF_FILES=		${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
 INSTALL_MAKE_FLAGS+=	PKG_ROOT=${DESTDIR}
 INSTALL_MAKE_FLAGS+=	CONFDIR=${DESTDIR}${PREFIX}/share/examples/tuxpaint
 
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS+=		-DHAVE_STRCASESTR
-.endif
+CPPFLAGS.NetBSD+=	-DHAVE_STRCASESTR
 
 # this uses iconv and png functions directly, so link against them
 # explicitly.
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index cde4e2b50d4..30bfa48a1e5 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2015/11/22 19:17:01 tsutsui Exp $
+# $NetBSD: Makefile,v 1.89 2016/02/25 13:37:48 jperkin Exp $
 
 DISTNAME=	xv-3.10a
 PKGREVISION=	22
@@ -44,15 +44,13 @@ INSTALLATION_DIRS+= share/doc/xv
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+=		ccflags
+SUBST_CLASSES.SunOS+=	ccflags
 SUBST_FILES.ccflags=	Makefile
 SUBST_SED.ccflags=	-e 's| CC = .*| CC = ${CC:Q}|'
 SUBST_SED.ccflags+=	-e 's| CCOPTIONS = .*| CCOPTIONS = ${CFLAGS:Q}|'
 SUBST_SED.ccflags+=	-e 's| CDEBUGFLAGS = .*| CDEBUGFLAGS =|'
 SUBST_STAGE.ccflags=	post-configure
 SUBST_MESSAGE.ccflags=	Fixing compiler flags for Solaris.
-.endif
 
 .if ${OPSYS} == "SunOS" || !empty(MACHINE_PLATFORM:MIRIX-5*)
 CPPFLAGS+=	-DNEED_ALLOCA_H