5 files changed, 60 insertions, 116 deletions

diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index e0e1328dafb8..1cd23f78ba94 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -3,7 +3,7 @@
 # Date created:         16 May 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.8 1996/11/18 11:42:25 asami Exp $
+# $Id: Makefile,v 1.9 1997/11/06 00:12:09 ache Exp $
 #
 
 # WWW site: http://www.fccc.edu/users/muquit/Count.html
@@ -25,13 +25,12 @@ pre-configure:
 	cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} ./Count-config
 
 post-build:
-	cd ${WRKSRC}/utils; ${MAKE}
 	cd ${WRKSRC}; ./Gen-conf
 
 do-install:
 	cd ${WRKSRC}; yes "" | ./Count-install
-	cd ${WRKSRC}/utils; \
-		${INSTALL_PROGRAM} mkstrip ${PREFIX}/bin; \
+	cd ${WRKSRC}/utils/mkstrip; \
+		${INSTALL_PROGRAM} extdgts mkstrip ${PREFIX}/bin; \
 		${INSTALL_MAN} mkstrip.1 ${PREFIX}/man/man1; \
 		${INSTALL_SCRIPT} mkstrip.sh ${PREFIX}/lib/Counter/digits
 
diff --git a/www/wwwcount/distinfo b/www/wwwcount/distinfo
index 5df426c4b8f1..a91b38a13a92 100644
--- a/www/wwwcount/distinfo
+++ b/www/wwwcount/distinfo
@@ -1 +1 @@
-MD5 (wwwcount2.4.tar.gz) = 95dba3651b42dd97979086e35783e6f0
+MD5 (wwwcount2.4.tar.gz) = b5e43fda19c8a99289afa33bd3003df0
diff --git a/www/wwwcount/files/patch-aa b/www/wwwcount/files/patch-aa
index ad1f88ddfcf0..084c3a56d692 100644
--- a/www/wwwcount/files/patch-aa
+++ b/www/wwwcount/files/patch-aa
@@ -1,5 +1,5 @@
-*** Count-config.orig	Fri May  3 06:20:27 1996
---- Count-config	Fri Sep  6 18:05:28 1996
+*** Count-config.orig	Mon Nov 24 04:49:51 1997
+--- Count-config	Sat Nov 29 18:50:53 1997
 ***************
 *** 20,26 ****
   trap 'echo '';echo "Interrupt Detected..exiting";rm -f "./Config.tmpl" 2>/dev/null;rm -f "./.alfcf" ;rm -f "./strict" 2>/dev/null;echo '';exit 1' 1 2 3 15
@@ -18,37 +18,37 @@
   if [ ! -f "./VERSION" ] 
   then
 ***************
-*** 36,48 ****
+*** 37,49 ****
   Version=`cat ./VERSION`
   Basedir="wwwcount$Version"
-  ConfigH="config.h"
+  ConfigH="src/config.h"
 ! BaseDir="/usr/local/etc/Counter"
-  ConfigDir="conf"
+  ConfigDir="$BaseDir/conf"
   ConfFile="count.cfg"
-  DigitDir="digits"
-  DataDir="data"
-! LogDir="Log"
+! DigitDir="$BaseDir/digits"
+  DataDir="$BaseDir/data"
+! LogDir="$BaseDir/logs"
 ! LogFile="Count$Version.log"
   RgbFile="./wcount/rgb.txt"
-  #allow_f_cr=0
-  #strict_mode=0
---- 36,49 ----
+  
+  #
+--- 37,50 ----
   Version=`cat ./VERSION`
   Basedir="wwwcount$Version"
-  ConfigH="config.h"
+  ConfigH="src/config.h"
 ! BaseDir="${PREFIX}/etc/Counter"
 ! LibDir="${PREFIX}/lib/Counter"
-  ConfigDir="conf"
+  ConfigDir="$BaseDir/conf"
   ConfFile="count.cfg"
-  DigitDir="digits"
-  DataDir="data"
+! DigitDir="$LibDir/digits"
+  DataDir="$BaseDir/data"
 ! LogDir="/var/log"
 ! LogFile="Counter.log"
   RgbFile="./wcount/rgb.txt"
-  #allow_f_cr=0
-  #strict_mode=0
+  
+  #
 ***************
-*** 114,120 ****
+*** 117,123 ****
   
   if [ .$answer = . ]
   then
@@ -56,7 +56,7 @@
   fi
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
---- 115,121 ----
+--- 118,124 ----
   
   if [ .$answer = . ]
   then
