Use OPSYSVARS.

6 files changed, 13 insertions, 34 deletions

diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index def29b3eaa4..f5604944a4a 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/12/12 06:45:34 mef Exp $
+# $NetBSD: Makefile,v 1.18 2016/02/25 11:09:50 jperkin Exp $
 
 DISTNAME=	dbench-4.0
 CATEGORIES=	benchmarks
@@ -12,11 +12,7 @@ LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=	yes
 USE_TOOLS=	autoconf
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	DB_LDFLAGS="-lrt" TB_LDFLAGS="-lsocket -lnsl"
-.endif
+MAKE_ENV.SunOS+=	DB_LDFLAGS="-lrt" TB_LDFLAGS="-lsocket -lnsl"
 
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
 			datadir=${DESTDIR}${PREFIX}/share/dbench \
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index 93baba7f8bb..7b25dde1842 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2015/06/12 10:48:25 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2016/02/25 11:09:50 jperkin Exp $
 
 DISTNAME=		hbench-OS-1.1
 PKGNAME=		hbench-1.1
@@ -28,9 +28,8 @@ GET_OS_CMD=		${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/^[^-]*-[^-
 PLIST_SUBST+=		PLATFORM=${GET_OS_CMD:sh:Q}-${GET_ARCH_CMD:sh:Q}
 
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-static
-.endif
+
+BUILDLINK_TRANSFORM.SunOS+=	rm:-static
 
 HB_HOSTNAME!=		${UNAME} -n
 HB_SHORTNAME=		${HB_HOSTNAME:C/\..*//}
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index d2db1b5961a..4afbba5b0ba 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/12/03 13:01:47 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2016/02/25 11:09:50 jperkin Exp $
 
 DISTNAME=	httperf-0.9.0
 PKGREVISION=	1
@@ -18,10 +18,6 @@ CFLAGS+=		-DFD_SETSIZE=16424
 INSTALL_MAKE_FLAGS+=	mandir=${PREFIX}/${PKGMANDIR} \
 			bindir=${PREFIX}/bin
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-LDFLAGS+=	-lsocket -lnsl -lresolv
-.endif
+LDFLAGS.SunOS+=	-lsocket -lnsl -lresolv
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 7852f8b605c..27dcc290cd1 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/10/09 14:05:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/25 11:09:50 jperkin Exp $
 
 DISTNAME=	NetPIPE-3.7.1
 PKGNAME=	netpipe-3.7.1
@@ -13,11 +13,7 @@ LICENSE=	gnu-gpl-v2
 MAKE_FILE=	makefile
 CFLAGS+=	-DHAVE_GETRUSAGE
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl"
-.endif
+MAKE_ENV.SunOS+=	EXTRA_LIBS="-lsocket -lnsl"
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
index 734c418f051..58741298e0f 100644
--- a/benchmarks/nttcp/Makefile
+++ b/benchmarks/nttcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/10/09 14:06:00 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/25 11:09:50 jperkin Exp $
 
 DISTNAME=	nttcp-1.47
 PKGREVISION=	1
@@ -9,11 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	# http://home.leo.org/~elmar/nttcp/
 COMMENT=	New TCP testing and performance measuring tool
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	LIB="-lsocket -lnsl"
-.endif
+MAKE_ENV.SunOS+=	LIB="-lsocket -lnsl"
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index a6ea16cf3cc..f56e2efa221 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/01/20 06:43:09 mef Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/25 11:09:50 jperkin Exp $
 
 DISTNAME=	sysbench-0.4.12
 PKGREVISION=	4
@@ -14,11 +14,7 @@ GNU_CONFIGURE=		yes
 PTHREAD_AUTO_VARS=	yes
 MAKE_FLAGS+=		bin_SCRIPTS= # don't install problematic scripts
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CFLAGS+=		-D_NETBSD_SOURCE # hack for ulong along with patch-aa
-.endif
+CFLAGS.NetBSD+=		-D_NETBSD_SOURCE # hack for ulong along with patch-aa
 
 .include "../../mk/compiler.mk"
 .if !empty(MACHINE_PLATFORM:MSunOS-5.1[0-9]-*) && \