Adapt this package to NetBSD. Patches supplied by Greg A. Woods in

PR pkg/7561.

10 files changed, 413 insertions, 135 deletions

diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index 143ee01d2c1..204b5b02dfe 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -1,38 +1,48 @@
-# New ports collection makefile for:    wwwcount
-# Version required:     2.4
-# Date created:         16 May 1996
-# Whom:                 ache
-#
-# FreeBSD Id: Makefile,v 1.12 1998/09/28 18:02:05 smace Exp
-#
+# $NetBSD: Makefile,v 1.2 1999/05/14 22:05:23 tron Exp $
+# FreeBSD: Makefile,v 1.12 1998/09/28 18:02:05 smace Exp
 
-# WWW site: http://www.fccc.edu/users/muquit/Count.html
-# For digit images look at:
-# http://www.digitmania.holowww.com/
-
-DISTNAME=       wwwcount2.4
-PKGNAME=        wwwcount-2.4
+DISTNAME=       wwwcount2.5
+PKGNAME=        wwwcount-2.5
 CATEGORIES=     www
-MASTER_SITES=   http://www.fccc.edu/users/muquit/src/wwwcount2.4/
+MASTER_SITES=   http://www.fccc.edu/users/muquit/src/wwwcount2.5/
 
-MAINTAINER=     ports@FreeBSD.ORG
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.fccc.edu/users/muquit/Count.html
 
 GNU_CONFIGURE=  yes
-IS_INTERACTIVE= yes
-USE_GMAKE=      yes
-MAN1=		mkstrip.1
 
 pre-configure:
 	cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} ./Count-config
 
-post-build:
-	cd ${WRKSRC}; ./Gen-conf
-
 do-install:
 	cd ${WRKSRC}; yes "" | ./Count-install
