Date: Mon, 20 Mar 2006 18:24:18 +0800 (CST) From: Xin LI <delphij@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: vsevolod@FreeBSD.org Subject: ports/94725: [PATCH] Update net/py-ldap2 to 2.0.11 Message-ID: <200603201024.k2KAOIB3039118@tarsier.delphij.net> Resent-Message-ID: <200603201030.k2KAUG3e078560@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94725
>Category: ports
>Synopsis: [PATCH] Update net/py-ldap2 to 2.0.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 20 10:30:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Xin LI
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
The FreeBSD Simplified Chinese Project
>Environment:
System: FreeBSD tarsier.delphij.net 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #19: Mon Mar 20 14:45:26 CST 2006 delphij@tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386
>Description:
The proposed patch updates py-ldap2 to 2.0.11:
- Update version in the ports
- Do not depend on OpenLDAP 2.2, this port works fine
with 2.3.x series. (*)
- Reorganize REPLACE_ARGS
Maintainer cc'ed.
* We should have a better way to handle with OpenLDAP
dependencies, though.
>How-To-Repeat:
>Fix:
--- patch-py-ldap2 begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/py-ldap2/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile 28 Sep 2005 23:20:16 -0000 1.31
+++ Makefile 20 Mar 2006 10:19:17 -0000
@@ -5,7 +5,7 @@
# $FreeBSD: ports/net/py-ldap2/Makefile,v 1.31 2005/09/28 23:20:16 vsevolod Exp $
PORTNAME= ldap2
-PORTVERSION= 2.0.10
+PORTVERSION= 2.0.11
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= python-ldap
@@ -19,18 +19,17 @@
USE_PYDISTUTILS= yes
USE_OPENLDAP= yes
USE_REINPLACE= yes
-WANT_OPENLDAP_VER= 22
-REPLACE_ARGS= -e 's=/opt/openldap-OPENLDAP_REL_ENG_2_3/include=${LOCALBASE}/include='
+REPLACE_ARGS= -e 's=/usr/local/openldap-REL_ENG_2_1/lib=${LOCALBASE}/lib=' \
+ -e 's=/usr/local/openldap-REL_ENG_2_1/include=${LOCALBASE}/include='
.if defined(WITH_SASL)
WANT_OPENLDAP_SASL= yes
-REPLACE_ARGS+= -e 's=/opt/sasl/include/sasl=${LOCALBASE}/include/sasl=' \
- -e 's=/opt/openldap-OPENLDAP_REL_ENG_2_3/lib=${LOCALBASE}/lib ${LOCALBASE}/lib/sasl2='
-CONFLICTS+= openldap22-client-2.*
+REPLACE_ARGS+= -e 's=/usr/local/cyrus-sasl/lib=${LOCALBASE}/lib/sasl2=' \
+ -e 's=/usr/local/cyrus-sasl/include=${LOCALBASE}/include/sasl2='
+CONFLICTS+= openldap2[23]-client-2.*
.else
-REPLACE_ARGS+= -e 's=ldap_r lber ssl crypto sasl2=ldap_r lber ssl crypto=' \
- -e 's=/opt/openldap-OPENLDAP_REL_ENG_2_3/lib=${LOCALBASE}/lib='
+REPLACE_ARGS+= -e 's=ldap_r lber sasl2 ssl crypto=ldap_r lber ssl crypto='
.endif
pre-everything::
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/py-ldap2/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 22 Jan 2006 21:23:41 -0000 1.13
+++ distinfo 20 Mar 2006 08:19:51 -0000
@@ -1,3 +1,3 @@
-MD5 (python-ldap-2.0.10.tar.gz) = 6bae44766e9d7e0b03a1ea5efb5a4382
-SHA256 (python-ldap-2.0.10.tar.gz) = bc8180a9258bd34900794cf019853fafa8a359867aba4cd7e783ed7c1ecab065
-SIZE (python-ldap-2.0.10.tar.gz) = 80655
+MD5 (python-ldap-2.0.11.tar.gz) = 1c20cdbe8cfab1c92b39848f7deeb6ec
+SHA256 (python-ldap-2.0.11.tar.gz) = c320ca3502426de75a5b982da2a57c44dc20c1024986d169a782299663f1c69f
+SIZE (python-ldap-2.0.11.tar.gz) = 71715
--- patch-py-ldap2 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603201024.k2KAOIB3039118>