Return to patch-aa CVS log

Up to [cvs.NetBSD.org] / pkgsrc / net / xymonclient / patches

Annotation of pkgsrc/net/xymonclient/patches/patch-aa, Revision 1.1.1.1

1.1       spz         1: $NetBSD$
                      2:
                      3: --- configure.client.orig      2009-02-22 20:41:16.000000000 +0000
                      4: +++ configure.client
                      5: @@ -75,7 +75,7 @@ then
                      6:        BBUSER="xymon"
                      7:  fi
                      8:
                      9: -if test -z "$BBTOPDIR"
                     10: +if test -z "$BBHOME"
                     11:  then
                     12:        if test "`uname -s`" = "Darwin"
                     13:        then
                     14: @@ -92,22 +92,24 @@ then
                     15:                echo ""; echo ""
                     16:                HOMEDIR="`dscl . -read /Users/$BBUSER | grep HomeDirectory | awk '{print $2}'`"
                     17:        else
                     18: -              USERDATA=`getent passwd $BBUSER 2>/dev/null || ypmatch "${BBUSER}" passwd || grep "^${BBUSER}:" /etc/passwd`
                     19: -              if test $? -eq 0
                     20: -              then
                     21: -                      echo "Found passwd entry for user $USERDATA"
                     22: -              else
                     23: -                      echo "FAILURE: The user $BBUSER does not exist. Create user and try again."
                     24: -                      exit 1
                     25: +              if [ -z ${PKGBUILD} ]; then
                     26: +                      USERDATA=`getent passwd $BBUSER 2>/dev/null || ypmatch "${BBUSER}" passwd || grep "^${BBUSER}:" /etc/passwd`
                     27: +                      if test $? -eq 0
                     28: +                      then
                     29: +                              echo "Found passwd entry for user $USERDATA"
                     30: +                      else
                     31: +                              echo "FAILURE: The user $BBUSER does not exist. Create user and try again."
                     32: +                              exit 1
                     33: +                      fi
                     34: +                      echo ""; echo ""
                     35: +                      HOMEDIR="`echo $USERDATA|cut -d: -f6`"
                     36:                fi
                     37: -              echo ""; echo ""
                     38: -              HOMEDIR="`echo $USERDATA|cut -d: -f6`"
                     39:        fi
                     40:  else
                     41: -      HOMEDIR="$BBTOPDIR"
                     42: +      HOMEDIR="$BBHOME"
                     43:  fi
                     44:
                     45: -echo "Where do you want the Xymon installation [${HOMEDIR}] ?"
                     46: +echo "Where do you want the Xymon installation [${BBTOPDIR}] ?"
                     47:  if test -z "$BBTOPDIR"
                     48:  then
                     49:        read BBTOPDIR
                     50: @@ -158,6 +160,7 @@ echo "# Toplevel dir"
                     51:  echo "BBTOPDIR = $BBTOPDIR"              >>Makefile
                     52:  echo "# Server home dir for etc/, www/"  >>Makefile
                     53:  echo "BBHOME = $BBHOME"                  >>Makefile
                     54: +echo "HOBBITCLIENTHOME = $BBHOME/client" >>Makefile
                     55:  echo ""                                  >>Makefile
                     56:  echo "# Xymon settings follows"          >>Makefile
                     57:  echo "#"                                 >>Makefile
                     58: @@ -194,6 +197,9 @@ fi
                     59:  if test "$INSTALLETCDIR" != ""; then
                     60:        echo "INSTALLETCDIR = $INSTALLETCDIR"   >>Makefile
                     61:  fi
                     62: +if test "$INSTALLEXADIR" != ""; then
                     63: +      echo "INSTALLEXADIR = $INSTALLEXADIR"   >>Makefile
                     64: +fi
                     65:  if test "$INSTALLEXTDIR" != ""; then
                     66:        echo "INSTALLEXTDIR = $INSTALLEXTDIR"   >>Makefile
                     67:  fi