From owner-freebsd-ports-bugs Mon Feb 24 2:50: 8 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9CCF37B401 for ; Mon, 24 Feb 2003 02:50:05 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ED6B43FCB for ; Mon, 24 Feb 2003 02:50:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h1OAo4NS054307 for ; Mon, 24 Feb 2003 02:50:04 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h1OAo4HP054306; Mon, 24 Feb 2003 02:50:04 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0686137B401 for ; Mon, 24 Feb 2003 02:40:06 -0800 (PST) Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12E7743FCB for ; Mon, 24 Feb 2003 02:40:03 -0800 (PST) (envelope-from ck@cksoft.de) Received: from localhost (localhost [127.0.0.1]) by transport.cksoft.de (Postfix) with ESMTP id 5271D1FFB25; Mon, 24 Feb 2003 11:40:01 +0100 (CET) Received: from majakka.cksoft.de (p508A9762.dip.t-dialin.net [80.138.151.98]) (using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by transport.cksoft.de (Postfix) with ESMTP id 035991FF97B; Mon, 24 Feb 2003 11:40:00 +0100 (CET) Received: from majakka.cksoft.de (localhost [127.0.0.1]) by majakka.cksoft.de (Postfix) with ESMTP id 4120244ABD; Mon, 24 Feb 2003 11:39:59 +0100 (CET) Received: by majakka.cksoft.de (Postfix, from userid 1000) id B2F7D44ABA; Mon, 24 Feb 2003 11:39:58 +0100 (CET) Message-Id: <20030224103958.B2F7D44ABA@majakka.cksoft.de> Date: Mon, 24 Feb 2003 11:39:58 +0100 (CET) From: Christian Kratzer Reply-To: Christian Kratzer To: FreeBSD-gnats-submit@FreeBSD.org Cc: Christian Kratzer X-Send-Pr-Version: 3.113 Subject: ports/48622: Update to 1.7.0, add selection of openldap port Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >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