Add automatic ${VARIABLE} handling for MESSAGE files.

Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced,
not @VARIABLE@, nor @@VARIABLE@@).
By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX,
X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST.
Clean up some packages while I'm there; add RCS tags to most MESSAGEs.
Remove some uninteresting MESSAGEs.

23 files changed, 75 insertions, 103 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index e82420b72d8..e18afe0d6e3 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/01/14 14:06:01 simonb Exp $
+# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:44 wiz Exp $
 #
 
 DISTNAME=	adzap-20010112
@@ -9,8 +9,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.zip.com.au/~cs/adzap/index.html
 WRKSRC=		${WRKDIR}/adzap
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 NO_BUILD=	# defined
 USE_PERL5=	# defined
 
@@ -32,8 +30,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/examples/adzap
 .endfor
 
-post-install:
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${PKGDIR}/MESSAGE \
-		>${WRKDIR}/MESSAGE
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/adzap/pkg/MESSAGE b/www/adzap/pkg/MESSAGE
index aea725bb26b..5bd8cf07bd0 100644
--- a/www/adzap/pkg/MESSAGE
+++ b/www/adzap/pkg/MESSAGE
@@ -1,12 +1,13 @@
-$NetBSD: MESSAGE,v 1.2 2000/04/25 15:50:21 rh Exp $
-
 ==========================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:44 wiz Exp $
+
   Adzap has now been installed.  To get it up and running, copy
-  @@PREFIX@@/share/examples/adzap/adzap.conf to /etc and modify
+  ${PREFIX}/share/examples/adzap/adzap.conf to /etc and modify
   it to match your setup.  Then edit your squid configuration and
-  add @@PREFIX@@/libexec/adzap as your http-redirector.
+  add ${PREFIX}/libexec/adzap as your http-redirector.
 
   If you run a web server, you can copy the *.{html,js,gif} files from
-  @@PREFIX@@/share/examples/adzap to your htdocs tree and modify
+  ${PREFIX}/share/examples/adzap to your htdocs tree and modify
   the web locations in /etc/adzap.conf accordingly.
+
 ==========================================================================
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 559953d9686..67688099e07 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/01/13 15:30:49 tv Exp $
+# $NetBSD: Makefile,v 1.27 2001/01/29 11:34:44 wiz Exp $
 #
 
 DISTNAME=	mod_ssl-2.7.1-1.3.14