-	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
-
-.include <bsd.port.mk>
+	${INSTALL_DATA} ${FILESDIR}/wwwcount.conf ${PREFIX}/share/examples
+	${INSTALL_PROGRAM} ${WRKSRC}/utils/extdgts/extdgts ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/utils/mkstrip/mkstrip ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/utils/mkstrip/mkstrip.1 ${PREFIX}/man/man1
+	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/wwwcount
+	${INSTALL_MAN} ${WRKSRC}/docs/blues.gif ${PREFIX}/share/doc/wwwcount
+	${INSTALL_MAN} ${WRKSRC}/docs/Count.html ${PREFIX}/share/doc/wwwcount
+	${INSTALL} -l rs ${PREFIX}/share/doc/wwwcount/Count.html ${PREFIX}/share/doc/wwwcount/index.html
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2_5-ex.html ${PREFIX}/share/doc/wwwcount
+	${INSTALL_MAN} ${WRKSRC}/docs/Count_Changelog.html ${PREFIX}/share/doc/wwwcount
+	${INSTALL_MAN} ${WRKSRC}/docs/Count_FAQ.html ${PREFIX}/share/doc/wwwcount
+	${INSTALL_MAN} ${WRKSRC}/docs/Count_download.html ${PREFIX}/share/doc/wwwcount
+	${INSTALL_MAN} ${WRKSRC}/docs/Count_mirrors.html ${PREFIX}/share/doc/wwwcount
+	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/wwwcount/Count2.5
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/c-c.txt ${PREFIX}/share/doc/wwwcount/Count2.5
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/gen-c.txt ${PREFIX}/share/doc/wwwcount/Count2.5
+	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/images/styleA.gif ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/images/styleB.gif ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/images/styleC.gif ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/images/styleD.gif ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/images/styleE.gif ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/images/stylecd.gif ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/images/stylecdd.gif ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/images/stylecdr.gif ${PREFIX}/share/doc/wwwcount/Count2.5/images
+	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/wwwcount/Count2.5/eximages
+	${INSTALL_MAN} ${WRKSRC}/docs/Count2.5/eximages/* ${PREFIX}/share/doc/wwwcount/Count2.5/eximages
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/mkstrip/mkstrip.sh ${PREFIX}/libdata/wwwcount/digits
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/wwwcount/files/md5 b/www/wwwcount/files/md5
index 8aa8d55b794..54f547d33dd 100644
--- a/www/wwwcount/files/md5
+++ b/www/wwwcount/files/md5
@@ -1 +1,3 @@
-MD5 (wwwcount2.4.tar.gz) = b9efab88431a1fd32f3908ba278d9375
+$NetBSD: md5,v 1.2 1999/05/14 22:05:23 tron Exp $
+
+MD5 (wwwcount2.5.tar.gz) = 90002b94a199f8d57ccabd0b89176e79
diff --git a/www/wwwcount/files/wwwcount.conf b/www/wwwcount/files/wwwcount.conf
new file mode 100644
index 00000000000..04a27ba3c20
--- /dev/null
+++ b/www/wwwcount/files/wwwcount.conf
@@ -0,0 +1,70 @@
+###-----------------------------------------------------------------------
+### configuration file for Count 2.5
+###
+### Note: Configuration file format for Count 2.5 is different than
+###       older versions. -- mm
+### The format of the file is described below:
+###   - Any line starts with # or ; is considered comment and ignored.
+###   - A section in the file is inside left and right bracket.
+###   - Each section has parameters below the section.
+###
+### Please read the Configuration section in the counter webpage for details.
+### The official counter homepage is at URL:
+###     http://www.fccc.edu/users/muquit/Count.html
+###----------------------------------------------------------------------
+
+[version]
+   2.5 
+
+##-- options section
+; If auto_file_creation=Yes, then the users can create data files. It IS
+;  dangerous to set this option to Yes.
+#
+; strict_mode=Yes or No. Run the program in strict mode or not. It's a good
+;  idea to set this option to Yes.
+#
+; allow_rgb_database=Yes or No. Convenient to use because colorname e.g., red,
+;  gold etc can be used instead of rgb components of the color, however it is
+;  very inefficient to lookup. If your site is busy, set this option to No.
+#
+; count_reload=Yes or No. It is a good idea to set this option to No. But
+;  you've to set this option to Yes if you are running a proxy server.
+;  Normally set this option to Yes.
+#
+; log_error_messages=Yes or No. If your site is extremely busy and if the
+;  counter generates lots of logs, set this option to No. Normally set this
+;  option to Yes.
+#
+; show_error_messages_to_browsers=Yes or No. Set this option to No if you're
+;  concerned with privacy and you're sure that the counter works perfectly.
+;  If you set this option to No, you will not see error messages.
+
+[options]
+  auto_file_creation=No
+  strict_mode=Yes
+  allow_rgb_database=No
+  count_reload=Yes
+  log_error_messages=Yes
+  show_error_messages_to_browsers=Yes
+
+; You can specify IP address of the hosts you want to ignore from
+; counting.  Netmasks can be used to ignore a entire network or a
+; specific range of hosts in the network.  Read the counter
+; documentation to know about netmasks.  Wild card can be used as
+; well.  One item per line.
+;
+[ignore IPs]
+  10.10.0.0 255.0.0.0
+  172.16.0.0 255.255.0.0
+  192.168.0.0 255.255.0.0
+
+; All possible names and IP addresses by which your host can be
+; referred.  These hosts can access the counter remotely or locally.
+; Host running the http server must exist here.  Wild cards can be
+; used.  One item per line.  NOTE: 192.0.2.0/24 is listed as the
+; TEST-NET.
+;
+[authorized]
+  www.your.domain
+  www
+  192.0.2.1
diff --git a/www/wwwcount/patches/patch-aa b/www/wwwcount/patches/patch-aa
index 084c3a56d69..ef318659498 100644
--- a/www/wwwcount/patches/patch-aa
+++ b/www/wwwcount/patches/patch-aa
@@ -1,8 +1,10 @@
-*** Count-config.orig	Mon Nov 24 04:49:51 1997
---- Count-config	Sat Nov 29 18:50:53 1997
+$NetBSD: patch-aa,v 1.2 1999/05/14 22:05:23 tron Exp $
+
+*** Count-config.orig	Tue May 11 19:44:15 1999
+--- Count-config	Tue May 11 19:44:31 1999
 ***************
 *** 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
+  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
   
   Tmpl="./Config.tmpl"
 ! CgiBinDir="/usr/local/etc/httpd/cgi-bin"
@@ -10,45 +12,51 @@
   if [ ! -f "./VERSION" ] 
   then
 --- 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
+  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
   
   Tmpl="./Config.tmpl"
-! CgiBinDir="${PREFIX}/www/cgi-bin"
+! CgiBinDir="${PREFIX}/libexec/cgi-bin"
   
   if [ ! -f "./VERSION" ] 
   then
 ***************
-*** 37,49 ****
+*** 35,51 ****
+  
+  AUTHOR="ma_muquit@fccc.edu"
   Version=`cat ./VERSION`
-  Basedir="wwwcount$Version"
+- Basedir="wwwcount$Version"
   ConfigH="src/config.h"
 ! BaseDir="/usr/local/etc/Counter"
-  ConfigDir="$BaseDir/conf"
-  ConfFile="count.cfg"
+! ConfigDir="$BaseDir/conf"
+! ConfFile="count.cfg"
 ! DigitDir="$BaseDir/digits"
-  DataDir="$BaseDir/data"
+! DataDir="$BaseDir/data"
 ! LogDir="$BaseDir/logs"
-! LogFile="Count$Version.log"
-  RgbFile="./wcount/rgb.txt"
+- ext=`echo $Version | sed 's/\./_/g'`
+! LogFile="Count$ext.log"
+! RgbFile="./data/rgb.txt"
   
   #
---- 37,50 ----
+  # from php/fis install script
+--- 35,50 ----
+  
+  AUTHOR="ma_muquit@fccc.edu"
   Version=`cat ./VERSION`
-  Basedir="wwwcount$Version"
   ConfigH="src/config.h"
-! BaseDir="${PREFIX}/etc/Counter"
-! LibDir="${PREFIX}/lib/Counter"
-  ConfigDir="$BaseDir/conf"
-  ConfFile="count.cfg"
+! BaseDir="${PREFIX}/etc"
++ LibDir="${PREFIX}/libdata/wwwcount"
+! ConfigDir="${PREFIX}/etc"
+! ConfFile="wwwcount.conf"
 ! DigitDir="$LibDir/digits"
-  DataDir="$BaseDir/data"
-! LogDir="/var/log"
-! LogFile="Counter.log"
-  RgbFile="./wcount/rgb.txt"
+! DataDir="${PREFIX}/var/db/wwwcount"
+! LogDir="${PREFIX}/var/log"
+! LogFile="wwwcount"
+! RgbFile="rgb.txt"
   
   #
+  # from php/fis install script
 ***************
-*** 117,123 ****
+*** 118,124 ****
   
   if [ .$answer = . ]
   then
@@ -56,7 +64,7 @@
   fi
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
---- 118,124 ----
+--- 119,125 ----
   
   if [ .$answer = . ]
   then
@@ -65,19 +73,7 @@
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
 ***************
-*** 183,191 ****
-  then
-      BaseDir=$newpath
-      ConfigDir=$BaseDir/conf
--     DigitDir=$BaseDir/digits
-      DataDir=$BaseDir/data
--     LogDir=$BaseDir/logs
-  fi
-  
-  #
---- 184,190 ----
-***************
-*** 374,380 ****
+*** 377,383 ****
   
   if [ .$answer = . ]
   then
@@ -85,7 +81,7 @@
   fi
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
---- 373,379 ----
+--- 376,382 ----
   
   if [ .$answer = . ]
   then
@@ -94,7 +90,7 @@
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
 ***************
-*** 517,523 ****
+*** 519,525 ****
   ** so RGB names can be looked up, but yet not allow users to make constant
   ** use of this very ineffiecient lookup.
   */
