pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/ncurses ncurses: fix circular dependency for Arc...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/64334692ad7b
branches:  trunk
changeset: 402470:64334692ad7b
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Thu Oct 10 12:29:11 2019 +0000

description:
ncurses: fix circular dependency for Arch Linux

pkgsrc changes
--------------
* Remove groff dependency when built on Arch Linux
* Bump revision

diffstat:

 devel/ncurses/Makefile        |  4 ++--
 devel/ncurses/Makefile.common |  6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 92aeb416b345 -r 64334692ad7b devel/ncurses/Makefile
--- a/devel/ncurses/Makefile    Thu Oct 10 12:27:42 2019 +0000
+++ b/devel/ncurses/Makefile    Thu Oct 10 12:29:11 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2019/02/25 11:54:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.103 2019/10/10 12:29:11 triaxx Exp $
 
 .include "Makefile.common"
-PKGREVISION=   5
+PKGREVISION=   6
 COMMENT=       CRT screen handling and optimization package
 
 INSTALLATION_DIRS+=    share/examples
diff -r 92aeb416b345 -r 64334692ad7b devel/ncurses/Makefile.common
--- a/devel/ncurses/Makefile.common     Thu Oct 10 12:27:42 2019 +0000
+++ b/devel/ncurses/Makefile.common     Thu Oct 10 12:29:11 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2019/06/22 11:37:14 nia Exp $
+# $NetBSD: Makefile.common,v 1.42 2019/10/10 12:29:11 triaxx Exp $
 #
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
@@ -53,10 +53,12 @@
 # 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
+# Additionally, Arch Linux boostrap comes without curses package.
 .  if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \
        ${OPSYS} == "Interix" || \
        (${OPSYS} == "FreeBSD" && empty(OS_VERSION:M[0-9].*) && \
-               empty(OS_VERSION:M1[01].*))
+               empty(OS_VERSION:M1[01].*)) || \
+       (${OPSYS} == "Linux" && exists(/etc/arch-release))
 # None was available, so disable use of tbl(1)
 USE_TOOLS:=            ${USE_TOOLS:Ntbl}
 CONFIGURE_ARGS+=       --without-manpage-tbl



Home | Main Index | Thread Index | Old Index