pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk fall back to /usr/xpg4/bin/sed if nbsed isn't found...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e5d97a76ced
branches:  trunk
changeset: 468450:7e5d97a76ced
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Feb 14 00:11:30 2004 +0000

description:
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.

diffstat:

 mk/defs.SunOS.mk |  24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r e7cb59bfb19b -r 7e5d97a76ced mk/defs.SunOS.mk
--- a/mk/defs.SunOS.mk  Sat Feb 14 00:07:29 2004 +0000
+++ b/mk/defs.SunOS.mk  Sat Feb 14 00:11:30 2004 +0000
@@ -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 @@
 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 @@
        @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)



Home | Main Index | Thread Index | Old Index