@@ -102,7 +98,7 @@
   EOX
   
   cat<<EOXXX>>$ConfigH
---- 516,522 ----
+--- 518,524 ----
   ** so RGB names can be looked up, but yet not allow users to make constant
   ** use of this very ineffiecient lookup.
   */
@@ -111,17 +107,7 @@
   
   cat<<EOXXX>>$ConfigH
 ***************
-*** 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=\"$ConfigDir\"" >> $Tmpl
-***************
-*** 543,549 ****
+*** 547,553 ****
   echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
   echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
   echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
@@ -129,7 +115,7 @@
   ##
   # create template for install program --ends
   ##
---- 543,549 ----
+--- 546,552 ----
   echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
   echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
   echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl
diff --git a/www/wwwcount/patches/patch-ab b/www/wwwcount/patches/patch-ab
index f4c58de6415..f14b63081ca 100644
--- a/www/wwwcount/patches/patch-ab
+++ b/www/wwwcount/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.2 1999/05/14 22:05:23 tron Exp $
+
 *** configure.bak	Sat Oct 25 08:47:50 1997
 --- configure	Thu Nov  6 00:59:05 1997
 ***************
diff --git a/www/wwwcount/patches/patch-ae b/www/wwwcount/patches/patch-ae
index e52c2c43025..a17ae5b285e 100644
--- a/www/wwwcount/patches/patch-ae
+++ b/www/wwwcount/patches/patch-ae
@@ -1,7 +1,63 @@
-*** Count-install.orig	Sat May  9 16:53:02 1998
---- Count-install	Sun Jun  7 15:03:51 1998
+$NetBSD: patch-ae,v 1.2 1999/05/14 22:05:23 tron Exp $
+
+*** Count-install.orig	Mon Mar  1 18:15:16 1999
+--- Count-install	Wed May 12 00:50:02 1999
 ***************
