Use OPSYSVARS.

7 files changed, 22 insertions, 44 deletions

diff --git a/textproc/CRF++/Makefile b/textproc/CRF++/Makefile
index acc4b272e98..c80450b0e11 100644
--- a/textproc/CRF++/Makefile
+++ b/textproc/CRF++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/05/11 14:58:24 mef Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/26 10:32:47 jperkin Exp $
 #
 
 DISTNAME=	CRF++-0.58
@@ -13,17 +13,14 @@ LICENSE=	gnu-lgpl-v2.1 OR 2-clause-bsd
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-USE_TOOLS+=		gmake
-.endif
+USE_TOOLS+=	gmake
 
 PTHREAD_AUTO_VARS=	yes
+
 SUBST_CLASSES+=			pthread_flags
 SUBST_STAGE.pthread_flags=	pre-configure
 SUBST_FILES.pthread_flags=	configure
 SUBST_SED.pthread_flags=	-e 's/-lpthread/'${PTHRAD_LIBS:M*:Q}' '${PTHREAD_LDFLAGS:M*:Q}'/'
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/groff/options.mk b/textproc/groff/options.mk
index 7bfc81033e1..3a66a4d695b 100644
--- a/textproc/groff/options.mk
+++ b/textproc/groff/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2015/10/03 07:26:11 richard Exp $
+# $NetBSD: options.mk,v 1.8 2016/02/26 10:32:47 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groff
 PKG_SUPPORTED_OPTIONS=	groff-docs x11
@@ -20,10 +20,7 @@ CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-appresdir=${PREFIX}/lib/X11/app-defaults
 PLIST_SRC+=		PLIST.x11
 .include "../../mk/xaw.buildlink3.mk"
-.include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} == "Interix"
-CONFIGURE_ENV+=		X_EXTRA_LIBS=-lXext
-.endif
+CONFIGURE_ENV.Interix+=	X_EXTRA_LIBS=-lXext
 .else
 CONFIGURE_ARGS+=	--without-x
 .endif
diff --git a/textproc/ispell-en_GB/Makefile b/textproc/ispell-en_GB/Makefile
index dfcd7f74434..d100dd86cf7 100644
--- a/textproc/ispell-en_GB/Makefile
+++ b/textproc/ispell-en_GB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/03/14 08:15:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2016/02/26 10:32:47 jperkin Exp $
 #
 
 DISTNAME=	ispell-3.4.00
@@ -25,12 +25,9 @@ MAKE_FLAGS+=	TMPDIR=${WRKDIR:Q}
 INSTALLATION_DIRS=	lib
 MAKE_JOBS_SAFE=		no
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-WORDS=		/usr/dict/words
-.else
-WORDS=		/usr/share/dict/words
-.endif
+OPSYSVARS+=	WORDS
+WORDS.SunOS=	/usr/dict/words
+WORDS.*=	/usr/share/dict/words
 
 do-configure:
 	cd ${WRKSRC};							\
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index b41088162fa..c33c27dc9b5 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2015/11/22 23:49:03 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2016/02/26 10:32:47 jperkin Exp $
 
 DISTNAME=	libxml2-2.9.3
 CATEGORIES=	textproc
@@ -30,8 +30,6 @@ PKGCONFIG_OVERRIDE=	libxml-2.0.pc.in
 
 MAKE_ENV+=	PAX=${PAX:Q}
 
-.include "../../mk/bsd.prefs.mk"
-
 TEST_TARGET=	check
 
 SUBST_CLASSES+=		cat
@@ -40,9 +38,7 @@ SUBST_FILES.cat=	catalog.c xmlcatalog.c
 SUBST_SED.cat=	-e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
 SUBST_SED.cat+=	-e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"
 
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-Werror=format=2
-.endif
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Werror=format=2
 
 LDFLAGS.SCO_SV+=	-lm
 
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 077be5e0799..34465a50730 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2015/07/08 10:34:46 richard Exp $
+# $NetBSD: Makefile,v 1.102 2016/02/26 10:32:47 jperkin Exp $
 
 DISTNAME=	libxslt-1.1.28
 PKGREVISION=	5
