Use OPSYSVARS.

16 files changed, 45 insertions, 95 deletions

diff --git a/multimedia/dvdview/Makefile b/multimedia/dvdview/Makefile
index bbf3056cbf2..3f676b5b777 100644
--- a/multimedia/dvdview/Makefile
+++ b/multimedia/dvdview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/02/16 11:23:31 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/25 15:49:43 jperkin Exp $
 
 DISTNAME=	dvdview-1.2.2
 PKGREVISION=	10
@@ -13,13 +13,8 @@ GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == SunOS)
-MAKE_ENV+=	RTLIB=-lrt
-.else
-MAKE_ENV+=	RTLIB=
-.endif
+MAKE_ENV.SunOS+=	RTLIB=-lrt
+MAKE_ENV.*+=		RTLIB=
 
 INSTALLATION_DIRS+=	share/doc/dvdview
 
diff --git a/multimedia/gst-plugins0.10-base/plugins.mk b/multimedia/gst-plugins0.10-base/plugins.mk
index 2cebd00797b..71b4ac1c566 100644
--- a/multimedia/gst-plugins0.10-base/plugins.mk
+++ b/multimedia/gst-plugins0.10-base/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.11 2014/05/05 21:21:47 ryoon Exp $
+# $NetBSD: plugins.mk,v 1.12 2016/02/25 15:49:43 jperkin Exp $
 #
 # This file is shared across the gst-plugins-{base,good} packages to
 # simplify their code.  It provides a framework to write simple packages
@@ -76,12 +76,10 @@ SUBST_SED.libs=		-e 's|$$(top_builddir)/gst-libs/gst/.*/libgst|${BUILDLINK_PREFI
 .include "../../multimedia/gst-plugins0.10-${GST_PLUGINS0.10_TYPE}/buildlink3.mk"
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "OpenBSD"
 # libtool(1) of /usr/bin/libtool is required to build gstreamer 0.10.
 # I have no idea how to fix the build with libtool-base from pkgsrc...
 # https://bugzilla.gnome.org/show_bug.cgi?id=726518
-SUBST_CLASSES+=			fix-libtool
+SUBST_CLASSES.OpenBSD+=		fix-libtool
 SUBST_STAGE.fix-libtool=	pre-configure
 SUBST_MESSAGE.fix-libtool=	Fix libtool path
 .for _d_ in pbutils audio app video fft cdda rtsp sdp riff tag interfaces rtp netbuffer
@@ -89,7 +87,6 @@ SUBST_FILES.fix-libtool+=	gst-libs/gst/${_d_}/Makefile.in
 .endfor
 #SUBST_SED.fix-libtool=		-e 's,--libtool=\"$$(top_builddir)/libtool\",--libtool=\"$${LIBTOOL}\",g'
 SUBST_SED.fix-libtool=		-e 's,--libtool=\"$$(top_builddir)/libtool\",--libtool=\"/usr/bin/libtool\",g'
-.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/gst-plugins1-base/plugins.mk b/multimedia/gst-plugins1-base/plugins.mk
index ec1aee5fb0b..cc42e75db6a 100644
--- a/multimedia/gst-plugins1-base/plugins.mk
+++ b/multimedia/gst-plugins1-base/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.2 2014/05/16 12:56:26 ryoon Exp $
+# $NetBSD: plugins.mk,v 1.3 2016/02/25 15:49:43 jperkin Exp $
 #
 # This file is shared across the gst-plugins-{base,good} packages to
 # simplify their code.  It provides a framework to write simple packages
@@ -78,19 +78,16 @@ SUBST_SED.libs=		-e 's|$$(top_builddir)/gst-libs/gst/.*/libgst|${BUILDLINK_PREFI
 .include "../../multimedia/gst-plugins1-${GST_PLUGINS1_TYPE}/buildlink3.mk"
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "OpenBSD"
 # libtool(1) of /usr/bin/libtool is required to build gstreamer 1.0.
 # I have no idea how to fix the build with libtool-base from pkgsrc...
 # https://bugzilla.gnome.org/show_bug.cgi?id=726518
