Use OPSYSVARS.

13 files changed, 49 insertions, 97 deletions

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 17f109b15fe..36a4d37a57f 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2015/08/23 14:30:35 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2016/02/25 11:46:20 jperkin Exp $
 
 DISTNAME=	freetds-0.91
 PKGREVISION=	4
@@ -19,12 +19,8 @@ CONFIGURE_ARGS+=	--with-tdsver=7.0
 # no thread-safe resolver functions on NetBSD
 CONFIGURE_ARGS+=	--disable-threadsafe
 
-.include "../../mk/bsd.prefs.mk"
-
 # Fails to build the shared lib on SunOS with -O2 or greater
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-O[23]
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-O[23]
 
 EGDIR=		${PREFIX}/share/examples/freetds
 CONF_FILES+=	${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index fc278eb5f83..d7fb1457ad7 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/08/30 22:33:46 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/25 11:46:20 jperkin Exp $
 #
 
 DISTNAME=	gigabase-3.82
@@ -19,11 +19,7 @@ PTHREAD_AUTO_VARS=	yes
 
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	ac_cv_func_gethostbyname_r=no
-.endif
+CONFIGURE_ARGS.NetBSD+=	ac_cv_func_gethostbyname_r=no
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mariadb55-client/Makefile.common b/databases/mariadb55-client/Makefile.common
index 96a5abe3bea..4f35699b8c1 100644
--- a/databases/mariadb55-client/Makefile.common
+++ b/databases/mariadb55-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2015/05/07 12:45:28 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/02/25 11:46:21 jperkin Exp $
 #
 # used by databases/mariadb55-client/Makefile
 # used by databases/mariadb55-server/Makefile
@@ -43,9 +43,7 @@ PKG_GROUPS_VARS+=	MYSQL_GROUP
 
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
-.if ${OPSYS} == "IRIX"
-CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
-.endif
+CFLAGS.IRIX+=		-DIRIX5 -DNEEDS_BSTRING_H
 
 BUILD_DEFS+=		VARBASE
 
@@ -93,10 +91,8 @@ CXXFLAGS+=		-fPIC -DPIC
 
 # force HAVE_CURSES_H on Solaris since the configure script is broken
 # and does not properly detect this, breaking the build later on.
-.if ${OPSYS} == "SunOS"
-CFLAGS+=		-DHAVE_CURSES_H
-CXXFLAGS+=		-DHAVE_CURSES_H
-.endif
+CFLAGS.SunOS+=		-DHAVE_CURSES_H
+CXXFLAGS.SunOS+=	-DHAVE_CURSES_H
 
 # SCO OpenServer 5.0.7/3.2's readdir_r has 2 arguments and return struct dirent.
 .if ${OS_VARIANT} == "SCOOSR5"
diff --git a/databases/mysql-cluster/Makefile.common b/databases/mysql-cluster/Makefile.common
index e77dad516c1..23c5a8de259 100644
--- a/databases/mysql-cluster/Makefile.common
+++ b/databases/mysql-cluster/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2015/09/07 04:33:06 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.9 2016/02/25 11:46:21 jperkin Exp $
 #
 # used by databases/mysql-cluster/Makefile
 
@@ -37,9 +37,7 @@ PKG_GROUPS_VARS+=	MYSQL_GROUP
 
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
-.if ${OPSYS} == "IRIX"
-CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
-.endif
+CFLAGS.IRIX+=		-DIRIX5 -DNEEDS_BSTRING_H
 
 BUILD_DEFS+=		VARBASE
 
@@ -88,11 +86,9 @@ CXXFLAGS+=		-fPIC -DPIC
 # force HAVE_CURSES_H on Solaris since the configure script is broken
 # and does not properly detect this, breaking the build later on.  Also
 # explicitly disable epoll support as it is Linux-specific.
-.if ${OPSYS} == "SunOS"
-CMAKE_ARGS+=		-DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO
-CFLAGS+=		-DHAVE_CURSES_H
-CXXFLAGS+=		-DHAVE_CURSES_H
-.endif
+CMAKE_ARGS.SunOS+=	-DHAVE_SYS_EPOLL_H=NO -DHAVE_EPOLL_CREATE=NO
+CFLAGS.SunOS+=		-DHAVE_CURSES_H
+CXXFLAGS.SunOS+=	-DHAVE_CURSES_H
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common
index d110a0c6d84..1c422c797f1 100644
--- a/databases/mysql51-client/Makefile.common
+++ b/databases/mysql51-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2014/05/28 10:16:54 markd Exp $
+# $NetBSD: Makefile.common,v 1.33 2016/02/25 11:46:21 jperkin Exp $
 #
 # used by databases/mysql51-client/Makefile
 # used by databases/mysql51-server/Makefile
@@ -42,11 +42,9 @@ CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
 CONFIGURE_ARGS+=	--without-libwrap
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
-.if ${OPSYS} == "IRIX"
-CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
+CFLAGS.IRIX+=		-DIRIX5 -DNEEDS_BSTRING_H
 # libgen is incorrectly detected
-CONFIGURE_ENV+=		ac_cv_lib_gen_p2open="no"
-.endif
+CONFIGURE_ENV.IRIX+=	ac_cv_lib_gen_p2open="no"
 
 BUILD_DEFS+=		VARBASE
 
@@ -78,9 +76,7 @@ GNU_ARCH.i386=		i486
 CFLAGS+=		-march=i486
 .endif
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=		ac_cv_func_gethostbyname_r="no"
-.endif
+CONFIGURE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r="no"
 
 CONFIGURE_ENV+=		mysql_cv_compress="yes"
 
@@ -94,10 +90,8 @@ CXXFLAGS+=		-fPIC -DPIC
 
 # force HAVE_CURSES_H on Solaris since the configure script is broken
 # and does not properly detect this, breaking the build later on.
-.if ${OPSYS} == "SunOS"
-CFLAGS+=		-DHAVE_CURSES_H
-CXXFLAGS+=		-DHAVE_CURSES_H
-.endif
+CFLAGS.SunOS+=		-DHAVE_CURSES_H
+CXXFLAGS.SunOS+=	-DHAVE_CURSES_H
 
 .include "../../mk/pthread.buildlink3.mk"
 
@@ -135,12 +129,10 @@ SUBST_SED.scr+=		-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scr=	Fixing scripts.
 
 # Fix broken shared library detection under Mac OS X
-.if ${OPSYS} == "Darwin"
-SUBST_CLASSES+=		dylib
+SUBST_CLASSES.Darwin+=	dylib
 SUBST_STAGE.dylib=	pre-configure
 SUBST_FILES.dylib=	configure
 SUBST_SED.dylib=	-e "s|\\\$$shrext_cmds|\\.dylib|g"
-.endif
 
 pre-configure:
 	${RM} -f ${WRKSRC}/configure~
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index b8b2cb12aeb..d383196bdc8 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2015/12/07 15:54:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.49 2016/02/25 11:46:21 jperkin Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
@@ -41,9 +41,7 @@ PKG_GROUPS_VARS+=	MYSQL_GROUP
 
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
-.if ${OPSYS} == "IRIX"
-CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
-.endif
+CFLAGS.IRIX+=		-DIRIX5 -DNEEDS_BSTRING_H
 
 BUILD_DEFS+=		VARBASE
 
@@ -91,10 +89,8 @@ CXXFLAGS+=		-fPIC -DPIC
 
 # force HAVE_CURSES_H on Solaris since the configure script is broken
 # and does not properly detect this, breaking the build later on.
-.if ${OPSYS} == "SunOS"
-CFLAGS+=		-DHAVE_CURSES_H
-CXXFLAGS+=		-DHAVE_CURSES_H
-.endif
+CFLAGS.SunOS+=		-DHAVE_CURSES_H
+CXXFLAGS.SunOS+=	-DHAVE_CURSES_H
 
 # SCO OpenServer 5.0.7/3.2's readdir_r has 2 arguments and return struct dirent.
 .if ${OS_VARIANT} == "SCOOSR5"
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index 391aab3b623..792fb546b12 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2015/12/08 08:49:50 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2016/02/25 11:46:21 jperkin Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
@@ -41,9 +41,7 @@ PKG_GROUPS_VARS+=	MYSQL_GROUP
 
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
-.if ${OPSYS} == "IRIX"
-CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
-.endif
+CFLAGS.IRIX+=		-DIRIX5 -DNEEDS_BSTRING_H
 
 BUILD_DEFS+=		VARBASE
 
@@ -90,11 +88,9 @@ CXXFLAGS+=		-fPIC -DPIC
 # Force HAVE_CURSES_H on Solaris since the configure script is broken
 # and does not properly detect this, breaking the build later on.  Also
 # explicitly disable epoll support as it is Linux-specific.
-.if ${OPSYS} == "SunOS"
-CMAKE_ARGS+=		-DHAVE_SYS_EPOLL_H=NO
-CFLAGS+=		-DHAVE_CURSES_H
-CXXFLAGS+=		-DHAVE_CURSES_H
-.endif
+CMAKE_ARGS.SunOS+=	-DHAVE_SYS_EPOLL_H=NO
+CFLAGS.SunOS+=		-DHAVE_CURSES_H
+CXXFLAGS.SunOS+=	-DHAVE_CURSES_H
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 7cea46f3e00..4d691cebaa8 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2013/05/10 06:51:26 riastradh Exp $
+# $NetBSD: Makefile.common,v 1.37 2016/02/25 11:46:21 jperkin Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -51,8 +51,7 @@ PKG_USERS_VARS+=	SLAPD_USER
 
 # the internal avl_* prototypes conflict with those in <sys/avl.h> which
 # is included by another system header file on Solaris, so subst them.
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+=		conflict
+SUBST_CLASSES.SunOS+=	conflict
 SUBST_STAGE.conflict=	post-patch
 SUBST_FILES.conflict=	${WRKSRC}/*/*.h
 SUBST_FILES.conflict+=	${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
@@ -62,7 +61,6 @@ SUBST_SED.conflict+=	-e 's,avl_delete,openldap_avl_delete,g'
 SUBST_SED.conflict+=	-e 's,avl_find,openldap_avl_find,g'
 SUBST_SED.conflict+=	-e 's,avl_find2,openldap_avl_find2,g'
 SUBST_MESSAGE.conflict=	Fixing conflicting function prototypes.
-.endif
 
 CPPFLAGS.Darwin+=	-DBIND_8_COMPAT
 CPPFLAGS.Linux+=	-D_GNU_SOURCE
diff --git a/databases/postgresql91/Makefile.common b/databases/postgresql91/Makefile.common
index 56634bc9229..7a4da80100c 100644
--- a/databases/postgresql91/Makefile.common
+++ b/databases/postgresql91/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2016/02/25 01:06:31 tnn Exp $
+# $NetBSD: Makefile.common,v 1.29 2016/02/25 11:46:21 jperkin Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -81,14 +81,11 @@ CONFIGURE_ARGS+=	--without-zlib
 
 # sys/ucred.h shouldn't be included on Solaris, causes conflicts between
 # procfs and largefile.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_header_sys_ucred_h=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_header_sys_ucred_h=no
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
-CONFIGURE_ARGS+=	--disable-thread-safety
-.endif
+CONFIGURE_ARGS.MirBSD+=		--disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=	--disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common
index 9437eac4fb3..bb4cbe91c09 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2016/02/25 00:41:54 tnn Exp $
+# $NetBSD: Makefile.common,v 1.20 2016/02/25 11:46:21 jperkin Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -81,14 +81,11 @@ CONFIGURE_ARGS+=	--without-zlib
 
 # sys/ucred.h shouldn't be included on Solaris, causes conflicts between
 # procfs and largefile.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_header_sys_ucred_h=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_header_sys_ucred_h=no
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
-CONFIGURE_ARGS+=	--disable-thread-safety
-.endif
+CONFIGURE_ARGS.MirBSD+=		--disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=	--disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index 11d5b01b1d1..2a7066ab4f4 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2016/02/25 00:06:30 tnn Exp $
+# $NetBSD: Makefile.common,v 1.16 2016/02/25 11:46:21 jperkin Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -80,14 +80,11 @@ CONFIGURE_ARGS+=	--without-zlib
 
 # sys/ucred.h shouldn't be included on Solaris, causes conflicts between
 # procfs and largefile.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_header_sys_ucred_h=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_header_sys_ucred_h=no
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
-CONFIGURE_ARGS+=	--disable-thread-safety
-.endif
+CONFIGURE_ARGS.MirBSD+=		--disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=	--disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index 2ab39ccd437..df075226024 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2016/02/25 01:38:56 tnn Exp $
+# $NetBSD: Makefile.common,v 1.8 2016/02/25 11:46:21 jperkin Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -80,14 +80,11 @@ CONFIGURE_ARGS+=	--without-zlib
 
 # sys/ucred.h shouldn't be included on Solaris, causes conflicts between
 # procfs and largefile.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_header_sys_ucred_h=no
-.endif
+CONFIGURE_ENV.SunOS+=	ac_cv_header_sys_ucred_h=no
 
 # configure fails on OpenBSD and MirBSD if thread safety is enabled.
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
-CONFIGURE_ARGS+=	--disable-thread-safety
-.endif
+CONFIGURE_ARGS.MirBSD+=		--disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=	--disable-thread-safety
 
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index 3d3ebfe6af0..e455e86235a 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/12/11 21:40:50 riz Exp $
+# $NetBSD: Makefile,v 1.2 2016/02/25 11:46:21 jperkin Exp $
 
 DISTNAME=	carbon-0.9.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -43,13 +43,11 @@ SUBST_VARS.dirs=	GRAPHITE_DIR GRAPHITE_EGDIR GRAPHITE_USER PREFIX \
 			PKG_SYSCONFDIR VARBASE
 
 # NetBSD has posix_fallocate in libc, but fs can't actually use it.
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		fallocate
+SUBST_CLASSES.NetBSD+=	fallocate
 SUBST_STAGE.fallocate=	pre-configure
 SUBST_MESSAGE.fallocate=Patching for NetBSD defaults
 SUBST_FILES.fallocate=	conf/carbon.conf.example
 SUBST_SED.fallocate=	-e 's,^\(WHISPER_FALLOCATE_CREATE *= *\)\(.*\),\1False,'
-.endif
 
 PKG_SYSCONFSUBDIR=	graphite