@@ -18,8 +18,6 @@ CONFLICTS=	apache-1.3.[0123456789] apache-*modssl-* apache6-*
 HAS_CONFIGURE=	defined
 USE_SSL=	defined
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--with-apxs=${PREFIX}/sbin/apxs
@@ -35,8 +33,6 @@ post-build:
 
 post-install:
 	@${SED} -e "s,@PREFIX@,${PREFIX},g" \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-	@${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/README.mkcert > ${WRKDIR}/README.mkcert
 
 	@cd ${PREFIX}/lib/httpd; ${MV} -f libssl.so mod_ssl.so
diff --git a/www/ap-ssl/pkg/MESSAGE b/www/ap-ssl/pkg/MESSAGE
index 0ebf358fa2e..a8d0f8507b0 100644
--- a/www/ap-ssl/pkg/MESSAGE
+++ b/www/ap-ssl/pkg/MESSAGE
@@ -1,10 +1,10 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.5 2000/10/13 21:48:02 jlam Exp $
+$NetBSD: MESSAGE,v 1.6 2001/01/29 11:34:45 wiz Exp $
 
 You will need to generate certificates and keys for your server before
 Apache will start with mod_ssl support.  Please read
 
-	@PREFIX@/share/doc/mod_ssl/README.mkcert
+	${PREFIX}/share/doc/mod_ssl/README.mkcert
 
 for more information on how to do this.
 
diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile
index c329d043e5d..8b78d71bb77 100644
--- a/www/asWedit/Makefile
+++ b/www/asWedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/09/08 13:33:15 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/01/29 11:34:45 wiz Exp $
 #
 
 DISTNAME=		${PKGNAME}-i386.linux
@@ -25,7 +25,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 NO_BUILD=		yes
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 
 CHECK_SHLIBS=		no
 
@@ -34,8 +33,6 @@ do-configure:
 	${SED} -e 's:/usr/local/lib:${PREFIX}/libdata:g' \
 	       -e 's:^!!\*helpDir:*helpDir:' \
 			< AsWedit.bak > AsWedit
-	${SED} -e 's:@@PREFIX@@:${PREFIX}:g' \
-			< ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/asWedit ${PREFIX}/bin
diff --git a/www/asWedit/pkg/MESSAGE b/www/asWedit/pkg/MESSAGE
index 8a72a296dda..fa1d74ff750 100644
--- a/www/asWedit/pkg/MESSAGE
+++ b/www/asWedit/pkg/MESSAGE
@@ -1,12 +1,12 @@
-$NetBSD: MESSAGE,v 1.1.1.1 2000/07/17 09:39:05 rh Exp $
-
 ==========================================================================
-  asWedit has now been installed in @@PREFIX@@.
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:45 wiz Exp $
+
+  asWedit has now been installed in ${PREFIX}.
 
   Before using this package for the first time, each user has to merge
-  the contents of @@PREFIX@@/share/examples/asWedit/AsWedit with his/her
+  the contents of ${PREFIX}/share/examples/asWedit/AsWedit with his/her
   X resources.  This can be done using the command
 
-	xrdb -merge @@PREFIX@@/share/examples/asWedit/AsWedit
+	xrdb -merge ${PREFIX}/share/examples/asWedit/AsWedit
 
 ==========================================================================
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 97bc5a4a9fa..56ae7cd1b41 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/10/19 23:23:34 jwise Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:45 wiz Exp $
 
 DISTNAME=	Cocoon-1.8
 PKGNAME=	cocoon-1.8
@@ -31,13 +31,11 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 NO_CONFIGURE=
 
 USE_JAVA=	yes
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 post-extract:
 	${RM} ${WRKSRC}/lib/fop_0_13_0.jar ${WRKSRC}/lib/servlet_2_2.jar \
 		${WRKSRC}/lib/xalan_1_2_D02.jar ${WRKSRC}/lib/xerces_1_2.jar \
 		${WRKSRC}/lib/bsf.jar ${WRKSRC}/lib/bsfengines.jar
-	${SED} -e s,@PREFIX@,${PREFIX},g < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 # Yes -- you have to run build.sh _twice_.  The first time triggers a bug in JDK-1.1 javac,
 # and the second time completes successfully.  While we're at it, note that we can't
diff --git a/www/cocoon/pkg/MESSAGE b/www/cocoon/pkg/MESSAGE
index a5a041c6f83..0bcb1fece6c 100644
--- a/www/cocoon/pkg/MESSAGE
+++ b/www/cocoon/pkg/MESSAGE
@@ -1,21 +1,23 @@
 ================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:45 wiz Exp $
+
   Cocoon is now installed.  To see cocoon in action, make sure
   that 
 
-  	@PREFIX@/lib/java/cocoon.jar,
-  	@PREFIX@/lib/java/fop.jar,
-  	@PREFIX@/lib/java/xalan.jar,
-  	@PREFIX@/lib/java/xerces.jar, and
-	@PREFIX@/jakarta/tomcat/lib/servlet.jar
+  	${PREFIX}/lib/java/cocoon.jar,
+  	${PREFIX}/lib/java/fop.jar,
+  	${PREFIX}/lib/java/xalan.jar,
+  	${PREFIX}/lib/java/xerces.jar, and
+	${PREFIX}/jakarta/tomcat/lib/servlet.jar
 
   are in your CLASSPATH and add
   
-  	@PREFIX@/share/examples/java/cocoon
+  	${PREFIX}/share/examples/java/cocoon
 
   as a servlet context under Jakarta Tomcat.  For more
   information, or for instructions on using cocoon with
   other servlet environments, see
 
-	@PREFIX@/share/doc/java/cocoon/install.html
+	${PREFIX}/share/doc/java/cocoon/install.html
 
 ================================================================
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index e6f63bc2e5d..5f22f29ca5c 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/02/29 23:31:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:45 wiz Exp $
 #
 
 DISTNAME=	htdig-3.1.5
@@ -17,11 +17,6 @@ CONFIGURE_ARGS=	--with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \
 		--with-search-dir=${PREFIX}/share/examples/htdig
 CONFIGURE_ENV=	CPPFLAGS=-I${PREFIX}/include/db2
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
-post-build:
-	${SED} 's#@PREFIX@#${PREFIX}#g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
-
 post-install:
 	if [ ! -f ${PREFIX}/etc/htdig/htdig.conf ]; then \
 	  ${CP} ${PREFIX}/share/examples/htdig/htdig.conf ${PREFIX}/etc/htdig/; \
diff --git a/www/htdig/pkg/MESSAGE b/www/htdig/pkg/MESSAGE
index 9503eb70e0d..fdb88fb8586 100644
--- a/www/htdig/pkg/MESSAGE
+++ b/www/htdig/pkg/MESSAGE
@@ -1,10 +1,15 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:46 wiz Exp $
+
 A sample ht://Dig config file has been installed to
-@PREFIX@/etc/htdig/htdig.conf, unless that file existed already.
-The sample @PREFIX@/bin/rundig script may be run to create a database
+${PREFIX}/etc/htdig/htdig.conf, unless that file existed already.
+The sample ${PREFIX}/bin/rundig script may be run to create a database
 in the newly created empty directory, /var/db/htdig. A sample search
 form, which may be used to search that database, has been installed to
-@PREFIX@/share/examples/htdig/search.html.
+${PREFIX}/share/examples/htdig/search.html.
 
 For an example of how to set up ht://Dig and integrate it with your web site, 
 you may wish to examine the scripts installed into
 /var/wwwoffle/html/htdig/scripts by the www/wwwoffle package.
+
+======================================================================
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 52481c59c34..828184131b6 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/12/13 03:49:30 jwise Exp $
+# $NetBSD: Makefile,v 1.12 2001/01/29 11:34:46 wiz Exp $
 
 DISTNAME=	jakarta-tomcat.src
 PKGNAME=	jakarta-tomcat-3.1.1
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/jakarta-tomcat-3.1.1-src
 JAKARTA_HOME=	${PREFIX}/jakarta
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
+MESSAGE_SUBST+=	TOMCAT_HOME=${JAKARTA_HOME}
 
 post-patch:
 	${SED} -e s,@JAKARTA_HOME@,${JAKARTA_HOME},g \
@@ -34,10 +34,6 @@ do-build:
 	cd ${WRKSRC}/../jakarta-ant && ${SH} bootstrap.sh
 	cd ${WRKSRC} && ${SH} ./build.sh
 
-post-build:
-	${SED} 's,@TOMCAT_HOME@,${JAKARTA_HOME}/tomcat,g' \
-		< ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
-
 do-install:
 	${MKDIR} ${JAKARTA_HOME}/tomcat
 	cd ${WRKSRC} && ${SH} ./build.sh dist
diff --git a/www/jakarta-tomcat/pkg/MESSAGE b/www/jakarta-tomcat/pkg/MESSAGE
index d17cec029f8..0467bd3d91f 100644
--- a/www/jakarta-tomcat/pkg/MESSAGE
+++ b/www/jakarta-tomcat/pkg/MESSAGE
@@ -1,16 +1,17 @@
-=============================================================
+======================================================================
+$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:46 wiz Exp $
 
 For detailed instructions on how to run Tomcat, either as a
 standalone server or in conjunction with Apache (using the
 www/ap-jserv package), see:
 
-	@TOMCAT_HOME@/doc/uguide/tomcat_ug.html
+	${TOMCAT_HOME}/doc/uguide/tomcat_ug.html
 
-For more information on application development with Tomcat
+For more information on application development with Tomcat, see
 
-	@TOMCAT_HOME@/doc/appdev/index.html
+	${TOMCAT_HOME}/doc/appdev/index.html
 
 Note also that in order for Tomcat to start up, ${JAVA_HOME}
 must point to your JVM installation.
 
-=============================================================
+======================================================================
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 9e1e8ab5bc9..ee2dd6f8274 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/06/22 14:23:26 jwise Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:46 wiz Exp $
 
 DISTNAME=	ApacheJSSI-1.1.2
 PKGNAME=	jssi-1.1.2
@@ -18,11 +18,9 @@ USE_GMAKE=
 NO_CONFIGURE=
 WRKSRC=		${WRKDIR}/ApacheJSSI-1.1.2/src/java
 MAKE_ENV+=	CLASSPATH=${CLASSPATH}
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 post-build:
 	(cd ${WRKSRC}/../../docs && CLASSPATH=${CLASSPATH} ${SH} generate_javadoc)
-	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar
diff --git a/www/jssi/pkg/MESSAGE b/www/jssi/pkg/MESSAGE
index 7e3e9955763..c0e8aeac230 100644
--- a/www/jssi/pkg/MESSAGE
+++ b/www/jssi/pkg/MESSAGE
@@ -1,5 +1,5 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.2 2000/05/09 20:53:19 jwise Exp $
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:46 wiz Exp $
 
 To install Apache-JSSI for use with Apache Server's mod_jserv (from the
 ap-jserv package), add the following line to your httpd.conf:
