Use OPSYSVARS.

FluentDevelopment · Feb 26, 2016 · 9c60715 · 9c60715
1 parent d5f3956
commit 9c60715
Show file tree

Hide file tree

Showing 34 changed files with 112 additions and 233 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,20 +11,15 @@ 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
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}