Use OPSYSVARS.

8 files changed, 26 insertions, 49 deletions

diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index 1bdcbdf9c3c..cd3229cbf50 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2015/04/25 14:22:54 tnn Exp $
+# $NetBSD: Makefile,v 1.44 2016/02/25 13:19:47 jperkin Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
@@ -39,17 +39,13 @@ SUBST_FILES.paths+=	sys/unix/nethack.sh
 SUBST_SED.paths=	-e "s,XXXPREFIXXXX,${PREFIX},g"
 SUBST_SED.paths+=	-e "s,@GZIP_PROGRAM@,${GZIP_CMD:M*gzip},g"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		unixconf
+SUBST_CLASSES.NetBSD+=	unixconf
 SUBST_MESSAGE.unixconf=	Configuring to use NetBSD presets.
 SUBST_STAGE.unixconf=	post-patch
 SUBST_FILES.unixconf=	include/unixconf.h
 SUBST_SED.unixconf=	-e 's,^\/\* \#define BSD 1 \*\/,\#define BSD 1,'
 SUBST_SED.unixconf+=	-e 's,^\#define SYSV,\/\* \#define SYSV \*\/,'
 SUBST_SED.unixconf+=	-e 's,^\#define LINUX,\/\* \#define LINUX \*\/,'
-.endif
 
 EGDIR=			${PREFIX}/share/examples/falcons-eye
 SHAREDIR=		${PREFIX}/share/falcons-eye-dir
diff --git a/games/nethack-lib/Makefile b/games/nethack-lib/Makefile
index 6165ad9889a..8b3d565dbf3 100644
--- a/games/nethack-lib/Makefile
+++ b/games/nethack-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/08/18 07:31:08 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/25 13:19:47 jperkin Exp $
 #
 
 .include		"../../games/nethack-lib/Makefile.common"
@@ -16,13 +16,11 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man6
 
 # Using 'nroff -Tascii' works better with groff and we don't want to use col
 # on linux as it removes the escape the the ansi color sequences.
-.if ${OPSYS} == "Linux"
-SUBST_CLASSES+=		nroff
+SUBST_CLASSES.Linux+=	nroff
 SUBST_STAGE.nroff=	pre-configure
 SUBST_MESSAGE.nroff=	Fixing Guidebook format command.
 SUBST_FILES.nroff=	sys/unix/Makefile.doc
 SUBST_SED.nroff=	-e '/^GUIDECMD/s,nroff .*$$,nroff -Tascii,'
-.endif
 
 # Special handling for the scorefiles: we do not want to delete
 # them between package installations and deinstallations.
diff --git a/games/nethack-lib/Makefile.common b/games/nethack-lib/Makefile.common
index 73a879d9eb6..5e9f9520014 100644
--- a/games/nethack-lib/Makefile.common
+++ b/games/nethack-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2016/01/25 11:07:38 leot Exp $
+# $NetBSD: Makefile.common,v 1.30 2016/02/25 13:19:47 jperkin Exp $
 #
 # used by games/nethack/Makefile
 # used by games/nethack-lib/Makefile
@@ -31,19 +31,18 @@ USE_TOOLS+=		gzip yacc lex awk
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
-SUBST_CLASSES+=		ttylib
+SUBST_CLASSES.Darwin+=	ttylib
+SUBST_CLASSES.Linux+=	ttylib
 SUBST_MESSAGE.ttylib=	Configuring to use ncurses
 SUBST_STAGE.ttylib=	post-patch
 SUBST_FILES.ttylib=	sys/unix/Makefile.src
 SUBST_SED.ttylib=	-e 's,^WINTTYLIB = -ltermlib,WINTTYLIB = -lncurses,'
-.endif
+
 .include "../../mk/curses.buildlink3.mk"
 
