Date: Wed, 22 Jun 2005 22:18:51 +0400 From: Boris Samorodov <bsam@ipt.ru> To: Michael Johnson <ahze@ahze.net> Cc: freebsd-ports@freebsd.org Subject: Re: net/py-ldap2 and SASL Message-ID: <18463220@srv.sem.ipt.ru> In-Reply-To: <81034115-1E0E-4DDE-AAF9-7790C795986A@ahze.net> (Michael Johnson's message of "Wed, 22 Jun 2005 14:13:41 -0400") References: <66624106@srv.sem.ipt.ru> <81034115-1E0E-4DDE-AAF9-7790C795986A@ahze.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
On Wed, 22 Jun 2005 14:13:41 -0400 Michael Johnson wrote:
> Please resend patch as an attachment
OK.
WBR
--
bsam
--=-=-=
Content-Disposition: attachment; filename=patch
Content-Description: patch for net/py-ldap2
--- Makefile.orig Wed Jun 22 17:20:17 2005
+++ Makefile Wed Jun 22 19:43:19 2005
@@ -6,6 +6,7 @@
PORTNAME= ldap2
PORTVERSION= 2.0.8
+PORTREVISON= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= python-ldap
@@ -20,10 +21,56 @@
USE_OPENLDAP= yes
USE_REINPLACE= yes
+
+.include <bsd.port.pre.mk>
+
+
+.if defined(WANT_OPENLDAP_SASL) && !defined(WITHOUT_SASL)
+WITH_SASL= yes
+.endif
+
+
+.if defined(WITH_SASL)
+LIB_DEPENDS= ldap_r-2.2.7:${PORTSDIR}/net/openldap22-sasl-client
+.endif
+
+
+pre-everything::
+ @${ECHO} ${WANT_OPENLDAP_SASL}, ${WITHOUT_SASL}, ${WITH_SASL}
+ @${ECHO} "============================================================="
+ @${ECHO}
+ @${ECHO} "You can build ${PKGNAME} with the following options:"
+ @${ECHO}
+.if defined(WANT_OPENLDAP_SASL)
+ @${ECHO} "WITHOUT_SASL without (Cyrus) SASL2 support"
+.else
+ @${ECHO} "WITH_SASL with (Cyrus) SASL2 support"
+
+.endif
+ @${ECHO}
+ @${ECHO} "============================================================="
+ @${ECHO}
+
+
do-configure:
- @${REINPLACE_CMD} -e "s=/opt/openldap-OPENLDAP_REL_ENG_2_2/lib=${LOCALBASE}/lib=" \
+.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
+ @${ECHO}
+ @${ECHO} Configuring ${PKGNAME} with SASL support
+ @${ECHO}
+ @${REINPLACE_CMD} -e "s=/opt/openldap-OPENLDAP_REL_ENG_2_2/lib=${LOCALBASE}/lib ${LOCALBASE}/lib/sasl2=" \
+ -e "s=/usr/include/sasl=${LOCALBASE}/include/sasl=" \
-e "s=/opt/openldap-OPENLDAP_REL_ENG_2_2/include=${LOCALBASE}/include=" \
+ ${WRKSRC}/setup.cfg
+.else
+ @${ECHO}
+ @${ECHO} Configuring ${PKGNAME} without SASL support
+ @${ECHO}
+ @${REINPLACE_CMD} -e "s=/opt/openldap-OPENLDAP_REL_ENG_2_2/lib=${LOCALBASE}/lib=" \
-e "s=ldap_r lber ssl crypto sasl2=ldap_r lber ssl crypto=" \
+ -e "s=/opt/openldap-OPENLDAP_REL_ENG_2_2/include /usr/include/sasl=${LOCALBASE}/include=" \
${WRKSRC}/setup.cfg
+.endif
+
+
+.include <bsd.port.post.mk>
-.include <bsd.port.mk>
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18463220>