Update to version 20051105.

Remove GNU_CONFIGURE=no from pkgsrc Makefile.

Add "--mksrc none" to arguments and
add --prefix=${PREFIX} and --sysconfdir=${PKG_SYSCONFDIR}
and remove ${CONFIGURE_ARGS} for boot-strap.

Note that I didn't import the files that only change was a
CVS $Id$ tag.

From ChangeLog:

2005-11-05  Simon J. Gerraty  <sjg@void.crufty.net>

	* Makefile.in (BMAKE_VERSION): bump to 20051105
	* configure.in: always set default_sys_path
	  default is ${prefix}/share/mk
	  - remove prefix_sys_path, anyone wanting more than above
	    needs to set it manually.

2005-11-04  Simon J. Gerraty  <sjg@void.crufty.net>

	* boot-strap: make this a bit easier for pkgsrc folk.
	  bootstrap still fails on IRIX64 since MACHINE_ARCH gets set to
	  'mips' while pkgsrc wants 'mipseb' or 'mipsel'

2005-11-02  Simon J. Gerraty  <sjg@void.crufty.net>

	* Makefile.in (BMAKE_VERSION): bump to 20051102
	* job.c (JobFinish): fix likely ancient merge lossage
	fix from Todd Vierling.
	* boot-strap (srcdir): allow setting mksrc=none

2005-10-31  Simon J. Gerraty  <sjg@void.crufty.net>

	* Makefile.in (BMAKE_VERSION): bump to 20051031
	* ranlib.h: skip on OSF too.
	  (NetBSD PR 31864)

7 files changed, 119 insertions, 61 deletions

diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index 543ac44459a..ea3ff072f19 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2005/11/02 18:16:04 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/11/10 00:09:34 reed Exp $
 #
 
-DISTNAME=       bmake-20051002
-PKGREVISION=	2
+DISTNAME=       bmake-20051105
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -18,8 +17,6 @@ WRKSRC=		${WRKDIR}/bmake
 NO_CHECKSUM=	YES
 
 makesyspath=${PREFIX}/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk
-GNU_CONFIGURE=	no
-CONFIGURE_ARGS+= --with-default-sys-path=${makesyspath}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
@@ -29,7 +26,10 @@ do-extract:
 do-configure:
 
 do-build:
-	cd ${WRKDIR} && ./bmake/boot-strap -q -o ${OPSYS} ${CONFIGURE_ARGS}
+	cd ${WRKDIR} && \
+		./bmake/boot-strap -q -o ${OPSYS} --prefix=${PREFIX} \
+		--with-default-sys-path=${makesyspath} --mksrc none \
+		--sysconfdir=${PKG_SYSCONFDIR}
 
 # we use locally formatted version if available
 BMAKE_CATg=${WRKDIR}/${OPSYS}/bmake.cat1
diff --git a/devel/bmake/files/ChangeLog b/devel/bmake/files/ChangeLog
index 7d70e2505ef..c865b948667 100644
--- a/devel/bmake/files/ChangeLog
+++ b/devel/bmake/files/ChangeLog
@@ -1,3 +1,30 @@
+2005-11-05  Simon J. Gerraty  <sjg@void.crufty.net>
+
+	* Makefile.in (BMAKE_VERSION): bump to 20051105
+	* configure.in: always set default_sys_path 
+	  default is ${prefix}/share/mk
+	  - remove prefix_sys_path, anyone wanting more than above
+	    needs to set it manually.
+
+2005-11-04  Simon J. Gerraty  <sjg@void.crufty.net>
+
+	* boot-strap: make this a bit easier for pkgsrc folk.
+	  bootstrap still fails on IRIX64 since MACHINE_ARCH gets set to
+	  'mips' while pkgsrc wants 'mipseb' or 'mipsel'
+
+2005-11-02  Simon J. Gerraty  <sjg@void.crufty.net>
+
+	* Makefile.in (BMAKE_VERSION): bump to 20051102
+	* job.c (JobFinish): fix likely ancient merge lossage
+	fix from Todd Vierling.
+	* boot-strap (srcdir): allow setting mksrc=none
+
+2005-10-31  Simon J. Gerraty  <sjg@void.crufty.net>
+
+	* Makefile.in (BMAKE_VERSION): bump to 20051031
+	* ranlib.h: skip on OSF too.
+	  (NetBSD PR 31864)
+
 2005-10-10  Simon J. Gerraty  <sjg@void.crufty.net>
 
 	* Makefile.in (BMAKE_VERSION): bump to 20051002
