[pkgsrc/trunk]: pkgsrc Try to force a proper shell on Solaris by extending bm...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da69233e0166
branches:  trunk
changeset: 532998:da69233e0166
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Sep 06 19:23:25 2007 +0000

description:
Try to force a proper shell on Solaris by extending bmake to
expect full path names. Use the default locations in /bin unless
overriden explicitly. Bump revision of bmake.

On Solaris, use /usr/xpg4/bin/sh if it exists.

diffstat:

 bootstrap/bootstrap                |     5 +-
 devel/bmake/Makefile               |    19 +-
 devel/bmake/files/Makefile.in      |    13 +-
 devel/bmake/files/config.h.in      |    16 +-
 devel/bmake/files/configure        |  6396 ++++++++++++++++++-----------------
 devel/bmake/files/configure.in     |    43 +-
 devel/bmake/files/job.c            |    17 +-
 devel/bmake/files/job.h            |     3 +-
 devel/bmake/files/main.c           |     8 +-
 devel/bmake/files/makefile.boot.in |    13 +-
 devel/bmake/files/pathnames.h      |    25 +-
 11 files changed, 3461 insertions(+), 3097 deletions(-)

diffs (truncated from 9507 to 300 lines):

diff -r 092fc3e81b74 -r da69233e0166 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Thu Sep 06 19:15:10 2007 +0000
+++ b/bootstrap/bootstrap       Thu Sep 06 19:23:25 2007 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.108 2007/08/18 11:01:28 schwarz Exp $
+# $NetBSD: bootstrap,v 1.109 2007/09/06 19:23:25 joerg Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -468,6 +468,9 @@
        if [ -d "/usr/xpg4/bin" ]; then
                overpath="/usr/xpg4/bin:$overpath"
        fi
+       if [ -x "/usr/xpg4/bin" ]; then
+               bmakexargs="$bmakexargs --with-defshell=/usr/xpg4/bin/sh"
+       fi
        root_group=root
        need_pax=yes
        need_bsd_install=no
diff -r 092fc3e81b74 -r da69233e0166 devel/bmake/Makefile
--- a/devel/bmake/Makefile      Thu Sep 06 19:15:10 2007 +0000
+++ b/devel/bmake/Makefile      Thu Sep 06 19:23:25 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2007/04/12 21:28:42 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/06 19:23:25 joerg Exp $
 #
 
 DISTNAME=      bmake-20051105
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -24,6 +24,16 @@
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
+BOOTSTRAP_ARGS=                -q -o ${OPSYS} --prefix=${PREFIX} \
+                       --with-default-sys-path=${makesyspath} \
+                       --mksrc none --sysconfdir=${PKG_SYSCONFDIR:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" && exists(/usr/xpg/bin/sh)
+BOOTSTRAP_ARGS+=       --with-defshell=/usr/xpg4/bin/sh
+.endif
+
 do-extract:
        ${CP} -R ${FILESDIR} ${WRKSRC}
 
@@ -31,10 +41,7 @@
 
 do-build:
        cd ${WRKDIR} && \
-               ${SETENV} ${MAKE_ENV} ${SH} ./bmake/boot-strap \
-               -q -o ${OPSYS} --prefix=${PREFIX} \
-               --with-default-sys-path=${makesyspath} --mksrc none \
-               --sysconfdir=${PKG_SYSCONFDIR}
+               ${SETENV} ${MAKE_ENV} ${SH} ./bmake/boot-strap ${BOOTSTRAP_ARGS}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${PREFIX}/bin
diff -r 092fc3e81b74 -r da69233e0166 devel/bmake/files/Makefile.in
--- a/devel/bmake/files/Makefile.in     Thu Sep 06 19:15:10 2007 +0000
+++ b/devel/bmake/files/Makefile.in     Thu Sep 06 19:23:25 2007 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.in,v 1.4 2007/05/29 19:00:42 schmonz Exp $
+#      $NetBSD: Makefile.in,v 1.5 2007/09/06 19:23:25 joerg Exp $
 #      @(#)Makefile    5.2 (Berkeley) 12/28/90
 
-#      $Id: Makefile.in,v 1.4 2007/05/29 19:00:42 schmonz Exp $
+#      $Id: Makefile.in,v 1.5 2007/09/06 19:23:25 joerg Exp $
 
 PROG=  bmake
 SRCS=  arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -29,7 +29,14 @@
 MACHINE=@machine@
 MACHINE_ARCH=@machine_arch@
 
-CFLAGS+= @CFLAGS@ -D_PATH_DEFSYSPATH=\"@default_sys_path@\"
+DEFAULT_CSH = @DEFAULT_CSH@
+DEFAULT_KSH = @DEFAULT_KSH@
+DEFAULT_SH = @DEFAULT_SH@
+DEFAULT_SYS_PATH = @DEFAULT_SYS_PATH@
+
+CFLAGS+= @CFLAGS@ -DDEFAULT_CSH=\"${DEFAULT_CSH}\"
+CFLAGS+= -DDEFAULT_KSH=\"${DEFAULT_KSH}\" -DDEFAULT_SH=\"${DEFAULT_SH}\"
+CFLAGS+= -DDEFAULT_SYS_PATH=\"${DEFAULT_SYS_PATH}\"
 CFLAGS+= -I. -I${srcdir} @DEFS@ @CPPFLAGS@ ${XDEFS} -DMAKE_NATIVE
 CFLAGS+= ${CFLAGS_${.TARGET:T}} 
 CFLAGS_main.o= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
diff -r 092fc3e81b74 -r da69233e0166 devel/bmake/files/config.h.in
--- a/devel/bmake/files/config.h.in     Thu Sep 06 19:15:10 2007 +0000
+++ b/devel/bmake/files/config.h.in     Thu Sep 06 19:23:25 2007 +0000
@@ -1,5 +1,17 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Path to csh */
+#undef DEFAULT_CSH
+
+/* Path to ksh */
+#undef DEFAULT_KSH
+
+/* Path to sh */
+#undef DEFAULT_SH
+
+/* Default path for sys.mk */
+#undef DEFAULT_SYS_PATH
+
 /* Shell spec to use by default */
 #undef DEFSHELL
 
@@ -233,13 +245,13 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
 #undef off_t
 
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define as `fork' if `vfork' does not work. */
diff -r 092fc3e81b74 -r da69233e0166 devel/bmake/files/configure
--- a/devel/bmake/files/configure       Thu Sep 06 19:15:10 2007 +0000
+++ b/devel/bmake/files/configure       Thu Sep 06 19:23:25 2007 +0000
@@ -1,81 +1,35 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.61.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)$' \| \
-        .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-         /^X\/\(\/\/\)$/{ s//\1/; q; }
-         /^X\/\(\/\).*/{ s//\1/; q; }
-         s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -96,124 +50,466 @@
   rm -f conf$$.sh
 fi
 
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""       $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '