[pkgsrc/trunk]: pkgsrc Bring back the "ssl" option so that the builder may ha...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1798d49aeeb7
branches:  trunk
changeset: 501254:1798d49aeeb7
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Oct 19 18:05:06 2005 +0000

description:
Bring back the "ssl" option so that the builder may have the *option* to
turn it off.  It's still on by default (in PKG_SUGGESTED_OPTIONS), so
no PKGREVISION bump required.

diffstat:

 lang/php5/Makefile.php |  15 ++++++++++-----
 www/php4/Makefile.php  |  15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r f502ea731a11 -r 1798d49aeeb7 lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Wed Oct 19 15:28:14 2005 +0000
+++ b/lang/php5/Makefile.php    Wed Oct 19 18:05:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.10 2005/10/16 12:06:05 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.11 2005/10/19 18:11:26 tv Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -40,11 +40,9 @@
 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+=        inet6
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl
+PKG_SUGGESTED_OPTIONS+=        ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -53,3 +51,10 @@
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl
+.else
+CONFIGURE_ARGS+=       --without-openssl
+.endif
diff -r f502ea731a11 -r 1798d49aeeb7 www/php4/Makefile.php
--- a/www/php4/Makefile.php     Wed Oct 19 15:28:14 2005 +0000
+++ b/www/php4/Makefile.php     Wed Oct 19 18:05:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.27 2005/10/16 12:06:05 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.28 2005/10/19 18:05:06 tv Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -31,9 +31,6 @@
 CONFIGURE_ARGS+=       --enable-memory-limit
 CONFIGURE_ARGS+=       --enable-track-vars
 
-CONFIGURE_ARGS+=       --with-openssl
-.include "../../security/openssl/buildlink3.mk"
-
 # Support for linking some PHP4 extensions statically into the php CGI and
 # into the apache mod_php.so DSO.
 #
@@ -52,7 +49,8 @@
 CONFIGURE_ENV+=                EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
-PKG_SUPPORTED_OPTIONS+=        inet6
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl
+PKG_SUGGESTED_OPTIONS+=        ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -61,3 +59,10 @@
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl
+.else
+CONFIGURE_ARGS+=       --without-openssl
+.endif