kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move USE_NCURSES stuff from bsd.pkg.mk to bsd.prefs.mk.

Browse source 
Do executable bit testing in bsd.pkg.mk, REPLACE_NCURSES, slightly
different.
This commit is contained in:
wiz 2000-11-02 03:01:40 +00:00
parent 545d166215
commit 7382d63dd0
2 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mk/bsd.pkg.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.595 2000/11/01 09:06:22 skrll Exp $ # $NetBSD: bsd.pkg.mk,v 1.596 2000/11/02 03:01:40 wiz Exp $
# #
# This file is in the public domain. # This file is in the public domain.
# #
@ -192,24 +192,8 @@ MAKE_ENV+= FC="${FC}"
USE_GTEXINFO= yes USE_GTEXINFO= yes
.endif .endif
.if defined(USE_CURSES) && !defined(NEED_NCURSES) .if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES" && \
.if ${OPSYS} == "NetBSD" ${PKGBASE} != "ncurses"
GOOD_CURSES= 1.4[YZ] 1.4Z[A-D] 1.[5-9]*
NEED_NCURSES= YES
.for PATTERN in ${GOOD_CURSES}
.if ${OS_VERSION:M${PATTERN}} != ""
NEED_NCURSES= NO
.endif
.endfor
.else
NEED_NCURSES= NO
.endif
# do _not_ pass NEED_NCURSES flag down, or we end up with recursive
# dependency of ncurses on itself on <1.4Y.
# MAKEFLAGS+= NEED_NCURSES=${NEED_NCURSES}
.endif
.if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES"
DEPENDS+= ncurses>=5.0:../../devel/ncurses DEPENDS+= ncurses>=5.0:../../devel/ncurses
.endif .endif
@ -1459,11 +1443,9 @@ do-configure:
${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; if [ -f ${f} ]; then \ ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}; if [ -f ${f} ]; then \
${SED} -e "s/ncurses/curses/g" ${f} > ${f}.new; \ ${SED} -e "s/ncurses/curses/g" ${f} > ${f}.new; \
if [ -x ${f} ]; then \ if [ -x ${f} ]; then \
${CHMOD} a+x ${f}.new; \
fi; \
${MV} ${f}.new ${f}; \ ${MV} ${f}.new ${f}; \
${CHMOD} a+x ${f}; \
else \
${MV} ${f}.new ${f}; \
fi \
fi fi
.endfor .endfor
.endif .endif

17
mk/bsd.prefs.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.prefs.mk,v 1.18 2000/10/15 11:31:42 rh Exp $ # $NetBSD: bsd.prefs.mk,v 1.19 2000/11/02 03:01:40 wiz Exp $
# #
# Make file, included to get the site preferences, if any. Should # Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined() # only be included by package Makefiles before any .if defined()
@ -126,4 +126,19 @@ HAVE_BUILTIN_MESA= YES
.undef __BUILTIN_MESA .undef __BUILTIN_MESA
.endif # CHECK_MESA .endif # CHECK_MESA
.if defined(USE_CURSES) && !defined(NEED_NCURSES)
NEED_NCURSES= NO
.if ${OPSYS} == "NetBSD"
_INCOMPAT_CURSES= 0.* 1.[0123]* 1.4.* 1.4[A-X]
.for PATTERN in ${_INCOMPAT_CURSES}
.if ${OS_VERSION:M${PATTERN}} != ""
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}
.endif # USE_CURSES
.endif # BSD_PKG_MK .endif # BSD_PKG_MK