diff options
| author | hubertf <hubertf> | 2000-11-21 00:16:43 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2000-11-21 00:16:43 +0000 |
| commit | ebe099e9caa4c49dc301c8e69e8564cfeee0ebbf (patch) | |
| tree | 7ee9613651ae4ebd4e648de2b8b602bcd4ee7e88 /mk | |
| parent | d798f243e4d75dba710cd71d7d5d22d2de4a9e86 (diff) | |
| download | pkgsrc-ebe099e9caa4c49dc301c8e69e8564cfeee0ebbf.tar.gz | |
Fix NEED_NCURSES handling:
Let's take timidity, which needs ncurses and tk. By setting
NEED_NCURSES=1 and adding it to MAKEFLAGS, all other required pkgs
automagically depend on ncurses - tk, tcl (which is slurped in by
tk), ...
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d5892438c1b..82ffa614d1f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.613 2000/11/20 09:33:39 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.614 2000/11/21 00:16:43 hubertf Exp $ # # This file is in the public domain. # @@ -50,7 +50,7 @@ PKGSRCDIR?= ${.CURDIR:C|/[^/]*/[^/]*$||} PKGPATH?= ${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|} PKGBASE?= ${PKGNAME:C/-[^-]*$//} PKGVERSION?= ${PKGNAME:C/^.*-//} -PKGWILDCARD= ${PKGBASE}-[0-9]* +PKGWILDCARD?= ${PKGBASE}-[0-9]* DISTDIR?= ${PKGSRCDIR}/distfiles _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} @@ -192,8 +192,7 @@ MAKE_ENV+= FC="${FC}" USE_GTEXINFO= yes .endif -.if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES" && \ - ${PKGBASE} != "ncurses" +.if ((defined(NEED_NCURSES)) && (${NEED_NCURSES} == YES)) DEPENDS+= ncurses>=5.0:../../devel/ncurses .endif diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index c33fb8a5464..3ca2e79a7b4 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.19 2000/11/02 03:01:40 wiz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.20 2000/11/21 00:16:44 hubertf Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -136,9 +136,9 @@ NEED_NCURSES= YES .endif .endfor .endif -# we can pass the flag down without recursive dependency of ncurses -# on itself, because it's explicitly tested in bsd.pkg.mk -MAKEFLAGS+= NEED_NCURSES=${NEED_NCURSES} +# we can NOT pass the NEED_NCURSES flag down as every required package +# will start to require ncurses, which is not true (and raises some +# recursive dependency problems!) .endif # USE_CURSES .endif # BSD_PKG_MK |