Use OPSYSVARS.

22 files changed, 65 insertions, 133 deletions

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 3673ceca0c1..4a26ac0eff2 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/10/25 23:48:11 darcy Exp $
+# $NetBSD: Makefile,v 1.38 2016/02/25 15:00:50 jperkin Exp $
 #
 
 DISTNAME=	alpine-2.11
@@ -34,15 +34,13 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 CONFIGURE_ARGS+= --without-pthread
 .endif
 
-.if ${OPSYS} == "Darwin"
 # mach/mach.h defines panic, differently.
-SUBST_CLASSES+=	panic
+SUBST_CLASSES.Darwin+=	panic
 SUBST_STAGE.panic=	pre-configure
 SUBST_MESSAGE.panic=	Renaming the panic function
 SUBST_FILES.panic=	*/*.c
 SUBST_FILES.panic+=	pith/util.h
 SUBST_SED.panic+=	-e 's,panic(,Panic(,g'
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine ${DESTDIR}${PREFIX}/bin/alpine
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 30503b80d72..e3254e334d8 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2015/06/12 10:50:18 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2016/02/25 15:00:50 jperkin Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
@@ -28,9 +28,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 .include "pkginstall.mk"
 .include "options.mk"
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	ac_cv_path_REHASH=${FALSE:Q}
-.endif
+CONFIGURE_ARGS.NetBSD+=	ac_cv_path_REHASH=${FALSE:Q}
 
 USERGROUP_PHASE=	configure
 
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index c46a6d87d9c..32af16afa8a 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/02/12 23:18:07 tron Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/25 15:00:50 jperkin Exp $
 
 DISTNAME=	dkim-milter-2.8.3
 PKGREVISION=	4
@@ -54,11 +54,7 @@ INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
 			share/doc/dkim-milter ${EGDIR} \
 			share/doc/dkim-milter/libdkim
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS+=	-DSM_CONF_STDBOOL_H=1
-.endif
+CPPFLAGS.NetBSD+=	-DSM_CONF_STDBOOL_H=1
 
 post-extract:
 	${CP} ${WRKSRC}/site.config.m4.dist \
diff --git a/mail/dovecot2-antispam-plugin/Makefile b/mail/dovecot2-antispam-plugin/Makefile
index ff230f1c608..8fba171a682 100644
--- a/mail/dovecot2-antispam-plugin/Makefile
+++ b/mail/dovecot2-antispam-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/08/23 14:30:38 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/25 15:00:50 jperkin Exp $
 
 DISTNAME=		dovecot-antispam-plugin-20130429
 PKGREVISION=		2
@@ -18,13 +18,9 @@ USE_TOOLS+=		aclocal autoheader automake autoconf gmake gawk gsed
 AUTOCONF_REQD=		2.54
 GNU_CONFIGURE=		yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-SUFX=			bundle
-.else
-SUFX=			so
-.endif
+OPSYSVARS+=		SUFX
+SUFX.Darwin=		bundle
+SUFX.*=			so
 
 PLIST_SUBST+=		SUFX=${SUFX:Q}
 
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 0c8524e3380..7a20a01a63b 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/10/08 12:19:09 asau Exp $
+# $NetBSD: Makefile,v 1.50 2016/02/25 15:00:50 jperkin Exp $
 
 DISTNAME=		elm2.5.8
 PKGNAME=		elm-2.5.8
@@ -25,13 +25,9 @@ USE_TOOLS+=		nroff
 
 INSTALLATION_DIRS=	share/nls/C
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "Darwin")
-LIBC=			/usr/lib/libSystem.dylib
-.else
-LIBC=			/usr/lib/libc.so
-.endif
+OPSYSVARS+=		LIBC
+LIBC.Darwin=		/usr/lib/libSystem.dylib
+LIBC.*=			/usr/lib/libc.so
 
 SPECIAL_PERMS+=		bin/elm ${ROOT_USER} mail 2755
 
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index d7d739ae0f0..53abefaaf25 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2016/01/31 07:01:55 richard Exp $
+# $NetBSD: Makefile,v 1.156 2016/02/25 15:00:50 jperkin Exp $
 
 DISTNAME=	evolution-data-server-2.32.3
 PKGREVISION=	38
@@ -35,9 +35,7 @@ LIBS+=		-lsemaphore
 BUILDLINK_TRANSFORM+=   rm:-Wl,--no-undefined
 .endif
 
-.if ${OPSYS} == "Darwin"
-CPPFLAGS+=	-DBIND_8_COMPAT
-.endif
+CPPFLAGS.Darwin+=	-DBIND_8_COMPAT
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
 CFLAGS.SunOS+=	-D__FUNCTION__=__func__
diff --git a/mail/ezmlm/options.mk b/mail/ezmlm/options.mk
index 1d655f707ef..7de79d875bd 100644
--- a/mail/ezmlm/options.mk
+++ b/mail/ezmlm/options.mk
@@ -1,11 +1,9 @@
-# $NetBSD: options.mk,v 1.8 2007/03/24 06:30:01 schmonz Exp $
+# $NetBSD: options.mk,v 1.9 2016/02/25 15:00:50 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm
 PKG_SUPPORTED_OPTIONS+=	ezmlm-althash
 
-.if ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS+=	ezmlm-althash
-.endif
+PKG_SUGGESTED_OPTIONS.Darwin+=	ezmlm-althash
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index c2bfbc76e0d..71424db5dc8 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2015/07/04 16:18:37 joerg Exp $
+# $NetBSD: Makefile,v 1.64 2016/02/25 15:00:50 jperkin Exp $
 
 DISTNAME=	faces-1.6.1
 PKGREVISION=	9
@@ -28,12 +28,10 @@ MAKE_FLAGS+=	MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	SVR4LIBS="-lnsl -lsocket -lgen"
-MAKE_ENV+=	SYSV=-DSYSV32
-MAKE_ENV+=	CC=gcc
-MAKE_ENV+=	CPPFLAGS=
-.endif
+MAKE_ENV.SunOS+=	SVR4LIBS="-lnsl -lsocket -lgen"
+MAKE_ENV.SunOS+=	SYSV=-DSYSV32
+MAKE_ENV.SunOS+=	CC=gcc
+MAKE_ENV.SunOS+=	CPPFLAGS=
 
 .if ${OPSYS} != "Interix"
 MAKE_ENV+=	NISLOOKUP=-DNISLOOKUP
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index b8e65b10377..afe5b4c2fe1 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.184 2014/12/23 06:48:32 mef Exp $
+# $NetBSD: Makefile,v 1.185 2016/02/25 15:00:50 jperkin Exp $
 
 # Note to updaters: mail/fetchmailconf reaches over here, make sure it builds.
 DISTNAME=	fetchmail-6.3.22
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fetchmail.info/
 COMMENT=	Batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
 
-.include "../../mk/bsd.prefs.mk"
-
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-hesiod
@@ -20,10 +18,8 @@ CONFIGURE_ENV+=		PYTHON=:
 LDFLAGS+=		${CFLAGS}
 USE_TOOLS+=		msgfmt tbl
 
-.if ${OPSYS} == "Darwin"
-LDFLAGS+=		-lresolv
+LDFLAGS.Darwin+=	-lresolv
 CFLAGS.Darwin+=		-DBIND_8_COMPAT -DHAVE_RESOLV_H
-.endif
 
 .include "options.mk"
 
diff --git a/mail/mini_sendmail/Makefile.common b/mail/mini_sendmail/Makefile.common
index b935c1eefb6..12738041351 100644
--- a/mail/mini_sendmail/Makefile.common
+++ b/mail/mini_sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2014/10/09 14:06:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.18 2016/02/25 15:00:50 jperkin Exp $
 #
 
 DISTNAME=	mini_sendmail-1.3.6
@@ -16,11 +16,7 @@ EGDIR=		share/examples/mini_sendmail
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin ${EGDIR}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == SunOS)
-MAKE_ENV+="SYSV_LIBS=-lsocket -lnsl"
-.endif
+MAKE_ENV.SunOS+=	"SYSV_LIBS=-lsocket -lnsl"
 
 post-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index b9766f41a9c..a0872f9e878 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2016/02/02 16:12:18 leot Exp $
+# $NetBSD: Makefile,v 1.63 2016/02/25 15:00:51 jperkin Exp $
 
 DISTNAME=	msmtp-1.6.4
 CATEGORIES=	mail
@@ -23,10 +23,7 @@ CONF_FILES=	${EGDIR}/msmtprc-user.example \
 INFO_FILES=	yes
 PLIST_VARS+=	scripts
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Interix"
-CPPFLAGS+=	-D__WINSOCK
-.endif
+CPPFLAGS.Interix+=	-D__WINSOCK
 
 .include "options.mk"
 
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index 1fbac859a19..fd7cab28316 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/08/18 07:31:11 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2016/02/25 15:00:51 jperkin Exp $
 
 DISTNAME=	mush-7.2.5
 PKGNAME=	mush-7.2.6.b4.pl1
@@ -32,13 +32,9 @@ BUILD_TARGET=	mush
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/misc
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
-PLAT_MAKEFILE=	makefile.netbsd
-.else
-PLAT_MAKEFILE=	makefile.${LOWER_OPSYS}
-.endif
+OPSYSVARS+=			PLAT_MAKEFILE
+PLAT_MAKEFILE.DragonFly=	makefile.netbsd
+PLAT_MAKEFILE.*=		makefile.${LOWER_OPSYS}
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	config.h-dist ${PLAT_MAKEFILE}
diff --git a/mail/mutt/Makefile.common b/mail/mutt/Makefile.common
index 6dbd952942d..761208efe51 100644
--- a/mail/mutt/Makefile.common
+++ b/mail/mutt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2015/09/03 14:49:02 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2016/02/25 15:00:51 jperkin Exp $
 #
 # used by mail/mutt/Makefile
 # used by mail/mutt-kz/Makefile
@@ -22,9 +22,7 @@ CONFIGURE_ARGS+=	--enable-imap
 CONFIGURE_ENV+=		SENDMAIL=/usr/sbin/sendmail
 .endif
 
-.if (${OPSYS} == "SunOS")
-CONFIGURE_ARGS+=	--without-wc-funcs
-.endif
+CONFIGURE_ARGS.SunOS+=	--without-wc-funcs
 
 # There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
 # there.
diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk
index ac1ee37e625..72a2083efac 100644
--- a/mail/mutt/options.mk
+++ b/mail/mutt/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2016/01/07 15:33:34 wiz Exp $
+# $NetBSD: options.mk,v 1.20 2016/02/25 15:00:51 jperkin Exp $
 
 # Global and legacy options
 
@@ -46,12 +46,11 @@ CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 ###
 .if !empty(PKG_OPTIONS:Mcurses)
 .  include "../../mk/curses.buildlink3.mk"
-.  if ${OPSYS} == "SunOS"
-BUILDLINK_PASSTHRU_DIRS+=	/usr/xpg4
-CONFIGURE_ARGS+=	--with-curses=/usr/xpg4
-LDFLAGS+=		-L/usr/xpg4/lib${LIBABISUFFIX}
-LDFLAGS+=		${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
-.  endif
+OPSYSVARS+=			BUILDLINK_PASSTHRU_DIRS
+BUILDLINK_PASSTHRU_DIRS.SunOS+=	/usr/xpg4
+CONFIGURE_ARGS.SunOS+=		--with-curses=/usr/xpg4
+LDFLAGS.SunOS+=			-L/usr/xpg4/lib${LIBABISUFFIX}
+LDFLAGS.SunOS+=			${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
 .endif
 
 ###
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index aec62abff76..2a9e500b21a 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/11/22 23:55:33 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/25 15:00:51 jperkin Exp $
 
 DISTNAME=	notmuch-0.21
 CATEGORIES=	mail
@@ -21,12 +21,10 @@ MAKE_FLAGS+=	PYTHON=${PYTHONBIN}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+=		gnuld
+SUBST_CLASSES.SunOS+=	gnuld
 SUBST_STAGE.gnuld=	pre-configure
 SUBST_FILES.gnuld=	lib/Makefile.local
 SUBST_SED.gnuld=	-e 's/-Wl,--[^ ]*//g'