@@ -11,6 +11,9 @@ HOMEPAGE=	http://xmlsoft.org/XSLT/
 COMMENT=	XSLT parser library from the GNOME project
 LICENSE=	mit # with advertisement clause
 
+BUILD_DEPENDS+=	docbook-xml-[0-9]*:../../textproc/docbook-xml
+BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
@@ -22,6 +25,8 @@ PKGCONFIG_OVERRIDE=	libxslt.pc.in
 PKGCONFIG_OVERRIDE+=	libexslt.pc.in
 TEST_TARGET=		check
 
+BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms
+
 .include "../../mk/bsd.prefs.mk"
 .if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CPPFLAGS+=	-Dsocklen_t=int
@@ -30,13 +35,6 @@ CPPFLAGS+=	-Dsocklen_t=int
 post-extract:
 	cp ${WRKSRC}/libxslt/libxslt.syms ${WRKSRC}/libxslt/libxslt_solaris.syms
 
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	opt:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms
-.endif
-
-BUILD_DEPENDS+=	docbook-xml-[0-9]*:../../textproc/docbook-xml
-BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
 BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.27
 
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/textproc/pod2mdoc/Makefile b/textproc/pod2mdoc/Makefile
index f058d6bec37..877a63cf84c 100644
--- a/textproc/pod2mdoc/Makefile
+++ b/textproc/pod2mdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/06/12 10:51:40 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/26 10:32:47 jperkin Exp $
 
 DISTNAME=	pod2mdoc-0.2
 PKGREVISION=	1
@@ -19,10 +19,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pod2mdoc ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/pod2mdoc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS+=	-DHAVE_OHASH=0
-.endif
+CPPFLAGS.NetBSD+=	-DHAVE_OHASH=0
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlrpc-c/Makefile b/textproc/xmlrpc-c/Makefile
index 10bdc918813..6b2fbed5265 100644
--- a/textproc/xmlrpc-c/Makefile
+++ b/textproc/xmlrpc-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/01/15 13:02:26 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2016/02/26 10:32:47 jperkin Exp $
 
 DISTNAME=	xmlrpc-c-1.25.26
 # the "super stable" branch
@@ -41,9 +41,7 @@ SUBST_FILES.pthread=	xmlrpc-c-config.* xmlrpc-c-config.test.*
 SUBST_SED.pthread=	-e 's/-lpthread/${PTHREAD_LINKFLAGS:Q}/'
 SUBST_SED.pthread+=	-e 's/-L\(.\)libdir/-L\1libdir ${COMPILER_RPATH_FLAG}\1libdir/'
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "MirBSD"
-SUBST_CLASSES+=		xopen
+SUBST_CLASSES.MirBSD+=	xopen
 SUBST_STAGE.xopen=	pre-configure
 SUBST_MESSAGE.xopen=	Removing _XOPEN_SOURCE lines.
 SUBST_FILES.xopen+=	lib/abyss/src/data.c lib/abyss/src/response.c lib/abyss/src/conf.c
@@ -56,7 +54,6 @@ SUBST_FILES.xopen+=	src/method.c src/xmlrpc_parse.c src/test/value_datetime.c sr
 SUBST_FILES.xopen+=	src/xmlrpc_server_info.c src/xmlrpc_server_abyss.c tools/lib/dumpvalue.c
 SUBST_FILES.xopen+=	tools/xmlrpc/xmlrpc.c tools/xmlrpc_transport/xmlrpc_transport.c
 SUBST_SED.xopen=	-e '/^\#define _XOPEN_SOURCE/d'
-.endif
 
 LDFLAGS.OpenBSD+=	${PTHREAD_LINKFLAGS}
 LDFLAGS.MirBSD+=	${PTHREAD_LINKFLAGS}