Date: Tue, 10 Jun 2003 00:51:30 +0200 (CEST) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53123: mail/turba & mail/imp3: replacing dependencies from openldap20 to openldap21. Message-ID: <20030609225130.3260276BC@graf.pompo.net> Resent-Message-ID: <200306092300.h59N0TBd084898@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53123 >Category: ports >Synopsis: mail/turba & mail/imp3: replacing dependencies from openldap20 to openldap21. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jun 09 16:00:29 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.8-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.8-STABLE FreeBSD 4.8-STABLE #0: Tue Apr 29 18:16:35 CEST 2003 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386 >Description: PHP 4.3.2 depends on net/openldap21, but Turba & IMP depend on PHP and on net/openldap20. Since both net/openldap20 and net/openldap21 register ldap.2, the installation runs smoothly, but /var/db/pkg is scrambled, and you have to run `pkgdb -F'. >How-To-Repeat: Install PHP whith OpenLDAP2, then install Turba & IMP, and check the dependencies. >Fix: Please apply the following patches: --- turba.diff begins here --- diff -urN mail/turba.orig/Makefile mail/turba/Makefile --- mail/turba.orig/Makefile Mon Apr 14 21:01:11 2003 +++ mail/turba/Makefile Tue Jun 10 00:04:30 2003 @@ -7,6 +7,7 @@ PORTNAME= turba PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ ftp://ftp.au.horde.org/pub/horde/turba/ \ @@ -19,22 +20,17 @@ COMMENT= The Horde contact management application #----------------------------------------------------------------------- -# You may define these options: +# You may define this option: # # - WITHOUT_LDAP : if you do not need OpenLDAP; -# - WITH_LDAP1 : if you prefer OpenLDAP1. -# -# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree; # #----------------------------------------------------------------------- .if !defined(WITHOUT_LDAP) -.if defined(WITH_LDAP1) -LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 \ - lber.1:${PORTSDIR}/net/openldap12 +.if exists(${LOCALBASE}/lib/libldap.so.1) +LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 .else -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 \ - lber.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21 .endif .endif @@ -70,7 +66,7 @@ pre-install: .if !defined(WITHOUT_LDAP) -.if defined(WITH_LDAP1) +.if exists(${LOCALBASE}/lib/libldap.so.1) @if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.1"; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \ --- turba.diff ends here --- --- imp3.diff begins here --- diff -urN mail/imp3.orig/Makefile mail/imp3/Makefile --- mail/imp3.orig/Makefile Fri Apr 18 09:30:56 2003 +++ mail/imp3/Makefile Tue Jun 10 00:04:44 2003 @@ -7,7 +7,7 @@ PORTNAME= imp PORTVERSION= 3.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/imp/ \ ftp://ftp.au.horde.org/pub/horde/imp/ \ @@ -23,7 +23,6 @@ # You may define these options: # # - WITHOUT_LDAP : if you do not need OpenLDAP; -# - WITH_LDAP1 : if you prefer OpenLDAP1. # # - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree; # @@ -66,12 +65,10 @@ .if defined(WITHOUT_TURBA) .if !defined(WITHOUT_LDAP) -.if defined(WITH_LDAP1) -LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 \ - lber.1:${PORTSDIR}/net/openldap12 +.if exists(${LOCALBASE}/lib/libldap.so.1) +LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 .else -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 \ - lber.2:${PORTSDIR}/net/openldap20 +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21 .endif .endif RUN_DEPENDS+= ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2 @@ -197,7 +194,7 @@ .endif .endif .if !defined(WITHOUT_LDAP) -.if defined(WITH_LDAP1) +.if exists(${LOCALBASE}/lib/libldap.so.1) @if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.1"; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \ --- imp3.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030609225130.3260276BC>