 @@ -1,41 +1,37 @@
-# $NetBSD: Makefile,v 1.39 2015/04/25 14:20:32 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2016/02/25 12:12:47 jperkin Exp $
 DISTNAME=	allegro-4.4.2
 PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=alleg/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://alleg.sourceforge.net/
 COMMENT=	Allegro game programming library
 #LICENSE=	# TODO: (see mk/license.mk)
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config makeinfo
 USE_LANGUAGES=	c c++
 INFO_FILES=	yes
 CMAKE_ARGS+=	-DINFODIR=${PKGINFODIR:Q}
-.include "../../mk/bsd.prefs.mk"
+SUBST_CLASSES.NetBSD+=	ossmidi
 .if ${OPSYS} == "NetBSD"
 SUBST_CLASSES+=		ossmidi
 SUBST_STAGE.ossmidi=	pre-configure
 SUBST_MESSAGE.ossmidi=	NetBSD's OSS midi emulation is non-existent.
 SUBST_FILES.ossmidi=	CMakeLists.txt
 SUBST_SED.ossmidi=	-e 's/ALLEGRO_WITH_OSSMIDI 1/ALLEGRO_WITH_OSSMIDI 0/'
 .endif
 PKGCONFIG_OVERRIDE+=	misc/logg.pc.in
 PKGCONFIG_OVERRIDE+=	misc/loadpng.pc.in
 PKGCONFIG_OVERRIDE+=	misc/allegrogl.pc.in
 PKGCONFIG_OVERRIDE+=	misc/jpgalleg.pc.in
 PKGCONFIG_OVERRIDE+=	misc/allegro.pc.in
 INSTALLATION_DIRS=	share/aclocal
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/allegro.m4 ${DESTDIR}${PREFIX}/share/aclocal
 .include "../../audio/libvorbis/buildlink3.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.28 2015/01/03 01:33:59 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2016/02/25 12:12:47 jperkin Exp $
 DISTNAME=		bcc
 PKGREVISION=		1
 PKGNAME=		bcc-95.3.12
 CATEGORIES=		devel lang
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Bruce Evans' C compiler (with as and ld); can do 16-bit code
 CONFLICTS=		bin86-[0-9]*
 CONFLICTS+=		dev86-[0-9]*
 NOT_FOR_PLATFORM=	Interix-*-*		# no <a.out.h>
 @@ -24,29 +24,27 @@ INSTALLATION_DIRS=	bin lib/bcc ${PKGMAND
 CWARNFLAGS.clang=	-Wno-error=logical-op-parentheses -Wno-error=array-bounds
 MAKE_FLAGS+=	CWARNFLAGS.clang=${CWARNFLAGS.clang:Q}
 .include "../../mk/bsd.prefs.mk"
 # This package has LP64 issues, so must build as 32-bit binary.
 .for P in ${LP64PLATFORMS}
 .if ${MACHINE_PLATFORM:M${P}}
 CFLAGS+=		-m32
 LDFLAGS+=		-m32
 .endif
 .endfor
-.if ${OPSYS} == "DragonFly"
+CPPFLAGS.DragonFly+=	-D_POSIX_SOURCE
 CPPFLAGS+=	-D_POSIX_SOURCE
 .endif
 post-extract:
 	set -e; \
 	cd ${FILESDIR}; \
 	mkdir ${WRKSRC}/bcc-cc1; \
 	cp Makefile.main ${WRKSRC}/Makefile; \
 	cp Makefile.ld ${WRKSRC}/ld/Makefile; \
 	cp ld86.1 ${WRKSRC}/ld/; \
 	cp Makefile.as ${WRKSRC}/as/Makefile; \
 	cp as86.1 ${WRKSRC}/as/; \
 	cp Makefile.bcc ${WRKSRC}/bcc/Makefile; \
 	cp bcc.1 ${WRKSRC}/bcc/; \
 	cp Makefile.bcc-cc1 ${WRKSRC}/bcc-cc1/Makefile; \

 @@ -1,44 +1,40 @@
-# $NetBSD: Makefile,v 1.101 2015/06/30 21:39:09 richard Exp $
+# $NetBSD: Makefile,v 1.102 2016/02/25 12:12:47 jperkin Exp $
 DISTNAME=	bison-3.0.4
 PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bison/bison.html
 COMMENT=	GNU yacc(1) replacement
 LICENSE=	gnu-gpl-v3
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		grep gm4:run msgfmt flex perl:build
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-yacc
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
 CONFIGURE_ENV+=		ac_cv_prog_M4=${TOOLS_PATH.gm4}
 INFO_FILES=		yes
 TEST_TARGET=		check
 REPLACE_PERL+=		examples/extexi
 REPLACE_SH+=		examples/test examples/*/*.test
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS.Cygwin+=	ac_cv_func___fpending=yes
 .if ${OPSYS} == "Cygwin"
 CONFIGURE_ARGS+=	ac_cv_func___fpending=yes
 .endif
 # Avoid rebuilding manpage
 pre-build:
 	${TOUCH} ${WRKSRC}/doc/bison.1
 # "bison" wants a recent version of "gettext" which at least some
 # NetBSD versions don't provide. Figure out whether it will install
 # the locale files or not.
 PLIST_SRC=	${WRKDIR}/PLIST
 post-configure:
 	if grep -q '^POSUB = po$$' ${WRKSRC}/Makefile; then		\
 	  ${CP} ${PKGDIR}/PLIST ${PLIST_SRC};				\

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.72 2016/01/24 16:14:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.73 2016/02/25 12:12:47 jperkin Exp $
 DISTNAME=	bmake-20150505
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 # distfile obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
 # source is kept in files/ for bootstrap purposes
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.crufty.net/help/sjg/bmake.html
 COMMENT=	Portable (autoconf) version of NetBSD 'make' utility
 LICENSE=	modified-bsd
 @@ -29,29 +29,27 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--with-default-sys-path=${makesyspath}
 CONFIGURE_ARGS+=	--with-machine_arch=${MACHINE_ARCH}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "SunOS" && exists(/usr/bin/bash)
 CONFIGURE_ARGS+=	--with-defshell=/usr/bin/bash
 .elif ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "IRIX" || ${OPSYS} == "AIX"
 DEPENDS+=		pdksh-[0-9]*:../../shells/pdksh
 CONFIGURE_ARGS+=	--with-defshell=${PREFIX}/bin/pdksh
 .endif
-.if ${OPSYS} == "Interix"
+MAKE_ENV.Interix+=	XDEFS=-DUSE_SELECT
 MAKE_ENV+=		XDEFS=-DUSE_SELECT
 .endif
 do-extract:
 	${CP} -R ${FILESDIR} ${WRKSRC}
 do-build:
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${SH} make-bootstrap.sh
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bmake ${DESTDIR}${PREFIX}/bin
 .if !empty(MANINSTALL:Mcatinstall)
 .  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
 	${INSTALL_MAN} ${WRKSRC}/bmake.cat1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/bmake.1

 @@ -1,21 +1,17 @@
-# $NetBSD: options.mk,v 1.3 2014/05/02 07:28:00 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2016/02/25 12:12:47 jperkin Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.boehm-gc
 PKG_SUPPORTED_OPTIONS=	threads
-.include "../../mk/bsd.prefs.mk"
+PKG_SUGGESTED_OPTIONS.Darwin+=	threads
 .if ${OPSYS} == "Darwin"
 PKG_SUGGESTED_OPTIONS=	threads
 .endif
 .include "../../mk/bsd.options.mk"
 ###
 ### threads support
 ###
 .if !empty(PKG_OPTIONS:Mthreads)
 .include "../../mk/pthread.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-threads
 .endif

 @@ -1,35 +1,33 @@
-# $NetBSD: Makefile,v 1.28 2016/02/20 09:57:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2016/02/25 12:12:47 jperkin Exp $
 PKGREVISION= 3
 .include "Makefile.common"
 CONFIGURE_ARGS+= --disable-editor
 PKGCONFIG_OVERRIDE+=	client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
 BUILDLINK_TRANSFORM+=	rm:-ldl
 .endif
-.if ${OPSYS} == "Darwin"
+SUBST_CLASSES.Darwin+=	libname
 SUBST_CLASSES+=		libname
 SUBST_STAGE.libname=	pre-configure
 SUBST_FILES.libname=	client/Makefile.in dbus-1/Makefile.in
 SUBST_FILES.libname+=	gsettings/Makefile.in
 SUBST_SED.libname=	-e "s|-Wl,-soname=|-install_name ${PREFIX}/lib/|g"
 SUBST_SED.libname+=	-e "/^libdconfsettings_so_LDFLAGS/s,$$, -install_name ${PREFIX}/lib/gio/modules/libdconfsettings.so,g"
 .endif
 BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILDLINK_DEPMETHOD.vala= build
 BUILDLINK_API_DEPENDS.vala+=	vala>=0.18.0
 .include "../../lang/vala/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.39.1
 .include "../../devel/glib2/modules.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,41 +1,35 @@
-# $NetBSD: Makefile,v 1.34 2014/10/09 14:06:08 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2016/02/25 12:12:47 jperkin Exp $
+#
 DISTNAME=		diffutils-3.3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=diffutils/}
 EXTRACT_SUFX=		.tar.xz
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/diffutils/diffutils.html
 COMMENT=		GNU diff utilities - find the differences between files
 LICENSE=		gnu-gpl-v2
 GNU_CONFIGURE=		YES
 INFO_FILES=		YES # PLIST
-CONFIGURE_ENV+=	gt_cv_func_gnugettext1_libintl=yes
+CONFIGURE_ARGS+=	--program-prefix=g
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ENV.SunOS+=	ac_cv_sys_xsi_stack_overflow_heuristic=no
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ENV+=	ac_cv_sys_xsi_stack_overflow_heuristic=no
 .endif
 AUTO_MKDIRS=		yes
 SUBST_CLASSES+=		diff
 SUBST_STAGE.diff=	pre-configure
 SUBST_FILES.diff=	src/Makefile.in
 SUBST_SED.diff=		-e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;'
 post-install:
 .for f in cmp diff diff3 sdiff
 	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
 	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor
 CONFIGURE_ARGS+=	--program-prefix=g
 SUBST_CLASSES+=		diff
 SUBST_STAGE.diff=	pre-configure
 SUBST_FILES.diff=	src/Makefile.in
 SUBST_SED.diff=		-e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;'
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.122 2015/12/05 21:25:34 adam Exp $
+# $NetBSD: Makefile,v 1.123 2016/02/25 12:12:47 jperkin Exp $
 DISTNAME=	doxygen-1.8.9.1.src
 PKGNAME=	${DISTNAME:S/.src//}
 PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.doxygen.org/
 COMMENT=	Documentation system for C++, Java, IDL and C
 LICENSE=	gnu-gpl-v2
 @@ -59,29 +59,27 @@ SUBST_SED.epstopdf=	-e 's,"epstopdf","${
 # Just install the binary and the man page.  (If the latex option
 # is enabled, this target will be augmented.)
 INSTALL_TARGET=		install
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
 PLIST.ci=		yes	# case-insensitive
 .else
 PLIST.cs=		yes	# case-sensitive
 .endif
-.if ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS.DragonFly+=	-platform freebsd-g++
 CONFIGURE_ARGS+=	-platform freebsd-g++
 .endif
 LDFLAGS+=		${BUILDLINK_LDADD.iconv}
 post-patch:
 	touch ${WRKSRC}/src/doxytag.l
 # remove unnecessary files that leak tool paths
 post-install:
 	rm -f ${DESTDIR}${PREFIX}/share/doc/doxygen/examples/Makefile*
 BUILDLINK_API_DEPENDS.graphviz+=	graphviz>=2.12nb1
 .include "options.mk"

 @@ -1,39 +1,37 @@
-# $NetBSD: Makefile,v 1.45 2016/01/08 11:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2016/02/25 12:12:47 jperkin Exp $
 DISTNAME=	flex-2.6.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flex/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://flex.sourceforge.net/
 COMMENT=	Fast clone of lex(1), the lexical scanner generator
 LICENSE=	2-clause-bsd
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gm4:run
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 TEST_TARGET=		check
 LIBS.SunOS+=		-lm
 .include "../../mk/bsd.prefs.mk"
-.if ${LOWER_OPSYS} == "aix"
+CFLAGS.AIX+=		-D_LINUX_SOURCE_COMPAT
 CFLAGS+=		-D_LINUX_SOURCE_COMPAT
 .endif
 .if ${OS_VARIANT} == "SCOOSR5"
 LDFLAGS.SCO_SV+=	-lsocket
 .endif
 #.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bash:build
 REPLACE_BASH=		tests/testwrapper.sh tests/options.cn
 USE_TOOLS+=		gmake	# bmake has problems with the test suite
 #.endif
 .include "../../devel/gettext-lib/buildlink3.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2016/02/15 09:06:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2016/02/25 12:12:47 jperkin Exp $
 .include "../../devel/gettext/Makefile.common"
 PKGNAME=	${DISTNAME:S/-/-tools-/}
 COMMENT=	Tools for providing messages in different languages
 DISTINFO_FILE=	${.CURDIR}/../../devel/gettext/distinfo
 PATCHDIR=	${.CURDIR}/../../devel/gettext/patches
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		xz:run
 USE_PKGLOCALEDIR=	yes
 CONFIGURE_ARGS+=	--disable-csharp
 @@ -21,33 +21,28 @@ CONFIGURE_ARGS+=	--without-emacs
 CONFIGURE_ARGS+=	--disable-openmp
 CONFIGURE_ENV+=		GCJ= ac_cv_prog_GCJ= ac_cv_prog_JAR=
 CONFIGURE_ENV+=		HAVE_GCJ_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JAVAC_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JIKES_IN_PATH=
 LDFLAGS.AIX+=		-Wl,-brtl
 SHLIBTOOL_OVERRIDE=	# empty
 INFO_FILES=		yes
 BROKEN_GETTEXT_DETECTION=	yes
 USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
-.include "../../mk/bsd.prefs.mk"
+BUILDLINK_TRANSFORM.Cygwin+=	rm:-Wl,--disable-auto-import
 .if ${OPSYS} == "Cygwin"
 BUILDLINK_TRANSFORM+=	rm:-Wl,--disable-auto-import
 .endif
 .if ${OPSYS} == "AIX"
 #bug 20453 in bug-gzip list, passed onto gnulib
-CONFIGURE_ENV+= ac_cv_header_wctype_h=no
+CONFIGURE_ENV.AIX+=	ac_cv_header_wctype_h=no
 .endif
 post-install:
 	cd ${WRKSRC}/gettext-tools/misc && ${MAKE} install DESTDIR=${DESTDIR}
 	${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/autopoint.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/gettextize.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.90 2016/02/15 11:42:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.91 2016/02/25 12:12:47 jperkin Exp $
 DISTNAME=		glib-1.2.10
 PKGREVISION=		11
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			${MASTER_SITE_GNOME:=sources/glib/1.2/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://developer.gnome.org/glib/
 COMMENT=		Some useful routines for C programming (glib1)
 LICENSE=		gnu-lgpl-v2.1
 CONFLICTS=		gtk+-1.0.*
 @@ -20,29 +20,27 @@ PKGCONFIG_OVERRIDE+=	gmodule.pc.in
 PKGCONFIG_OVERRIDE+=	gthread.pc.in
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 INFO_FILES=		yes
 MAKE_JOBS_SAFE=		no
 TEST_TARGET=		check
 PTHREAD_OPTS+=		require
 .include "../../mk/bsd.prefs.mk"
 # Force the result of this configure test, because the testing technique
 # breaks with NetBSD's native libpthread.so.
-.if ${OPSYS} == "NetBSD"
+CONFIGURE_ENV.NetBSD+=	glib_cv_rtldglobal_broken=no
 CONFIGURE_ENV+=		glib_cv_rtldglobal_broken=no
 .endif
 # Tests are insufficient, override with correct values.
 .if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER} == "clang"
 CONFIGURE_ENV+=		glib_cv_has__inline=yes
 CONFIGURE_ENV+=		glib_cv_has__inline__=yes
 CONFIGURE_ENV+=		glib_cv_hasinline=yes
 .endif
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=		3.0
 .endif
 GLIB_VERSION=		${DISTNAME:S/glib-//}

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.45 2015/06/10 23:00:05 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.46 2016/02/25 12:12:47 jperkin Exp $
+#
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
 # used by sysutils/gio-fam/Makefile
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
 DISTNAME=	glib-2.44.1
 PKGNAME=	${DISTNAME:S/glib/glib2/}
 CATEGORIES=	# empty; redefined in Makefile
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 @@ -58,37 +58,30 @@ SUBST_FILES.thr=	gthread/Makefile.in
 .  if ${OS_VERSION:R} >= 5
 SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
 .  else
 SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
 .  endif
 SUBST_MESSAGE.thr=	Fixing libgthread.
 .endif
 .if !empty(MACHINE_PLATFORM:MDarwin-[56].*-*)
 CONFIGURE_ENV+=		gt_cv_c_wchar_t=no
 .endif
-.if ${OPSYS} == "Darwin"
+BUILDLINK_TRANSFORM.Darwin+=	rm:-Werror=missing-prototypes
-BUILDLINK_TRANSFORM+=	rm:-Werror=missing-prototypes
+BUILDLINK_TRANSFORM.SunOS+=	rm:-Werror=format=2
 .endif
 .if ${OPSYS} == "HPUX"
 CONFIGURE_ENV+=		ac_cv_func_mmap_fixed_mapped=yes
 .endif
-.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV.HPUX+=		ac_cv_func_mmap_fixed_mapped=yes
 BUILDLINK_TRANSFORM+=	rm:-Werror=format=2
 .endif
 .include "../../mk/dlopen.buildlink3.mk"
 .if !empty(MACHINE_PLATFORM:MIRIX-5*)
 CONFIGURE_ARGS+=	--disable-threads
 .else
 .include "../../mk/pthread.buildlink3.mk"
 .endif
 BUILD_DEFS+=		VARBASE
 SUBST_CLASSES+=		dbusdb
 SUBST_MESSAGE.dbusdb=	Adjust dbus machine uuid path to dbus package
 SUBST_STAGE.dbusdb=	post-patch

 @@ -1,47 +1,43 @@
-# $NetBSD: Makefile,v 1.92 2016/01/01 01:42:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.93 2016/02/25 12:12:48 jperkin Exp $
 DISTNAME=	make-4.1
 PKGNAME=	g${DISTNAME}
 PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=make/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/make/make.html
 COMMENT=	GNU version of 'make' utility
 LICENSE=	gnu-gpl-v3
 USE_FEATURES=		snprintf
 GNU_CONFIGURE=		yes
 TEXINFO_REQD+=		4.0
 INFO_FILES=		yes
 # NOTE:  the 'test' target requires perl, but since gmake does
 # not otherwise require it, perl is not listed as an explicit
 # dependency
 TEST_TARGET=		check
 .include "../../mk/bsd.prefs.mk"
 CONFIGURE_ARGS+=	--program-prefix=g
 # workaround for broken strndup
 CONFIGURE_ARGS.MirBSD+=	ac_cv_func_strndup=no
 AUTO_MKDIRS=		yes
 PLIST_SRC=		${PKGDIR}/PLIST
 .include "options.mk"
 .if ${OPSYS} == "MirBSD"
 # workaround for broken strndup
 CONFIGURE_ARGS+=	ac_cv_func_strndup=no
 .endif
 post-install:
 	${CHMOD} g-s ${DESTDIR}${PREFIX}/bin/gmake
 	${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/gmake
 	${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/${PKGGNUDIR}/bin/make
 	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/make.1
 .include "../../mk/bsd.pkg.mk"

 @@ -1,20 +1,18 @@
-# $NetBSD: options.mk,v 1.4 2013/07/04 16:19:41 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2016/02/25 12:12:48 jperkin Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gtexinfo
 PKG_SUPPORTED_OPTIONS=	nls
 PKG_SUGGESTED_OPTIONS=	# blank
-.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS.NetBSD+=	nls
 PKG_SUGGESTED_OPTIONS+=	nls
 .endif
 PKG_OPTIONS_LEGACY_VARS=	TEXINFO_LOCALE
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mnls)
 USE_PKGLOCALEDIR=	yes
 PLIST_SRC+=		${PKGDIR}/PLIST.locale
 .  include "../../devel/gettext-lib/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif

 @@ -1,30 +1,27 @@
-# $NetBSD: Makefile,v 1.39 2013/07/05 13:29:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2016/02/25 12:12:48 jperkin Exp $
 DISTNAME=	libast-0.7
 PKGREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	http://www.eterm.org/download/
 MAINTAINER=	gendalia@NetBSD.org
 HOMEPAGE=	http://freshmeat.net/projects/libast/
 COMMENT=	The Library of Assorted Spiffy Things
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 TEST_TARGET=		test
 .include "options.mk"
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
+LDFLAGS.SunOS+=	-lresolv
 LDFLAGS+=-lresolv
 .endif
 BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.48 2015/04/23 09:23:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.49 2016/02/25 12:12:48 jperkin Exp $
 .include "../../devel/libevent/Makefile.common"
 PKGNAME=	libevent-${LIBEVENT_VERSION}
 CATEGORIES=	devel
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://libevent.org/
 COMMENT=	Asynchronous event notification library
 LICENSE=	modified-bsd
 CONFLICTS+=	libev<3.9nb1
 @@ -18,25 +18,23 @@ PKGCONFIG_OVERRIDE+=	libevent_openssl.pc
 PKGCONFIG_OVERRIDE+=	libevent_pthreads.pc.in
 PKGCONFIG_OVERRIDE+=	libevent.pc.in
 TEST_TARGET=		verify
 LIBS.SunOS+=	-lnsl -lresolv
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 # XXX helps build, but needs more testing
 #CFLAGS.Interix+=	-Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32
 .include "../../mk/bsd.prefs.mk"
 # Explicitly disable epoll on illumos, provided for Linux compat only.
-.if ${OPSYS} == "SunOS"
+CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_ctl=no
 CONFIGURE_ENV+=		ac_cv_func_epoll_ctl=no
 .endif
 .if !empty(MACHINE_PLATFORM:MHPUX-11.11-*)
 CONFIGURE_ENV+=		ac_cv_func_strtoll=yes
 CPPFLAGS+=		-Dstrtoll=__strtoll
 .endif
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.65 2016/02/04 11:57:50 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2016/02/25 12:12:48 jperkin Exp $
 DISTNAME=	libgphoto2-2.5.8
 PKGREVISION=	1
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gphoto.sourceforge.net/
 COMMENT=	Digital camera access library
 LICENSE=	gnu-lgpl-v2
 CONFLICTS+=	gphoto<2.1.1
 @@ -17,34 +17,32 @@ USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		ac_cv_path_DOXYGEN=false
 CONFIGURE_ARGS+=	--with-gdlib=no
 PKGCONFIG_OVERRIDE+=	libgphoto2.pc.in libgphoto2_port/libgphoto2_port.pc.in
 REPLACE_SH=		packaging/generic/check-ptp-camera
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=	libusb
-.if ${OPSYS} == "SunOS"
+BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,--version-script=./libgphoto2_port.ver:-Wl,-M./libgphoto2_port.ver
 BUILDLINK_TRANSFORM+=	opt:-Wl,--version-script=./libgphoto2_port.ver:-Wl,-M./libgphoto2_port.ver
-SUBST_CLASSES+=	mapfile
+SUBST_CLASSES.SunOS+=	mapfile
 SUBST_STAGE.mapfile=	post-patch
 SUBST_FILES.mapfile=	libgphoto2_port/libgphoto2_port/libgphoto2_port.ver
 SUBST_SED.mapfile=	-e '/gpi_gphoto_port_type_map/d'
 .endif
 # remove symbolic link
 post-install:
 	rm ${DESTDIR}${PREFIX}/include/gphoto2/gphoto2
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .if ${OPSYS} != "SunOS"
 PLIST.libusb=	yes
 .include "../../devel/libusb/buildlink3.mk"
 .endif
 .include "../../devel/zlib/buildlink3.mk"

 @@ -1,36 +1,32 @@
-# $NetBSD: Makefile,v 1.94 2015/08/06 07:54:57 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2016/02/25 12:12:48 jperkin Exp $
 DISTNAME=	libidn-1.32
 CATEGORIES=	devel
 MASTER_SITES=	ftp://alpha.gnu.org/pub/gnu/libidn/ \
 		${MASTER_SITE_GNU:=libidn/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/libidn/
 COMMENT=	Internationalized Domain Names command line tool
 LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v2.1
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		makeinfo pkg-config perl:build gsed
 TEXINFO_REQD=		4.7
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 CONFIGURE_ENV+=		EMACS=${FALSE:Q}
 CONFIGURE_ARGS+=	--disable-csharp --disable-java
 CONFIGURE_ARGS+=	--with-packager=pkgsrc
 CONFIGURE_ARGS+=	--with-packager-bug-reports=http://www.NetBSD.org/cgi-bin/sendpr.cgi?gndb=netbsd
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS.Interix+=	--disable-ld-version-script
 .if ${OPSYS} == "Interix"
 CONFIGURE_ARGS+=	--disable-ld-version-script
 .endif
 PKGCONFIG_OVERRIDE+=	libidn.pc.in
 TEST_TARGET=		check
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,32 +1,28 @@
-# $NetBSD: Makefile,v 1.18 2015/12/26 23:47:48 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/25 12:12:48 jperkin Exp $
+#
 DISTNAME=	libjit-0.1.2
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.savannah.gnu.org/releases/dotgnu-pnet/libjit-releases/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.southern-storm.com.au/libjit.html
 COMMENT=	Just-In-Time compilation functionality
 LICENSE=	gnu-lgpl-v2.1
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake lex yacc makeinfo
 GNU_CONFIGURE=		yes
 INFO_FILES=	yes
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS.NetBSD+=	ac_cv_header_tgmath_h=no
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	ac_cv_header_tgmath_h=no
 .endif
 # this is supposed to be generated, not shipped
 post-extract:
 	rm -f ${WRKSRC}/include/jit/jit-arch.h
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,22 +1,20 @@
-# $NetBSD: options.mk,v 1.1 2013/09/12 14:21:27 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/25 12:12:48 jperkin Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libmemcached
 PKG_SUPPORTED_OPTIONS=	sasl
 PKG_SUGGESTED_OPTIONS=	sasl
-#.if ${OPSYS} == "SunOS"
+#PKG_SUGGESTED_OPTIONS.SunOS+=	dtrace
 #PKG_SUGGESTED_OPTIONS+=	dtrace
 #.endif
 .include "../../mk/bsd.options.mk"
 ###
 ### Cyrus SASL support
 ###
 .if !empty(PKG_OPTIONS:Msasl)
 CONFIGURE_ARGS+=	--enable-sasl
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-sasl
 .endif

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.114 2016/02/23 15:17:42 joerg Exp $
+# $NetBSD: Makefile,v 1.115 2016/02/25 12:12:48 jperkin Exp $
 ###########################################################################
 ###########################################################################
+#
 # HEADS UP!  DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
+#
 ###########################################################################
 ###########################################################################
+#
 # This package is maintained specially in order to preserve pkgsrc
 # specific OS changes that diverge from the "out of the box" libtool.
 # In order to keep this package in a maintainable condition, the .m4 files
 # must be manipulated in order to generate the patch-* files.
 @@ -26,43 +26,37 @@
 .include "../../devel/libtool/Makefile.common"
 PKGNAME=	${DISTNAME:S/-/-base-/}
 PKGREVISION=	11
 COMMENT=	Generic shared library support script (the script itself)
 CONFLICTS+=	libtool<=1.3.5nb11
 TEST_TARGET=	check
 OVERRIDE_DIRDEPTH.install-sh=	1
-.if ${OPSYS} == "AIX"
+# Always build libraries and executables that use the runtime linker.
 # always build libraries and executables that use the runtime linker.
 # in addition, disable libtool locking, as the test is broken on AIX,
 # and results in files being locked indefinitely.
-LDFLAGS+=		-Wl,-brtl
+LDFLAGS.AIX+=		-Wl,-brtl
-CONFIGURE_ARGS+=	--disable-libtool-lock
+CONFIGURE_ARGS.AIX+=	--disable-libtool-lock
 .elif ${OPSYS} == "IRIX"
 # The MIPSpro compiler doesn't support -c with -o, but the locking
 # workaround is itself broken.  Disable it unconditionally.
-CONFIGURE_ARGS+=	--disable-libtool-lock
+CONFIGURE_ARGS.IRIX+=	--disable-libtool-lock
-.elif ${OPSYS} == "SunOS"
+CFLAGS.SunOS+=	${_COMPILER_ABI_FLAG.${ABI}}
 CFLAGS+=	${_COMPILER_ABI_FLAG.${ABI}}
 .endif
 # We are going to want libtool to find the same versions of the C, C++,
 # and Fortran compilers.
+#
 USE_LANGUAGES=		c c++
 CONFIGURE_ARGS+=	--disable-ltdl-install
 CONFIGURE_ARGS+=	F77=no FC=no
 USE_TOOLS+=		echo
 .PHONY: fix-libtool
 fix-libtool:
 	cd ${WRKSRC}; for f in libtool; do				\

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2014/10/09 13:44:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/25 12:12:48 jperkin Exp $
 ###########################################################################
 ###########################################################################
+#
 # HEADS UP!  DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
+#
 ###########################################################################
 ###########################################################################
+#
 # This package is maintained specially in order to preserve pkgsrc
 # specific OS changes that diverge from the "out of the box" libtool.
 # In order to keep this package in a maintainable condition, the .m4 files
 # must be manipulated in order to generate the patch-* files.
 @@ -28,43 +28,37 @@
 FILESDIR=	${.CURDIR}/../libtool-base/files
 PKGNAME=	${DISTNAME:S/-/-fortran-/}
 PKGREVISION=	5
 COMMENT=	Generic shared library support script (the script itself, incl. Fortran)
 CONFLICTS+=	libtool<=1.3.5nb11
 TEST_TARGET=	check
 OVERRIDE_DIRDEPTH.install-sh=	1
-.if ${OPSYS} == "AIX"
+# Always build libraries and executables that use the runtime linker.
 # always build libraries and executables that use the runtime linker.
 # in addition, disable libtool locking, as the test is broken on AIX,
 # and results in files being locked indefinitely.
-LDFLAGS+=		-Wl,-brtl
+LDFLAGS.AIX+=		-Wl,-brtl
-CONFIGURE_ARGS+=	--disable-libtool-lock
+CONFIGURE_ARGS.AIX+=	--disable-libtool-lock
 .elif ${OPSYS} == "IRIX"
 # The MIPSpro compiler doesn't support -c with -o, but the locking
 # workaround is itself broken.  Disable it unconditionally.
-CONFIGURE_ARGS+=	--disable-libtool-lock
+CONFIGURE_ARGS.IRIX+=	--disable-libtool-lock
-.elif ${OPSYS} == "SunOS"
+CFLAGS.SunOS+=	${_COMPILER_ABI_FLAG.${ABI}}
 CFLAGS+=	${_COMPILER_ABI_FLAG.${ABI}}
 .endif
 # We are going to want libtool to find the same versions of the C, C++,
 # and Fortran compilers.
+#
 USE_LANGUAGES=		c c++ fortran
 CONFIGURE_ARGS+=	--disable-ltdl-install
 USE_TOOLS+=		echo
 INSTALLATION_DIRS+=	bin
 .PHONY: fix-libtool
 fix-libtool:

 @@ -1,34 +1,29 @@
-# $NetBSD: Makefile,v 1.73 2014/10/09 14:06:10 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2016/02/25 12:12:48 jperkin Exp $
 DISTNAME=	m4-1.4.17
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/m4/
 COMMENT=	GNU version of UNIX m4 macro language processor
 LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 TEST_TARGET=		check
 CONFIGURE_ARGS+=	--program-prefix=g
 CONFIGURE_ARGS.Cygwin+=	ac_cv_func___fpending=yes
-.include "../../mk/bsd.prefs.mk"
+CFLAGS.AIX+=	-D_LINUX_SOURCE_COMPAT
 .if ${LOWER_OPSYS} == "aix"
 CFLAGS+=	-D_LINUX_SOURCE_COMPAT
 .elif ${OPSYS} == "Cygwin"
 CONFIGURE_ARGS+=	ac_cv_func___fpending=yes
 .endif
 AUTO_MKDIRS=		yes
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${DESTDIR}${PREFIX}/share/examples/m4
 	${LN} -sf ${PREFIX}/bin/gm4 ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/m4
 	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gm4.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/m4.1
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.31 2015/11/04 13:30:06 richard Exp $
+# $NetBSD: Makefile.common,v 1.32 2016/02/25 12:12:48 jperkin Exp $
+#
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
 DISTNAME=	ncurses-${NC_VERS}
 NC_VERS=	6.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ncurses/} \
 		ftp://dickey.his.com/ncurses/ \
 		ftp://dickey.his.com/ncurses/${NC_VERS}/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://invisible-island.net/ncurses/ncurses.html
 @@ -28,29 +28,27 @@ CONFIGURE_ARGS+=	--with-manpage-format=n
 CONFIGURE_ARGS+=	--with-manpage-tbl
 CONFIGURE_ARGS+=	--with-default-terminfo-dir=${PREFIX}/${TERMINFODIR}
 CONFIGURE_ARGS+=	--with-terminfo-dirs=${PREFIX}/${TERMINFODIR}
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/ncurses
 SUBST_CLASSES+=		rpath
 SUBST_FILES.rpath+=	misc/ncurses-config
 SUBST_STAGE.rpath=	post-configure
 SUBST_SED.rpath+=	-e "s|-L\\(.libdir\\)|${COMPILER_RPATH_FLAG}\\1 -L\\1|"
 SUBST_MESSAGE.rpath=	Fixing rpath in ncurses-config.
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS.Darwin+=	--disable-mixed-case
 CONFIGURE_ARGS+=	--disable-mixed-case
 .endif
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 TOOL_DEPENDS+=		ncurses-${NC_VERS}:../../devel/ncurses
 CONFIGURE_ENV+=		BUILD_CC=${NATIVE_CC:Q}
 CONFIGURE_ENV+=		ac_cv_path_TIC_PATH=${LOCALBASE}/bin/tic
 .endif
 .if !defined(TOOLS_TBL)
 # This means that groff needs to be built to get tbl(1).
 # We can only build groff if there is a builtin implementation of curses,
 # otherwise we get a circular dependency problem.
 # Additionally, Interix is special, see ../../mk/curses.buildlink3.mk
 .  if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.82 2016/02/23 12:42:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.83 2016/02/25 12:12:49 jperkin Exp $
 DISTNAME=	nspr-${NSPR_RELEASE:S/.0$//}
 NSPR_RELEASE=	4.12.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR
 COMMENT=	Platform-neutral API for system level and libc like functions
 LICENSE=	mpl-2.0
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 @@ -31,33 +31,31 @@ CONFIGURE_ENV+=		LIBRUNPATH=${PREFIX:Q}/
 .include "../../mk/bsd.prefs.mk"
 SUBST_CLASSES+=			nspr-config
 SUBST_STAGE.nspr-config=	pre-configure
 SUBST_MESSAGE.nspr-config=	Fixing nspr-config run path
 SUBST_FILES.nspr-config=	nspr/config/nspr-config.in
 SUBST_SED.nspr-config=		-e 's|-L$$libdir|"${COMPILER_RPATH_FLAG}$$libdir -L$$libdir"|g'
 .if ${OPSYS} == "OpenBSD"
 CHECK_SHLIBS_SUPPORTED= no
 .endif
-.if ${OPSYS} == "Darwin"
+SUBST_CLASSES.Darwin+=		exec_path
 SUBST_CLASSES+=			exec_path
 SUBST_STAGE.exec_path=		pre-configure
 SUBST_MESSAGE.exec_path=	Fixing @executable_path
 SUBST_FILES.exec_path=		nspr/configure.in
 SUBST_SED.exec_path=		-e 's,@executable_path,${PREFIX}/lib/nspr,g'
 .endif
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=		so
 .elif ${OBJECT_FMT} == "Mach-O"
 SO_SUFFIX=		dylib
 .else
 SO_SUFFIX=		so.1.0
 .endif
 PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX:Q}
 PLIST_VARS+=		sun4u_32
 # see nspr/pr/src/md/unix/Makefile.in
 # for the bit about 32-bit sun4u machines installing an extra file.

 @@ -1,46 +1,42 @@
-# $NetBSD: Makefile,v 1.107 2016/02/17 22:00:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.108 2016/02/25 12:12:49 jperkin Exp $
 DISTNAME=		nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=		3.22.1
 CATEGORIES=		security
 MASTER_SITES=		${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_RELEASE:S/.0$//:S/./_/g}_RTM/src/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.mozilla.org/projects/security/pki/nss/
 COMMENT=		Libraries to support development of security-enabled applications
 LICENSE=		mpl-2.0
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}nss/tests/libpkix/libpkix.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}nss/tests/multinit/multinit.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/configure
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}configure
 USE_GCC_RUNTIME=	yes
 USE_TOOLS+=		gmake perl pax pkg-config
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
+SUBST_CLASSES.Darwin+=		exec_path
 SUBST_CLASSES+=			exec_path
 SUBST_STAGE.exec_path=		pre-configure
 SUBST_MESSAGE.exec_path=	Fixing @executable_path
 SUBST_FILES.exec_path=		nss/coreconf/Darwin.mk
 SUBST_SED.exec_path=		-e 's,@executable_path,${PREFIX}/lib/nss,g'
 .endif
-.if ${OPSYS} == "Linux"
+MAKE_ENV.Linux+=	FREEBL_NO_DEPEND=0
 MAKE_ENV+=	FREEBL_NO_DEPEND=0
 .endif
 .if ${OBJECT_FMT} == "ELF"
 SO_SUFFIX=		so
 .elif ${OBJECT_FMT} == "Mach-O"
 SO_SUFFIX=		dylib
 .else
 SO_SUFFIX=		so.1.0
 .endif
 PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX:Q}
 .if ${OPSYS} == "SunOS" && (${PKGSRC_COMPILER} == "clang" || ${PKGSRC_COMPILER} == "gcc")
 MAKE_ENV+=	NS_USE_GCC=YES
 .endif

 @@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.36 2015/08/15 12:46:07 mef Exp $
+# $NetBSD: Makefile,v 1.37 2016/02/25 12:12:49 jperkin Exp $
 DISTNAME=	Data-UUID-1.221
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Data/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Data-UUID/
 COMMENT=	Perl module for generating UUIDs
 LICENSE=	modified-bsd
 #DEPENDS+=		{perl>=5.7.3,p5-Digest-MD5>=0}:../../security/p5-Digest-MD5
 USE_LANGUAGES=		c
 PERL5_PACKLIST=		auto/Data/UUID/.packlist
-.include "../../mk/bsd.prefs.mk"
+OPSYSVARS+=		MAKE_PARAMS
 MAKE_PARAMS.Darwin+=	DEFINE=-D_POSIX_C_SOURCE
 .if ${OPSYS} == "Darwin"
 MAKE_PARAMS+=		DEFINE=-D_POSIX_C_SOURCE
 .endif
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,60 +1,56 @@
-# $NetBSD: Makefile,v 1.34 2015/12/04 11:32:40 hauke Exp $
+# $NetBSD: Makefile,v 1.35 2016/02/25 12:12:49 jperkin Exp $
 DISTNAME=	pkg-config-0.29
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pkgconfig.freedesktop.org/
 COMMENT=	System for managing library compile/link flags
 LICENSE=	gnu-gpl-v2
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-internal-glib
 CONFIGURE_ARGS+=	--disable-host-tool
 CONFIGURE_ARGS+=	--disable-maintainer-mode
 # old name of the package
 CONFLICTS=		pkgconfig-[0-9]*
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "IRIX"
 # configure bails out in subdir after re-parsing the cache
-CONFIGURE_ARGS+=	--cache-file=/dev/null
+CONFIGURE_ARGS.IRIX+=	--cache-file=/dev/null
 .endif
 .if ${OPSYS} == "NetBSD"
 .if ${MACHINE_ARCH} == "i386" && !empty(OS_VERSION:M[12345].*)
 # Built-in GLib wants __sync_bool_compare_and_swap_4
 CFLAGS+=		-march=i486
 .endif
 post-configure:
 	cd ${WRKSRC}/glib; \
 	${GREP} -v HAVE_DTRACE config.h >config.h.new; \
 	${MV} config.h.new config.h
 .endif
 .if ${OS_VARIANT} == "SCOOSR5"
 # SCO OpenServer 5.0.7/3.2 has no IPv6 support.
 CONFIGURE_ENV+=		glib_cv_value_AF_INET6=yes
 .endif
-.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS.SunOS+=	--disable-dtrace
-CONFIGURE_ARGS+=	--disable-dtrace
+CFLAGS.SunOS+=		-DENABLE_NLS # required due to __EXTENSIONS__
 CFLAGS+=		-DENABLE_NLS # required due to __EXTENSIONS__
 .endif
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=gnu
 PKGCONFIG_EXTRA_PATHS=	# empty
 .if ${LOCALBASE} != ${X11BASE}
 PKGCONFIG_EXTRA_PATHS+=	${X11BASE}/lib/pkgconfig
 .endif
 .if ${LOCALBASE} != "/usr"
 PKGCONFIG_EXTRA_PATHS+=	/usr/lib/pkgconfig
 .endif

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.12 2016/01/16 12:15:12 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.13 2016/02/25 12:12:49 jperkin Exp $
+#
 # used by devel/poco/Makefile
 # used by databases/poco-data/Makefile
 # used by databases/poco-data-sqlite/Makefile
 # used by databases/poco-data-mysql/Makefile
 # used by databases/poco-data-odbc/Makefile
 POCO_VERSION=1.6.1
 DISTNAME=	poco-${POCO_VERSION}-all
 MASTER_SITES=	http://pocoproject.org/releases/poco-${POCO_VERSION}/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 @@ -30,31 +30,29 @@ MAKE_JOBS_SAFE=	no
 # Fix Net/sample build at least.
 BUILDLINK_TRANSFORM+=	l:PocoUtil:PocoUtil:PocoJSON
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --omit=Data,MongoDB
 # don't use the bundled versions of SQLite, zlib, etc..
 CONFIGURE_ARGS+=	--unbundled
 .include "../../mk/bsd.prefs.mk"
 .if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Bitrig"
 CONFIGURE_ARGS+=	--config=FreeBSD
 .endif
 .if ${OPSYS} == "NetBSD"
 # NetBSD doesn't have fenv.h. We should add one.
-CONFIGURE_ARGS+=	--no-fpenvironment
+CONFIGURE_ARGS.NetBSD+=	--no-fpenvironment
-CONFIGURE_ARGS+=	--no-sharedmemory
+CONFIGURE_ARGS.NetBSD+=	--no-sharedmemory
 .endif
 .if ${OPSYS} == "SunOS"
 .include "../../mk/compiler.mk"
 . if ${PKGSRC_COMPILER} == "sunpro"
 CONFIGURE_ARGS+=	--config=SunOS-SunStudio
 . elif ${PKGSRC_COMPILER} == "gcc"
 CONFIGURE_ARGS+=	--config=SunOS-GCC
 # GCC 4.6 and newer forces c99 for C++, need _XOPEN_SOURCE=600
 .  if !empty(CC_VERSION:Mgcc-4.[6-9].*)
 MAKE_ENV+=		XOPEN_SOURCE=600
 .  else
 MAKE_ENV+=		XOPEN_SOURCE=500
 .  endif

 @@ -1,34 +1,30 @@
-# $NetBSD: Makefile,v 1.29 2015/10/10 01:58:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/25 12:12:49 jperkin Exp $
+#
 VERS=			1.7.6
 DISTNAME=		pysvn-${VERS}
 PKGNAME=		${PYPKGPREFIX}-pysvn-${VERS}
 PKGREVISION=		10
 CATEGORIES=		devel
 MASTER_SITES=	http://pysvn.barrys-emacs.org/source_kits/
 MAINTAINER=		helgoman@users.sourceforge.net
 HOMEPAGE=		http://pysvn.tigris.org/
 COMMENT=		Python interface to Subversion
 LICENSE=		apache-1.1
 DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 USE_LANGUAGES=		c
-.include "../../mk/bsd.prefs.mk"
+BUILDLINK_TRANSFORM.DragonFly+=	rm:-lresolv
 .if ${OPSYS} == "DragonFly"
 BUILDLINK_TRANSFORM+=	rm:-lresolv
 .endif
 SUBST_CLASSES+=		rpath-flg
 SUBST_STAGE.rpath-flg=	pre-configure
 SUBST_FILES.rpath-flg=	Source/setup_configure.py
 SUBST_SED.rpath-flg=	-e 's|-Wl,--rpath|${COMPILER_RPATH_FLAG}|g'
 .include "../../devel/subversion-base/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,33 +1,31 @@
-# $NetBSD: Makefile,v 1.18 2015/11/22 08:05:07 richard Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/25 12:12:49 jperkin Exp $
 TRYTON_MODULE_NAME=	tryton
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	devel python
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.tryton.org/
 COMMENT=	Three-tiers high-level general purpose application platform
 LICENSE=	gnu-gpl-v3
 USE_LANGUAGES=		# none
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 PY_PATCHPLIST=			yes
 PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 .include "options.mk"
-DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
+OPSYSVARS+=		DEPENDS
 DEPENDS+=		${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
-.if ${OPSYS} == "Darwin"
+DEPENDS.Darwin+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
 DEPENDS+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
 .endif
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/tryton \
 		${DESTDIR}${PREFIX}/bin/tryton${PYVERSSUFFIX}
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2015/08/24 14:49:41 richard Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/25 12:12:49 jperkin Exp $
 TRYTON_MODULE_NAME=	trytond
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	devel python
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.tryton.org/
 COMMENT=	Server of the Tryton application platform
 LICENSE=	gnu-gpl-v3
 DEPENDS+=	${PYPKGPREFIX}-python-sql>=0.2:../../databases/py-python-sql
 DEPENDS+=	${PYPKGPREFIX}-polib-[0-9]*:../../devel/py-polib
 DEPENDS+=	${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
 DEPENDS+=	${PYPKGPREFIX}-relatorio>=0.2.0:../../textproc/py-relatorio
 @@ -27,24 +27,23 @@ REPLACE_PYTHON+=	trytond/tests/test_mode
 REPLACE_PYTHON+=	trytond/tests/test_mptt.py trytond/tests/test_pyson.py
 REPLACE_PYTHON+=	trytond/tests/test_sequence.py
 REPLACE_PYTHON+=	trytond/tests/test_tools.py
 REPLACE_PYTHON+=	trytond/tests/test_transaction.py
 REPLACE_PYTHON+=	trytond/tests/test_trigger.py
 REPLACE_PYTHON+=	trytond/tests/test_tryton.py
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 PY_PATCHPLIST=			yes
 PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 .include "options.mk"
-.if ${OPSYS} == "Darwin"
+OPSYSVARS+=		DEPENDS
-DEPENDS+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
+DEPENDS.Darwin+=	${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app
 .endif
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/trytond \
 		${DESTDIR}${PREFIX}/bin/trytond${PYVERSSUFFIX}
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,31 +1,29 @@
-# $NetBSD: Makefile,v 1.61 2015/02/14 06:51:33 riastradh Exp $
+# $NetBSD: Makefile,v 1.62 2016/02/25 12:12:49 jperkin Exp $
 READLINE_VERSION=	6.3
 DISTNAME=       readline-${READLINE_VERSION}
 PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=readline/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 COMMENT=	GNU library that can recall and edit previous input
 LICENSE=	gnu-gpl-v3
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 .include "../../mk/bsd.prefs.mk"
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-.if ${OPSYS} == "NetBSD"
+CONFIGURE_ENV.NetBSD+=	bash_cv_wcwidth_broken=no
 CONFIGURE_ENV+=		bash_cv_wcwidth_broken=no
 .endif
 .endif
 BUILD_TARGET=		all-libtool examples
 INSTALL_TARGET=		install-libtool
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,37 +1,33 @@
-# $NetBSD: Makefile,v 1.14 2015/04/12 07:43:42 dsainty Exp $
+# $NetBSD: Makefile,v 1.15 2016/02/25 12:12:49 jperkin Exp $
 DISTNAME=	cvs-1.12.13
 PKGREVISION=	3
 CATEGORIES=	devel scm
 MASTER_SITES=	http://ftp.gnu.org/non-gnu/cvs/source/feature/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cvs.nongnu.org/
 COMMENT=	Concurrent Versions System
 LICENSE=	gnu-gpl-v2
 USE_TOOLS+=		makeinfo autoconf
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-external-zlib
 CONFIGURE_ARGS+=	--with-rsh=ssh
 CONFIGURE_ENV+=		PERL=${TOOLS_PERL5} gl_cv_func_getcwd_null=yes
 CHECK_INTERPRETER_SKIP=	share/cvs/contrib/*
 INFO_FILES=		yes
 TEXINFO_REQD+=		4.0
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS.Darwin+=	--enable-case-sensitivity
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--enable-case-sensitivity
 .endif
 .include "options.mk"
 AUTOCONF_REQD=		2.50
 pre-configure:
 	cd ${WRKSRC} && autoconf
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2015/12/05 21:25:41 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2016/02/25 12:12:49 jperkin Exp $
+#
 # common Makefile fragment for mozilla packages based on gecko 2.0.
+#
 # used by devel/xulrunner10/Makefile
 # used by www/firefox10/Makefile
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=		c99 c++
 UNLIMIT_RESOURCES+=	datasize
 DRAGONFLY_CCVER=	gcc44
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 @@ -58,31 +58,29 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 #
 .include "../../lang/python/application.mk"
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 # Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
 .PHONY: create-rm-wrapper
 pre-configure: create-rm-wrapper
 create-rm-wrapper:
 	printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
 	  ${WRAPPER_DIR}/bin/rm
 	chmod +x ${WRAPPER_DIR}/bin/rm
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 # The configure test for __thread succeeds, but later we end up with:
 # dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+=	ac_cv_thread_keyword=no
+CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyword=no
 .endif
 .if ${OPSYS} == "SunOS"
 # native libbz2.so hides BZ2_crc32Table
 PREFER.bzip2?=	pkgsrc
 .endif
 .if ${OPSYS} == "Linux"
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../archivers/bzip2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.7.7.1
 CONFIGURE_ENV+=	ac_cv_sqlite_secure_delete=yes	# c.f. patches/patch-al
 .include "../../databases/sqlite3/buildlink3.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2015/12/05 21:25:41 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2016/02/25 12:12:49 jperkin Exp $
+#
 # common Makefile fragment for mozilla packages based on gecko 2.0.
+#
 # used by devel/xulrunner17/Makefile
 # used by www/firefox17/Makefile
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=		c99 c++
 UNLIMIT_RESOURCES+=	datasize
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 @@ -65,31 +65,29 @@ CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
+#
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
 # Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
 .PHONY: create-rm-wrapper
 pre-configure: create-rm-wrapper
 create-rm-wrapper:
 	printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
 	  ${WRAPPER_DIR}/bin/rm
 	chmod +x ${WRAPPER_DIR}/bin/rm
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 # The configure test for __thread succeeds, but later we end up with:
 # dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+=	ac_cv_thread_keyword=no
+CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyword=no
 .endif
 .if ${OPSYS} == "SunOS"
 # native libbz2.so hides BZ2_crc32Table
 PREFER.bzip2?=	pkgsrc
 .endif
 .if ${OPSYS} == "Linux"
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../archivers/bzip2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.7.13
 CONFIGURE_ENV+=	ac_cv_sqlite_secure_delete=yes	# c.f. patches/patch-al
 .include "../../databases/sqlite3/buildlink3.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2015/12/05 21:25:41 adam Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2016/02/25 12:12:49 jperkin Exp $
+#
 # common Makefile fragment for mozilla packages based on gecko 2.0.
+#
 # used by devel/xulrunner192/Makefile
 # used by www/firefox36/Makefile
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=		c99 c++
 UNLIMIT_RESOURCES+=	datasize
 DRAGONFLY_CCVER=	gcc44
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 @@ -53,31 +53,29 @@ PYTHON_VERSIONS_INCOMPATIBLE=  33 34 35
 .include "../../lang/python/application.mk"
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 # Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
 .PHONY: create-rm-wrapper
 pre-configure: create-rm-wrapper
 create-rm-wrapper:
 	printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
 	  ${WRAPPER_DIR}/bin/rm
 	chmod +x ${WRAPPER_DIR}/bin/rm
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 # The configure test for __thread succeeds, but later we end up with:
 # dist/bin/libxul.so: undefined reference to `__tls_get_addr'
-CONFIGURE_ENV+=	ac_cv_thread_keyword=no
+CONFIGURE_ENV.NetBSD+=	ac_cv_thread_keyword=no
 .endif
 .if ${OPSYS} == "SunOS"
 # native libbz2.so hides BZ2_crc32Table
 PREFER.bzip2?=	pkgsrc
 .endif
 .if ${OPSYS} == "Linux"
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../archivers/bzip2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.7.5
 CONFIGURE_ENV+=	ac_cv_sqlite_secure_delete=yes	# c.f. patches/patch-al
 .include "../../databases/sqlite3/buildlink3.mk"

 @@ -1,30 +1,26 @@
-# $NetBSD: Makefile,v 1.18 2012/10/31 11:19:55 asau Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/25 12:12:50 jperkin Exp $
+#
 DISTNAME=	xxgdb-1.12
 PKGREVISION=	2
 CATEGORIES=	devel x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Graphical X11 interface for gdb
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_IMAKE=	yes
-.include "../../mk/bsd.prefs.mk"
+MAKE_ENV.SunOS+=	CPPFLAGS=
 .if ${OPSYS} == "SunOS"
 MAKE_ENV+=	CPPFLAGS=
 .endif
 INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man1
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xxgdb ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XDbx.ad ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XDbx
 	${INSTALL_DATA} ${WRKSRC}/xxgdb.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xxgdb.1
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,36 +1,34 @@
-# $NetBSD: Makefile,v 1.34 2014/08/17 16:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2016/02/25 12:12:50 jperkin Exp $
 DISTNAME=	yasm-1.3.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/
 MAINTAINER=	shaun@inerd.com
 HOMEPAGE=	http://www.tortall.net/projects/yasm/
 COMMENT=	Complete rewrite of the NASM assembler with BSD license
 LICENSE=	modified-bsd AND (artistic OR gnu-gpl-v2 OR gnu-lgpl-v2)
 USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 TEST_TARGET=		check
 .include "../../mk/bsd.prefs.mk"
 # Commit message suggests this is Darwin-specific.  Won't work to
 # cross-compile to Darwin, but that doesn't work at all anyway.
-.if ${OPSYS} == "Darwin"
+SUBST_CLASSES.Darwin+=	link
 SUBST_CLASSES+=		link
 SUBST_STAGE.link=	pre-configure
 SUBST_MESSAGE.link=	Fix linking command.
 SUBST_FILES.link=	Makefile.in
 SUBST_SED.link=		-e 's,$$(CCLD_FOR_BUILD) -o $$@,$$(LINK) -o $$@,'
 .endif
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 CONFIGURE_ENV+=		CC_FOR_BUILD=${NATIVE_CC:Q}
 CONFIGURE_ENV+=		CCLD_FOR_BUILD=${NATIVE_CC:Q}
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"