Use OPSYSVARS.

7 files changed, 17 insertions, 41 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index a560dd9536d..42c69f12d80 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.226 2016/02/07 11:29:30 leot Exp $
+# $NetBSD: Makefile,v 1.227 2016/02/25 17:52:45 jperkin Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -70,9 +70,7 @@ PLIST.notmac=		yes
 # Avoid the following error when compiling with clang.
 # /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
 # can not be used when making a shared object; recompile with -fPIC
-.if ${OPSYS} == "FreeBSD"
-BUILDLINK_TRANSFORM+=	rm:-Wl,-pie
-.endif
+BUILDLINK_TRANSFORM.FreeBSD+=	rm:-Wl,-pie
 
 # CUPS_USER		user to run filter and CGI programs as
 # CUPS_GROUP		group to run filter and CGI programs as
diff --git a/print/cups15/Makefile b/print/cups15/Makefile
index 64fded10d01..2256124ef2c 100644
--- a/print/cups15/Makefile
+++ b/print/cups15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/10/10 17:05:17 richard Exp $
+# $NetBSD: Makefile,v 1.10 2016/02/25 17:52:45 jperkin Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -90,9 +90,7 @@ PLIST.notmac=		yes
 # Avoid the following error when compiling with clang.
 # /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
 # can not be used when making a shared object; recompile with -fPIC
-.if ${OPSYS} == "FreeBSD"
-BUILDLINK_TRANSFORM+=	rm:-Wl,-pie
-.endif
+BUILDLINK_TRANSFORM.FreeBSD+=	rm:-Wl,-pie
 
 # CUPS_USER		user to run filter and CGI programs as
 # CUPS_GROUP		group to run filter and CGI programs as
diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile
index 3b8d8c49b1f..57a22766ae8 100644
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/12/10 11:58:58 markd Exp $
+# $NetBSD: Makefile,v 1.18 2016/02/25 17:52:45 jperkin Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
@@ -65,9 +65,7 @@ SUBST_MESSAGE.resdir=	Fixing resource directory path
 SUBST_FILES.resdir=	Resource/Init/gs_res.ps
 SUBST_SED.resdir=	-e "s|/Resource/|${GS_RESOURCEDIR}/|g"
 
-.if ${OPSYS} == "HPUX"
-CONFIGURE_ENV+=		ac_cv_func_fopen64=no
-.endif
+CONFIGURE_ENV.HPUX+=	ac_cv_func_fopen64=no
 
 # On Linux-*-x86_64, there was an error message:
 # gp_unix.o: relocation R_X86_64_32 against `a local symbol' can not be
@@ -78,9 +76,7 @@ CFLAGS+=		-fPIC
 
 # Interim IRIX build fix, the real problem is that fontconfig.pc doesn't
 # require linking against libiconv when it should do so.
-.if ${OPSYS} == "IRIX"
-BUILDLINK_TRANSFORM+=	l:fontconfig:fontconfig:iconv
-.endif
+BUILDLINK_TRANSFORM.IRIX+=	l:fontconfig:fontconfig:iconv
 
 CONFIGURE_ENV+=	LPLIBDIR=${PREFIX}/lib
 
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index aab56d7ba0a..7791fb4b53c 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/09/23 08:25:09 he Exp $
+# $NetBSD: Makefile,v 1.20 2016/02/25 17:52:45 jperkin Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-gpl/}
@@ -66,9 +66,7 @@ SUBST_MESSAGE.resdir=	Fixing resource directory path
 SUBST_FILES.resdir=	Resource/Init/gs_res.ps
 SUBST_SED.resdir=	-e "s|/Resource/|${GS_RESOURCEDIR}/|g"
 
-.if ${OPSYS} == "HPUX"
-CONFIGURE_ENV+=		ac_cv_func_fopen64=no
-.endif
+CONFIGURE_ENV.HPUX+=	ac_cv_func_fopen64=no
 
 # On Linux-*-x86_64, there was an error message:
 # gp_unix.o: relocation R_X86_64_32 against `a local symbol' can not be
@@ -79,9 +77,7 @@ CFLAGS+=		-fPIC
 
 # Interim IRIX build fix, the real problem is that fontconfig.pc doesn't
 # require linking against libiconv when it should do so.
-.if ${OPSYS} == "IRIX"
-BUILDLINK_TRANSFORM+=	l:fontconfig:fontconfig:iconv
-.endif
+BUILDLINK_TRANSFORM.IRIX+=	l:fontconfig:fontconfig:iconv
 
 CONFIGURE_ENV+=	LPLIBDIR=${PREFIX}/lib
 
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index a476cbfaf70..21cff93ae9d 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2015/04/25 14:24:46 tnn Exp $
+# $NetBSD: Makefile,v 1.98 2016/02/25 17:52:45 jperkin Exp $
 #
 
 DISTNAME=	libgnomeprint-2.18.8
@@ -37,13 +37,9 @@ CONFIGURE_ARGS+=	--without-cups
 
 CONFIGURE_ARGS+=	--without-papi
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
 # AC_LTDL_SHLIBEXT doesn't work on Darwin (and would give the wrong
 # answer here even if it did).
-CONFIGURE_ENV+=		libltdl_cv_shlibext=so
-.endif
+CONFIGURE_ENV.Darwin+=	libltdl_cv_shlibext=so
 
 PRINT_PLIST_AWK+=	/cups/ { print "$${USE_CUPS}" $$0; next; }
 
diff --git a/print/mp/Makefile b/print/mp/Makefile
index 20e9a001b14..2526e781977 100644
--- a/print/mp/Makefile
+++ b/print/mp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/08 13:45:42 asau Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/25 17:52:45 jperkin Exp $
 #
 
 DISTNAME=	mpdist-3.7.1
@@ -14,12 +14,8 @@ COMMENT=	PostScript pretty printer
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-.else
-CONFIGURE_ARGS+=--enable-bsd-print
-.endif
+CONFIGURE_ARGS.SunOS+=	# empty
+CONFIGURE_ARGS.*+=	--enable-bsd-print
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile
index a78511a2bee..dabf764a988 100644
--- a/print/rtf2latex/Makefile
+++ b/print/rtf2latex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 13:45:46 asau Exp $
+# $NetBSD: Makefile,v 1.16 2016/02/25 17:52:45 jperkin Exp $
 
 DISTNAME=	rtf2LaTeX.1.5
 PKGNAME=	rtf2latex-1.5
@@ -14,11 +14,7 @@ NO_CONFIGURE=	yes
 post-extract:
 	${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	XCFLAGS="${CPPFLAGS} -DSYSV" CC=${CC:Q}
-.endif
+MAKE_ENV.SunOS+=	XCFLAGS="${CPPFLAGS} -DSYSV" CC=${CC:Q}
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1