-*** 193,199 ****
+*** 13,19 ****
+  # Nov 24, 1995
+  ##
+  ver=`cat ./VERSION`
+- Basedir="wwwcount$ver"
+  INSTALL_PROG="./install-sh"
+  Tmpl="./Config.tmpl"
+  Binary="./src/Count.cgi"
+--- 13,18 ----
+***************
+*** 27,34 ****
+  Digit_cdd="./data/digits/cdd"
+  Rgbfile="./data/rgb.txt"
+  SAMPLE_DAT="./data/data/sample.dat"
+- mirror_file="mirror_count.sh"
+- mirror_script="./utils/mirror/$mirror_file"
+  
+  UserId="nobody"
+  userid_flag=0
+--- 26,31 ----
+***************
+*** 114,133 ****
+  
+  . $Tmpl
+  
+- if [ ! -f ./$CONFIG_FILE ]
+- then
+- 
+- cat <<EOC
+- 
+-     The configuration file $CONFIG_FILR is not created!
+-     please create it first by running the script ./Gen-conf
+- 
+-     Aborting installation!
+- EOC
+- 
+-     exit 1
+- fi
+- 
+  tdir="./tmp"
+  
+  if [ ! -d $tdir ]; then
+--- 111,116 ----
+***************
+*** 196,202 ****
+  
+  cgi-bin directory   = $CGIBIN_DIR
+  conf directory      = $CONFIG_DIR
+- conf file to install= $CONFIG_FILE
+  digit directory     = $DIGIT_DIR
+  data directory      = $DATA_DIR
+  log directory       = $LOG_DIR
+--- 179,184 ----
+***************
+*** 211,217 ****
   
   if [ .$answer = . ]
   then
@@ -18,7 +74,7 @@
       until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
       do
 ***************
-*** 233,239 ****
+*** 252,258 ****
      read answer
      if [ .$answer = . ]
      then
@@ -26,7 +82,7 @@
      fi   
      until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
      do
---- 233,239 ----
+--- 234,240 ----
      read answer
      if [ .$answer = . ]
      then
@@ -35,7 +91,7 @@
      until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ]
      do
 ***************
-*** 252,262 ****
+*** 271,281 ****
   ###
   # enter user id -starts
   ###
@@ -47,7 +103,7 @@
      fi
      until [ $answer != "x" ]
      do
---- 252,262 ----
+--- 253,263 ----
   ###
   # enter user id -starts
   ###
@@ -60,7 +116,7 @@
      until [ $answer != "x" ]
      do
 ***************
