Use OPSYSVARS.

6 files changed, 15 insertions, 36 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index fc3d5fe4fec..c74acfe2665 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2016/02/19 21:57:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.164 2016/02/25 15:26:55 jperkin Exp $
 
 DISTNAME=		R-3.2.2
 CATEGORIES=		math
@@ -85,11 +85,7 @@ CONFIGURE_ENV+=		LIBnn=lib
 # been installed SHAREMODE
 SHAREMODE=		644
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-openmp
-.endif
+CONFIGURE_ARGS.Darwin+=	--disable-openmp
 
 # R_PAPERSIZE can be: A4, Letter, Legal, Executive
 .if defined(PAPERSIZE)
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 5b31e1ead4f..170e985e3b7 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/06/30 07:56:44 wen Exp $
+# $NetBSD: Makefile,v 1.27 2016/02/25 15:26:55 jperkin Exp $
 
 DISTNAME=	cln-1.3.4
 CATEGORIES=	math
@@ -19,12 +19,8 @@ PKGCONFIG_OVERRIDE=	cln.pc.in
 INFO_FILES=		yes
 TEST_TARGET=		check
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
 # Work around broken configure test
-CONFIGURE_ENV+=		cl_cv_proto_perror=yes
-.endif
+CONFIGURE_ENV.SunOS+=	cl_cv_proto_perror=yes
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/mapm/Makefile b/math/mapm/Makefile
index 7bd2164adcf..3afc29542c4 100644
--- a/math/mapm/Makefile
+++ b/math/mapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/01/09 12:07:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/25 15:26:55 jperkin Exp $
 #
 
 DISTNAME=		mapm-4.9.5a
@@ -17,11 +17,7 @@ USE_LANGUAGES=	c c++
 
 INSTALLATION_DIRS=	bin include lib share/doc/mapm
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-static
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-static
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/m_apm.h ${DESTDIR}${PREFIX}/include
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 45fa5b5a156..a1b29bc3322 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2016/02/16 04:21:40 dbj Exp $
+# $NetBSD: Makefile,v 1.133 2016/02/25 15:26:55 jperkin Exp $
 
 DISTNAME=	octave-4.0.0
 CATEGORIES=	math
@@ -41,14 +41,12 @@ CONFIGURE_ARGS+=	--disable-java
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
 # When __APPLE__ is defined, fltk headers typedef an alternate version of Window
 # which conflicts with the one in the X11 headers, so avoid pulling in X11.
-CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS.Darwin+=	--without-x
 
 # The OpenGL framework doesn't have osmesa and the X11 one has header conflicts with the framework
-CONFIGURE_ARGS+=	--without-OSMesa
-.endif
+CONFIGURE_ARGS.Darwin+=	--without-OSMesa
 
 # We use this to install .oct files so it doesn't strip them.
 CONFIGURE_ENV+=		INSTALL_LIB=${INSTALL_LIB:Q}
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
index 13f47ae8ecc..a7f72c2e973 100644
--- a/math/py-scipy/Makefile
+++ b/math/py-scipy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/04/17 00:49:50 wen Exp $
+# $NetBSD: Makefile,v 1.18 2016/02/25 15:26:55 jperkin Exp $
 
 DISTNAME=	scipy-0.15.1
 PKGNAME=	${PYPKGPREFIX}-scipy-0.15.1
@@ -18,12 +18,10 @@ MAKE_ENV+=	ATLAS=None
 .include "../../mk/compiler.mk"
 
 .if defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95)
-PYSETUPBUILDARGS+= --fcompiler=g95
+PYSETUPBUILDARGS+=	--fcompiler=g95
 .elif defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mgfortran)
-PYSETUPBUILDARGS+= --fcompiler=gnu95
-.if ${OPSYS} == "Darwin"
-LDFLAGS+=	-undefined dynamic_lookup
-.endif
+PYSETUPBUILDARGS+=	--fcompiler=gnu95
+LDFLAGS.Darwin+=	-undefined dynamic_lookup
 .else
 BROKEN=		Requires fortran 95
 .endif
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index 18108eb77d2..8f94b2a8766 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/07/04 16:18:37 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2016/02/25 15:26:55 jperkin Exp $
 
 DISTNAME=		xlispstat-3-52-20
 PKGNAME=		xlispstat-3.52.20
@@ -18,13 +18,8 @@ BROKEN_ON_PLATFORM=	*-*-alpha	# core dumps
 
 BUILD_TARGET=		xlispstat
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=		CPPFLAGS=
-.endif
-
 MAKE_ENV+=		DISPLAY=	# Prevent 'Rejected connection'
+MAKE_ENV.SunOS+=	CPPFLAGS=
 
 BUILDLINK_DEPMETHOD.libXt?=	build