@@ -65,49 +65,19 @@
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
 ***************
-*** 245,251 ****
-      You need to enter the directory of the Log file.
-  
-  EOB
-! echo $n "*Log directory [$BaseDir/$LogDir]:$c "
-  read newpath
-  if [ .$newpath != . ]
-  then
---- 246,252 ----
-      You need to enter the directory of the Log file.
-  
-  EOB
-! echo $n "*Log directory [$LogDir]:$c "
-  read newpath
-  if [ .$newpath != . ]
+*** 183,191 ****
   then
-***************
-*** 289,299 ****
-  echo "++++++++++++++++++++++++++++++"
-      echo "CgiBinDir=$CgiBinDir"
-      echo "BaseDir= $BaseDir"
-!     echo "DigitDir= $BaseDir/$DigitDir"
-      echo "ConfDir = $BaseDir/$ConfigDir"
-      echo "ConfFile= $ConfFile"
-      echo "DataDir= $BaseDir/$DataDir"
-!     echo "LogDir= $BaseDir/$LogDir"
-      echo "LogFile= $LogFile"
-  echo "++++++++++++++++++++++++++++++"
-  
---- 290,300 ----
-  echo "++++++++++++++++++++++++++++++"
-      echo "CgiBinDir=$CgiBinDir"
-      echo "BaseDir= $BaseDir"
-!     echo "DigitDir= $LibDir/$DigitDir"
-      echo "ConfDir = $BaseDir/$ConfigDir"
-      echo "ConfFile= $ConfFile"
-      echo "DataDir= $BaseDir/$DataDir"
-!     echo "LogDir= $LogDir"
-      echo "LogFile= $LogFile"
-  echo "++++++++++++++++++++++++++++++"
+      BaseDir=$newpath
+      ConfigDir=$BaseDir/conf
+-     DigitDir=$BaseDir/digits
+      DataDir=$BaseDir/data
+-     LogDir=$BaseDir/logs
+  fi
   
+  #
+--- 184,190 ----
 ***************
-*** 302,308 ****
+*** 374,380 ****
   
   if [ .$answer = . ]
   then
@@ -115,7 +85,7 @@
   fi
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
---- 303,309 ----
+--- 373,379 ----
   
   if [ .$answer = . ]
   then
@@ -124,69 +94,43 @@
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
 ***************
-*** 338,345 ****
-  echo "#define ConfigDir \"$BaseDir/$ConfigDir\"" >> $ConfigH
-  echo "#define ConfigFile \"$ConfFile\"" >> $ConfigH
-  echo "#define DataDir \"$BaseDir/$DataDir\"" >> $ConfigH
-! echo "#define DigitDir \"$BaseDir/$DigitDir\"" >> $ConfigH
-! echo "#define LogDir \"$BaseDir/$LogDir\"" >> $ConfigH
-  echo "#define LogFile \"$LogFile\"" >> $ConfigH
-  
-  cat<<EOX>>$ConfigH
---- 339,346 ----
-  echo "#define ConfigDir \"$BaseDir/$ConfigDir\"" >> $ConfigH
-  echo "#define ConfigFile \"$ConfFile\"" >> $ConfigH
-  echo "#define DataDir \"$BaseDir/$DataDir\"" >> $ConfigH
-! echo "#define DigitDir \"$LibDir/$DigitDir\"" >> $ConfigH
-! echo "#define LogDir \"$LogDir\"" >> $ConfigH
-  echo "#define LogFile \"$LogFile\"" >> $ConfigH
-  
-  cat<<EOX>>$ConfigH
-***************
-*** 381,387 ****
-  * so RGB names can be looked up, but yet not allow users to make constant
-  * use of this very ineffiecient lookup.
-  *****************************************************************************/
-! #define RgbMappingDict        "$BaseDir/rgb.txt"
+*** 517,523 ****
+  ** so RGB names can be looked up, but yet not allow users to make constant
+  ** use of this very ineffiecient lookup.
+  */
+! #define RGB_MAPPING_DICT            "$BaseDir/rgb.txt"
   EOX
   
-  #if [ $allow_f_cr -eq 1 ]
---- 382,388 ----
-  * so RGB names can be looked up, but yet not allow users to make constant
-  * use of this very ineffiecient lookup.
-  *****************************************************************************/
-! #define RgbMappingDict        "$LibDir/rgb.txt"
+  cat<<EOXXX>>$ConfigH
+--- 516,522 ----
+  ** so RGB names can be looked up, but yet not allow users to make constant
+  ** use of this very ineffiecient lookup.
+  */
+! #define RGB_MAPPING_DICT            "$LibDir/rgb.txt"
   EOX
   
