Use OPSYSVARS.

32 files changed, 108 insertions, 223 deletions

diff --git a/security/botan-devel/Makefile b/security/botan-devel/Makefile
index 4555ff0048c..738516f63e0 100644
--- a/security/botan-devel/Makefile
+++ b/security/botan-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/10/21 21:29:14 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/26 09:41:05 jperkin Exp $
 
 DISTNAME=	Botan-1.11.16
 PKGNAME=	${DISTNAME:tl}
@@ -43,9 +43,8 @@ CONFIGURE_ARGS+=	--cpu=x86_64
 PLIST.x86=	yes
 .endif
 
-.if ${OPSYS} == "SunOS"
-MAKE_FLAGS+=	USER_APP_LINKS_TO=-lnsl
-.endif
+OPSYSVARS+=		MAKE_FLAGS
+MAKE_FLAGS.SunOS+=	USER_APP_LINKS_TO=-lnsl
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common
index d02d2a6f96d..9afbab13f3e 100644
--- a/security/courier-authlib/Makefile.common
+++ b/security/courier-authlib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2014/05/06 03:45:36 rodent Exp $
+# $NetBSD: Makefile.common,v 1.15 2016/02/26 09:41:05 jperkin Exp $
 #
 # used by mail/courier-mta/Makefile.common
 
@@ -19,11 +19,9 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-mailuser=${COURIER_USER}
 CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP}
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS.SunOS+=	--with-waitfunc=wait3
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--with-waitfunc=wait3
-.endif
+.include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "OpenBSD"
 BUILDLINK_DEPMETHOD.libiconv?=  build
diff --git a/security/crack/Makefile b/security/crack/Makefile
index 960a04bc215..ea08d89f2d3 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/02/20 11:38:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.32 2016/02/26 09:41:05 jperkin Exp $
 
 DISTNAME=	crack5.0
 PKGNAME=	crack-5.0
