Use OPSYSVARS.

6 files changed, 13 insertions, 32 deletions

diff --git a/biology/plink/Makefile b/biology/plink/Makefile
index 63ba8f64f84..8ea81ae30ee 100644
--- a/biology/plink/Makefile
+++ b/biology/plink/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/12/29 04:54:37 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/25 11:21:11 jperkin Exp $
 
 DISTNAME=	plink-1.07-src
 PKGNAME=	$(DISTNAME:-src=)
@@ -21,10 +21,7 @@ MAKE_FLAGS+=	LIBDL=${DL_LIBS:Q}
 LIB_LAPACK=	-L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -llapack -lblas -lf2c
 MAKE_FLAGS+=	WITH_LAPACK=1 LIB_LAPACK=${LIB_LAPACK:Q}
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	LIB="-lsocket -lnsl"
-.endif
+MAKE_ENV.SunOS+=	LIB="-lsocket -lnsl"
 
 INSTALLATION_DIRS=	bin
 
diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index ba08a4a65b3..781de6b232e 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2015/09/27 19:06:23 kamil Exp $
+# $NetBSD: Makefile,v 1.57 2016/02/25 11:28:57 jperkin Exp $
 
 DISTNAME=	bitchx-1.2.1
 CATEGORIES=	chat
@@ -16,11 +16,7 @@ CONFIGURE_ARGS+=	--with-ssl
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CFLAGS+=	-DBIND_8_COMPAT
-.endif
+CFLAGS.Darwin+=	-DBIND_8_COMPAT
 
 SUBST_CLASSES+=		manpage
 SUBST_STAGE.manpage=	post-patch
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 78e8c314f76..9d277b253fc 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2015/12/07 06:44:23 mrg Exp $
+# $NetBSD: Makefile,v 1.75 2016/02/25 11:28:58 jperkin Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
@@ -45,9 +45,7 @@ CONFIGURE_ENV+=		${IRCII_CONFIGURE_ENV}
 LDFLAGS.SunOS+=	-lsocket -lnsl
 LDFLAGS+=	${BUILDLINK_LDADD.iconv}
 
-.if ${OPSYS} == "Interix"
-CONFIGURE_ARGS+=	--with-non-blocking=none
-.endif
+CONFIGURE_ARGS.Interix+=	--with-non-blocking=none
 
 # Optionally install compressed help files if MANZ is defined.
 .if defined(MANZ)
diff --git a/chat/phone/Makefile b/chat/phone/Makefile
index e0b6071cf60..4734fe6a76a 100644
--- a/chat/phone/Makefile
+++ b/chat/phone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/11/07 22:19:32 dholland Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/25 11:28:58 jperkin Exp $
 
 DISTNAME=	phone-2.0
 PKGREVISION=	3
@@ -16,12 +16,8 @@ INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man1 sbin
 # needs utmpx unless someone wants to patch legacy utmp support in
 BROKEN_ON_PLATFORM=	OpenBSD-*-*
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-BUILDLINK_TRANSFORM+=	rm:-Wa,--fatal-warnings
-CFLAGS+=		-DINFTIM=-1
-.endif
+BUILDLINK_TRANSFORM.Darwin+=	rm:-Wa,--fatal-warnings
+CFLAGS.Darwin+=			-DINFTIM=-1
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/phone.1 \
diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index ec5c28f6a65..d822f13c403 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2016/02/01 12:35:33 fhajny Exp $
+# $NetBSD: Makefile,v 1.24 2016/02/25 11:28:58 jperkin Exp $
 #
 
 DISTNAME=		prosody-0.9.10
@@ -67,9 +67,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-lua-include=${PREFIX}/${LUA_INCDIR}
 
 CFLAGS+=		-fPIC -Wall -DLUA_COMPAT_MODULE
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=		SOCKET_LIB=-lsocket
-.endif
+MAKE_ENV.SunOS+=	SOCKET_LIB=-lsocket
 
 RCD_SCRIPTS=		prosody
 
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 87352d03f17..60fa9fb0c9b 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2015/12/29 04:54:37 dholland Exp $
+# $NetBSD: Makefile.common,v 1.66 2016/02/25 11:28:58 jperkin Exp $
 #
 # used by chat/xchat/Makefile
 # used by chat/xchat-perl/Makefile
@@ -19,10 +19,6 @@ GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 USE_TOOLS+=	gmake pkg-config
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-mmx
-.endif
+CONFIGURE_ARGS.Darwin+=	--disable-mmx
 
 .include "../../devel/glib2/buildlink3.mk"