pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/platform Default to pkgsrc terminfo. The curses de...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/881aa40425c9
branches:  trunk
changeset: 362199:881aa40425c9
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon May 08 17:34:15 2017 +0000

description:
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:

 mk/platform/SunOS.mk |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 21489d16051c -r 881aa40425c9 mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Mon May 08 15:39:42 2017 +0000
+++ b/mk/platform/SunOS.mk      Mon May 08 17:34:15 2017 +0000
@@ -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 @@
 
 # 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.



Home | Main Index | Thread Index | Old Index