@@ -21,11 +21,7 @@ REPLACE_FILES.xdawg=	dict/*/*
 
 CHECK_INTERPRETER_SKIP+=	share/crack/extra/Dictstats.pl
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-MAKE_ENV+=	LIBS="-lcrypt"
-.endif
+MAKE_ENV.Linux+=	LIBS="-lcrypt"
 
 pre-configure:
 	@if [ -f /usr/lib/libcrypt.a ]; then				\
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common
index bbc439dea79..e26e02353be 100644
--- a/security/cyrus-sasl/Makefile.common
+++ b/security/cyrus-sasl/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2015/03/15 16:47:19 hiramatsu Exp $
+# $NetBSD: Makefile.common,v 1.23 2016/02/26 09:41:05 jperkin Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -54,9 +54,7 @@ PLUGINDIR=		${PREFIX}/lib/sasl2
 CONFIGURE_ARGS+=	--with-plugindir=${PLUGINDIR:Q}
 CONFIGURE_ARGS+=	--disable-java
 
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-macos-framework
-.endif
+CONFIGURE_ARGS.Darwin+=	--disable-macos-framework
 
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--disable-anon		# ANONYMOUS
diff --git a/security/dsniff-nox11/Makefile b/security/dsniff-nox11/Makefile
index 6c8412cf4e3..e08180f6265 100644
--- a/security/dsniff-nox11/Makefile
+++ b/security/dsniff-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/01/26 16:05:04 sevan Exp $
+# $NetBSD: Makefile,v 1.14 2016/02/26 09:41:05 jperkin Exp $
 
 .include "../../security/dsniff/Makefile.common"
 
@@ -11,9 +11,7 @@ CONFIGURE_ARGS+=	--without-x
 INSTALLATION_DIRS+=	${PKGMANDIR}/man8
 INSTALL_MAKE_FLAGS+=	install_prefix=${DESTDIR}
 
-.if ${OPSYS} == "Darwin"
-CFLAGS+= 	-DBIND_8_COMPAT
-.endif
+CFLAGS.Darwin+=	-DBIND_8_COMPAT
 
 post-configure:
 	( cd ${WRKSRC} \
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index ea66f5b155b..063b3701302 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2015/04/25 14:24:48 tnn Exp $
+# $NetBSD: Makefile,v 1.84 2016/02/26 09:41:05 jperkin Exp $
 
 DISTNAME=	gnome-keyring-2.32.1
 PKGREVISION=	19
@@ -25,10 +25,7 @@ CFLAGS.HPUX+=		-DMAP_ANON=MAP_ANONYMOUS
 #
 CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	ac_cv_header_security_pam_modules_h=yes
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_header_security_pam_modules_h=yes
 
 .include "../../mk/dlopen.buildlink3.mk"
 
diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index 6b15e9a9d25..85e5272d1d2 100644
--- a/security/gnupg21/Makefile
+++ b/security/gnupg21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/02/02 15:06:46 fhajny Exp $
+# $NetBSD: Makefile,v 1.15 2016/02/26 09:41:05 jperkin Exp $
 
 DISTNAME=	gnupg-2.1.11
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg21-/}
@@ -23,16 +23,10 @@ INFO_FILES=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-g13
 
-.include "../../mk/bsd.fast.prefs.mk"
-
 # SunOS does have getaddrinfo() and the code knows how to use it
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	ac_cv_func_getaddrinfo=yes
-.endif
+CONFIGURE_ARGS.SunOS+=	ac_cv_func_getaddrinfo=yes
 
-.if ${OPSYS} == "Darwin"
-LDFLAGS+=	-lresolv
-.endif
+LDFLAGS.Darwin+=	-lresolv
 
 .include "options.mk"
 
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 27a38587477..e0bc1a15b20 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.158 2015/09/14 00:29:45 mef Exp $
+# $NetBSD: Makefile,v 1.159 2016/02/26 09:41:05 jperkin Exp $
 
 DISTNAME=	gnutls-3.3.18
 CATEGORIES=	security devel
@@ -36,12 +36,8 @@ MAKE_ENV+=		TZ=UTC
 
 EGDIR=		${PREFIX}/share/examples/gnutls
 
-.include "../../mk/bsd.prefs.mk"
-
 # Assembler support is broken for SunOS in 3.2.9.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--disable-hardware-acceleration
-.endif
+CONFIGURE_ARGS.SunOS+=	--disable-hardware-acceleration
 
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} include/gnutls
 
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 92e1672b09f..8b73cae7349 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2015/09/24 23:33:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.78 2016/02/26 09:41:05 jperkin Exp $
 
 DISTNAME=	gpgme-1.6.0
 PKGREVISION=	1
@@ -34,11 +34,9 @@ TEST_TARGET=		check
 
 .include "options.mk"
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ENV.HPUX+=	ac_cv_lib_pthread_pthread_create=yes
 
-.if ${OPSYS} == "HPUX"
-CONFIGURE_ENV+=		ac_cv_lib_pthread_pthread_create=yes
-.endif
+.include "../../mk/bsd.prefs.mk"
 
 # TLS is unsupported on NetBSD<=5, but causes crashes on -current too
 #.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*)
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index ae2186a7b24..aa30bed2c54 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2015/04/30 15:07:28 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2016/02/26 09:41:05 jperkin Exp $
 
 DISTNAME=	libtasn1-4.5
 CATEGORIES=	security devel
@@ -19,13 +19,9 @@ CONFIGURE_ARGS+=	--with-packager="pkgsrc"
 CONFIGURE_ARGS+=	--with-packager-version="${PKGVERSION}"
 CONFIGURE_ARGS+=	--with-packager-bug-reports="http://gnats.NetBSD.org/"
 
-.include "../../mk/bsd.prefs.mk"
-
 # Mac OS X has no prototype for getopt_long and no declaration for
 # struct option, so ignore getopt_long() even though the test succeeds.
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ENV+=		ac_cv_func_getopt_long=no
-CFLAGS+=	-fno-common
-.endif
+CONFIGURE_ENV.Darwin+=	ac_cv_func_getopt_long=no
+CFLAGS.Darwin+=		-fno-common
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/lua-sec/Makefile b/security/lua-sec/Makefile
index 79b88c6145f..2b70c318ed5 100644
--- a/security/lua-sec/Makefile
+++ b/security/lua-sec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/10/19 22:27:47 alnsn Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/26 09:41:05 jperkin Exp $
 
 DISTNAME=		luasec-0.5
 PKGNAME=		${LUA_PKGPREFIX}-${DISTNAME:S/lua//}
@@ -11,8 +11,6 @@ HOMEPAGE=		https://github.com/brunoos/luasec/
 COMMENT=		Lua binding for OpenSSL library
 LICENSE=		mit
 
-.include "../../mk/bsd.prefs.mk"
-
 DEPENDS+=		${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
 
 USE_TOOLS+=		gmake
@@ -20,11 +18,8 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}/luasec-${DISTNAME}
 INSTALLATION_DIRS+=	${LUA_CDIR} ${LUA_LDIR}
 
-.if ${OPSYS} == "SunOS"
-BUILD_TARGET=		solaris
-.else
-BUILD_TARGET=		bsd
-.endif
+BUILD_TARGET.SunOS=	solaris
+BUILD_TARGET.*=		bsd
 
 MAKE_ENV+=	LUAPATH=${PREFIX}/${LUA_LDIR}
 MAKE_ENV+=	LUACPATH=${PREFIX}/${LUA_CDIR}
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 6bbd4f8fb42..e99c6f163af 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2014/10/09 14:06:52 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2016/02/26 09:41:06 jperkin Exp $
 
 DISTNAME=	opencdk-0.6.6
 PKGREVISION=	2
@@ -26,11 +26,7 @@ PKGCONFIG_OVERRIDE=	src/opencdk.pc.in
 
 INSTALLATION_DIRS=	${HTMLDIR} ${EGDIR}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-LIBS+=	-lnsl
-.endif
+LIBS.SunOS+=	-lnsl
 
 pre-install:
 	${INSTALL_DATA}	${WRKSRC}/doc/opencdk-api.html ${DESTDIR}${HTMLDIR}
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 4e552216a70..4c8678818dc 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.239 2016/01/18 12:53:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.240 2016/02/26 09:41:06 jperkin Exp $
 
 DISTNAME=		openssh-7.1p1
 PKGNAME=		${DISTNAME:S/p1/.1/}
@@ -34,14 +34,11 @@ INSTALL_TARGET=		install-nokeys
 
 .include "options.mk"
 
-.if ${OPSYS} == "Darwin"
 # fixes: dyld: Symbol not found: _allow_severity
-CONFIGURE_ARGS+=	--disable-strip
-.endif
-
-.if ${OPSYS} == "Interix"
+CONFIGURE_ARGS.Darwin+=	--disable-strip
 
 # OpenSSH on Interix has some important caveats
+.if ${OPSYS} == "Interix"
 MESSAGE_SRC=		${.CURDIR}/MESSAGE.Interix
 BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib/bind
 CONFIGURE_ENV+=		ac_cv_func_openpty=no
@@ -116,9 +113,8 @@ CONFIGURE_ENV+=		ac_cv_func_strnvis=no
 .if (${OPSYS} == "SunOS") && (${OS_VERSION} == "5.8" || ${OS_VERSION} == "5.9")
 CONFIGURE_ARGS+=	--disable-utmp --disable-wtmp
 .endif
-.if ${OPSYS} == "Linux"
-CONFIGURE_ARGS+=	--enable-md5-password
-.endif
+
+CONFIGURE_ARGS.Linux+=	--enable-md5-password
 
 # The ssh-askpass program is in ${X11BASE}/bin or ${PREFIX}/bin depending
 # on if it's part of the X11 distribution, or if it's installed from pkgsrc
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index d23a7e6818f..5dcd7423730 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/08/23 14:30:41 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/02/26 09:41:06 jperkin Exp $
 #
 
 DISTNAME=	openvas-libraries-2.0.0
@@ -19,12 +19,8 @@ USE_TOOLS+=	pkg-config
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
-.include "../../mk/bsd.prefs.mk"
-
 # DragonFly-2.8.2 has dn_expand(3) in libc, and not have libresolv.
-.if ${OPSYS} == "DragonFly"
-BUILDLINK_TRANSFORM+=	rm:-lresolv
-.endif
+BUILDLINK_TRANSFORM.DragonFly+=	rm:-lresolv
 
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index 22ddbb86112..cc6f7ce37ea 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2016/02/07 14:16:59 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2016/02/26 09:41:06 jperkin Exp $
 
 DISTNAME=	IO-Socket-SSL-2.024
 PKGNAME=	p5-${DISTNAME}
@@ -18,14 +18,11 @@ DEPENDS+=	p5-Mozilla-CA-[0-9]*:../../security/p5-Mozilla-CA
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/IO/Socket/SSL/.packlist
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "MirBSD"
-SUBST_CLASSES+=			openssl
-SUBST_STAGE.openssl=		pre-configure
-SUBST_MESSAGE.openssl=		Adapting minimum OpenSSL version.
-SUBST_FILES.openssl=		Makefile.PL
-SUBST_SED.openssl=		-e 's/openssl < 0x00908000/openssl < 0x00907000/'
-.endif
+SUBST_CLASSES.MirBSD+=	openssl
+SUBST_STAGE.openssl=	pre-configure
+SUBST_MESSAGE.openssl=	Adapting minimum OpenSSL version.
+SUBST_FILES.openssl=	Makefile.PL
+SUBST_SED.openssl=	-e 's/openssl < 0x00908000/openssl < 0x00907000/'
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pam-dbm/Makefile b/security/pam-dbm/Makefile
index a6abc9b06f2..ede93b56fad 100644
--- a/security/pam-dbm/Makefile
+++ b/security/pam-dbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 18:16:48 asau Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/26 09:41:06 jperkin Exp $
 #
 
 DISTNAME=		pam_dbm-0.2
@@ -20,12 +20,7 @@ BDB_ACCEPTED=		db1
 
 # Fix (workaround?) a bug with openpam/NetBSD
 # The bug is described in PR security/39313.
-#
-.include "../../mk/bsd.prefs.mk"
-#
-.if ${OPSYS} == "NetBSD"
-CFLAGS+=		-DNO_STATIC_MODULES
-.endif
+CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/authtest ${DESTDIR}${PREFIX}/sbin/pam_dbm-authtest
diff --git a/security/pam-fprint/Makefile b/security/pam-fprint/Makefile
index db9809ae332..9871e9ccb79 100644
--- a/security/pam-fprint/Makefile
+++ b/security/pam-fprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/12/30 08:26:08 plunky Exp $
+# $NetBSD: Makefile,v 1.6 2016/02/26 09:41:06 jperkin Exp $
 
 DISTNAME=	pam_fprint-0.2
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -11,18 +11,13 @@ HOMEPAGE=	http://reactivated.net/fprint/wiki/Pam_fprint
 COMMENT=	PAM module to provide authentication using fingerprint readers
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake pkg-config
 
 # Fix (workaround?) a bug with openpam/NetBSD
 # The bug is described in PR security/39313.
-#
-.include "../../mk/bsd.prefs.mk"
-#
-.if ${OPSYS} == "NetBSD"
-CFLAGS+=		-DNO_STATIC_MODULES
-.endif
+CFLAGS.NetBSD+=	-DNO_STATIC_MODULES
 
 .include "../../security/libfprint/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 6864a79da7f..f295e1ca222 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2014/07/28 18:23:39 fhajny Exp $
+# $NetBSD: Makefile,v 1.44 2016/02/26 09:41:06 jperkin Exp $
 
 DISTNAME=	pam_ldap-186
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -25,11 +25,7 @@ CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/ldap.secret
 
 # Fix (workaround?) a bug with openpam/NetBSD
 # The bug is described in PR security/39313.
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CFLAGS+=		-DNO_STATIC_MODULES
-.endif
+CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
 
 # shared with databases/nss_ldap
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
diff --git a/security/pam-mkhomedir/Makefile b/security/pam-mkhomedir/Makefile
index 4144fde4f74..cf5d3b21eaf 100644
--- a/security/pam-mkhomedir/Makefile
+++ b/security/pam-mkhomedir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/10 13:45:16 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/26 09:41:06 jperkin Exp $
 
 DISTNAME=	pam-mkhomedir-1
 CATEGORIES=	security
@@ -31,12 +31,7 @@ do-install:
 
 # Fix (workaround?) a bug with openpam/NetBSD
 # The bug is described in PR security/39313.
-#
-.include "../../mk/bsd.prefs.mk"
-#
-.if ${OPSYS} == "NetBSD"
-CFLAGS+=		-DNO_STATIC_MODULES
-.endif
+CFLAGS.NetBSD+=		-DNO_STATIC_MODULES
 
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/racoon2/options.mk b/security/racoon2/options.mk
index 3f84081b702..ddc3b9185dd 100644
--- a/security/racoon2/options.mk
+++ b/security/racoon2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2012/01/11 20:08:39 drochner Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/26 09:41:06 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.racoon2
 PKG_SUPPORTED_OPTIONS=	iked kinkd
@@ -28,6 +28,4 @@ CONFIGURE_ARGS+=	--disable-kinkd
 PLIST_SUBST+=		KINKD="@comment "
 .endif
 
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-natt
-.endif
+CONFIGURE_ARGS.Darwin+=	--disable-natt
diff --git a/security/skey/Makefile b/security/skey/Makefile
index 55d807530a0..9df3ce79b84 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/06/12 10:51:10 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2016/02/26 09:41:06 jperkin Exp $
 #
 
 DISTNAME=		skey-1.1.5
@@ -23,21 +23,17 @@ REPLACE_PERL=		skeyprune.pl
 
 INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 
-.include "../../mk/bsd.prefs.mk"
-
 # PR#40434
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_header_md4_h=no
-CONFIGURE_ENV+=		ac_cv_header_sha1_h=no
-BUILDLINK_TRANSFORM+=	l:crypt:md5:crypt
-.endif
+CONFIGURE_ENV.SunOS+=		ac_cv_header_md4_h=no
+CONFIGURE_ENV.SunOS+=		ac_cv_header_sha1_h=no
+BUILDLINK_TRANSFORM.SunOS+=	l:crypt:md5:crypt
+
 # PR#44324
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ENV+=		ac_cv_header_rmd160_h=no
-.endif
-.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
-BUILDLINK_TRANSFORM+=	l:crypt:md:crypt
-.endif
+CONFIGURE_ENV.DragonFly+=	ac_cv_header_rmd160_h=no
+
+BUILDLINK_TRANSFORM.DragonFly+=	l:crypt:md:crypt
+BUILDLINK_TRANSFORM.FreeBSD+=	l:crypt:md:crypt
+
 # setusercontext() is in -lutil
 LIBS.DragonFly+=	-lutil
 LIBS.FreeBSD+=		-lutil
diff --git a/security/skey/buildlink3.mk b/security/skey/buildlink3.mk
index 9c22d9f0181..19cf5f74a2f 100644
--- a/security/skey/buildlink3.mk
+++ b/security/skey/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:53:58 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2016/02/26 09:41:06 jperkin Exp $
 
 BUILDLINK_TREE+=	skey
 
@@ -13,12 +13,10 @@ BUILDLINK_DEPMETHOD.skey?=	build
 .include "../../mk/bsd.fast.prefs.mk"
 
 # PR#40434
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	l:skey:skey:md5
+BUILDLINK_TRANSFORM.SunOS+=	l:skey:skey:md5
 # PR#44324
-.elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
-BUILDLINK_TRANSFORM+=	l:skey:skey:md
-.endif
+BUILDLINK_TRANSFORM.DragonFly+=	l:skey:skey:md
+BUILDLINK_TRANSFORM.FreeBSD+=	l:skey:skey:md
 .endif # SKEY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-skey
diff --git a/security/sniff/Makefile b/security/sniff/Makefile
index 54f9fe012d4..e66818c5e2b 100644
--- a/security/sniff/Makefile
+++ b/security/sniff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/02/06 19:31:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2016/02/26 09:41:06 jperkin Exp $
 #
 
 DISTNAME=	sniff-2.0
@@ -11,12 +11,8 @@ COMMENT=	Program to sniff logins and passwords
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1 sbin
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-LIBS+=		-lsocket -lnsl
-MAKE_ENV+=	LIBS=${LIBS:M*:Q}
-.endif
+LIBS.SunOS+=		-lsocket -lnsl
+MAKE_ENV.SunOS+=	LIBS=${LIBS:M*:Q}
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/spiped/Makefile b/security/spiped/Makefile
index 6f09afd8982..d199be4acf2 100644
--- a/security/spiped/Makefile
+++ b/security/spiped/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/12/14 09:32:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2016/02/26 09:41:06 jperkin Exp $
 
 DISTNAME=	spiped-1.5.0
 CATEGORIES=	net security
@@ -17,19 +17,19 @@ MAKE_FLAGS+=	MAN1DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 LDADD_EXTRA=	${COMPILER_RPATH_FLAG:Q}${BUILDLINK_PREFIX.openssl}/lib
 LDADD_EXTRA+=	-L${BUILDLINK_PREFIX.openssl}/lib
 
+OPSYSVARS+=		LDADD_EXTRA
+LDADD_EXTRA.SunOS+=	-lsocket -lnsl
+
 CFLAGS.SunOS+=	-D__EXTENSIONS__
 
 SMF_METHODS=	spiped
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-LDADD_EXTRA+=	-lsocket -lnsl
-.endif
-
 MAKE_ENV+=	LDADD_EXTRA="${LDADD_EXTRA}"
 
 INSTALLATION_DIRS+=	share/doc/spiped ${PKGMANDIR}/man1
 
+.include "../../mk/bsd.prefs.mk"
+
 .if ${INIT_SYSTEM} == "smf"
 MESSAGE_SRC+=	MESSAGE.smf
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index 1303764f025..579c09a813d 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/05/15 17:36:06 tron Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/26 09:41:07 jperkin Exp $
 
 DISTNAME=	sshguard-1.5
 PKGREVISION=	1
@@ -19,8 +19,6 @@ RCD_SCRIPTS=	sshguard
 
 # Claiming to be an X/Open applications hides inet_pton(3) under NetBSD
 # which this application needs.
-.if ${OPSYS} == "NetBSD"
-BUILDLINK_TRANSFORM+=	rm:-D_XOPEN_SOURCE
-.endif
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-D_XOPEN_SOURCE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sshguard/options.mk b/security/sshguard/options.mk
index 1f0411cef25..67ae76dc530 100644
--- a/security/sshguard/options.mk
+++ b/security/sshguard/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/07/26 19:57:44 tron Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/26 09:41:07 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.sshguard
 PKG_OPTIONS_REQUIRED_GROUPS=	firewall
@@ -11,25 +11,15 @@ PKG_OPTIONS_GROUP.firewall=	sshguard-aix sshguard-hosts sshguard-ipfilter \
 # Pick an appropriate default firewall depending on the platform. We however
 # don't restrict the firewall types. You can e.g. use "iptables" under NetBSD
 # to remotely manage a Linux firewall.
-.if ${OPSYS} == "AIX"
-PKG_SUGGESTED_OPTIONS=		sshguard-aix
-.elif ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS=		sshguard-ipfw
-.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS=		sshguard-pf
-.elif ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS=		sshguard-iptables
-.elif ${OPSYS} == "FreeBSD"
-PKG_SUGGESTED_OPTIONS=		sshguard-ipfw
-.elif ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS=		sshguard-ipfilter
-.elif ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS=		sshguard-pf
-.elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS=		sshguard-ipfilter
-.else
-PKG_SUGGESTED_OPTIONS=		sshguard-hosts
-.endif
+PKG_SUGGESTED_OPTIONS.AIX=		sshguard-aix
+PKG_SUGGESTED_OPTIONS.Darwin=		sshguard-ipfw
+PKG_SUGGESTED_OPTIONS.DragonFly=	sshguard-pf
+PKG_SUGGESTED_OPTIONS.FreeBSD=		sshguard-ipfw
+PKG_SUGGESTED_OPTIONS.Linux=		sshguard-iptables
+PKG_SUGGESTED_OPTIONS.NetBSD=		sshguard-ipfilter
+PKG_SUGGESTED_OPTIONS.OpenBSD=		sshguard-pf
+PKG_SUGGESTED_OPTIONS.SunOS=		sshguard-ipfilter
+PKG_SUGGESTED_OPTIONS.*=		sshguard-hosts
 
 .include "../../mk/bsd.options.mk"
 
@@ -41,9 +31,7 @@ CONFIGURE_ARGS+=	--with-firewall=hosts
 .elif !empty(PKG_OPTIONS:Msshguard-ipfilter)
 CONFIGURE_ARGS+=	--with-firewall=ipfilter
 # Set correct location of IPFilter configuration file under NetBSD.
-.  if ${OPSYS} == "NetbSD"
-CONFIGURE_ARGS+=	--with-ipfilterconf=/etc/ipf.conf
-.  endif
+CONFIGURE_ARGS.NetBSD+=	--with-ipfilterconf=/etc/ipf.conf
 .elif !empty(PKG_OPTIONS:Msshguard-ipfw)
 CONFIGURE_ARGS+=	--with-firewall=ipfw
 .elif !empty(PKG_OPTIONS:Msshguard-iptables)
diff --git a/security/sslproxy/Makefile b/security/sslproxy/Makefile
index eb824052ab4..336bcf7d1cf 100644
--- a/security/sslproxy/Makefile
+++ b/security/sslproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/02/12 23:18:37 tron Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/26 09:41:07 jperkin Exp $
 
 DISTNAME=	sslproxy-1.1.2
 PKGREVISION=	1
@@ -15,11 +15,7 @@ USE_TOOLS+=		gmake
 DOCDIR=			${PREFIX}/share/doc/ssl_proxy
 INSTALLATION_DIRS=	bin ${DOCDIR}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	LDLIBS="-lsocket -lnsl"
-.endif
+MAKE_ENV.SunOS+=	LDLIBS="-lsocket -lnsl"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ssl_proxy ${DESTDIR}${PREFIX}/bin/ssl_proxy
diff --git a/security/sudo/options.mk b/security/sudo/options.mk
index fec0fe8e1c6..0099107638c 100644
--- a/security/sudo/options.mk
+++ b/security/sudo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2016/01/09 11:22:12 adam Exp $
+# $NetBSD: options.mk,v 1.20 2016/02/26 09:41:07 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sudo
 PKG_SUPPORTED_OPTIONS=	ldap nls
@@ -9,9 +9,7 @@ PKG_OPTIONS_GROUP.auth=	kerberos pam skey
 PKG_SUGGESTED_OPTIONS=	skey
 .endif
 
-.if ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS=	pam
-.endif
+PKG_SUGGESTED_OPTIONS.Darwin=	pam
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile
index 152499d1560..c70bd9e55a3 100644
--- a/security/tor-browser/Makefile
+++ b/security/tor-browser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2016/02/26 09:41:07 jperkin Exp $
 
 TORBVER=	5.5.2
 
@@ -40,13 +40,9 @@ LDFLAGS.SunOS+=		-lm
 
 ALL_ENV+=		MOZILLA_PKG_NAME=tor-browser
 
-.include "../../mk/bsd.prefs.mk"
-
 # Avoid ld "invalid section index" errors.
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-fdata-sections
-BUILDLINK_TRANSFORM+=	rm:-ffunction-sections
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-fdata-sections
+BUILDLINK_TRANSFORM.SunOS+=	rm:-ffunction-sections
 
 LDFLAGS.DragonFly=	-lplc4 -lnspr4
 LDFLAGS.FreeBSD=	-lplc4 -lnspr4
diff --git a/security/tor-browser/options.mk b/security/tor-browser/options.mk
index a5819709ba0..be9235a58fd 100644
--- a/security/tor-browser/options.mk
+++ b/security/tor-browser/options.mk
@@ -1,14 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2016/02/14 07:30:54 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/26 09:41:07 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tor-browser
 PKG_SUPPORTED_OPTIONS+=	alsa debug debug-info mozilla-jemalloc pulseaudio
 PLIST_VARS+=		debug
 
-.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/security/validns/Makefile b/security/validns/Makefile
index 8db02109c60..2171f05a1dc 100644
--- a/security/validns/Makefile
+++ b/security/validns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/03/15 16:45:04 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/26 09:41:07 jperkin Exp $
 #
 
 DISTNAME=	validns-0.8
@@ -19,10 +19,7 @@ LICENSE=	2-clause-bsd
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	EXTRALIBS="-lsocket -lnsl"
-.endif
+MAKE_ENV.SunOS+=	EXTRALIBS="-lsocket -lnsl"
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 212790d8665..520d1cfb531 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2015/06/12 10:51:11 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2016/02/26 09:41:07 jperkin Exp $
 
 DISTNAME=	zebedee-2.5.3
 PKGREVISION=	10
@@ -13,12 +13,9 @@ USE_TOOLS+=		gmake perl tclsh:run
 
 MAKE_ENV+=		PERL5=${PERL5:Q}
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-MAKE_FLAGS+=		OS=macosx
-.else
-MAKE_FLAGS+=		OS=${LOWER_OPSYS:Q}
-.endif
+OPSYSVARS+=		MAKE_FLAGS
+MAKE_FLAGS.Darwin+=	OS=macosx
+MAKE_FLAGS.*+=		OS=${LOWER_OPSYS:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing tclsh paths.
@@ -35,5 +32,4 @@ PTHREAD_CFLAGS+=  -DHAVE_PTHREADS
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"