@@ -8,7 +8,7 @@ ap-jserv package), add the following line to your httpd.conf:
 
 and the following line to your zone.properties:
 
-	repositories=@PREFIX@/lib/java/ApacheJSSI.jar
+	repositories=${PREFIX}/lib/java/ApacheJSSI.jar
 
 To use Apache-JSSI with others servlet engines, see the appropriate
 documentation.
diff --git a/www/php3-mysql/Makefile b/www/php3-mysql/Makefile
index b5e71690115..f6e8b9692da 100644
--- a/www/php3-mysql/Makefile
+++ b/www/php3-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/10/21 23:04:34 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/01/29 11:34:46 wiz Exp $
 #
 
 PKGNAME=	php-mysql-${PHP_VERSION}
@@ -9,8 +9,6 @@ CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 
 BUILDING_EXTENSION_MODULE=yes
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 do-build:
 	cd ${WRKSRC}/functions && \
 		${COMPILE.c} -I.. -I. -I${LOCALBASE}/include/mysql -fPIC -DPIC -DCOMPILE_DL mysql.c && \
@@ -18,6 +16,5 @@ do-build:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/functions/mysql.so ${PREFIX}/lib/php3/
-	${SED} -e 's|@PREFIX@|${PREFIX}|g' ${PKGDIR}/MESSAGE >${MESSAGE_FILE}
 
 .include "../php3/Makefile"