-*** 276,286 ****
+*** 295,305 ****
   ##
   # enter groud id -starts
   ##
@@ -72,7 +128,7 @@
      fi
      until [ $answer != "x" ]
      do
---- 276,286 ----
+--- 277,287 ----
   ##
   # enter groud id -starts
   ##
@@ -85,8 +141,42 @@
      until [ $answer != "x" ]
      do
 ***************
-*** 323,336 ****
-      echo 
+*** 317,340 ****
+  # enter groud id -ends
+  ##
+  echo "installing Count.cgi->$CGIBIN_DIR"
+! $INSTALL_PROG -c -o $UserId -g $GroupId -m 700 $Binary $CGIBIN_DIR/Count.cgi
+! echo "installing $CONFIG_FILE->$CONFIG_DIR"
+! 
+! #
+! # check if the file exist or not
+! #
+! 
+! if [ ! -f $CONFIG_DIR/$CONFIG_FILE ]; then
+! 
+!     $INSTALL_PROG -c -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE
+! else
+!     echo "  ===> ****** File exists!"
+!     echo "  ===> skipping... Will not overwrite $CONFIG_DIR/$CONFIG_FILE"
+!     echo "  ===> install it manually if you want to overwrite"
+! 	echo "  ===> To install manually, at the shell prompt type: "
+!     echo " $INSTALL_PROG -c -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE"
+! 	echo ""
+! fi
+  
+  echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
+  
+--- 299,305 ----
+  # enter groud id -ends
+  ##
+  echo "installing Count.cgi->$CGIBIN_DIR"
+! $INSTALL_PROG -c $Binary $CGIBIN_DIR/Count.cgi
+  
+  echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
+  
+***************
+*** 350,363 ****
+  	echo ""
   fi
   
 ! echo "installing rgb.txt->$BASE_DIR"
@@ -100,8 +190,8 @@
   
   echo "installing image strip for digit style A->$DIGIT_DIR/A"
   $INSTALL_PROG -c -m 644 $DigitA/strip.gif\
---- 323,335 ----
-      echo 
+--- 315,327 ----
+  	echo ""
   fi
   
 ! echo "installing rgb.txt->$RGB_DIR"
@@ -115,34 +205,34 @@
   echo "installing image strip for digit style A->$DIGIT_DIR/A"
   $INSTALL_PROG -c -m 644 $DigitA/strip.gif\
 ***************
-*** 360,367 ****
-  # -R is not portable, reported by Geoff Scully <gws@dis.on.ca> and suggested
-  # the alternative (01/15/96)
-  #chown -R $UserId.$GroupId $BASE_DIR
-! #find $BASE_DIR -exec chown $UserId {} \;
-! #find $BASE_DIR -exec chgrp $GroupId {} \;
-  #            echo "UserId=$UserId"
-  #            echo "GroupId=$GroupId"
-          ;;
---- 359,368 ----
-  # -R is not portable, reported by Geoff Scully <gws@dis.on.ca> and suggested
-  # the alternative (01/15/96)
-  #chown -R $UserId.$GroupId $BASE_DIR
-! find $BASE_DIR -exec chown $UserId {} \;
-! find $BASE_DIR -exec chgrp $GroupId {} \;
-! find $LIB_DIR -exec chown $UserId {} \;
-! find $LIB_DIR -exec chgrp $GroupId {} \;
-  #            echo "UserId=$UserId"
-  #            echo "GroupId=$GroupId"
+*** 399,416 ****
+  $INSTALL_PROG -c -m 644 $Digit_cdd/strip.gif\
+      $DIGIT_DIR/cdd/strip.gif
+  
+- echo "installing the mirroring script"
+- $INSTALL_PROG -c $mirror_script -m 755 $BASE_DIR/$mirror_file
+- 
+- ##
+- # change ownership
+- # -R is not portable, reported by Geoff Scully <gws@dis.on.ca> and suggested
+- # the alternative (01/15/96)
+- #chown -R $UserId.$GroupId $BASE_DIR
+- #find $BASE_DIR -exec chown $UserId {} \;
+- #find $BASE_DIR -exec chgrp $GroupId {} \;
+- #            echo "UserId=$UserId"
+- #            echo "GroupId=$GroupId"
           ;;
