Fix explicit paths for config and rc files.

aolserver4/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/21 18:16:44 ianharding Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/22 17:53:07 ianharding Exp $
 #
 
 DISTNAME=		aolserver-4.0.7-src
@@ -37,6 +37,12 @@ RCD_SCRIPTS=		nsd
 OWN_DIRS_PERMS=		${NSD_LOGDIR} ${NSD_USER} ${NSD_GROUP} 740
 OWN_DIRS_PERMS+=	${NSD_PIDDIR} ${NSD_USER} ${NSD_GROUP} 740
 
+SUBST_CLASSES=		cl1
+SUBST_STAGE.cl1=	post-patch
+SUBST_FILES.cl1=	sample-config.tcl
+SUBST_SED.cl1=		-e s!@PREFIX@!${PREFIX}!g \
+			-e s!@VARBASE@!${VARBASE}!g
+
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

aolserver4/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2004/07/20 18:15:55 ianharding Exp $
+$NetBSD: distinfo,v 1.4 2004/07/22 17:53:07 ianharding Exp $
 
 SHA1 (aolserver-4.0.7-src.tar.gz) = 421e9b0973d5b1fb8f597e9a8403f2c1434999c8
 Size (aolserver-4.0.7-src.tar.gz) = 578795 bytes
 SHA1 (patch-aa) = 8366ce785d534b9d0eaa9e3f82f60318f984dd4a
 SHA1 (patch-ab) = 18e762ab27d6d201a2a61c1e8cdcf5541bec3874
-SHA1 (patch-ac) = e8fb331151a0d44ba000719956346adf08e82abe
+SHA1 (patch-ac) = 1bda5588eb2c828845759aeb6f6c07a6ef1e5c06
 SHA1 (patch-ad) = 6944d758a99e49ac5138bd920138e34e4fd006c7

aolserver4/files/nsd.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
 # 
 
@@ -6,8 +6,8 @@
 
 name="nsd"
 rcvar=${name}
-command="/usr/pkg/bin/${name}"
-nsd_flags="-t /usr/pkg/etc/nsd.tcl -u nsadmin -g nsadmin"
+command="@PREFIX@/bin/${name}"
+nsd_flags="-t @PKG_SYSCONFDIR@/nsd.tcl -u nsadmin -g nsadmin"
 nsd_user="root"
 
 # set defaults
@@ -19,4 +19,3 @@ else
 fi
 
 run_rc_command "$1"
-

aolserver4/patches/patch-ac

@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2004/06/08 20:53:37 ianharding Exp $
+$NetBSD: patch-ac,v 1.2 2004/07/22 17:53:08 ianharding Exp $
 
---- sample-config.tcl.orig	2003-08-08 14:52:17.000000000 +0000
+--- sample-config.tcl.orig	2004-03-26 20:58:18.000000000 +0000
 +++ sample-config.tcl
 @@ -52,16 +52,16 @@ set httpport               8000
  set httpsport              8443
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.1 2004/06/08 20:53:37 ianharding Exp $
  
 -set homedir                [file dirname [ns_info config]]
 -set bindir                 [file dirname [ns_info nsd]]
-+set homedir                /usr/pkg
++set homedir                @PREFIX@
 +set bindir                 ${homedir}/bin
  
 -set pageroot               ${homedir}/servers/${servername}/pages
@@ -29,8 +29,8 @@ $NetBSD: patch-ac,v 1.1 2004/06/08 20:53:37 ianharding Exp $
  #ns_param  PreferredCharsets { utf-8 iso8859-1 } ;# This parameter supports output
                                         # encoding arbitration.
 -
-+ns_param pidfile	"/var/run/nsd/${servername}.pid"
-+ns_param serverlog	"/var/log/nsd/${servername}.log"
++ns_param pidfile	"@VARBASE@/run/nsd/${servername}.pid"
++ns_param serverlog	"@VARBASE@/log/nsd/${servername}.log"
  #
  # MIME types.
  #
@@ -62,7 +62,7 @@ $NetBSD: patch-ac,v 1.1 2004/06/08 20:53:37 ianharding Exp $
  
  #
  # Socket driver module (HTTP)  -- nssock
-@@ -321,8 +343,10 @@ ns_param   rollonsignal    true      ;# 
+@@ -341,8 +363,10 @@ ns_param   rollonsignal    true      ;# 
  ns_param   rollhour        0         ;# Time to roll log.
  ns_param   maxbackup       5         ;# Max number to keep around when rolling.
  ns_param   logreqtime      true      ;# Log the execution time of request
@@ -74,7 +74,7 @@ $NetBSD: patch-ac,v 1.1 2004/06/08 20:53:37 ianharding Exp $
  #
  # CGI interface -- nscgi
  #
-@@ -342,7 +366,10 @@ ns_section "ns/server/${servername}/modu
+@@ -362,7 +386,10 @@ ns_section "ns/server/${servername}/modu
      ns_param nslog ${bindir}/nslog.so
      #ns_param nscgi ${bindir}/nscgi.so
      #ns_param nsperm ${bindir}/nsperm.so