Fix outdated patch to work with current version of distfile.

2 files changed, 28 insertions, 28 deletions

diff --git a/www/wwwcount/files/patch-sum b/www/wwwcount/files/patch-sum
index de396d34637..bdbba4f9487 100644
--- a/www/wwwcount/files/patch-sum
+++ b/www/wwwcount/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:20 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/12/12 08:46:00 rh Exp $
 
 MD5 (patch-aa) = 3a1affafbb84add1d3c4658f6ed41b27
 MD5 (patch-ab) = ce6d9607d79e8903142b55084ed6738e
-MD5 (patch-ae) = 1dc7544d3576d5b113999fa641e87421
+MD5 (patch-ae) = 61bd4c508ebeb1844de6eba7f2f56b44
diff --git a/www/wwwcount/patches/patch-ae b/www/wwwcount/patches/patch-ae
index 6504266951e..153de0e5146 100644
--- a/www/wwwcount/patches/patch-ae
+++ b/www/wwwcount/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
+$NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $
 
---- Count-install.orig	Tue Mar  2 00:15:16 1999
-+++ Count-install	Sat May 15 01:19:09 1999
+--- Count-install.orig	Mon May 17 03:01:50 1999
++++ Count-install	Sun Dec 12 09:45:45 1999
 @@ -13,7 +13,6 @@
  # Nov 24, 1995
  ##
@@ -9,9 +9,9 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
 -Basedir="wwwcount$ver"
  INSTALL_PROG="./install-sh"
  Tmpl="./Config.tmpl"
- Binary="./src/Count.cgi"
-@@ -27,8 +26,6 @@
- Digit_cdd="./data/digits/cdd"
+ Binary="./bin/Count.cgi"
+@@ -28,8 +27,6 @@
+ Digit_bang="./data/digits/bang"
  Rgbfile="./data/rgb.txt"
  SAMPLE_DAT="./data/data/sample.dat"
 -mirror_file="mirror_count.sh"
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
  
  UserId="nobody"
  userid_flag=0
-@@ -114,20 +111,6 @@
+@@ -115,20 +112,6 @@
  
  . $Tmpl
  
@@ -40,7 +40,7 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
  tdir="./tmp"
  
  if [ ! -d $tdir ]; then
-@@ -196,7 +179,6 @@
+@@ -197,7 +180,6 @@
  
  cgi-bin directory   = $CGIBIN_DIR
  conf directory      = $CONFIG_DIR
@@ -48,7 +48,7 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
  digit directory     = $DIGIT_DIR
  data directory      = $DATA_DIR
  log directory       = $LOG_DIR
-@@ -211,7 +193,7 @@
+@@ -212,7 +194,7 @@
  
  if [ .$answer = . ]
  then
@@ -57,7 +57,7 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
  fi
      until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
      do
-@@ -252,7 +234,7 @@
+@@ -253,7 +235,7 @@
     read answer
     if [ .$answer = . ]
     then
@@ -66,7 +66,7 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
     fi   
     until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
     do
-@@ -271,11 +253,11 @@
+@@ -272,11 +254,11 @@
  ###
  # enter user id -starts
  ###
@@ -80,7 +80,7 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
     fi
     until [ $answer != "x" ]
     do
-@@ -295,11 +277,11 @@
+@@ -296,11 +278,11 @@
  ##
  # enter groud id -starts
  ##
@@ -94,7 +94,7 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
     fi
     until [ $answer != "x" ]
     do
-@@ -317,47 +299,18 @@
+@@ -318,47 +300,18 @@
  # enter groud id -ends
  ##
  echo "installing Count.cgi->$CGIBIN_DIR"
@@ -105,13 +105,11 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
 -#
 -# check if the file exist or not
 -#
+-
+-if [ ! -f $CONFIG_DIR/$CONFIG_FILE ]; then
 +echo "installing sample datafile $SAMPLE_DAT->$RGB_DIR"
 +$INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $RGB_DIR/sample.dat
  
--if [ ! -f $CONFIG_DIR/$CONFIG_FILE ]; then
-+echo "installing rgb.txt->$RGB_DIR"
-+$INSTALL_PROG -c -m 644 $Rgbfile $RGB_DIR/rgb.txt
- 
 -    $INSTALL_PROG -c -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE
 -else
 -    echo "  ===> ****** File exists!"
@@ -121,7 +119,9 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
 -    echo " $INSTALL_PROG -c -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE"
 -	echo ""
 -fi
--
++echo "installing rgb.txt->$RGB_DIR"
++$INSTALL_PROG -c -m 644 $Rgbfile $RGB_DIR/rgb.txt
+ 
 -echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
 -
 -if [ ! -f $DATA_DIR/sample.dat ]; then
@@ -150,10 +150,10 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
 +chown $UserId.$GroupId $LOG_DIR/$LOG_FILE
  
  echo "installing image strip for digit style A->$DIGIT_DIR/A"
- $INSTALL_PROG -c -m 644 $DigitA/strip.gif\
-@@ -399,18 +352,6 @@
- $INSTALL_PROG -c -m 644 $Digit_cdd/strip.gif\
-     $DIGIT_DIR/cdd/strip.gif
+ $INSTALL_PROG -c -m 644 $DigitA/strip.gif $DIGIT_DIR/A/strip.gif
+@@ -400,18 +353,6 @@
+ echo "installing strip image for digit style bang->$DIGIT_DIR/bang"
+ $INSTALL_PROG -c -m 644 $Digit_bang/strip.gif $DIGIT_DIR/bang/strip.gif
  
 -echo "installing the mirroring script"
 -$INSTALL_PROG -c $mirror_script -m 755 $BASE_DIR/$mirror_file
@@ -170,7 +170,7 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
          ;;
          n|N)
  cat <<EOM
-@@ -423,17 +364,16 @@
+@@ -424,17 +365,16 @@
  
  EOM
  echo "installing Count.cgi->$CGIBIN_DIR"
@@ -194,10 +194,10 @@ $NetBSD: patch-ae,v 1.3 1999/05/14 23:23:58 tron Exp $
  
  echo "installing image strip for digit style A->$DIGIT_DIR/A"
  $INSTALL_PROG -c $DigitA/strip.gif $DIGIT_DIR/A/strip.gif
-@@ -464,9 +404,6 @@
+@@ -474,9 +414,6 @@
  
- echo "installing image strip for digit style cdd->$DIGIT_DIR/cdd"
- $INSTALL_PROG -c $Digit_cdd/strip.gif $DIGIT_DIR/cdd/strip.gif
+ echo "installing strip image for digit style bang->$DIGIT_DIR/bang"
+ $INSTALL_PROG -c $Digit_bang/strip.gif $DIGIT_DIR/bang/strip.gif
 -
 -echo "installing the mirroring script"
 -$INSTALL_PROG -c $mirror_script $BASE_DIR/$mirror_file