+          n|N)
+  cat <<EOM
+--- 363,368 ----
 ***************
-*** 376,392 ****
+*** 423,439 ****
   
   EOM
   echo "installing Count.cgi->$CGIBIN_DIR"
 ! $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 $CONFIG_FILE->$CONFIG_DIR"
+! $INSTALL_PROG -c $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE
   echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR"
   $INSTALL_PROG -c $SAMPLE_DAT $DATA_DIR/sample.dat
   
@@ -154,13 +244,11 @@
   
   echo "installing image strip for digit style A->$DIGIT_DIR/A"
   $INSTALL_PROG -c $DigitA/strip.gif $DIGIT_DIR/A/strip.gif
---- 377,394 ----
+--- 375,390 ----
   
   EOM
   echo "installing Count.cgi->$CGIBIN_DIR"
 ! $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"
   $INSTALL_PROG -c $SAMPLE_DAT $DATA_DIR/sample.dat
   
@@ -173,3 +261,15 @@
   
   echo "installing image strip for digit style A->$DIGIT_DIR/A"
   $INSTALL_PROG -c $DigitA/strip.gif $DIGIT_DIR/A/strip.gif
+***************
+*** 464,472 ****
+  
+  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 the mirroring script"
+- $INSTALL_PROG -c $mirror_script $BASE_DIR/$mirror_file
+  
+      ;;
+          *)
+--- 415,420 ----
diff --git a/www/wwwcount/pkg/COMMENT b/www/wwwcount/pkg/COMMENT
index 401523383b4..5e1ed189167 100644
--- a/www/wwwcount/pkg/COMMENT
+++ b/www/wwwcount/pkg/COMMENT
@@ -1 +1 @@
-Access counter, clock and date for WWW pages
+Graphical access counter, clock and date indicator for WWW pages
diff --git a/www/wwwcount/pkg/DESCR b/www/wwwcount/pkg/DESCR
index 02f7bf742b2..443dc1d8ad0 100644
--- a/www/wwwcount/pkg/DESCR
+++ b/www/wwwcount/pkg/DESCR
@@ -1,4 +1,4 @@
-The counter, clock and date, all in one program. The single program can
+The counter, clock and date, all in one program.  This single program can
 be used for any number of web pages, for any number of users.
 
 WWW: http://www.semcor.com/~muquit/Count.html
diff --git a/www/wwwcount/pkg/MESSAGE b/www/wwwcount/pkg/MESSAGE
new file mode 100644
index 00000000000..85c7ec675a6
--- /dev/null
+++ b/www/wwwcount/pkg/MESSAGE
@@ -0,0 +1,23 @@
+
+     If you are using this program, I like to hear from you.  If you are
+     having any problem with the program, please let me know as well.
+     Feel free to send any suggestion.  If you think that the program is
+     cool, please consider sending me a picture postcard of the area
+     where you live.  Thanks to all of you who sent me the nice
+     postcards.  I really appreciate it.
+
+     snail-mail:
+
+         Muhammad A Muquit
+         Fox Chase Cancer Center
+         Research Computing Services (C119)
+         7701 Burholme Avenue
+         Philadelphia, PA 19111
+         USA
+         
+
+     email: ma_muquit@fccc.edu 
+
+     Thanks. 
+
+     Enjoy! 
diff --git a/www/wwwcount/pkg/PLIST b/www/wwwcount/pkg/PLIST
index 0dbd766014d..e20eacb5911 100644
--- a/www/wwwcount/pkg/PLIST
+++ b/www/wwwcount/pkg/PLIST
@@ -1,17 +1,102 @@
-www/cgi-bin/Count.cgi
-etc/Counter/conf/count.cfg
-etc/Counter/data/sample.dat
-lib/Counter/rgb.txt
-lib/Counter/digits/A/strip.gif
-lib/Counter/digits/B/strip.gif
-lib/Counter/digits/C/strip.gif
-lib/Counter/digits/D/strip.gif
-lib/Counter/digits/D/lenna.gif
-lib/Counter/digits/E/strip.gif
-lib/Counter/digits/mkstrip.sh
+@comment $NetBSD: PLIST,v 1.2 1999/05/14 22:05:23 tron Exp $
 bin/mkstrip
 bin/extdgts