-.endif
 
 SUBST_CLASSES+=		sphinx
 SUBST_SED.sphinx+=	-e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
diff --git a/mail/php-imap/Makefile b/mail/php-imap/Makefile
index c6503388047..cd07539b0f4 100644
--- a/mail/php-imap/Makefile
+++ b/mail/php-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/03/20 16:33:28 taca Exp $
+# $NetBSD: Makefile,v 1.29 2016/02/25 15:00:51 jperkin Exp $
 
 MODNAME=		imap
 CATEGORIES+=		mail
@@ -10,29 +10,19 @@ USE_PHP_EXT_PATCHES=	yes
 
 USE_TOOLS+=		pkg-config
 
-.include "../../mk/bsd.prefs.mk"
-
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.imap-uw}
 CONFIGURE_ARGS+=	--with-${MODNAME}-linkage
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--with-${MODNAME}-ssl=yes
-.else
-CONFIGURE_ARGS+=	--with-${MODNAME}-ssl=${SSLBASE}
-.endif
-
 CONFIGURE_ENV+=		ac_cv_lib_pam_pam_start=no
 
 # Imap extension's config.m4 calls m4 macro PHP_SETUP_OPENSSL() which
 # expects PHP_ARG_WITH(openssl, ...) being called beforehand so that
 # PHP_OPENSSL is set. For a self contained extension build like for
 # this package this is not the case of course.
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		PHP_OPENSSL=yes
-.else
-CONFIGURE_ENV+=		PHP_OPENSSL=${SSLBASE:Q}
-.endif
+CONFIGURE_ENV.SunOS+=	PHP_OPENSSL=yes
+CONFIGURE_ENV.*+=	PHP_OPENSSL=${SSLBASE:Q}
+CONFIGURE_ARGS.SunOS+=	--with-${MODNAME}-ssl=yes
+CONFIGURE_ARGS.*+=	--with-${MODNAME}-ssl=${SSLBASE}
 
 .include "../../mail/imap-uw/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index f2b32f00e9c..e6229586a0d 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2015/08/18 07:31:12 wiz Exp $
