ports/95465: net/gnomemeeting: fix compilation when openldap-2.3.x is installed

[Joerg Pulz]

>Number:         95465
>Category:       ports
>Synopsis:       net/gnomemeeting: fix compilation when openldap-2.3.x is installed
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 07 09:20:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Joerg Pulz
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
TU-Munich / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Wed Feb 22 19:01:44 CET 2006 root at hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386


	
>Description:
	- fix compilation problem when WANT_OPENLDAP_VER=23 is set
	  The problem will not occur with openldap-2.2.x as LDAP_DEPRECATED
	  is defined in ${LOCALBASE}/include/ldap.h but for openldap-2.3.x
	  we have to define it explicit!
>How-To-Repeat:
	
>Fix:

	- apply the patch

--- net_gnomemeeting.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/gnomemeeting/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- Makefile	5 Apr 2006 19:20:06 -0000	1.56
+++ Makefile	7 Apr 2006 07:12:14 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomemeeting
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -33,7 +34,7 @@
 		CXXFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \
-		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		CPPFLAGS="-I${LOCALBASE}/include ${LDAP_CPPFLAGS} ${PTHREAD_CFLAGS}" \
 		PTLIBDIR=${PREFIX}
 
 CONFIGURE_ARGS=	--with-pwlib-dir=${LOCALBASE} \
@@ -42,6 +43,12 @@
 
 MAN1=	gnomemeeting.1
 
+.include <bsd.port.pre.mk>
+
+.if (${WANT_OPENLDAP_VER} == "23")
+LDAP_CPPFLAGS=	-DLDAP_DEPRECATED
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's:-lh323_FreeBSD_x86_r_s:-lh323_r:g; \
 		s:-lpt_FreeBSD_x86_r_s:-lpt_r:g; \
@@ -50,4 +57,4 @@
 		s: -DSTATIC_LIBS_USED::g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- net_gnomemeeting.diff ends here ---


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