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.

4 files changed, 12 insertions, 24 deletions

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.
+
 ===========================================================================