diff options
| author | triaxx <triaxx@pkgsrc.org> | 2019-10-10 12:29:11 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2019-10-10 12:29:11 +0000 |
| commit | 137d76fbafe42a59f036334d971cc2b37dddb9fa (patch) | |
| tree | a0607ed933ede85d079576911a4247b335047c46 /devel/ncurses | |
| parent | a55942bf0a90244f40f66646be867599bf5ed653 (diff) | |
| download | pkgsrc-137d76fbafe42a59f036334d971cc2b37dddb9fa.tar.gz | |
ncurses: fix circular dependency for Arch Linux
pkgsrc changes
--------------
* Remove groff dependency when built on Arch Linux
* Bump revision
Diffstat (limited to 'devel/ncurses')
| -rw-r--r-- | devel/ncurses/Makefile | 4 | ||||
| -rw-r--r-- | devel/ncurses/Makefile.common | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index e8044edfd0d..172fafeea3b 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -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 --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common index ab9d0eac91f..24445156fb3 100644 --- a/devel/ncurses/Makefile.common +++ b/devel/ncurses/Makefile.common @@ -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=${LOCALBASE}/bin/tic # 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 |