From c2ad77555f7423f4fa8082b84b4cb63577345e9f Mon Sep 17 00:00:00 2001 From: grant Date: Sat, 14 Feb 2004 00:11:30 +0000 Subject: fall back to /usr/xpg4/bin/sed if nbsed isn't found, and bomb with a helpful error suggesting the user install textproc/nbsed. idea from gavan. --- mk/defs.SunOS.mk | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index f0b523d4ebc..258e8308069 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.78 2004/01/27 16:11:47 agc Exp $ +# $NetBSD: defs.SunOS.mk,v 1.79 2004/02/14 00:11:30 grant Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -67,7 +67,11 @@ PS?= /bin/ps PWD_CMD?= /bin/pwd # needs to print physical path RM?= /usr/bin/rm RMDIR?= /usr/bin/rmdir +.if exists(${LOCALBASE}/bin/nbsed) SED?= ${LOCALBASE}/bin/nbsed +.else +SED?= /usr/xpg4/bin/sed +.endif SETENV?= /usr/bin/env SH?= /bin/ksh SHLOCK= ${LOCALBASE}/bin/shlock @@ -158,6 +162,24 @@ _STRIPFLAG_INSTALL?= -s # install(1) option to strip @false .endif +.if !exists(${SED}) || ${SED} == "/usr/xpg4/bin/sed" +.BEGIN: + @echo "" + @echo "===========================================================================" + @echo "" + @echo "ERROR: pkgsrc now requires a more functional sed(1) than Solaris provides." + @echo "you can satisfy this requirement by running:" + @echo "" + @echo " cd ${_PKGSRCDIR}/textproc/nbsed; ${MAKE} install" + @echo "" + @echo "this will install ${LOCALBASE}/bin/nbsed and eliminate this message." + @echo "(nbsed is already installed by recent bootstrap-pkgsrc)." + @echo "" + @echo "===========================================================================" + @echo "" + @false +.endif + LOCALBASE?= ${DESTDIR}/usr/pkg .if !defined(ZOULARISBASE) . if exists(${LOCALBASE}/bsd) -- cgit v1.2.3