diff options
Diffstat (limited to 'mail/postfix-current/scripts/configure.postfix')
| -rw-r--r-- | mail/postfix-current/scripts/configure.postfix | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix index 2096139a21bd..ba8aae46b62a 100644 --- a/mail/postfix-current/scripts/configure.postfix +++ b/mail/postfix-current/scripts/configure.postfix @@ -23,19 +23,17 @@ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ -TLS "SSL and TLS (broken)" "$status_TLS" \ -IPv6 "IPv6 support (broken)" "$status_IPv6" \ -IPv6TLS "IPv6 support with SSL and TLS (broken)" "$status_IPv6TLS" \ +TLS "SSL and TLS" "$status_TLS" \ +IPv6 "IPv6 support" "$status_IPv6" \ +IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -MySQL "MySQL map lookups" "$status_MySQL" \ +MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ PgSQL "PostgreSQL v7.4 map lookups" "$status_PgSQL" \ PgSQL73 "PostgreSQL v7.3 map lookups" "$status_PgSQL73" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ -OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ -OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ -OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ +OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile @@ -80,6 +78,7 @@ while [ "$1" ]; do echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then + echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi @@ -93,6 +92,7 @@ while [ "$1" ]; do echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then + echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi @@ -107,8 +107,8 @@ while [ "$1" ]; do echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-20031113-0.9.7c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-20031113-0.9.7c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.18-2.0.18-20040205-0.9.7c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.18-2.0.18-20040205-0.9.7c/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" @@ -150,7 +150,7 @@ while [ "$1" ]; do DB41_SELECTED="YES" ;; MySQL) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" + echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" @@ -176,23 +176,11 @@ while [ "$1" ]; do echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" ;; - OpenLDAP12) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" + OpenLDAP) + echo "USE_OPENLDAP=YES" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" - echo "OPENLDAP_SUFFIX= +openldap12" - ;; - OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" - echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - echo "POSTFIX_AUXLIBS+= -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap20" - ;; - OpenLDAP21) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" - echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - echo "POSTFIX_AUXLIBS+= -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" @@ -205,7 +193,7 @@ while [ "$1" ]; do exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.18b-pf-2.0.16-20030921.patch.gz" + echo "PATCHFILES+= ipv6-1.21a-pf-2.0.18-20040209.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" @@ -223,7 +211,7 @@ while [ "$1" ]; do echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.18b-pf-2.0.16-20030921.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.21a-pf-2.0.18-20040209.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" |