-SUBST_CLASSES+=			fix-libtool
+SUBST_CLASSES.OpenBSD+=		fix-libtool
 SUBST_STAGE.fix-libtool=	pre-configure
 SUBST_MESSAGE.fix-libtool=	Fix libtool path
 .for _d_ in app audio fft pbutils riff rtp rtsp sdp tag video
 SUBST_FILES.fix-libtool+=	gst-libs/gst/${_d_}/Makefile.in
 .endfor
 SUBST_SED.fix-libtool=		-e 's,--libtool=\"$$(top_builddir)/libtool\",--libtool=\"/usr/bin/libtool\",g'
-.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/gstreamer0.10/Makefile b/multimedia/gstreamer0.10/Makefile
index 82d6e6e9a09..de9a57a923e 100644
--- a/multimedia/gstreamer0.10/Makefile
+++ b/multimedia/gstreamer0.10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2015/06/12 10:50:38 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2016/02/25 15:49:43 jperkin Exp $
 #
 
 DISTNAME=		gstreamer-0.10.36
@@ -42,16 +42,13 @@ PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "FreeBSD"
-CONFIGURE_ENV+=		ac_cv_func_register_printf_function="no"
-.endif
+CONFIGURE_ENV.FreeBSD+=	ac_cv_func_register_printf_function="no"
 
 .if ${OPSYS} == "NetBSD"
 # We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
 # won't work at all.
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0nb1
 .endif
-.undef f
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gstreamer
 PKG_SUPPORTED_OPTIONS=	gstcheck
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index a9ac2946d14..d5f55a709cb 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/02/21 00:12:26 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2016/02/25 15:49:43 jperkin Exp $
 
 DISTNAME=	libmpeg2-0.5.1
 PKGNAME=	libmpeg2-0.5.1
@@ -22,10 +22,6 @@ CONFIG_SUB_OVERRIDE+=	.auto/config.sub
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--disable-sdl
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ENV+=		ac_cv_header_altivec_h=no
-.endif
+CONFIGURE_ENV.Darwin+=	ac_cv_header_altivec_h=no
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 58027d2785f..a91dbd257d4 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/04/26 13:29:42 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2016/02/25 15:49:43 jperkin Exp $
 #
 
 DISTNAME=	libmpeg3-1.8-src
@@ -19,10 +19,8 @@ MAKE_ENV+=	USE_MMX=1
 MAKE_ENV+=	USE_CSS=1
 BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 .else
-.  if ${OPSYS} == "DragonFly"
-MAKE_ENV+=	USE_MMX=0
-MAKE_ENV+=	USE_CSS=0
-.  endif
+MAKE_ENV.DragonFly+=	USE_MMX=0
+MAKE_ENV.DragonFly+=	USE_CSS=0
 .endif
 
 NO_CONFIGURE=	yes
diff --git a/multimedia/liboggz/Makefile b/multimedia/liboggz/Makefile
index d43584a2476..8abb224d8e9 100644
--- a/multimedia/liboggz/Makefile
+++ b/multimedia/liboggz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/09/10 15:59:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/25 15:49:43 jperkin Exp $
 #
 
 DISTNAME=	liboggz-1.1.1
@@ -18,9 +18,7 @@ PKGCONFIG_OVERRIDE+=	oggz.pc.in
 
 .include "options.mk"
 
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-Wl,--version-script=Version_script
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=Version_script
 
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libva/available.mk b/multimedia/libva/available.mk
index be8aadaa156..2bf58d9713e 100644
--- a/multimedia/libva/available.mk
+++ b/multimedia/libva/available.mk
@@ -1,18 +1,12 @@
-# $NetBSD: available.mk,v 1.2 2013/04/14 01:07:56 cheusov Exp $
-
-.include "../../mk/bsd.prefs.mk"
+# $NetBSD: available.mk,v 1.3 2016/02/25 15:49:44 jperkin Exp $
 
 # At the moment VAAPI is available only for XXX.  The following
 # condition is here to NOT list these platforms in multiple places,
 # i.e. in mplayer, xine, xbmc etc.  Have a look at buildlink3.mk too.
 
 # The following should be kept up-to-date!
