Use VARBASE instead of hardcoding /var. This addresses part of

PR pkg/29896.

3 files changed, 14 insertions, 14 deletions

diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index c8227edf3fc..fa3d1304a14 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/05 20:19:13 reed Exp $
+# $NetBSD: Makefile,v 1.11 2005/10/01 17:25:32 minskim Exp $
 
 DISTNAME=       wwwcount2.5
 PKGNAME=        wwwcount-2.5
@@ -14,7 +14,7 @@ INSTALLATION_DIRS=	bin man/man1 share/doc/wwwcount/Count2.5/images \
 			share/doc/wwwcount/Count2.5/eximages share/examples
 
 pre-configure:
-	cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} ./Count-config
+	cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} VARBASE=${VARBASE} ./Count-config
 
 do-install:
 	cd ${WRKSRC}; yes "" | ./Count-install
diff --git a/www/wwwcount/distinfo b/www/wwwcount/distinfo
index d5325cf1330..0ecce81e6b5 100644
--- a/www/wwwcount/distinfo
+++ b/www/wwwcount/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:40 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/10/01 17:25:32 minskim Exp $
 
 SHA1 (wwwcount2.5.tar.gz) = 374babfc93db3092eda13bda5fd65a372beca4bb
 RMD160 (wwwcount2.5.tar.gz) = 354c92ab5e0f8ec2acd484108fa968a5bfb6e62a
 Size (wwwcount2.5.tar.gz) = 441215 bytes
-SHA1 (patch-aa) = 34295db70d0f2f349dcb6a69db7e1761f76b5ff8
+SHA1 (patch-aa) = 1a3d7bbbb3013dce2fbb0b3e4ade9ab98bdf9ba2
 SHA1 (patch-ab) = f6f71b1428506ab565f127c38096b65408f5bc53
 SHA1 (patch-ae) = e950e48c2f9a8f3da27c8b51267a52d7a7bd704e
diff --git a/www/wwwcount/patches/patch-aa b/www/wwwcount/patches/patch-aa
index 01077bca453..b2a2903aa47 100644
--- a/www/wwwcount/patches/patch-aa
+++ b/www/wwwcount/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1999/05/14 23:23:58 tron Exp $
+$NetBSD: patch-aa,v 1.4 2005/10/01 17:25:32 minskim Exp $
 
---- Count-config.orig	Mon Jan  4 00:07:56 1999
-+++ Count-config	Sat May 15 01:12:06 1999
+--- Count-config.orig	1999-01-03 15:07:58.000000000 -0800
++++ Count-config
 @@ -20,7 +20,7 @@
  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
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 1999/05/14 23:23:58 tron Exp $
  
  if [ ! -f "./VERSION" ] 
  then
-@@ -35,17 +35,16 @@
+@@ -35,17 +35,16 @@ fi
  
  AUTHOR="ma_muquit@fccc.edu"
  Version=`cat ./VERSION`
@@ -31,14 +31,14 @@ $NetBSD: patch-aa,v 1.3 1999/05/14 23:23:58 tron Exp $
 +ConfigDir="${PREFIX}/etc"
 +ConfFile="wwwcount.conf"
 +DigitDir="$LibDir/digits"
-+DataDir="/var/db/wwwcount"
-+LogDir="/var/log"
++DataDir="${VARBASE}/db/wwwcount"
++LogDir="${VARBASE}/log"
 +LogFile="wwwcount"
 +RgbFile="rgb.txt"
  
  #
  # from php/fis install script
-@@ -118,7 +117,7 @@
+@@ -118,7 +117,7 @@ read answer
  
  if [ .$answer = . ]
  then
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,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
-@@ -377,7 +376,7 @@
+@@ -377,7 +376,7 @@ read answer
  
  if [ .$answer = . ]
  then
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,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
-@@ -519,7 +518,7 @@
+@@ -519,7 +518,7 @@ cat<<EOX>>$ConfigH
  ** so RGB names can be looked up, but yet not allow users to make constant
  ** use of this very ineffiecient lookup.
  */
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.3 1999/05/14 23:23:58 tron Exp $
  EOX
  
  cat<<EOXXX>>$ConfigH
-@@ -547,7 +546,7 @@
+@@ -547,7 +546,7 @@ echo "DATA_DIR=\"$DataDir\"" >> $Tmpl
  echo "LOG_DIR=\"$LogDir\"" >> $Tmpl
  echo "LOG_FILE=\"$LogFile\"" >> $Tmpl
  echo "RGB_FILE=\"$RgbFile\"" >> $Tmpl