diff --git a/devel/bmake/files/Makefile.in b/devel/bmake/files/Makefile.in
index f878ab6c599..bddcdffe0e5 100644
--- a/devel/bmake/files/Makefile.in
+++ b/devel/bmake/files/Makefile.in
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.in,v 1.1 2005/10/31 21:34:24 reed Exp $
+#	$NetBSD: Makefile.in,v 1.2 2005/11/10 00:09:34 reed Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 
-#	$Id: Makefile.in,v 1.1 2005/10/31 21:34:24 reed Exp $
+#	$Id: Makefile.in,v 1.2 2005/11/10 00:09:34 reed Exp $
 
 PROG=	bmake
 SRCS=	arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -22,13 +22,14 @@ srcdir= @srcdir@
 CC?= @CC@
 
 # Base version on src date
-BMAKE_VERSION= 20051002
+BMAKE_VERSION= 20051105
 # knowing when it was built is also handy
 BUILD_DATE!= date +%Y%m%d
 MAKE_VERSION:= bmake-${BMAKE_VERSION} build-${BUILD_DATE}
 MACHINE=@machine@
 MACHINE_ARCH=@machine_arch@
 
+CFLAGS+= -D_PATH_DEFSYSPATH=\"@default_sys_path@\"
 CFLAGS+= -I. -I${srcdir} @DEFS@ @CPPFLAGS@ ${XDEFS} -DMAKE_NATIVE
 CFLAGS+= ${CFLAGS_${.TARGET:T}} 
 CFLAGS_main.o= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
diff --git a/devel/bmake/files/boot-strap b/devel/bmake/files/boot-strap
index 0d6d0c7cd55..054c3c55c67 100755
--- a/devel/bmake/files/boot-strap
+++ b/devel/bmake/files/boot-strap
@@ -14,11 +14,31 @@
 #	(http://www.crufty.net/FreeWare/configs.html), $prefix/bin
 #	and a suitable ~/*bin directory.
 #
+#	Possibly useful configure_args:
+#
+#	--with-machine="machine"
+#		set "machine" to override that determined by
+#		machine.sh
+#	
+#	--with-force-machine="machine"
+#		force "machine" even if uname(3) provides a value.
+#
+#	--with-machine_arch="machine_arch"
+#		set "machine_arch" to override that determined by
+#		machine.sh
+#
+#	--with-default-sys-path="syspath"
+#		set an explicit default "syspath" which is where bmake
+#		will look for sys.mk and friends.
+#	
+#	--with-prefix-sys-path="syspath"
+#		prefix the built in default syspath with "syspath"
+#
 # AUTHOR:
 #	Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: boot-strap,v 1.1 2005/10/31 21:34:24 reed Exp $
+#	$Id: boot-strap,v 1.2 2005/11/10 00:09:34 reed Exp $
 #
 #	@(#) Copyright (c) 2001 Simon J. Gerraty
 #
@@ -69,12 +89,12 @@ do
 	--prefix=*) prefix=`IFS="="; set -- $1; echo $2`; shift;;
 	--src=*) srcdir=`IFS="="; set -- $1; echo $2`; shift;;
 	--with-mksrc=*) mksrc=`IFS="="; set -- $1; echo $2`; shift;;
-	--*) CONFIGURE_ARGS="$CONFIGURE_ARGS $1"; shift;;
-	*=*) eval "$1"; export `IFS="="; set -- $1; echo $1`; shift;;
 	-s|--src) srcdir=$2; shift 2;;
 	-m|--mksrc) mksrc=$2; shift 2;;
-	-o) objdir=$2; shift 2;;
+	-o|--objdir) objdir=$2; shift 2;;
 	-q) quiet=; shift;;
+	--*) CONFIGURE_ARGS="$CONFIGURE_ARGS $1"; shift;;
+	*=*) eval "$1"; export `IFS="="; set -- $1; echo $1`; shift;;
 	*) break;;
 	esac
 done
@@ -106,9 +126,16 @@ GetDir() {
 }
 	
 srcdir=`GetDir /bmake $srcdir $2 $Mydir ./bmake* $Mydir/../bmake*`