-  #if [ $allow_f_cr -eq 1 ]
+  cat<<EOXXX>>$ConfigH
 ***************
-*** 413,427 ****
+*** 535,540 ****
+--- 534,540 ----
   ##
   echo "creating variables template file $Tmpl for the install program.."
   echo "BASE_DIR=\"$BaseDir\"" > $Tmpl
++ echo "LIB_DIR=\"$LibDir\"" >> $Tmpl
   echo "CGIBIN_DIR=\"$CgiBinDir\"" >> $Tmpl
   echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl
-  echo "CONFIG_DIR=\"$BaseDir/$ConfigDir\"" >> $Tmpl
-! echo "DIGIT_DIR=\"$BaseDir/$DigitDir\"" >> $Tmpl
-  echo "DATA_DIR=\"$BaseDir/$DataDir\"" >> $Tmpl
-! echo "LOG_DIR=\"$BaseDir/$LogDir\"" >> $Tmpl
+  echo "CONFIG_DIR=\"$ConfigDir\"" >> $Tmpl
+***************
+*** 543,549 ****
+  echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
   echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
   echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
 ! echo "RGB_DIR=\"$BaseDir\"" >> $Tmpl
   ##
   # create template for install program --ends
   ##
---- 414,429 ----
-  ##
-  echo "creating variables template file $Tmpl for the install program.."
-  echo "BASE_DIR=\"$BaseDir\"" > $Tmpl
-+ echo "LIB_DIR=\"$LibDir\"" >> $Tmpl
-  echo "CGIBIN_DIR=\"$CgiBinDir\"" >> $Tmpl
-  echo "CONFIG_FILE=\"$ConfFile\"" >> $Tmpl
-  echo "CONFIG_DIR=\"$BaseDir/$ConfigDir\"" >> $Tmpl
-! echo "DIGIT_DIR=\"$LibDir/$DigitDir\"" >> $Tmpl
-  echo "DATA_DIR=\"$BaseDir/$DataDir\"" >> $Tmpl
-! echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
+--- 543,549 ----
+  echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
   echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
   echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
 ! echo "RGB_DIR=\"$LibDir\"" >> $Tmpl
diff --git a/www/wwwcount/files/patch-ae b/www/wwwcount/files/patch-ae
index 746ad947ba8e..e8721615aa93 100644
--- a/www/wwwcount/files/patch-ae
+++ b/www/wwwcount/files/patch-ae
@@ -1,5 +1,5 @@
-*** Count-install.orig	Tue Oct 21 02:08:46 1997
---- Count-install	Thu Nov  6 00:55:09 1997
+*** Count-install.orig	Mon Nov 24 04:49:51 1997
+--- Count-install	Sat Nov 29 18:33:38 1997
 ***************
 *** 193,199 ****
   
@@ -130,7 +130,7 @@
   
   EOM
   echo "installing Count.cgi->$CGIBIN_DIR"
-! $INSTALL_PROG -c -m 755 ./Count.cgi $CGIBIN_DIR/Count.cgi
+! $INSTALL_PROG -c -m 755 $Binary $CGIBIN_DIR/Count.cgi
   echo "installing $CONFIG_FILE->$CONFIG_DIR"
   $INSTALL_PROG -c $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE
   echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
@@ -148,7 +148,7 @@
   
   EOM
   echo "installing Count.cgi->$CGIBIN_DIR"
-! $INSTALL_PROG -s -c -m 755 ./Count.cgi $CGIBIN_DIR/Count.cgi
+! $INSTALL_PROG -s -c -m 755 $Binary $CGIBIN_DIR/Count.cgi
   echo "installing $CONFIG_FILE->$CONFIG_DIR"
   $INSTALL_PROG -c $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE
   echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
diff --git a/www/wwwcount/pkg-plist b/www/wwwcount/pkg-plist
index f135a082696f..395d8150c88a 100644
--- a/www/wwwcount/pkg-plist
+++ b/www/wwwcount/pkg-plist
@@ -10,6 +10,7 @@ lib/Counter/digits/D/lenna.gif
 lib/Counter/digits/E/strip.gif
 lib/Counter/digits/mkstrip.sh
 bin/mkstrip
+bin/extdgts
 man/man1/mkstrip.1.gz
 @exec touch /var/log/Counter.log
 @exec chown nobody.nogroup /var/log/Counter.log