pkgsrc-Changes-HG archive

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

[pkgsrc/pkgsrc-2007Q2]: pkgsrc/devel/ncurses Pullup ticket 2126 - requested b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5b7cda284f9
branches:  pkgsrc-2007Q2
changeset: 530458:c5b7cda284f9
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Jul 09 13:59:36 2007 +0000

description:
Pullup ticket 2126 - requested by tnn
build fix for ncurses

- pkgsrc/devel/ncurses/Makefile.common                  1.6

   Module Name: pkgsrc
   Committed By:        tnn
   Date:                Mon Jul  2 02:08:20 UTC 2007

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

   Log Message:
   On platforms that have neither a builtin groff nor builtin curses
   we can end up with a circular dependency:

   ncurses -> groff -> netpbm -> flex -> bison -> gtexinfo -> ncurses

   ncurses may depend on groff because of USE_TOOLS+=tbl.
   Break the circular dependency by using --without-manpage-tbl
   if there is no tbl(1) available and we're unable to build
   groff because of missing curses.

diffstat:

 devel/ncurses/Makefile.common |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r a7d1154faf15 -r c5b7cda284f9 devel/ncurses/Makefile.common
--- a/devel/ncurses/Makefile.common     Sun Jul 01 00:18:35 2007 +0000
+++ b/devel/ncurses/Makefile.common     Mon Jul 09 13:59:36 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2007/02/06 14:34:54 rillig Exp $
+# $NetBSD: Makefile.common,v 1.5.4.1 2007/07/09 13:59:36 ghen Exp $
 
 DISTNAME=      ncurses-${NC_VERS}
 NC_VERS=       5.6
@@ -31,6 +31,18 @@
 MAKE_JOBS_SAFE=                no
 
 .include "../../mk/bsd.prefs.mk"
+.if !defined(TOOLS_TBL)
+# This means that groff needs to be built to get tbl(1).
+# 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
+. if !(exists(/usr/include/curses.h) || exists(/usr/include/ncurses.h)) || \
+       ${OPSYS} == "Interix"
+# None was available, so disable use of tbl(1)
+USE_TOOLS:=            ${USE_TOOLS:Ntbl}
+CONFIGURE_ARGS+=       --without-manpage-tbl
+. endif
+.endif
 
 .if ${OPSYS} == "SunOS"
 PLIST_SUBST+=  NOT_SUNOS="@comment "



Home | Main Index | Thread Index | Old Index