Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Feb 2003 11:39:58 +0100 (CET)
From:      Christian Kratzer <ck@cksoft.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Christian Kratzer <ck@cksoft.de>
Subject:   ports/48622: Update to 1.7.0, add selection of openldap port
Message-ID:  <20030224103958.B2F7D44ABA@majakka.cksoft.de>

next in thread | raw e-mail | index | archive | help

>Number:         48622
>Category:       ports
>Synopsis:       Update to 1.7.0, add selection of openldap port
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 24 02:50:03 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Christian Kratzer
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
CK Software GmbH
>Environment:
System: FreeBSD majakka.cksoft.de 4.7-STABLE FreeBSD 4.7-STABLE #1: Thu Dec 19 14:57:42 CET 2002 ck@majakka.cksoft.de:/usr/obj/usr/src/RELENG_4/src/sys/MAJAKKA i386

>Description:

Update courier-imap to 1.7.0 and add flags to 
select openldap port.

Add WITH_LDAP20 and WITH_LDAP21 to Makefile to select 
which of the 2.x openldap ports to build against.

>How-To-Repeat:
>Fix:

--- courier-imap/Makefile.orig	Mon Feb 24 11:16:01 2003
+++ courier-imap/Makefile	Mon Feb 24 11:28:37 2003
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.7.0
+PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -29,7 +29,9 @@
 # WITH_VPOPMAIL:		Build in vpopmail support
 # WITH_MYSQL:			Build in mysql support
 # WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap 2.x
+# WITH_LDAP:			Build in ldap support with openldap 2.1
+# WITH_LDAP21:			Build in ldap support with openldap 2.1
+# WITH_LDAP20:			Build in ldap support with openldap 2.0
 # WITH_LDAP1:			Build in ldap support with openldap 1.x
 #
 
@@ -64,14 +66,22 @@
 BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 .endif
 
-.if !defined(WITH_LDAP) && !defined(WITH_LDAP1)
+# default to openldap21
+.if defined(WITH_LDAP)
+WITH_LDAP21=	yes
+.endif
+
+.if !defined(WITH_LDAP21) && !defined(WITH_LDAP20) && !defined(WITH_LDAP1)
 CONFIGURE_ARGS+= --without-authldap
 PLIST_SUB+=	LDAPFLAG="@comment "
 .else
 CONFIGURE_ARGS+= --with-authldap
 PLIST_SUB+=	LDAPFLAG=""
 
-.if defined(WITH_LDAP)
+.if defined(WITH_LDAP21)
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap21 \
+		lber.2:${PORTSDIR}/net/openldap21
+.elseif defined(WITH_LDAP20)
 LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
 		lber.2:${PORTSDIR}/net/openldap20
 .else
--- courier-imap/distinfo.orig	Mon Feb 24 11:28:16 2003
+++ courier-imap/distinfo	Mon Feb 24 11:30:11 2003
@@ -1 +1 @@
-MD5 (courier-imap-1.6.1.tar.bz2) = 313a1b1c7a6813c81f543b524f4f2a3d
+MD5 (courier-imap-1.7.0.tar.bz2) = f74abb58b45810cc485426bc8bad14e6

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030224103958.B2F7D44ABA>