[BACK]Return to bootstrap CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / bootstrap

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/bootstrap/bootstrap between version 1.299 and 1.300

version 1.299, 2021/04/28 11:14:51 version 1.300, 2021/05/30 23:41:05
Line 74  usage="Usage: $0 "'
Line 74  usage="Usage: $0 "'
     [ --prefix <prefix> ]      [ --prefix <prefix> ]
     [ --preserve-path ]      [ --preserve-path ]
     [ --quiet ]      [ --quiet ]
       [ --sysconfbase <sysconfbase> ]
     [ --sysconfdir <sysconfdir> ]      [ --sysconfdir <sysconfdir> ]
     [ --unprivileged | --ignore-user-check ]      [ --unprivileged | --ignore-user-check ]
     [ --varbase <varbase> ]      [ --varbase <varbase> ]
Line 413  prefix=
Line 414  prefix=
 pkgdbdir=  pkgdbdir=
 pkginfodir=  pkginfodir=
 pkgmandir=  pkgmandir=
   sysconfbase=
 sysconfdir=  sysconfdir=
 varbase=  varbase=
   
Line 440  while [ $# -gt 0 ]; do
Line 442  while [ $# -gt 0 ]; do
         --pkginfodir)   pkginfodir="$2"; shift ;;          --pkginfodir)   pkginfodir="$2"; shift ;;
         --pkgmandir=*)  pkgmandir=`get_optarg "$1"` ;;          --pkgmandir=*)  pkgmandir=`get_optarg "$1"` ;;
         --pkgmandir)    pkgmandir="$2"; shift ;;          --pkgmandir)    pkgmandir="$2"; shift ;;
           --sysconfbase=*)sysconfbase=`get_optarg "$1"` ;;
           --sysconfbase)  sysconfbase="$2"; shift ;;
         --sysconfdir=*) sysconfdir=`get_optarg "$1"` ;;          --sysconfdir=*) sysconfdir=`get_optarg "$1"` ;;
         --sysconfdir)   sysconfdir="$2"; shift ;;          --sysconfdir)   sysconfdir="$2"; shift ;;
         --varbase=*)    varbase=`get_optarg "$1"` ;;          --varbase=*)    varbase=`get_optarg "$1"` ;;
Line 485  while [ $# -gt 0 ]; do
Line 489  while [ $# -gt 0 ]; do
 done  done
   
 checkarg_sane_absolute_path "$pkgdbdir" "--pkgdbdir"  checkarg_sane_absolute_path "$pkgdbdir" "--pkgdbdir"
   checkarg_sane_absolute_path "$sysconfbase" "--sysconfbase"
 checkarg_sane_absolute_path "$sysconfdir" "--sysconfdir"  checkarg_sane_absolute_path "$sysconfdir" "--sysconfdir"
 checkarg_sane_absolute_path "$varbase" "--varbase"  checkarg_sane_absolute_path "$varbase" "--varbase"
 checkarg_sane_relative_path "$pkginfodir" "--pkginfodir"  checkarg_sane_relative_path "$pkginfodir" "--pkginfodir"
Line 500  if [ "$unprivileged" = "yes" ]; then
Line 505  if [ "$unprivileged" = "yes" ]; then
         [ -z "$prefix" ] && prefix=${HOME}/pkg          [ -z "$prefix" ] && prefix=${HOME}/pkg
 elif [ -z "$prefix" -o "$prefix" = "/usr/pkg" ]; then  elif [ -z "$prefix" -o "$prefix" = "/usr/pkg" ]; then
         prefix=/usr/pkg          prefix=/usr/pkg
           [ -z "$sysconfbase" ] && sysconfbase=/etc
         [ -z "$varbase" ] && varbase=/var          [ -z "$varbase" ] && varbase=/var
 fi  fi
 checkarg_sane_absolute_path "$prefix" "--prefix"  checkarg_sane_absolute_path "$prefix" "--prefix"
Line 510  checkarg_sane_absolute_path "$prefix" "-
Line 516  checkarg_sane_absolute_path "$prefix" "-
 if [ "$prefix" = "/usr" ]; then  if [ "$prefix" = "/usr" ]; then
         [ -z "$pkginfodir" ] && pkginfodir=share/info          [ -z "$pkginfodir" ] && pkginfodir=share/info
         [ -z "$pkgmandir" ] && pkgmandir=share/man          [ -z "$pkgmandir" ] && pkgmandir=share/man
           [ -z "$sysconfbase" ] && sysconfbase=/etc
 else  else
         [ -z "$pkginfodir" ] && pkginfodir=info          [ -z "$pkginfodir" ] && pkginfodir=info
         [ -z "$pkgmandir" ] && pkgmandir=man          [ -z "$pkgmandir" ] && pkgmandir=man
           [ -z "$sysconfbase" ] && sysconfbase=${prefix}/etc
 fi  fi
 infodir=${prefix}/${pkginfodir}  infodir=${prefix}/${pkginfodir}
 mandir=${prefix}/${pkgmandir}  mandir=${prefix}/${pkgmandir}
Line 1087  fi
Line 1095  fi
 # save environment in example mk.conf  # save environment in example mk.conf
 echo "PKG_DBDIR=                $pkgdbdir" >> ${TARGET_MKCONF}  echo "PKG_DBDIR=                $pkgdbdir" >> ${TARGET_MKCONF}
 echo "LOCALBASE=                $prefix" >> ${TARGET_MKCONF}  echo "LOCALBASE=                $prefix" >> ${TARGET_MKCONF}
   if [ "${sysconfbase}" != "/etc" ]; then
   echo "SYSCONFBASE=              $sysconfbase" >> ${TARGET_MKCONF}
   fi
 echo "VARBASE=          $varbase" >> ${TARGET_MKCONF}  echo "VARBASE=          $varbase" >> ${TARGET_MKCONF}
 if [ "${sysconfdir}" != "${prefix}/etc" ]; then  if [ "${sysconfdir}" != "${prefix}/etc" ]; then
         echo "PKG_SYSCONFBASE=  $sysconfdir" >> ${TARGET_MKCONF}          echo "PKG_SYSCONFBASE=  $sysconfdir" >> ${TARGET_MKCONF}
Legend:
Removed from v.1.299  
changed lines
  Added in v.1.300
CVSweb <webmaster@jp.NetBSD.org>