+# $NetBSD: Makefile,v 1.133 2016/02/25 15:00:51 jperkin Exp $
 
 DISTNAME=	pine4.64
 PKGNAME=	pine-4.64
@@ -39,9 +39,7 @@ BUILDNAME=	neb
 BUILDFILE=	neb
 .endif
 
-.if ${OPSYS} == "OpenBSD"
-BUILDLINK_TRANSFORM+=	rm:-lcrypt
-.endif
+BUILDLINK_TRANSFORM.OpenBSD+=	rm:-lcrypt
 
 .if !empty(CC_VERSION:Mgcc-*)
 UNLIMIT_RESOURCES+=	datasize
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 304dcdc8186..8d19105435e 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2015/06/12 10:50:26 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2016/02/25 15:00:51 jperkin Exp $
 
 DISTNAME=	prayer-1.3.4
 PKGREVISION=	9
@@ -54,12 +54,8 @@ OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
 FILES_SUBST+=	OPSYS=${OPSYS}
 FILES_SUBST+=	VAR_PREFIX=${VAR_PREFIX:Q}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	opt:-lutil:"-lsocket -lnsl"
-BUILDLINK_TRANSFORM+=	rm:-lcom_err # XXX: handle pkgsrc krb
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	opt:-lutil:"-lsocket -lnsl"
+BUILDLINK_TRANSFORM.SunOS+=	rm:-lcom_err # XXX: handle pkgsrc krb
 
 post-patch:
 	${FIND} ${WRKSRC} -name CVS -type d -print | ${SORT} -r | \
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 9cb1c0325e7..f7124c41ca3 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2014/12/30 15:13:19 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2016/02/25 15:00:51 jperkin Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}
@@ -133,11 +133,9 @@ SPECIAL_PERMS+=		${PREFIX}/bin/${f} root qmail 0711
 SPECIAL_PERMS+=		${PREFIX}/bin/${f} root qmail 0700
 .endfor
 
