Upgrade to 2.4

2 files changed, 30 insertions, 44 deletions

diff --git a/www/wwwcount/files/patch-ab b/www/wwwcount/files/patch-ab
index 7dd5a832c2b8..f4c58de6415e 100644
--- a/www/wwwcount/files/patch-ab
+++ b/www/wwwcount/files/patch-ab
@@ -1,19 +1,19 @@
-*** Makefile.in.bak	Fri May  3 06:20:33 1996
---- Makefile.in	Thu May 16 05:43:27 1996
+*** configure.bak	Sat Oct 25 08:47:50 1997
+--- configure	Thu Nov  6 00:59:05 1997
 ***************
-*** 22,28 ****
-  ##
-  ACCESS_AUTH= -DACCESS_AUTH=1
-  DEFINES= $(INCLUDES) $(DEFS) $(ACCESS_AUTH) -D__USE_FIXED_PROTOTYPES__
-! CFLAGS= -O $(DEFINES) -DSYS_UNIX=1 -DDEBUG=1
-  
-  
-  OBJS= main.o parse.o strimage.o
---- 22,28 ----
-  ##
-  ACCESS_AUTH= -DACCESS_AUTH=1
-  DEFINES= $(INCLUDES) $(DEFS) $(ACCESS_AUTH) -D__USE_FIXED_PROTOTYPES__
-! CFLAGS+= $(DEFINES) -DSYS_UNIX=1 -DDEBUG=1
-  
-  
-  OBJS= main.o parse.o strimage.o
+*** 1587,1593 ****
+  s%@CFLAGS@%$CFLAGS%g
+  s%@CPPFLAGS@%$CPPFLAGS%g
+  s%@CXXFLAGS@%$CXXFLAGS%g
+! s%@DEFS@%$DEFS%g
+  s%@LDFLAGS@%$LDFLAGS%g
+  s%@LIBS@%$LIBS%g
+  s%@exec_prefix@%$exec_prefix%g
+--- 1587,1593 ----
+  s%@CFLAGS@%$CFLAGS%g
+  s%@CPPFLAGS@%$CPPFLAGS%g
+  s%@CXXFLAGS@%$CXXFLAGS%g
+! s%@DEFS@%$CFLAGS $DEFS%g
+  s%@LDFLAGS@%$LDFLAGS%g
+  s%@LIBS@%$LIBS%g
+  s%@exec_prefix@%$exec_prefix%g
diff --git a/www/wwwcount/files/patch-ae b/www/wwwcount/files/patch-ae
index adc106e86bce..746ad947ba8e 100644
--- a/www/wwwcount/files/patch-ae
+++ b/www/wwwcount/files/patch-ae
@@ -1,5 +1,5 @@
-*** Count-install.orig	Fri May  3 06:20:31 1996
---- Count-install	Fri Sep  6 18:05:28 1996
+*** Count-install.orig	Tue Oct 21 02:08:46 1997
+--- Count-install	Thu Nov  6 00:55:09 1997
 ***************
 *** 193,199 ****
   
@@ -85,16 +85,9 @@
      until [ $answer != "x" ]
      do
 ***************
-*** 298,318 ****
-  # enter groud id -ends
-  ##
-  echo "installing Count.cgi->$CGIBIN_DIR"
-! $INSTALL_PROG -c -o $UserId -g $GroupId -m 755 ./Count.cgi $CGIBIN_DIR/Count.cgi
-  echo "installing $CONFIG_FILE->$CONFIG_DIR"
-  $INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE
-  echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
-  $INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $DATA_DIR/sample.dat
-  chmod 775 $DATA_DIR
+*** 323,336 ****
+      echo 
+  fi
   
 ! echo "installing rgb.txt->$BASE_DIR"
 ! $INSTALL_PROG -c -o $UserId -g $GroupId -m 644 $Rgbfile $BASE_DIR/rgb.txt
@@ -107,16 +100,9 @@
   
   echo "installing image strip for digit style A->$DIGIT_DIR/A"
   $INSTALL_PROG -c -o $UserId -g $GroupId -m 644 $DigitA/strip.gif\
---- 298,317 ----
-  # enter groud id -ends
-  ##
-  echo "installing Count.cgi->$CGIBIN_DIR"
-! $INSTALL_PROG -s -c -o $UserId -g $GroupId -m 755 ./Count.cgi $CGIBIN_DIR/Count.cgi
-  echo "installing $CONFIG_FILE->$CONFIG_DIR"
-  $INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE
-  echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
-  $INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $DATA_DIR/sample.dat
-  chmod 775 $DATA_DIR
+--- 323,335 ----
+      echo 
+  fi
   
 ! echo "installing rgb.txt->$RGB_DIR"
 ! $INSTALL_PROG -c -o $UserId -g $GroupId -m 644 $Rgbfile $RGB_DIR/rgb.txt
@@ -129,8 +115,8 @@
   echo "installing image strip for digit style A->$DIGIT_DIR/A"
   $INSTALL_PROG -c -o $UserId -g $GroupId -m 644 $DigitA/strip.gif\
 ***************
-*** 344,349 ****
---- 343,350 ----
+*** 362,367 ****
+--- 361,368 ----
   #chown -R $UserId.$GroupId $BASE_DIR
   find $BASE_DIR -exec chown $UserId {} \;
   find $BASE_DIR -exec chgrp $GroupId {} \;
@@ -140,7 +126,7 @@
   #            echo "GroupId=$GroupId"
           ;;
 ***************
-*** 358,374 ****
+*** 376,392 ****
   
   EOM
   echo "installing Count.cgi->$CGIBIN_DIR"
@@ -158,7 +144,7 @@
   
   echo "installing image strip for digit style A->$DIGIT_DIR/A"
   $INSTALL_PROG -c $DigitA/strip.gif $DIGIT_DIR/A/strip.gif
---- 359,376 ----
+--- 377,394 ----
   
   EOM
   echo "installing Count.cgi->$CGIBIN_DIR"