diff options
author | jlam <jlam@pkgsrc.org> | 2006-07-13 14:54:00 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2006-07-13 14:54:00 +0000 |
commit | 3fb04117ee27bcb2d948371d3ac8c50872a8ac90 (patch) | |
tree | 84d8ca61e838443d425de8ec0720a2f8f25eb818 /bootstrap | |
parent | c09109156dcf3e76009111008d0eab331f44ba02 (diff) | |
download | pkgsrc-3fb04117ee27bcb2d948371d3ac8c50872a8ac90.tar.gz |
* Set PKG_TOOLS_BIN to the location of the bootstrapped pkg_* tools
in the example mk.conf file.
* Don't install digest anymore. It's not needed by binary package users
and it's handled within pkgsrc/mk now via BOOTSTRAP_DEPENDS.
Diffstat (limited to 'bootstrap')
-rwxr-xr-x | bootstrap/bootstrap | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index c676fcbcfe8..2d30558eaee 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.53 2006/07/11 18:04:08 jlam Exp $ +# $NetBSD: bootstrap,v 1.54 2006/07/13 14:54:00 jlam Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -35,7 +35,7 @@ # #set -x -BOOTSTRAP_VERSION=20051201 +BOOTSTRAP_VERSION=20060713 ignorecasecheck=no ignoreusercheck=no @@ -294,7 +294,6 @@ root_user=root bmakexenv= bmakexargs= tnftpxenv= -digestxenv= case "$opsys" in Darwin) root_group=wheel @@ -366,8 +365,6 @@ IRIX*) if [ `uname -r` -lt 6 ]; then # IRIX 5 does not have uint32_t typedef'd in sys/types.h tnftpxenv="CPPFLAGS=-DUINT32_T=int" -# IRIX 5 does not have snprintf() needed to compile digest - digestxenv="LDFLAGS=\"\$LDFLAGS -L../libnbcompat\" LIBS=-lnbcompat" # IRIX 5 is lacking fnmatch.h and regex.h, both provided by libnbcompat needfnmatchh=yes needregexh=yes @@ -646,6 +643,7 @@ echo "VARBASE= $varbase" >> ${MKCONF_EXAMPLE} if [ "${sysconfdir}" != "${prefix}/etc" ]; then echo "PKG_SYSCONFBASE= $sysconfdir" >> ${MKCONF_EXAMPLE} fi +echo "PKG_TOOLS_BIN= $prefix/sbin" >> ${MKCONF_EXAMPLE} echo "" >> ${MKCONF_EXAMPLE} # create directories @@ -735,19 +733,6 @@ FETCH_CMD="$fetch_cmd" export FETCH_CMD echo "FETCH_CMD= $fetch_cmd" >> ${MKCONF_EXAMPLE} -# bootstrap digest -echo_msg "Installing digest" -copy_src ../pkgtools/digest/files digest -run_cmd "(cd $wrkdir/digest; env $BSTRAP_ENV $digestxenv $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir && $bmake && $bmake install)" - -# create the digest package's meta files -digestversion=digest-`$awkprog -F\' '/^PACKAGE_VERSION=/ {print $2}' $wrkdir/digest/configure` -$lsprog -ld $prefix/bin/digest | $awkprog '{ print $5 }' > $wrkdir/digest/.size -env DIGESTPROG=$prefix/bin/digest PKG_DIGEST=md5 PKG_DBDIR=$pkgdbdir \ - $shprog ./pkg.sh create -d $wrkdir/digest/DESCR -O \ - -c '-Message digest wrapper utility' -l -p $prefix \ - -f $wrkdir/digest/PLIST -s $wrkdir/digest/.size -S $wrkdir/digest/.size $digestversion - # we often need NetBSD's pax as well, nowadays, to make binary packages case "$need_pax" in yes) echo_msg "Installing pax" |