Unfortunately PHP has several openssl hooks, which are only enabled

when the base PHP is compiled with openssl extension (e.g. ssl://, tls://
stream support, and couple others). These don't work when SSL support
is loaded via extension.

For this reason, make openssl extension unconditionally built-in
into the main PHP package, and g/c security/php-openssl.

4 files changed, 10 insertions, 6 deletions

diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile
index 5993c4e3bca..c29dbb4eb28 100644
--- a/www/ap-php/Makefile
+++ b/www/ap-php/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/10/07 16:51:41 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/08 16:49:36 jdolecek Exp $
 #
 
 PKGNAME=		ap-php-${PHP_BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		Apache (${PKG_APACHE}) module for ${PKG_PHP}
 
 APACHE_MODULE=		YES
diff --git a/www/php4/MESSAGE b/www/php4/MESSAGE
index f47f633debe..b7cf176a0de 100644
--- a/www/php4/MESSAGE
+++ b/www/php4/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.8 2004/12/16 17:42:14 jdolecek Exp $
+$NetBSD: MESSAGE,v 1.9 2005/10/08 16:49:35 jdolecek Exp $
 
 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
@@ -12,4 +12,7 @@ Some additional packages you may wish to install are:
 
 Note that php4-pcre, php4-session and php4-xml are no longer
 separate packages since 4.3.3, the main PHP4 package has them built-in now.
+
+Note php-openssl has been removed as separate package as of 4.4.0nb2, the
+main PHP4 package has them built-in now.
 ===========================================================================
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 03977cd529a..f930f9452ea 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/10/05 15:59:47 tron Exp $
+# $NetBSD: Makefile,v 1.54 2005/10/08 16:49:35 jdolecek Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES+=		lang
 COMMENT=		HTML-embedded scripting language
 
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 5f7565aa979..754422910fc 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.23 2005/09/04 20:13:59 jlam Exp $
+# $NetBSD: Makefile.php,v 1.24 2005/10/08 16:49:35 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -40,6 +40,7 @@ CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
 PKG_SUPPORTED_OPTIONS+=	ssl
+PKG_SUGGESTED_OPTIONS+=	ssl
 
 .include "../../mk/bsd.options.mk"