diff --git a/www/php3-mysql/pkg/MESSAGE b/www/php3-mysql/pkg/MESSAGE
index 57bb90dec6e..7ebad5c1862 100644
--- a/www/php3-mysql/pkg/MESSAGE
+++ b/www/php3-mysql/pkg/MESSAGE
@@ -1,12 +1,15 @@
-$NetBSD: MESSAGE,v 1.2 2000/10/02 14:29:23 agc Exp $
+======================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:47 wiz Exp $
 
 To enable fully this package, you will need to ensure that the
 following lines appear in php3.ini (which is normally
-@PREFIX@/etc/php3.ini)
+${PREFIX}/etc/php3.ini)
 
-	extension_dir=@PREFIX@/lib/php3
+	extension_dir=${PREFIX}/lib/php3
 	extension=mysql.so
 
 If you are using the ap-php3 package (php3 as an apache module),
 you will need to restart apache. The command "apachectl restart"
 will do this.
+
+======================================================================
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 4daeca78d42..ae3ce39e640 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/01/25 17:18:07 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/01/29 11:34:47 wiz Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -10,12 +10,6 @@ HOMEPAGE=		http://www.php.net/
 
 CONFLICTS+=		ap-php-4.0.3pl1
 
-MESSAGE_FILE=		${WRKDIR}/.MESSAGE
-
-pre-install:
-	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/cgi-bin
 	${LN} -sf ../../bin/php ${PREFIX}/libexec/cgi-bin/php
diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module
index 2618dd688b2..3d624bfb9e5 100644
--- a/www/php4/Makefile.module
+++ b/www/php4/Makefile.module
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.module,v 1.1.1.1 2000/12/17 09:19:32 jlam Exp $
+# $NetBSD: Makefile.module,v 1.2 2001/01/29 11:34:47 wiz Exp $
 #
 # This Makefile is provided to ease creating PHP4 packages for the extension
 # modules distributed in the PHP4 sources.
@@ -17,24 +17,16 @@ MODULESDIR=		${WRKSRC}/modules
 PLIST_SUBST+=		MODNAME=${MODNAME}
 
 MESSAGE_SRC=		${.CURDIR}/../../www/php4/pkg/MESSAGE.module
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
+MESSAGE_SUBST+=		MODNAME=${MODNAME}		\
+			PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
 PLIST_SRC=		${.CURDIR}/../../www/php4/pkg/PLIST.module
 
 do-build:
 	@cd ${EXTDIR}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_TARGET}
 
-pre-install: pre-module-install
-
 do-install: do-module-install
 
-pre-module-install:
-	${CAT} ${MESSAGE_SRC} | ${SED} \
-		-e "s,@MODNAME@,${MODNAME},g" \
-		-e "s,@PHP_EXTENSION_DIR@,${PHP_EXTENSION_DIR},g" \
-		-e "s,@PREFIX@,${PREFIX},g" \
-		> ${MESSAGE_FILE}
-
 do-module-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${PHP_EXTENSION_DIR}
 	${INSTALL_DATA} ${MODULESDIR}/${MODNAME}.so \
diff --git a/www/php4/pkg/MESSAGE b/www/php4/pkg/MESSAGE
index 626b8ebc121..745b23b834e 100644
--- a/www/php4/pkg/MESSAGE
+++ b/www/php4/pkg/MESSAGE
@@ -1,13 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2000/12/17 21:33:55 jlam Exp $
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:47 wiz Exp $
 
 Example configuration files suitable as a basis for a custom php.ini may
 be found at:
 
