cvs commit: ports/net/nss_ldap Makefile ports/net/nss_ldap/files patch-ldap-nss.c

[Tom McLaughlin]

Sergey Skvortsov wrote, On 08/18/2009 10:33 AM:
> skv         2009-08-18 14:33:38 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     net/nss_ldap         Makefile 
>     net/nss_ldap/files   patch-ldap-nss.c 
>   Log:
>   Unbreak build with defined WITHOUT_KERBEROS.
>   
>   PR:             ports/133344
>   Submitted by:   Alex Bakhtin <bakhtin xx amt.ru>
>   Approved by:    maintainer timeout (> 4 months)
>   
>   Revision  Changes    Path
>   1.29      +1 -3      ports/net/nss_ldap/Makefile
>   1.3       +8 -0      ports/net/nss_ldap/files/patch-ldap-nss.c
> 

Please commit the attached instead, krb5_ccname is now broken.  I've
moved krb5.h out of the way on my box to check that the original issue
is still fixed and it appears to be.

-- 
| tmclaugh at sdf.lonestar.org                 tmclaugh at FreeBSD.org |
| FreeBSD                                       http://www.FreeBSD.org |

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/nss_ldap/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile	18 Aug 2009 14:33:37 -0000	1.29
+++ Makefile	18 Aug 2009 16:24:50 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	nss_ldap
 PORTVERSION=	1.${NSS_LDAP_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.padl.com/download/
 DISTNAME=	${PORTNAME}-${NSS_LDAP_VERSION}
@@ -36,6 +36,11 @@
 
 MAN5=	nss_ldap.5
 
+.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_KERBEROS)
+CONFIGURE_ARGS+=--enable-configurable-krb5-ccname-env
+.endif
+
 post-extract:
 	${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}
 
@@ -47,4 +52,4 @@
 	${INSTALL_MAN} ${WRKSRC}/${MAN5} ${MAN5PREFIX}/man/man5
 	${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: files/patch-ldap-nss.c
===================================================================
RCS file: /home/pcvs/ports/net/nss_ldap/files/patch-ldap-nss.c,v
retrieving revision 1.3
diff -u -r1.3 patch-ldap-nss.c
--- files/patch-ldap-nss.c	18 Aug 2009 14:33:37 -0000	1.3
+++ files/patch-ldap-nss.c	18 Aug 2009 16:24:50 -0000
@@ -9,11 +9,3 @@
  #include <sasl/sasl.h>
  #elif defined(HAVE_SASL_H)
  #include <sasl.h>
-@@ -84,7 +84,7 @@
- #include <gssapi/gssapi.h>
- #include <gssapi/gssapi_krb5.h>
- #endif
--#ifdef CONFIGURE_KRB5_CCNAME
-+#if defined(CONFIGURE_KRB5_CCNAME) && defined(HAVE_KRB5_H)
- #include <krb5.h>
- #endif