diff options
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 31 | ||||
| -rw-r--r-- | mk/bsd.pkg.obsolete.mk | 45 |
2 files changed, 46 insertions, 30 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 5b880c1f4be..82b1761601e 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.259 2004/07/16 23:21:50 xtraeme Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.260 2004/07/19 20:00:15 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -1768,30 +1768,11 @@ PKG_LANG?=english # Possible: YES, not defined # Default: not defined -#POSTFIX_USE_INET6=YES -# Add support for IPv6. -# Possible: YES, not defined -# Default: not defined - -#POSTFIX_USE_MYSQL=YES -# Add support for MySQL maps. -# Possible: YES, not defined -# Default: not defined - -#POSTFIX_USE_PCRE=YES -# Add support for Perl Compatible Regular Expressions. -# Possible: YES, not defined -# Default: not defined - -#POSTFIX_USE_TLS=YES -# Add support for TLS. -# Possible: YES, not defined -# Default: not defined - -#POSTFIX_VERP=YES -# Add support for Variable Envelope Return Paths. -# Possible: YES, not defined -# Default: not defined +#POSTFIX_OPTIONS?= inet6 mysql sasl +# Add support for various optional add-ons to Postfix. +# Possible: Valid values can be found in POSTFIX_ALL_OPTIONS in +# mail/postfix/Makefile.options. +# Default: empty PURE_FTPD_USE_MYSQL?= NO # Compile in MySQL support. diff --git a/mk/bsd.pkg.obsolete.mk b/mk/bsd.pkg.obsolete.mk index 087c61e992f..47df7e62170 100644 --- a/mk/bsd.pkg.obsolete.mk +++ b/mk/bsd.pkg.obsolete.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.obsolete.mk,v 1.12 2004/06/14 03:16:43 uebayasi Exp $ +# $NetBSD: bsd.pkg.obsolete.mk,v 1.13 2004/07/19 20:00:15 jlam Exp $ # # This file holds make(1) logic to allow obsolete or deprecated variables # still to be used. These may eventually disappear over time as the contents @@ -34,10 +34,6 @@ PKG_SYSCONFDIR.ssh?= ${SSH_CONF_DIR} PKG_SYSCONFDIR.vtun?= ${VTUN_SYSCONFDIR} .endif -.if defined(POSTFIX_USE_SASL_AUTH) -USE_SASL= YES -.endif - .if defined(SAMBA_WITH_CUPS) USE_CUPS= YES .endif @@ -53,3 +49,42 @@ ELK_GUI= xaw .if defined(PRIV_CONF_DIR) PKG_SYSCONFDIR.priv?= ${PRIV_CONF_DIR} .endif + +.if defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \ + defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \ + defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_VERP) || \ + defined(POSTFIX_USE_SASL_AUTH) || defined(USE_SASL) || \ + defined(USE_SASL2) || defined(USE_OPENLDAP) +. if !defined(POSTFIX_OPTIONS) +. if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) +POSTFIX_OPTIONS+= inet6 +. endif +. if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) +POSTFIX_OPTIONS+= tls +. endif +. if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) +POSTFIX_OPTIONS+= pcre +. endif +. if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) +POSTFIX_OPTIONS+= mysql +. endif +. if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) +POSTFIX_OPTIONS+= pgsql +. endif +. if defined(POSTFIX_USE_VERP) && !empty(POSTFIX_USE_VERP:M[yY][eE][sS]) +POSTFIX_OPTIONS+= verp +. endif +. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) +POSTFIX_OPTIONS+= ldap +. endif +. if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) +USE_SASL= YES +. endif +. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) +POSTFIX_OPTIONS+= sasl +. endif +. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +POSTFIX_OPTIONS+= sasl +. endif +. endif +.endif |