pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/php4 openssl is included unconditionally



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec095a5dbeb7
branches:  trunk
changeset: 500461:ec095a5dbeb7
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Oct 08 20:34:26 2005 +0000

description:
openssl is included unconditionally

diffstat:

 www/php4/Makefile.php |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r ba45236c1e2f -r ec095a5dbeb7 www/php4/Makefile.php
--- a/www/php4/Makefile.php     Sat Oct 08 19:55:21 2005 +0000
+++ b/www/php4/Makefile.php     Sat Oct 08 20:34:26 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.24 2005/10/08 16:49:35 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.25 2005/10/08 20:34:26 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -21,6 +21,9 @@
 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.
 #
@@ -39,12 +42,5 @@
 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"
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-openssl
-.endif



Home | Main Index | Thread Index | Old Index