From e4855206f0db4ae35c43079fd4ea8e66ab68b05b Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@pkgsrc.org>
Date: Sat, 8 Oct 2005 16:49:35 +0000
Subject: 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.
---
 lang/php5/MESSAGE      |  7 +++++++
 lang/php5/Makefile     |  4 ++--
 lang/php5/Makefile.php | 11 ++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 lang/php5/MESSAGE

(limited to 'lang')

diff --git a/lang/php5/MESSAGE b/lang/php5/MESSAGE
new file mode 100644
index 00000000000..0955f8edf4a
--- /dev/null
+++ b/lang/php5/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.3 2005/10/08 16:50:23 jdolecek Exp $
+
+Note php-openssl has been removed as separate package as of 5.0.5nb1, the
+main PHP5 package has them built-in now.
+===========================================================================
+
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index c04106275d1..28abb99d253 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/09/08 18:49:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.17 2005/10/08 16:49:35 jdolecek Exp $
 #
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		# empty
+PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index a716eacef30..69b59006a4b 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.7 2005/09/04 20:13:59 jlam Exp $
+# $NetBSD: Makefile.php,v 1.8 2005/10/08 16:49:35 jdolecek Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -34,8 +34,10 @@ CONFIGURE_ARGS+=	--enable-xml
 CONFIGURE_ARGS+=	--with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
+CONFIGURE_ARGS+=	--with-openssl
+.include "../../security/openssl/buildlink3.mk"
+
 PKG_OPTIONS_VAR=		PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
-PKG_SUPPORTED_OPTIONS+=	ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -44,8 +46,3 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-openssl
-.endif
-- 
cgit v1.2.3