[pkgsrc/trunk]: pkgsrc/databases Add an options.mk for SSL support

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f2ebdc3960f
branches:  trunk
changeset: 530813:7f2ebdc3960f
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Mon Jul 09 22:27:35 2007 +0000

description:
Add an options.mk for SSL support
Suggested by pancake@ in PR #28573

diffstat:

 databases/mysql4-client/Makefile.common |   5 ++---
 databases/mysql4-client/options.mk      |  18 ++++++++++++++++++
 databases/mysql5-client/Makefile.common |   5 ++---
 databases/mysql5-client/options.mk      |  18 ++++++++++++++++++
 4 files changed, 40 insertions(+), 6 deletions(-)

diffs (106 lines):

diff -r 0fd8e1d8b75e -r 7f2ebdc3960f databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common   Mon Jul 09 21:51:30 2007 +0000
+++ b/databases/mysql4-client/Makefile.common   Mon Jul 09 22:27:35 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2007/07/04 20:54:35 jlam Exp $
+# $NetBSD: Makefile.common,v 1.59 2007/07/09 22:27:36 adrianp Exp $
 
 DISTNAME=              mysql-4.1.22
 CATEGORIES=            databases
@@ -11,6 +11,7 @@
 GNU_CONFIGURE=         yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 EXTRACT_USING=         pax
 
@@ -62,7 +63,6 @@
 CONFIGURE_ARGS+=       --without-debug
 CONFIGURE_ARGS+=       --without-bench
 CONFIGURE_ARGS+=       --with-low-memory
-CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=       --with-vio
 
 CONFIGURE_ARGS+=       --with-charset=${MYSQL_CHARSET:Q}
@@ -114,5 +114,4 @@
                        -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scripts= Fixing scripts.
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r 0fd8e1d8b75e -r 7f2ebdc3960f databases/mysql4-client/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-client/options.mk        Mon Jul 09 22:27:35 2007 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2007/07/09 22:27:35 adrianp Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql4-client
+
+PKG_SUPPORTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Enable OpenSSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.      include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+.else
+CONFIGURE_ARGS+=       --without-openssl
+.endif
diff -r 0fd8e1d8b75e -r 7f2ebdc3960f databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Mon Jul 09 21:51:30 2007 +0000
+++ b/databases/mysql5-client/Makefile.common   Mon Jul 09 22:27:35 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2007/07/09 20:01:44 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.24 2007/07/09 22:34:27 adrianp Exp $
 
 DISTNAME=              mysql-5.0.41
 CATEGORIES=            databases
@@ -11,6 +11,7 @@
 GNU_CONFIGURE=         yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 EXTRACT_USING=         pax
 
@@ -56,7 +57,6 @@
 CONFIGURE_ARGS+=       --without-debug
 CONFIGURE_ARGS+=       --without-bench
 CONFIGURE_ARGS+=       --with-low-memory
-CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl:Q}
 CONFIGURE_ARGS+=       --with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q}
 CONFIGURE_ARGS+=       --with-vio
 
@@ -122,5 +122,4 @@
 pre-configure:
        cd ${WRKSRC} && autoconf
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r 0fd8e1d8b75e -r 7f2ebdc3960f databases/mysql5-client/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql5-client/options.mk        Mon Jul 09 22:27:35 2007 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2007/07/09 22:34:27 adrianp Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql5-client
+
+PKG_SUPPORTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Enable OpenSSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.      include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+.else
+CONFIGURE_ARGS+=       --without-openssl
+.endif