Update ap-php and php to 4.0.6. Changes from version 4.0.5 include:

- Bug fixes (memory leaks and other errors)
- Made $HTTP_SESSION_VARS['foo'] and $foo be references to the same value
  when register_globals is on. (Andrei)
- Added is_callable() function that can be used to find out whether
  its argument is a valid callable construct. (Andrei)
- Added pg_last_notice() function. (Rasmus from suggestion by Dirk@rackspace.com)
- Added support to getimagesize to return dimensions of BMP and PSD
  files. (Derick)
- Added Japanese multibyte string functions support. (Rui)
- Added key_exists() to check if a given key or index exists in an
  array or object. (David Croft)
- Added -C command-line option to avoid chdir to the script's directory. (Stig)
- printf argnum (parameter swapping) support. (Morten Poulsen, Rasmus)
- Modified get_parent_class() and get_class_methods() to accept a class name as
  well as a class instance. (Andrei, Zend Engine)
- Added array_map() function that applies a callback to the elements
  of given arrays and returns the result. It can also be used with a
  null callback to transpose arrays. (Andrei)
- Added array_filter(), which allows filtering of array elements via
  the specified callback. (Andrei)

2 files changed, 11 insertions, 13 deletions

diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile
index 3104c45496e..8a69a9e2d38 100644
--- a/www/ap-php4/Makefile
+++ b/www/ap-php4/Makefile
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.15 2001/05/20 05:23:28 jonb Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/16 04:54:23 jlam Exp $
 
-.include "../../www/php4/Makefile.common"
-
-PKGNAME=		ap-php-${PHP_MODULE_VERS}
+.include "../php4/Makefile.php"
 
+PKGNAME=		ap-php-${PHP_VERS}
 PHP_PKG_VERS=		# empty
-PHP_MODULE_VERS=	${PHP_BASE_VERS}${PHP_PKG_VERS}
-
-COMMENT=		PHP4: Hypertext Preprocessor (Apache module)
+COMMENT=		Apache module for PHP4
 
-DEPENDS+=		php-${PHP_VERS}:../../www/php4
+DEPENDS+=		php>=${PHP_BASE_VERS}:../php4
 DEPENDS+=		apache{,6}>=1.3:../../www/apache
 
 # For "apxs":
 BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 
+USE_BUILDLINK_ONLY=	YES
 CONFIGURE_ARGS+=	--with-apxs=${LOCALBASE}/sbin/apxs
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		-Wl,--export-dynamic
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/.libs/libphp4.so 			\
+	${INSTALL_DATA} ${WRKSRC}/.libs/libphp4.so	\
 		${PREFIX}/lib/httpd/mod_php4.so
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-php4/pkg/DESCR b/www/ap-php4/pkg/DESCR
index e1b720a6020..98b126e653d 100644
--- a/www/ap-php4/pkg/DESCR
+++ b/www/ap-php4/pkg/DESCR
@@ -1,6 +1,6 @@
-PHP is an HTML-embedded scripting language. Much of its syntax is
-borrowed from C, Java and Perl with a couple of unique PHP-specific
-features thrown in. The goal of the language is to allow web
-developers to write dynamically generated pages quickly.
+PHP is an HTML-embedded scripting language.  Much of its syntax is borrowed
+from C, Java and Perl with a couple of unique PHP-specific features thrown
+in.  The goal of the language is to allow web developers to write
+dynamically generated pages quickly.
 
 This package contains the dynamically loadable PHP4 Apache module.