-	@PREFIX@/etc/php.ini-dist
-	@PREFIX@/etc/php.ini-optimized
+	${PREFIX}/etc/php.ini-dist
+	${PREFIX}/etc/php.ini-optimized
 
 To process PHP scripts, you will need a PHP-enabled HTTP server.  You may
 either configure the HTTP server to use PHP as a CGI program, or install a
 PHP module for your HTTP server, e.g. ap-php4.
+
 ===========================================================================
diff --git a/www/php4/pkg/MESSAGE.module b/www/php4/pkg/MESSAGE.module
index 3d7537a634c..4bd4adf3fb3 100644
--- a/www/php4/pkg/MESSAGE.module
+++ b/www/php4/pkg/MESSAGE.module
@@ -1,10 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE.module,v 1.2 2001/01/15 16:32:28 jlam Exp $
+$NetBSD: MESSAGE.module,v 1.3 2001/01/29 11:34:47 wiz Exp $
 
 To enable this package, add the following lines to php.ini:
 
-    extension_dir=@PREFIX@/@PHP_EXTENSION_DIR@
-    extension=@MODNAME@.so
+    extension_dir=${PREFIX}/${PHP_EXTENSION_DIR}
+    extension=${MODNAME}.so
 
 and restart your PHP4-enabled HTTP server to load this module.
+
 ===========================================================================
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 3f26e034a7e..55080caac2c 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/01/26 05:21:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.24 2001/01/29 11:34:47 wiz Exp $
 
 DISTNAME=	wwwoffle-2.6
 CATEGORIES=	www
@@ -17,8 +17,7 @@ HOMEPAGE=	http://www.gedanken.demon.co.uk/wwwoffle/
 USE_GMAKE=	yes
 NO_CONFIGURE=	yes
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-PLIST_SRC=	${WRKDIR}/PLIST
+PLIST_SUBST+=	GTAR=${GTAR}
 
 BUILD_DEFS+=	USE_INET6
 
@@ -31,9 +30,6 @@ MAKE_ENV+=	LIBRARY="-lnsl -lsocket"
 post-build:
 	@${SED} -e 's#@PREFIX@#${PREFIX}#g' <${FILESDIR}/wwwoffle.sh \
 	  >${WRKDIR}/wwwoffle.sh
-	@${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \
-	  >${MESSAGE_FILE}
-	@${SED} -e 's#@GTAR@#${GTAR}#g' <${PKGDIR}/PLIST >${PLIST_SRC}
 
 pre-install:
 	${MKDIR} ${PREFIX}/etc/wwwoffle
diff --git a/www/wwwoffle/pkg/MESSAGE b/www/wwwoffle/pkg/MESSAGE
index cb4c297d524..909e2c5cdb7 100644
--- a/www/wwwoffle/pkg/MESSAGE
+++ b/www/wwwoffle/pkg/MESSAGE
@@ -1 +1,6 @@
-Please add "@PREFIX@/etc/rc.d/wwwoffle.sh" to "/etc/rc.local".
+======================================================================
+$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:47 wiz Exp $
+
+Please add "${PREFIX}/etc/rc.d/wwwoffle" to "/etc/rc.local".
+
+======================================================================
diff --git a/www/wwwoffle/pkg/PLIST b/www/wwwoffle/pkg/PLIST
index 7bbd5fbacef..c7997d29e14 100644
--- a/www/wwwoffle/pkg/PLIST
+++ b/www/wwwoffle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2001/01/26 05:21:49 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/01/29 11:34:47 wiz Exp $
 bin/wwwoffle
 bin/wwwoffle-ls
 bin/wwwoffle-mv
@@ -30,7 +30,7 @@ share/doc/wwwoffle/README.lang
 share/doc/wwwoffle/README.udmsearch
 share/doc/wwwoffle/README.win32
 @dirrm share/doc/wwwoffle
-@exec @GTAR@ xzCf / %D/libdata/wwwoffle-spool.tar.gz
+@exec ${GTAR} xzCf / %D/libdata/wwwoffle-spool.tar.gz
 @exec cd /var/wwwoffle/html && mv wwwoffle.pac wwwoffle.pac.dist && sed /PROXY/s/localhost/`hostname`/ <wwwoffle.pac.dist >wwwoffle.pac
 @unexec cd /var/wwwoffle && rm -rf html* lasttime outgoing prevtime* temp
 @unexec rmdir /var/wwwoffle/* 2>/dev/null && rmdir /var/wwwoffle ; :