summaryrefslogtreecommitdiff
path: root/mk/platform
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2017-05-08 17:34:15 +0000
committerjperkin <jperkin@pkgsrc.org>2017-05-08 17:34:15 +0000
commitebb1f4b8bdcfbcf570bc795a4af67be7f267d37c (patch)
tree6d70e06041e7f87226326df129a535fa0660fee2 /mk/platform
parenteaa6b1e5aba69140d9317d5f2cc3c9552f7e0ed5 (diff)
downloadpkgsrc-ebb1f4b8bdcfbcf570bc795a4af67be7f267d37c.tar.gz
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.
Diffstat (limited to 'mk/platform')
-rw-r--r--mk/platform/SunOS.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index d756b86f185..b2cfd6c9636 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -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.