diff options
-rw-r--r-- | mail/postfix/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix20/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix21/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix22/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix23/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix24/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix25/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix26/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix27/scripts/configure.postfix | 30 | ||||
-rw-r--r-- | mail/postfix28/scripts/configure.postfix | 30 |
10 files changed, 90 insertions, 210 deletions
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix index 790f1c9d5509..233749169125 100644 --- a/mail/postfix/scripts/configure.postfix +++ b/mail/postfix/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix index 5f614e74cdf2..145244929737 100644 --- a/mail/postfix20/scripts/configure.postfix +++ b/mail/postfix20/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix index c68b0d72ff8e..92ca87457c3d 100644 --- a/mail/postfix21/scripts/configure.postfix +++ b/mail/postfix21/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix index d38f6baf1e64..4be9bf9e5149 100644 --- a/mail/postfix22/scripts/configure.postfix +++ b/mail/postfix22/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix index 70d942cb14e9..0916f76c6679 100644 --- a/mail/postfix23/scripts/configure.postfix +++ b/mail/postfix23/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix index 5201fbe60460..f41ff53d3783 100644 --- a/mail/postfix24/scripts/configure.postfix +++ b/mail/postfix24/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix index dad3c2a0a585..6f9a043bc75a 100644 --- a/mail/postfix25/scripts/configure.postfix +++ b/mail/postfix25/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix index 2535d3aa961f..b7f2b6662f1d 100644 --- a/mail/postfix26/scripts/configure.postfix +++ b/mail/postfix26/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix index f8bcd368f730..7fc7a8f3927c 100644 --- a/mail/postfix27/scripts/configure.postfix +++ b/mail/postfix27/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix index 34d81c78a1d6..f452cf46c104 100644 --- a/mail/postfix28/scripts/configure.postfix +++ b/mail/postfix28/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.43 2004-02-20 15:36:26 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.44 2004-03-10 22:54:03 ale Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -29,13 +29,11 @@ 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 USE_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 @@ -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" @@ -185,23 +185,11 @@ while [ "$1" ]; do echo "PATCH_DIST_STRIP= -p1" 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+= -L\${LOCALBASE}/lib -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+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap21" + echo "OPENLDAP_SUFFIX= +openldap" ;; Test) echo "BIN1= smtp-sink smtp-source" |