-.if ${OPSYS} == "Darwin"
-DARWINSUFX=		.doc
-.else
-DARWINSUFX=		# empty
-.endif
+OPSYSVARS+=		DARWINSUFX
+DARWINSUFX.Darwin=	.doc
+DARWINSUFX.*=		# empty
 
 post-extract: post-extract-viruscan
 	${CP} ${FILESDIR}/README.pkgsrc ${WRKSRC}
diff --git a/mail/re-alpine/Makefile b/mail/re-alpine/Makefile
index b66c946c5e8..2119f9f0cc6 100644
--- a/mail/re-alpine/Makefile
+++ b/mail/re-alpine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/08/18 07:31:12 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/25 15:00:51 jperkin Exp $
 #
 
 DISTNAME=	re-alpine-2.02
@@ -36,12 +36,10 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 CONFIGURE_ARGS+= --without-pthread
 .endif
 
-.if ${OPSYS} == "MirBSD"
-SUBST_CLASSES+=			mirbsd
+SUBST_CLASSES.MirBSD+=		mirbsd
 SUBST_STAGE.mirbsd=		pre-configure
 SUBST_FILES.mirbsd=		configure
 SUBST_SED.mirbsd=		-e 's,\*-\*-openbsd,*-*-mirbsd,g'
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine ${DESTDIR}${PREFIX}/bin/alpine
diff --git a/mail/thunderbird/options.mk b/mail/thunderbird/options.mk
index 6c44eb15511..bce63863046 100644
--- a/mail/thunderbird/options.mk
+++ b/mail/thunderbird/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2015/07/09 15:17:34 ryoon Exp $
+# $NetBSD: options.mk,v 1.18 2016/02/25 15:00:51 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird
 PKG_SUPPORTED_OPTIONS=	alsa debug mozilla-jemalloc gnome \