-.if ${OPSYS} == "Linux"
-VAAPI_AVAILABLE=	yes
-.elif ${OPSYS} == "FreeBSD"
-VAAPI_AVAILABLE=	yes
-.elif ${OPSYS} == "OpenBSD"
-VAAPI_AVAILABLE=	yes
-.else
-VAAPI_AVAILABLE=	no
-.endif
+OPSYSVARS+=			VAAPI_AVAILABLE
+VAAPI_AVAILABLE.Linux=		yes
+VAAPI_AVAILABLE.FreeBSD=	yes
+VAAPI_AVAILABLE.OpenBSD=	yes
+VAAPI_AVAILABLE.*=		no
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index b917b7e7bbf..9541223e0b3 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2016/01/03 20:59:17 markd Exp $
+# $NetBSD: Makefile,v 1.64 2016/02/25 15:49:44 jperkin Exp $
 
 DISTNAME=	libvpx-1.5.0
 PKGREVISION=	1
@@ -110,14 +110,12 @@ CONFIGURE_ARGS+=	--target=mips32-linux-gcc
 CONFIGURE_ARGS+=	--disable-runtime-cpu-detect
 .endif
 
-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+=	rm:-lrt
+BUILDLINK_TRANSFORM.MirBSD+=	rm:-lrt
 # Compiler is too old for these newfangled features
-CONFIGURE_ENV+=		sse2=no sse3=no ssse3=no sse4_1=no
+CONFIGURE_ENV.MirBSD+=		sse2=no sse3=no ssse3=no sse4_1=no
 # runtime_cpu_detect=no
-CONFIGURE_ENV+=		RTCD_OPTIONS='--disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse4_1'
-CONFIGURE_ARGS+=	--disable-runtime-cpu-detect
-.endif
+CONFIGURE_ENV.MirBSD+=		RTCD_OPTIONS='--disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse4_1'
+CONFIGURE_ARGS.MirBSD+=		--disable-runtime-cpu-detect
 
 # Under Solaris 10 its /usr/xpg4/bin/tr is not sufficient. PR pkg/48508
 .if !empty(MACHINE_PLATFORM:MSunOS-5.10*)
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index f74067c45cd..7f7d2a5786b 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2016/02/07 13:34:34 leot Exp $
+# $NetBSD: Makefile,v 1.67 2016/02/25 15:49:44 jperkin Exp $
 
 PKGNAME=	mencoder-${MPLAYER_VERSION}
 
@@ -10,9 +10,7 @@ USE_TOOLS+=	pkg-config
 
 # Fix build under Mac OS X, please see here for details:
 # http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2009-May/061515.html
-.if ${OPSYS} == "Darwin"
-LDFLAGS+=	-framework Carbon
-.endif
+LDFLAGS.Darwin+=	-framework Carbon
 
 CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index 1d217fe0531..0a05fc6cb7c 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.54 2015/11/29 11:48:29 leot Exp $
+# $NetBSD: options.mk,v 1.55 2016/02/25 15:49:44 jperkin Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -54,12 +54,9 @@ PKG_SUPPORTED_OPTIONS+=	faac lame
 # OS-specific options.
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
 PKG_SUPPORTED_OPTIONS+=	cdparanoia
-.elif ${OPSYS} == "SunOS"
-PKG_SUPPORTED_OPTIONS+=	mlib
-.endif
-.if ${OPSYS} == "Linux"
-PKG_SUPPORTED_OPTIONS+=	vidix
 .endif
+PKG_SUPPORTED_OPTIONS.SunOS+=	mlib
+PKG_SUPPORTED_OPTIONS.Linux+=	vidix
 
 # TODO: v4l2 option probably could be supported on Linux and OpenBSD too
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
@@ -100,9 +97,7 @@ PKG_SUPPORTED_OPTIONS+= xvid
 PKG_SUGGESTED_OPTIONS+=	${o}
 .  endif
 .endfor
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	vidix
-.endif
+PKG_SUGGESTED_OPTIONS.Linux+=	vidix
 
 # -------------------------------------------------------------------------
 # Handle extra libraries (part 1)
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index afba8d62c8b..8a1a086b9e8 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/01/26 21:36:38 adam Exp $
+# $NetBSD: Makefile,v 1.23 2016/02/25 15:49:44 jperkin Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}-src
@@ -19,13 +19,10 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV+=		my_cv_comment=""
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
 # nbsed creates a config.h that is several megabytes big and contains
 # lots of non-printing characters.
