Fixed the hard-coded paths in the configuration file. Populated

BUILD_DEFS. Bumped PKGREVISION.

3 files changed, 64 insertions, 9 deletions

diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 96ff2ea6f36..6bcb371f292 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/04/23 00:12:42 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/09/19 08:31:18 rillig Exp $
 #
 
 DISTNAME=	tinyproxy-1.6.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tinyproxy/}
 
@@ -15,6 +15,10 @@ GNU_CONFIGURE=	YES
 RCD_SCRIPTS=		tinyproxy
 PKG_SYSCONFSUBDIR=	tinyproxy
 
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+=		TINYPROXY_USER TINYPROXY_GROUP VARBASE
+
 TINYPROXY_USER?=	tinyproxy
 TINYPROXY_GROUP?=	tinyproxy
 PKG_GROUPS=		${TINYPROXY_GROUP}
@@ -35,11 +39,13 @@ EGDIR=		${PREFIX}/share/examples/tinyproxy
 CONF_FILES=	${EGDIR}/tinyproxy.conf.default ${PKG_SYSCONFDIR}/tinyproxy.conf
 
 SUBST_CLASSES+=		docs
+SUBST_STAGE.docs=	pre-configure
 SUBST_FILES.docs=	doc/tinyproxy.8 doc/tinyproxy.conf
 SUBST_SED.docs+=	-e 's,@TINYPROXY_USER@,${TINYPROXY_USER},g'
 SUBST_SED.docs+=	-e 's,@TINYPROXY_GROUP@,${TINYPROXY_GROUP},g'
 SUBST_SED.docs+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.docs=	post-patch
+SUBST_SED.docs+=	-e 's,@DATADIR@,${PREFIX}/share/tinyproxy,g'
+SUBST_SED.docs+=	-e 's,@VARBASE@,${VARBASE},g'
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/www/tinyproxy/distinfo b/www/tinyproxy/distinfo
index 0787e6b8764..8e88a34ba5e 100644
--- a/www/tinyproxy/distinfo
+++ b/www/tinyproxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:08:39 wiz Exp $
+$NetBSD: distinfo,v 1.6 2006/09/19 08:31:18 rillig Exp $
 
 SHA1 (tinyproxy-1.6.2.tar.gz) = b305ebdef29de19e0c2c74efcd4a2acd8caa9018
 RMD160 (tinyproxy-1.6.2.tar.gz) = a85ebc7ebdc353df7ef5a09b3502df6046054531
 Size (tinyproxy-1.6.2.tar.gz) = 463274 bytes
 SHA1 (patch-aa) = e94f2410ae2b5dd94a1039e96635b32505de9f5d
 SHA1 (patch-ab) = b6a18b859cb3260c237a98745ca9e2d0e1a1b486
-SHA1 (patch-ac) = baab9768068f1d11a34c22295396726e867e32a4
+SHA1 (patch-ac) = 12ebe959c626c14a8294a7d919eba6df8cf3e95b
diff --git a/www/tinyproxy/patches/patch-ac b/www/tinyproxy/patches/patch-ac
index 23c110c85cf..36cc666476d 100644
--- a/www/tinyproxy/patches/patch-ac
+++ b/www/tinyproxy/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/03/07 23:46:01 salo Exp $
+$NetBSD: patch-ac,v 1.2 2006/09/19 08:31:18 rillig Exp $
 
---- doc/tinyproxy.conf.orig	2003-03-08 00:11:42.000000000 +0100
-+++ doc/tinyproxy.conf	2003-03-08 00:14:15.000000000 +0100
+--- doc/tinyproxy.conf.orig	2003-06-23 23:14:32.000000000 +0200
++++ doc/tinyproxy.conf	2006-09-19 10:15:24.000000000 +0200
 @@ -6,8 +6,8 @@
  # Name of the user the tinyproxy daemon should switch to after the port
  # has been bound.
@@ -13,7 +13,56 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/03/07 23:46:01 salo Exp $
  
  #
  # Port to listen on.
-@@ -120,7 +120,7 @@
+@@ -40,31 +40,31 @@ Timeout 600
+ #   /usr/share/tinyproxy
+ #   /etc/tinyproxy
+ #
+-# ErrorFile 404 "/usr/share/tinyproxy/404.html"
+-# ErrorFile 400 "/usr/share/tinyproxy/400.html"
+-# ErrorFile 503 "/usr/share/tinyproxy/503.html"
+-# ErrorFile 403 "/usr/share/tinyproxy/403.html"
+-# ErrorFile 408 "/usr/share/tinyproxy/408.html"
++# ErrorFile 404 "@DATADIR@/404.html"
++# ErrorFile 400 "@DATADIR@/400.html"
++# ErrorFile 503 "@DATADIR@/503.html"
++# ErrorFile 403 "@DATADIR@/403.html"
++# ErrorFile 408 "@DATADIR@/408.html"
+ 
+ # 
+ # DefaultErrorFile: The HTML file that gets sent if there is no
+ # HTML file defined with an ErrorFile keyword for the HTTP error
+ # that has occured.
+ #
+-DefaultErrorFile "/usr/share/tinyproxy/default.html"
++DefaultErrorFile "@DATADIR@/default.html"
+ 
+ #
+ # StatFile: The HTML file that gets sent when a request is made
+ # for the stathost.  If this file doesn't exist a basic page is
+ # hardcoded in tinyproxy.
+ #
+-StatFile "/usr/share/tinyproxy/stats.html"
++StatFile "@DATADIR@/stats.html"
+ 
+ #
+ # Where to log the information. Either LogFile or Syslog should be set,
+ # but not both.
+ #
+-Logfile "/var/log/tinyproxy.log"
++Logfile "@VARBASE@/log/tinyproxy.log"
+ # Syslog On
+ 
+ #
+@@ -85,7 +85,7 @@ LogLevel Info
+ # PidFile: Write the PID of the main tinyproxy thread to this file so it
+ # can be used for signalling purposes.
+ #
+-PidFile "/var/run/tinyproxy.pid"
++PidFile "@VARBASE@/run/tinyproxy.pid"
+ 
+ #
+ # Include the X-Tinyproxy header, which has the client's IP address when
+@@ -180,7 +180,7 @@ ViaProxyName "tinyproxy"
  #
  # The location of the filter file.
  #