-[ -d $srcdir ] || Usage
-mksrc=`GetDir /mk $mksrc $3 ./mk* $srcdir/mk* $srcdir/../mk*`
-[ -d $mksrc ] || Usage
+[ -d ${srcdir:-/dev/null} ] || Usage
+case "$mksrc" in
+none|-) # we don't want it
+	mksrc=
+	;;
+*)	# guess we want mksrc...
+	mksrc=`GetDir /mk $mksrc $3 ./mk* $srcdir/mk* $srcdir/../mk*`
+	[ -d ${mksrc:-/dev/null} ] || Usage
+	;;
+esac
 
 # Ok, get to work...
 objdir=${objdir:-$OS}
@@ -116,16 +143,12 @@ objdir=${objdir:-$OS}
 [ -d $objdir ] || mkdir $objdir
 cd $objdir || exit 1
 
-defsyspath=/usr/share/mk:/share/mk:/usr/local/share/mk:/opt/share/mk
-prefix=${prefix:-${1:-/usr/local}}
-case "$prefix" in
-/usr/local) makesyspath=$defsyspath;;
-*) makesyspath=`echo $prefix/share/mk:$defsyspath | sed "s,:$prefix/share/mk,,"`;;
-esac
-
 AddConfigure --prefix= $prefix
-AddConfigure --with-default-sys-path= $makesyspath
-AddConfigure --with-mksrc= $mksrc
+case "$CONFIGURE_ARGS" in
+*--with-prefix-sys-path*) ;;	# skip
+*) AddConfigure --with-default-sys-path= $prefix/share/mk;;
+esac
+[ "$mksrc" ] && AddConfigure --with-mksrc= $mksrc
 $srcdir/configure $CONFIGURE_ARGS || exit 1
 ${MAKE:-make} -f makefile.boot clean
 ${MAKE:-make} -f makefile.boot bootstrap || exit 1
@@ -144,7 +167,7 @@ install_prefix() {
        echo cp $objdir/bmake $bdir/$make_version
        echo rm -f $bdir/bmake
        echo ln -s $make_version $bdir/bmake
-       echo $mksrc/install-mk $1/share/mk
+       [ "$mksrc" ] && echo $mksrc/install-mk $1/share/mk
 }
 
 case $prefix/ in
diff --git a/devel/bmake/files/configure b/devel/bmake/files/configure
index 1e62355be39..9e461f1f992 100755
--- a/devel/bmake/files/configure
+++ b/devel/bmake/files/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA ac_exe_suffix LIBOBJS machine force_machine machine_arch mksrc INSTALL GCC diff_u LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA ac_exe_suffix LIBOBJS machine force_machine machine_arch mksrc default_sys_path prefix_sys_path INSTALL GCC diff_u LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -849,12 +849,12 @@ Optional Packages:
   --with-defshell=SHELL  explicitly set DEFSHELL to either /bin/sh or /bin/ksh
   --with-machine=MACHINE  explicitly set MACHINE
   --with-force-machine=MACHINE  set FORCE_MACHINE
+  --with-force-machine-arch=MACHINE  set FORCE_MACHINE_ARCH
   --with-machine_arch=MACHINE_ARCH  explicitly set MACHINE_ARCH
   --with-default-sys-path=PATH:DIR:LIST  use an explicit _PATH_DEFSYSPATH
 	MAKESYSPATH is a ':' separated list of directories
 	that bmake will search for system .mk files.
 	_PATH_DEFSYSPATH is its default value.
-  --with-prefix-sys-path=PATH:DIR:LIST  prefix _PATH_PREFIX_SYSPATH
   --with-path-objdirprefix=PATH  override _PATH_OBJDIRPREFIX
   --with-mksrc=PATH tell makefile.boot where to find mk src
 
@@ -5835,6 +5835,17 @@ no)    ;;
 *)     force_machine=FORCE_; machine=$with_force_machine;;
 esac
 fi;
+force_machine_arch=
+
+# Check whether --with-force_machine_arch or --without-force_machine_arch was given.
+if test "${with_force_machine_arch+set}" = set; then
+  withval="$with_force_machine_arch"
+  case "${withval}" in
+yes)   force_machine_arch=FORCE_;;
+no)    ;;
+*)     force_machine_arch=FORCE_; machine_arch=$with_force_machine;;
+esac
+fi;
 
 # Check whether --with-machine_arch or --without-machine_arch was given.
 if test "${with_machine_arch+set}" = set; then