-USE_TOOLS+=		gsed
-.endif
+OPSYSVARS+=		USE_TOOLS
+USE_TOOLS.SunOS+=	gsed
 
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 INSTALLATION_DIRS+=	bin lib
diff --git a/multimedia/py-gstreamer0.10/Makefile b/multimedia/py-gstreamer0.10/Makefile
index 2b9c92d7ce9..b75c2bad2ca 100644
--- a/multimedia/py-gstreamer0.10/Makefile
+++ b/multimedia/py-gstreamer0.10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/12/05 21:25:51 adam Exp $
+# $NetBSD: Makefile,v 1.35 2016/02/25 15:49:44 jperkin Exp $
 
 DISTNAME=		gst-python-0.10.22
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/gst-python/gstreamer0.10/}
@@ -24,10 +24,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not yet ported as of 0.10.22; use py-go
 
 PKGCONFIG_OVERRIDE+=	pkgconfig/gst-python.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_prog_cc_c99=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_prog_cc_c99=no
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.26
diff --git a/multimedia/py-gstreamer1/Makefile b/multimedia/py-gstreamer1/Makefile
index f0112e59e52..8e42a914279 100644
--- a/multimedia/py-gstreamer1/Makefile
+++ b/multimedia/py-gstreamer1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/13 23:12:42 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/25 15:49:44 jperkin Exp $
 
 DISTNAME=		gst-python-1.2.1
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/gst-python/gstreamer1/}
@@ -20,10 +20,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
 PY_PATCHPLIST=		yes
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_prog_cc_c99=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_prog_cc_c99=no
 
 BUILDLINK_API_DEPENDS.gstreamer1+=	gstreamer1>=1.2.0
 .include "../../multimedia/gstreamer1/buildlink3.mk"
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index b853c87f88e..9b89228a1eb 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/09/05 11:39:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2016/02/25 15:49:44 jperkin Exp $
 #
 
 DISTNAME=	smpeg-0.4.4
@@ -33,9 +33,7 @@ post-wrapper:
 CONFIGURE_ARGS+=	--enable-mmx
 .endif
 
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
-.endif
+MAKE_ENV.SunOS+=	SunOS_LDFLAGS="-shared -mimpure-text"
 
 .include "options.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index fd9a104debe..6f07c2afd5e 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2014/10/09 14:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2016/02/25 15:49:44 jperkin Exp $
 
 DISTNAME=	xvidcore-1.3.3
 CATEGORIES=	multimedia
@@ -28,15 +28,13 @@ BUILD_DEPENDS+=		nasm>=0.98.39nb3:../../devel/nasm
 #BUILD_DEPENDS+=		yasm>=0.4.0:../../devel/yasm
 .endif
 
-.if !empty(PKGSRC_COMPILER:Msunpro) || ${OPSYS} == "SunOS"
-CFLAGS+=		-D__inline=inline
-SUBST_CLASSES+=		ld
+CFLAGS.SunOS+=		-D__inline=inline
+SUBST_CLASSES.SunOS+=	ld
 SUBST_MESSAGE.ld=	Fixing linker arguments for Solaris
 SUBST_STAGE.ld=		pre-configure
 SUBST_FILES.ld=		build/generic/configure
 SUBST_SED.ld=		-e "s|-Wl,-soname,libxvidcore...(SHARED_EXTENSION)...(API_MAJOR)||"
 SUBST_SED.ld+=		-e "s|-Wl,--version-script=libxvidcore.ld||"
-.endif
 
 WRKSRC=		${WRKDIR}/xvidcore
 CONFIGURE_DIRS=	build/generic