-@exec touch /var/log/Counter.log
-@exec chown nobody.nogroup /var/log/Counter.log
-@exec chmod 644 /var/log/Counter.log
-@unexec rm /var/log/Counter.log
+libdata/wwwcount/rgb.txt
+libdata/wwwcount/digits/A/peng.gif
+libdata/wwwcount/digits/A/strip.gif
+libdata/wwwcount/digits/B/strip.gif
+libdata/wwwcount/digits/C/strip.gif
+libdata/wwwcount/digits/D/lenna.gif
+libdata/wwwcount/digits/D/strip.gif
+libdata/wwwcount/digits/E/strip.gif
+libdata/wwwcount/digits/cd/strip.gif
+libdata/wwwcount/digits/cdd/strip.gif
+libdata/wwwcount/digits/cdr/strip.gif
+libdata/wwwcount/digits/mkstrip.sh
+libexec/cgi-bin/Count.cgi
+share/doc/wwwcount/blues.gif
+share/doc/wwwcount/index.html
+share/doc/wwwcount/Count.html
+share/doc/wwwcount/Count2_5-ex.html
+share/doc/wwwcount/Count_Changelog.html
+share/doc/wwwcount/Count_FAQ.html
+share/doc/wwwcount/Count_download.html
+share/doc/wwwcount/Count_mirrors.html
+share/doc/wwwcount/Count2.5/c-c.txt
+share/doc/wwwcount/Count2.5/gen-c.txt
+share/doc/wwwcount/Count2.5/images/styleA.gif
+share/doc/wwwcount/Count2.5/images/styleB.gif
+share/doc/wwwcount/Count2.5/images/styleC.gif
+share/doc/wwwcount/Count2.5/images/styleD.gif
+share/doc/wwwcount/Count2.5/images/styleE.gif
+share/doc/wwwcount/Count2.5/images/stylecd.gif
+share/doc/wwwcount/Count2.5/images/stylecdd.gif
+share/doc/wwwcount/Count2.5/images/stylecdr.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51026648.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51055166.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51083684.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51112202.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5114072.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51140720.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51169238.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51197756.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51226274.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51254792.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51283310.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51311828.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51340346.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_51368864.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5142590.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5171108.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5199626.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5228144.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5256662.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_528518.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5285180.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5313698.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5342216.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5370734.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5399252.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5427770.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5456288.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5484806.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5513324.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5541842.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_557036.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5570360.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5598878.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5627396.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5655914.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5684432.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5712950.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5741468.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5769986.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5798504.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5827022.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_585554.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5855540.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5884058.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5912576.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5941094.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5969612.gif
+share/doc/wwwcount/Count2.5/eximages/ex2_5998130.gif
+share/examples/wwwcount.conf
+@exec if [ ! -f %D/etc/wwwcount.conf ]; then cp -p %D/share/examples/wwwcount.conf %D/etc/wwwcount.conf; fi
+share/man/man1/mkstrip.1
+var/db/wwwcount/sample.dat
+@exec touch %D/var/log/wwwcount
+@exec chown nobody.nogroup %D/var/log/wwwcount
+@dirrm libdata/wwwcount/digits/A
+@dirrm libdata/wwwcount/digits/B
+@dirrm libdata/wwwcount/digits/C
+@dirrm libdata/wwwcount/digits/D
+@dirrm libdata/wwwcount/digits/E
+@dirrm libdata/wwwcount/digits/cd
+@dirrm libdata/wwwcount/digits/cdd
+@dirrm libdata/wwwcount/digits/cdr
+@dirrm libdata/wwwcount/digits
+@dirrm libdata/wwwcount
+@dirrm share/doc/wwwcount/Count2.5/images
+@dirrm share/doc/wwwcount/Count2.5/eximages
+@dirrm share/doc/wwwcount/Count2.5
+@dirrm share/doc/wwwcount