@@ -8,11 +8,8 @@ PKG_SUGGESTED_OPTIONS=	mozilla-lightning
 
 PLIST_VARS+=		branding nobranding debug gnome jemalloc
 
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	alsa mozilla-jemalloc
-.else
-PKG_SUGGESTED_OPTIONS+=	pulseaudio
-.endif
+PKG_SUGGESTED_OPTIONS.Linux+=	alsa mozilla-jemalloc
+PKG_SUGGESTED_OPTIONS.*+=	pulseaudio
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/mail/thunderbird31/options.mk b/mail/thunderbird31/options.mk
index 946fb81255e..2304f5ffd6f 100644
--- a/mail/thunderbird31/options.mk
+++ b/mail/thunderbird31/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/07/13 17:49:26 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/25 15:00:51 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird31
 PKG_SUPPORTED_OPTIONS=	alsa debug mozilla-jemalloc gnome \
@@ -8,11 +8,8 @@ PKG_SUGGESTED_OPTIONS=	mozilla-lightning
 
 PLIST_VARS+=		branding nobranding debug gnome jemalloc
 
-.if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	alsa mozilla-jemalloc
-.else
-PKG_SUGGESTED_OPTIONS+=	pulseaudio
-.endif
+PKG_SUGGESTED_OPTIONS.Linux+=	alsa mozilla-jemalloc
+PKG_SUGGESTED_OPTIONS.*+=	pulseaudio
 
 .include "../../mk/bsd.options.mk"