diff options
| author | kuriyama <kuriyama@FreeBSD.org> | 2003-08-15 00:49:31 +0000 |
|---|---|---|
| committer | kuriyama <kuriyama@FreeBSD.org> | 2003-08-15 00:49:31 +0000 |
| commit | 23487909ca7033a70fc30adfb2f3bdadddcee493 (patch) | |
| tree | c7a9a132ab286601d6d7a3590fd42cad88671385 /mail | |
| parent | 39602a96bc814acbf78e72edd603b5471a42823c (diff) | |
| download | FreeBSD-ports-23487909ca7033a70fc30adfb2f3bdadddcee493.zip FreeBSD-ports-23487909ca7033a70fc30adfb2f3bdadddcee493.tar.gz | |
Fix non-default dependency on openldap2[012] which is broken by splitting.
# I'm not bumped port revision of them because this should not affect
# packages built on bento...
Diffstat (limited to 'mail')
27 files changed, 54 insertions, 54 deletions
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 894e3d9..a590680 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -69,7 +69,7 @@ RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot CONFIGURE_ARGS+= --enable-jpilot .endif .if defined(WITH_LDAP) || defined(WITH_ALL) -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client CONFIGURE_ARGS+= --enable-ldap CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g} .endif diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index b3fa3cc..6505ed4 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -89,11 +89,11 @@ CONFIGURE_ARGS+=--with-authldap PLIST_SUB+= LDAPFLAG="" .if defined(WITH_LDAP21) -LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap21 \ - lber.2:${PORTSDIR}/net/openldap21 +LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap21-client \ + lber.2:${PORTSDIR}/net/openldap21-client .elseif defined(WITH_LDAP20) -LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20 \ - lber.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20-client \ + lber.2:${PORTSDIR}/net/openldap20-client .else LIB_DEPENDS= ldap.1:${PORTSDIR}/net/openldap12 \ lber.1:${PORTSDIR}/net/openldap12 diff --git a/mail/courier/scripts/configure.courier b/mail/courier/scripts/configure.courier index 2d1b2b3..c1c571b 100644 --- a/mail/courier/scripts/configure.courier +++ b/mail/courier/scripts/configure.courier @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.7 2003-08-09 22:40:32 oliver Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.8 2003-08-15 00:49:28 kuriyama Exp $ [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ] && exit @@ -210,7 +210,7 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "LIB_DEPENDS+= ldap.2:\${PORTSDIR}/net/openldap21" + echo "LIB_DEPENDS+= ldap.2:\${PORTSDIR}/net/openldap21-client" CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib" WITH_LDAP="--with-authldap" diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile index 1504751..59029b3 100644 --- a/mail/dovecot-devel/Makefile +++ b/mail/dovecot-devel/Makefile @@ -78,7 +78,7 @@ CONFIGURE_ARGS+= --with-vpopmail # user database. # .if WITH_LDAP2 -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client CONFIGURE_ARGS+= --with-ldap .endif diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 1504751..59029b3 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -78,7 +78,7 @@ CONFIGURE_ARGS+= --with-vpopmail # user database. # .if WITH_LDAP2 -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client CONFIGURE_ARGS+= --with-ldap .endif diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile index aaebf4e..c9ac41a 100644 --- a/mail/exim-old/Makefile +++ b/mail/exim-old/Makefile @@ -118,7 +118,7 @@ SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,,' .if (${LDAP_LIB_TYPE} == OPENLDAP1) || (${LDAP_LIB_TYPE} == UMICHIGAN) LIB_DEPENDS+= lber.1:${PORTSDIR}/net/openldap12 .elif ${LDAP_LIB_TYPE} == OPENLDAP2 -LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20-client .else .error LDAP_LIB_TYPE must be either OPENLDAP1 or OPENLDAP2 .endif diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile index 4eb0de7..5dbd238 100644 --- a/mail/imp3/Makefile +++ b/mail/imp3/Makefile @@ -68,7 +68,7 @@ LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient .if exists(${LOCALBASE}/lib/libldap.so.1) LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 .else -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client .endif .endif RUN_DEPENDS+= ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2 diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix index c98fc90..7a12d2f 100644 --- a/mail/postfix-current/scripts/configure.postfix +++ b/mail/postfix-current/scripts/configure.postfix @@ -174,13 +174,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix index e4253b8..681ec79 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix index c23a1a0..11f6afd 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix index f6241a2..0a3fa16 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix index 6689a0b..d2939fd 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix index 9064495..658da9b 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix index 2b8f58e..a61d6dd 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix index 984d0b3..7d2780d 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix index ed9bcf6..4c8b62e 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix index 368765b..9890dac 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix index 4eaa800..7da993a 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.37 2003-07-07 08:28:33 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -180,13 +180,13 @@ while [ "$1" ]; do echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/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" + 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" diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index 90ce24e..1bd282a 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -22,7 +22,7 @@ COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support .if !defined(WITH_LDAP2) LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 .else -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client .endif .if defined(WITH_LDAP2) diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile index ff0ba8a..90b3b62 100644 --- a/mail/sendmail-old/Makefile +++ b/mail/sendmail-old/Makefile @@ -37,8 +37,8 @@ MAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \ .if defined(SENDMAIL_WITH_LDAP) PKGNAMESUFFIX?= -ldap -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 -LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client +LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20-client .endif .if defined(SENDMAIL_WITH_SASL) LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile index ff0ba8a..90b3b62 100644 --- a/mail/sendmail811/Makefile +++ b/mail/sendmail811/Makefile @@ -37,8 +37,8 @@ MAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \ .if defined(SENDMAIL_WITH_LDAP) PKGNAMESUFFIX?= -ldap -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 -LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client +LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20-client .endif .if defined(SENDMAIL_WITH_SASL) LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile index 894e3d9..a590680 100644 --- a/mail/sylpheed-claws/Makefile +++ b/mail/sylpheed-claws/Makefile @@ -69,7 +69,7 @@ RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot CONFIGURE_ARGS+= --enable-jpilot .endif .if defined(WITH_LDAP) || defined(WITH_ALL) -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client CONFIGURE_ARGS+= --enable-ldap CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g} .endif diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index d6e33c4..a64985b 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--enable-jpilot CONFIGURE_ARGS+= --disable-jpilot .endif .if defined(WITH_LDAP) -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client CONFIGURE_ARGS+=--enable-ldap .else CONFIGURE_ARGS+=--disable-ldap diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile index d6e33c4..a64985b 100644 --- a/mail/sylpheed2-devel/Makefile +++ b/mail/sylpheed2-devel/Makefile @@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--enable-jpilot CONFIGURE_ARGS+= --disable-jpilot .endif .if defined(WITH_LDAP) -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client CONFIGURE_ARGS+=--enable-ldap .else CONFIGURE_ARGS+=--disable-ldap diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile index d6e33c4..a64985b 100644 --- a/mail/sylpheed2/Makefile +++ b/mail/sylpheed2/Makefile @@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--enable-jpilot CONFIGURE_ARGS+= --disable-jpilot .endif .if defined(WITH_LDAP) -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client CONFIGURE_ARGS+=--enable-ldap .else CONFIGURE_ARGS+=--disable-ldap diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile index d6e33c4..a64985b 100644 --- a/mail/sylpheed3/Makefile +++ b/mail/sylpheed3/Makefile @@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--enable-jpilot CONFIGURE_ARGS+= --disable-jpilot .endif .if defined(WITH_LDAP) -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client CONFIGURE_ARGS+=--enable-ldap .else CONFIGURE_ARGS+=--disable-ldap diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile index af8cc30..c68f33d 100644 --- a/mail/tpop3d/Makefile +++ b/mail/tpop3d/Makefile @@ -18,7 +18,7 @@ COMMENT= Virtual-domain capable POP3 server supporting MySQL auth LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client .endif .if defined(WITH_LDAP) -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client .endif # perl authentication |