-.if ${OPSYS} == "Linux"
-NETHACK_OS=		SYSV
-.endif
-NETHACK_OS?=		BSD
+OPSYSVARS+=		NETHACK_OS
+NETHACK_OS.Linux=	SYSV
+NETHACK_OS.*=		BSD
 
 SUBST_CLASSES+=		os
 SUBST_MESSAGE.os=	Configuring for ${NETHACK_OS}
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index e5ea503367a..a90981a6970 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2015/12/31 18:48:55 leot Exp $
+# $NetBSD: Makefile,v 1.62 2016/02/25 13:19:47 jperkin Exp $
 
 DISTNAME=	openttd-1.5.3-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -35,11 +35,9 @@ CONFIGURE_ARGS+=	--with-lzo2=${BUILDLINK_PREFIX.lzo}/lib
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == "DragonFly")
-CONFIGURE_ARGS+=	--os=FREEBSD
-.endif
+CONFIGURE_ARGS.DragonFly+=	--os=FREEBSD
 
-.if (${OPSYS} == "Darwin")
+.if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--disable-cocoa-quickdraw
 CONFIGURE_ARGS+=	--with-cocoa
 CONFIGURE_ARGS+=	--without-application-bundle
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 2ebe8a2f53f..d7a6494ae8b 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/04/25 14:23:04 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2016/02/25 13:19:47 jperkin Exp $
 #
 
 DISTNAME=		stratagus-2.1-src
@@ -25,12 +25,9 @@ CONFIGURE_ARGS+=	--with-flac --with-mad --with-lua=${BUILDLINK_PREFIX.lua}
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.lua}/${LUA_INCDIR}
 INSTALLATION_DIRS=	bin
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "DragonFly"
-X_LDFLAGS=	${X11_LDFLAGS} -lX11
-.else
-X_LDFLAGS=	${X11_LDFLAGS}
-.endif
+OPSYSVARS+=		X_LDFLAGS
+X_LDFLAGS.DragonFly=	${X11_LDFLAGS} -lX11
+X_LDFLAGS.*=		${X11_LDFLAGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stratagus ${DESTDIR}${PREFIX}/bin
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index d9aa1631a56..4916b43462d 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2015/04/25 14:23:05 tnn Exp $
+# $NetBSD: Makefile,v 1.59 2016/02/25 13:19:47 jperkin Exp $
 #
 
 DISTNAME=	xarchon-0.60
@@ -15,12 +15,7 @@ USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	CC=${CC:Q}
-.endif
-
+CONFIGURE_ENV.SunOS+=	CC=${CC:Q}
 LDFLAGS.DragonFly=	-lX11
 LIBS.SunOS+=		-lX11 -lsocket -lnsl
 
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index fbbf02a3ff3..02c3fa58418 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2015/07/04 16:18:35 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2016/02/25 13:19:47 jperkin Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -24,9 +24,7 @@ BROKEN_ON_PLATFORM=	${LP64PLATFORMS}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Linux"
-CFLAGS+=	-DLINUX
-.endif
+CFLAGS.Linux+=	-DLINUX
 
 .include "../../mk/endian.mk"
 
diff --git a/geography/garmin-utils/Makefile b/geography/garmin-utils/Makefile
index bfa60281a20..d1141908682 100644
--- a/geography/garmin-utils/Makefile
+++ b/geography/garmin-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/04 09:19:17 asau Exp $
+# $NetBSD: Makefile,v 1.15 2016/02/25 13:22:00 jperkin Exp $
 #
 
 DISTNAME=		garmin-utils-2.5
@@ -21,15 +21,11 @@ MAKE_JOBS_SAFE=		no
 # so make everyone use a symlink.
 MAKE_FLAGS+=		GPS_SERIAL_PORT=/dev/gps
 
-.include "../../mk/bsd.prefs.mk"
-
 CPPFLAGS.Linux=		-DLINUX
 
-.if ${OPSYS} == "Linux"
-MAKE_FLAGS+=	SIO_TYPE=-DSIO_TYPE=Linux
-
+OPSYSVARS+=		MAKE_FLAGS
+MAKE_FLAGS.Linux+=	SIO_TYPE=-DSIO_TYPE=Linux
 # On Linux, libc apparently does not have strlcpy.
-MAKE_FLAGS+=	NEEDS_STRLCPY=1
-.endif
+MAKE_FLAGS.Linux+=	NEEDS_STRLCPY=1
 
 .include "../../mk/bsd.pkg.mk"