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.4

1.4     ! sbd         1: $NetBSD: patch-aa,v 1.3 2011/04/22 15:37:02 spz Exp $
1.1       spz         2:
1.3       spz         3: --- configure.client.orig      2011-03-08 17:20:28.000000000 +0000
1.1       spz         4: +++ configure.client
                      5: @@ -75,7 +75,7 @@ then
1.3       spz         6:        XYMONUSER="xymon"
1.1       spz         7:  fi
                      8:
1.3       spz         9: -if test -z "$XYMONTOPDIR"
                     10: +if test -z "$XYMONHOME"
1.1       spz        11:  then
                     12:        if test "`uname -s`" = "Darwin"
                     13:        then
1.3       spz        14: @@ -92,29 +92,31 @@ then
1.1       spz        15:                echo ""; echo ""
1.3       spz        16:                HOMEDIR="`dscl . -read /Users/$XYMONUSER | grep HomeDirectory | awk '{print $2}'`"
1.1       spz        17:        else
1.3       spz        18: -              USERDATA=`getent passwd $XYMONUSER 2>/dev/null || ypmatch "${XYMONUSER}" passwd || grep "^${XYMONUSER}:" /etc/passwd`
1.1       spz        19: -              if test $? -eq 0
                     20: -              then
                     21: -                      echo "Found passwd entry for user $USERDATA"
                     22: -              else
1.3       spz        23: -                      echo "FAILURE: The user $XYMONUSER does not exist. Create user and try again."
1.1       spz        24: -                      exit 1
                     25: +              if [ -z ${PKGBUILD} ]; then
1.3       spz        26: +                      USERDATA=`getent passwd $XYMONUSER 2>/dev/null || ypmatch "${XYMONUSER}" passwd || grep "^${XYMONUSER}:" /etc/passwd`
1.1       spz        27: +                      if test $? -eq 0
                     28: +                      then
                     29: +                              echo "Found passwd entry for user $USERDATA"
                     30: +                      else
1.3       spz        31: +                              echo "FAILURE: The user $XYMONUSER does not exist. Create user and try again."
1.1       spz        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
1.3       spz        41: -      HOMEDIR="$XYMONTOPDIR"
                     42: +      HOMEDIR="$XYMONHOME"
1.1       spz        43:  fi
                     44:
                     45: -echo "Where do you want the Xymon installation [${HOMEDIR}] ?"
1.3       spz        46: +echo "Where do you want the Xymon installation [${XYMONTOPDIR}] ?"
                     47:  if test -z "$XYMONTOPDIR"
                     48:  then
                     49:        read XYMONTOPDIR
                     50:  fi
                     51:  if test -z "$XYMONTOPDIR"
                     52:  then
                     53: -      XYMONTOPDIR=${HOMEDIR}
                     54: +      XYMONTOPDIR=${XYMONTOPDIR}
                     55:  fi
                     56:  if test -d "$XYMONTOPDIR"
1.1       spz        57:  then
1.4     ! sbd        58: @@ -158,9 +160,12 @@ echo "# Toplevel dir"
1.3       spz        59:  echo "XYMONTOPDIR = $XYMONTOPDIR"        >>Makefile
1.1       spz        60:  echo "# Server home dir for etc/, www/"  >>Makefile
1.3       spz        61:  echo "XYMONHOME = $XYMONHOME"            >>Makefile
                     62: +echo "XYMONCLIENTHOME = $XYMONHOME/client"            >>Makefile
1.1       spz        63:  echo ""                                  >>Makefile
                     64:  echo "# Xymon settings follows"          >>Makefile
                     65:  echo "#"                                 >>Makefile
1.2       spz        66: +echo "# Xymon Logdir"                    >>Makefile
1.3       spz        67: +echo "XYMONLOGDIR = $XYMONLOGDIR"        >>Makefile
1.2       spz        68:  echo "# Username running Xymon"          >>Makefile
1.3       spz        69:  echo "XYMONUSER = $XYMONUSER"            >>Makefile
1.2       spz        70:  echo "# Xymon server IP-address"         >>Makefile
1.4     ! sbd        71: @@ -194,9 +199,15 @@ fi
1.1       spz        72:  if test "$INSTALLETCDIR" != ""; then
                     73:        echo "INSTALLETCDIR = $INSTALLETCDIR"   >>Makefile
                     74:  fi
                     75: +if test "$INSTALLEXADIR" != ""; then
                     76: +      echo "INSTALLEXADIR = $INSTALLEXADIR"   >>Makefile
                     77: +fi
                     78:  if test "$INSTALLEXTDIR" != ""; then
                     79:        echo "INSTALLEXTDIR = $INSTALLEXTDIR"   >>Makefile
                     80:  fi
1.4     ! sbd        81: +if test "$INSTALLLOCALDIR" != ""; then
        !            82: +      echo "INSTALLLOCALDIR = $INSTALLLOCALDIR"   >>Makefile
        !            83: +fi
        !            84:  if test "$INSTALLTMPDIR" != ""; then
        !            85:        echo "INSTALLTMPDIR = $INSTALLTMPDIR"   >>Makefile
        !            86:  fi