@@ -5848,28 +5859,18 @@ no)    ;;
 esac
 fi;
 echo "Using: ${force_machine}MACHINE=$machine, MACHINE_ARCH=$machine_arch" 1>&6
+default_sys_path=\${prefix}/share/mk
 
 # Check whether --with-default-sys-path or --without-default-sys-path was given.
 if test "${with_default_sys_path+set}" = set; then
   withval="$with_default_sys_path"
   case "${withval}" in
-yes)   { { echo "$as_me:$LINENO: error: bad value ${withval} given for bmake _PATH_DEFSYSPATH" >&5
+yes)	{ { echo "$as_me:$LINENO: error: bad value ${withval} given for bmake _PATH_DEFSYSPATH" >&5
 echo "$as_me: error: bad value ${withval} given for bmake _PATH_DEFSYSPATH" >&2;}
    { (exit 1); exit 1; }; } ;;
-no)    ;;
-*)     CPPFLAGS="$CPPFLAGS \"-D_PATH_DEFSYSPATH=\\\"$with_default_sys_path\\\"\"" ;;
-esac
-fi;
-
-# Check whether --with-prefix-sys-path or --without-prefix-sys-path was given.
-if test "${with_prefix_sys_path+set}" = set; then
-  withval="$with_prefix_sys_path"
-  case "${withval}" in
-yes)   { { echo "$as_me:$LINENO: error: bad value ${withval} given for bmake _PATH_PREFIX_SYSPATH" >&5
-echo "$as_me: error: bad value ${withval} given for bmake _PATH_PREFIX_SYSPATH" >&2;}
-   { (exit 1); exit 1; }; } ;;
-no)    ;;
-*)     CPPFLAGS="$CPPFLAGS \"-D_PATH_PREFIX_SYSPATH=\\\"$with_prefix_sys_path\\\"\"" ;;
+no)	;;
+*)	default_sys_path="$with_default_sys_path"
+	;;
 esac
 fi;
 
@@ -5933,6 +5934,8 @@ echo "Using: MKSRC=$mksrc" 1>&6
 
 
 
+
+
                                         ac_config_files="$ac_config_files Makefile makefile.boot lst.lib/makefile.boot unit-tests/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6565,6 +6568,8 @@ s,@machine@,$machine,;t t
 s,@force_machine@,$force_machine,;t t
 s,@machine_arch@,$machine_arch,;t t
 s,@mksrc@,$mksrc,;t t
+s,@default_sys_path@,$default_sys_path,;t t
+s,@prefix_sys_path@,$prefix_sys_path,;t t
 s,@INSTALL@,$INSTALL,;t t
 s,@GCC@,$GCC,;t t
 s,@diff_u@,$diff_u,;t t
diff --git a/devel/bmake/files/configure.in b/devel/bmake/files/configure.in
index be7ad7cd66f..0e449943ea5 100644
--- a/devel/bmake/files/configure.in
+++ b/devel/bmake/files/configure.in
@@ -1,6 +1,6 @@
 dnl
 dnl RCSid:
-dnl	$Id: configure.in,v 1.1 2005/10/31 21:34:24 reed Exp $
+dnl	$Id: configure.in,v 1.2 2005/11/10 00:09:34 reed Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
@@ -190,6 +190,15 @@ no)    ;;
 *)     force_machine=FORCE_; machine=$with_force_machine;;
 esac])
 dnl
