CVS commit: pkgsrc/mk/platform

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May  8 17:34:15 UTC 2017

Modified Files:
        pkgsrc/mk/platform: SunOS.mk

Log Message:
Default to pkgsrc terminfo.  The curses default was switched to pkgsrc a
while ago, but since then any packages that included both curses and
terminfo ended up with conflicting BUILDLINK_TRANSFORM entries, leaving it
to include ordering to determine whether the builtin or pkgsrc curses was
used.  This keeps them in sync, at least by default, though ideally we'd
ensure that at an infrastructure level.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/mk/platform/SunOS.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/platform/SunOS.mk
diff -u pkgsrc/mk/platform/SunOS.mk:1.74 pkgsrc/mk/platform/SunOS.mk:1.75
--- pkgsrc/mk/platform/SunOS.mk:1.74    Wed Mar  8 15:26:51 2017
+++ pkgsrc/mk/platform/SunOS.mk Mon May  8 17:34:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.74 2017/03/08 15:26:51 jperkin Exp $
+# $NetBSD: SunOS.mk,v 1.75 2017/05/08 17:34:15 jperkin Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -98,8 +98,11 @@ BUILDLINK_TRANSFORM+=        rm:-mimpure-text
 
 # The native curses implementations are reasonably old and can cause lots of
 # issues with software which assumes newer interfaces, so it's easier to just
-# use pkgsrc curses at this point.
-_INCOMPAT_CURSES=      SunOS-*-*
+# use pkgsrc curses at this point.  Both curses and terminfo should be in sync
+# otherwise it's possible to end up with conflicting buildlink transforms.
+#
+_INCOMPAT_CURSES=              SunOS-*-*
+_OPSYS_PREFER.terminfo?=       pkgsrc
 
 # Solaris has /usr/include/iconv.h, but it's not GNU iconv, so mark it
 # incompatible.