From 6556d193110e2b17235c01a0344a3680b38a87b7 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Fri, 15 Dec 2000 17:36:22 +0000
Subject: [PATCH] Use customary framework for INSTALL/DEINSTALL scripts; fixes
 INSTALL.

---
 www/php4/pkg/DEINSTALL |  6 +++---
 www/php4/pkg/INSTALL   | 47 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/www/php4/pkg/DEINSTALL b/www/php4/pkg/DEINSTALL
index cf51d93fa4f..3aaf1b10eef 100644
--- a/www/php4/pkg/DEINSTALL
+++ b/www/php4/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2000/09/03 11:55:00 jakob Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2000/12/15 17:36:22 naddy Exp $
 #
 # php4 de-installation
 
-CONF=`/usr/sbin/apxs -q SYSCONFDIR`/httpd.conf
-
 set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+CONF=`apxs -q SYSCONFDIR`/httpd.conf
 
 rm -f /usr/lib/apache/modules/libphp4.so
 
diff --git a/www/php4/pkg/INSTALL b/www/php4/pkg/INSTALL
index 69bceba6c78..af155fac4cf 100644
--- a/www/php4/pkg/INSTALL
+++ b/www/php4/pkg/INSTALL
@@ -1,18 +1,47 @@
 #!/bin/sh
 #
-# $OpenBSD: INSTALL,v 1.1.1.1 2000/09/03 11:55:00 jakob Exp $
+# $OpenBSD: INSTALL,v 1.2 2000/12/15 17:36:22 naddy Exp $
 #
 # php4 installation
 
+# exit on errors, use a sane path and install prefix
+#
 set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
 
-echo
-echo "+---------------"
-echo "| To finish the install, you need to enable the php4"
-echo "| module using the following command"
-echo "|"
-echo "|   ${PKG_PREFIX}/sbin/php4-enable"
-echo "+---------------"
-echo
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| To finish the install, you need to enable the php4"
+    echo "| module using the following command"
+    echo "|"
+    echo "|       $PREFIX/sbin/php4-enable"
+    echo "+---------------"
+    echo
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	do_notice $1
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
 
 exit 0