+force_machine_arch=
+AC_ARG_WITH(force_machine_arch,
+[  --with-force-machine-arch=MACHINE  set FORCE_MACHINE_ARCH],
+[case "${withval}" in
+yes)   force_machine_arch=FORCE_;;
+no)    ;;
+*)     force_machine_arch=FORCE_; machine_arch=$with_force_machine;;
+esac])
+dnl
 AC_ARG_WITH(machine_arch,
 [  --with-machine_arch=MACHINE_ARCH  explicitly set MACHINE_ARCH],
 [case "${withval}" in
@@ -204,25 +213,17 @@ echo "Using: ${force_machine}MACHINE=$machine, MACHINE_ARCH=$machine_arch" 1>&6
 dnl
 dnl Allow folk to control _PATH_DEFSYSPATH
 dnl
+default_sys_path=\${prefix}/share/mk
 AC_ARG_WITH(default-sys-path,
 [  --with-default-sys-path=PATH:DIR:LIST  use an explicit _PATH_DEFSYSPATH
 	MAKESYSPATH is a ':' separated list of directories 
 	that bmake will search for system .mk files. 
 	_PATH_DEFSYSPATH is its default value.],
 [case "${withval}" in
-yes)   AC_MSG_ERROR(bad value ${withval} given for bmake _PATH_DEFSYSPATH) ;;
-no)    ;;
-*)     CPPFLAGS="$CPPFLAGS \"-D_PATH_DEFSYSPATH=\\\"$with_default_sys_path\\\"\"" ;;
-esac])
-dnl
-dnl Or just to prefix it 
-dnl
-AC_ARG_WITH(prefix-sys-path,
-[  --with-prefix-sys-path=PATH:DIR:LIST  prefix _PATH_PREFIX_SYSPATH],
-[case "${withval}" in
-yes)   AC_MSG_ERROR(bad value ${withval} given for bmake _PATH_PREFIX_SYSPATH) ;;
-no)    ;;
-*)     CPPFLAGS="$CPPFLAGS \"-D_PATH_PREFIX_SYSPATH=\\\"$with_prefix_sys_path\\\"\"" ;;
+yes)	AC_MSG_ERROR(bad value ${withval} given for bmake _PATH_DEFSYSPATH) ;;
+no)	;;
+*)	default_sys_path="$with_default_sys_path"
+	;;
 esac])
 dnl
 dnl Some folk don't like this one
@@ -281,6 +282,7 @@ AC_SUBST(machine)
 AC_SUBST(force_machine)
 AC_SUBST(machine_arch)
 AC_SUBST(mksrc)
+AC_SUBST(default_sys_path)
 AC_SUBST(INSTALL)
 AC_SUBST(GCC)
 AC_SUBST(diff_u)
diff --git a/devel/bmake/files/makefile.boot.in b/devel/bmake/files/makefile.boot.in
index 0c980d4ebe2..6fdbb4d3d65 100644
--- a/devel/bmake/files/makefile.boot.in
+++ b/devel/bmake/files/makefile.boot.in
@@ -1,5 +1,5 @@
 # RCSid:
-#	$Id: makefile.boot.in,v 1.1 2005/10/31 21:34:24 reed Exp $
+#	$Id: makefile.boot.in,v 1.2 2005/11/10 00:09:34 reed Exp $
 
 #
 # modify MACHINE and MACHINE_ARCH as appropriate for your target architecture
@@ -14,13 +14,13 @@ MKDEP_OPTS=-A
 MK=${prefix}/share/mk
 MKSRC=@mksrc@
 DEFAULT_MAKESYSPATH=/usr/share/mk:/usr/local/share/mk:/opt/share/mk
-CFLAGS=-I. -I$(srcdir) @DEFS@ @CPPFLAGS@ ${XDEFS}
+CFLAGS=-I. -I$(srcdir) @DEFS@ @CPPFLAGS@ ${XDEFS} -D_PATH_DEFSYSPATH=\"@default_sys_path@\"
 MDEFS="-D@force_machine@MACHINE=\"@machine@\"" "-DMACHINE_ARCH=\"@machine_arch@\""
 
 OBJ=arch.o buf.o compat.o cond.o dir.o for.o hash.o job.o main.o make.o \
     parse.o str.o suff.o targ.o trace.o var.o util.o getopt.o sigcompat.o @LIBOBJS@
 
-BMAKE_ENV= CC="$(CC)" MAKEFLAGS= MAKESYSPATH=`pwd`/mk:${MKSRC}:${MK}:${DEFAULT_MAKESYSPATH}
+BMAKE_ENV= CC="$(CC)" LIBC= MAKEFLAGS= MAKESYSPATH=`pwd`/mk:${MKSRC}:${MK}:${DEFAULT_MAKESYSPATH}
 
 bootstrap:	bmake.boot .mk.done
 	${BMAKE_ENV} ./bmake.boot -f Makefile 
@@ -41,7 +41,7 @@ bmake.boot: ${OBJ}
 	@if test -s ${MKSRC}/install-mk; then \
 	  sh ${MKSRC}/install-mk -v -m 644 `pwd`/mk ${USE_OS}; \
 	elif test ! -s /usr/share/mk/sys.mk -a ! -s ${MK}/sys.mk; then \
-	  echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false; \
+	  echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC or MK; false; \
 	fi
 	@touch $@