Mon Dec 12 14:36:23 2016 UTC ()
MAKE_ENV is in OPSYSVARS -- simplify previous.

Thanks, jperkin!


(wiz)
diff -r1.5 -r1.6 pkgsrc/math/lapack/Makefile.common
diff -r1.35 -r1.36 pkgsrc/math/py-numpy/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/math/lapack/Makefile.common (expand / switch to context diff)
--- pkgsrc/math/lapack/Makefile.common 2016/12/12 14:24:59 1.5
+++ pkgsrc/math/lapack/Makefile.common 2016/12/12 14:36:23 1.6
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2016/12/12 14:24:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2016/12/12 14:36:23 wiz Exp $
 # used by math/blas/Makefile
 # used by math/lapack/Makefile
 
@@ -19,12 +19,8 @@
 
 INSTALLATION_DIRS=	lib
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
 # blas fails using the gold linker with:
 # fatal error: --sysroot=: must take a non-empty argument
 # Work around it on DragonFly by specifying the classic gnu linker
 
-MAKE_ENV+=	LDVER=ld.bfd
+MAKE_ENV.DragonFly+=	LDVER=ld.bfd
-.endif
cvs diff -r1.35 -r1.36 pkgsrc/math/py-numpy/Makefile (expand / switch to context diff)
--- pkgsrc/math/py-numpy/Makefile 2016/12/12 14:23:47 1.35
+++ pkgsrc/math/py-numpy/Makefile 2016/12/12 14:36:22 1.36
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2016/12/12 14:23:47 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2016/12/12 14:36:22 wiz Exp $
 
 DISTNAME=	numpy-1.11.2
 GITHUB_PROJECT=	numpy
@@ -34,12 +34,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "DragonFly"
 # numpy fails using the gold linker with:
 # fatal error: --sysroot=: must take a non-empty argument
 # Work around it on DragonFly by specifying the classic gnu linker
-MAKE_ENV+=	LDVER=ld.bfd
-.endif
+MAKE_ENV.DragonFly+=	LDVER=ld.bfd
 
 # TEST_DEPENDS
 BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose