CVS commit: pkgsrc/devel/ncurses

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Thu Oct 10 12:29:11 UTC 2019

Modified Files:
        pkgsrc/devel/ncurses: Makefile Makefile.common

Log Message:
ncurses: fix circular dependency for Arch Linux

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


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 pkgsrc/devel/ncurses/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/ncurses/Makefile.common

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

Modified files:

Index: pkgsrc/devel/ncurses/Makefile
diff -u pkgsrc/devel/ncurses/Makefile:1.102 pkgsrc/devel/ncurses/Makefile:1.103
--- pkgsrc/devel/ncurses/Makefile:1.102 Mon Feb 25 11:54:05 2019
+++ pkgsrc/devel/ncurses/Makefile       Thu Oct 10 12:29:11 2019
@@ -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

Index: pkgsrc/devel/ncurses/Makefile.common
diff -u pkgsrc/devel/ncurses/Makefile.common:1.41 pkgsrc/devel/ncurses/Makefile.common:1.42
--- pkgsrc/devel/ncurses/Makefile.common:1.41   Sat Jun 22 11:37:14 2019
+++ pkgsrc/devel/ncurses/Makefile.common        Thu Oct 10 12:29:11 2019
@@ -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 @@ CONFIGURE_ENV+=             ac_cv_path_TIC_PATH=${L
 # 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