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.

3 files changed, 1 insertions, 24 deletions

diff --git a/security/Makefile b/security/Makefile
index a0ad9e49615..b1c5f86aee1 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2005/09/03 22:47:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.246 2005/10/08 16:49:35 jdolecek Exp $
 #
 
 COMMENT=	Security tools
@@ -173,7 +173,6 @@ SUBDIR+=	pgpdump
 SUBDIR+=	pgpenvelope
 SUBDIR+=	php-mcrypt
 SUBDIR+=	php-mhash
-SUBDIR+=	php-openssl
 SUBDIR+=	pinentry
 SUBDIR+=	pinepgp
 SUBDIR+=	pks
diff --git a/security/php-openssl/DESCR b/security/php-openssl/DESCR
deleted file mode 100644
index 02094829dfa..00000000000
--- a/security/php-openssl/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to the OpenSSL library.
diff --git a/security/php-openssl/Makefile b/security/php-openssl/Makefile
deleted file mode 100644
index 2e39d60c2ec..00000000000
--- a/security/php-openssl/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:17 tv Exp $
-
-MODNAME=		openssl
-CATEGORIES+=		security
-PKGREVISION=		# empty
-COMMENT=		PHP extension for the OpenSSL library
-
-
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.openssl}
-
-# the config test for -lssl fails to link in -lcrypto; just force it
-# to succeed
-CONFIGURE_ENV+=		ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
-
-post-extract:
-	cd ${WRKSRC} && ln -s config0.m4 config.m4
-
-.include "../../lang/php/ext.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"