pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/pure-ftpd * properly mark the legacy variables.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6442f234da23
branches:  trunk
changeset: 508719:6442f234da23
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Fri Feb 24 09:15:38 2006 +0000

description:
* properly mark the legacy variables.
* remove the -I flag for mysql option as this is handled by the bl3.mk file.

diffstat:

 net/pure-ftpd/options.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r b655cd171d5b -r 6442f234da23 net/pure-ftpd/options.mk
--- a/net/pure-ftpd/options.mk  Fri Feb 24 08:13:12 2006 +0000
+++ b/net/pure-ftpd/options.mk  Fri Feb 24 09:15:38 2006 +0000
@@ -1,7 +1,13 @@
-# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
+# $NetBSD: options.mk,v 1.4 2006/02/24 09:15:38 ghen Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pureftpd
 PKG_SUPPORTED_OPTIONS= ldap mysql pgsql ssl virtualchroot
+
+PKG_OPTIONS_LEGACY_VARS+=      PURE_FTPD_USE_MYSQL:mysql
+PKG_OPTIONS_LEGACY_VARS+=      PURE_FTPD_USE_PGSQL:pgsql
+PKG_OPTIONS_LEGACY_VARS+=      PURE_FTPD_USE_TLS:ssl
+PKG_OPTIONS_LEGACY_VARS+=      PURE_FTPD_USE_VIRTUAL_CHROOT:virtualchroot
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mldap)
@@ -12,22 +18,18 @@
 .if !empty(PKG_OPTIONS:Mmysql)
 .  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-mysql
-CPPFLAGS+=             -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-pgsql
-BUILD_DEFS+=           PURE_FTPD_USE_PGSQL
 .endif
 
 .if !empty(PKG_OPTIONS:Mssl)
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-tls
-BUILD_DEFS+=           PURE_FTPD_USE_TLS
 .endif
 
 .if !empty(PKG_OPTIONS:Mvirtualchroot)
 CONFIGURE_ARGS+=       --with-virtualchroot
-BUILD_DEFS+=           PURE_FTPD_USE_VIRTUAL_CHROOT
 .endif



Home | Main Index | Thread Index | Old Index