From 3fb41401633aeb5eacee7245732cc206eaa2870b Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Mon, 21 Mar 2011 12:36:12 +0000
Subject: Add a patch from OpenLDAP ITS 6832 to fix build when the user uses a
 custom GCC version.

PORTREVISION intentionally not bumped because this does not affect compiled
binary.

PR:		ports/155743
Submitted by:	mm
---
 net/openldap24-server/files/patch-its-6832 | 68 ++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 net/openldap24-server/files/patch-its-6832

diff --git a/net/openldap24-server/files/patch-its-6832 b/net/openldap24-server/files/patch-its-6832
new file mode 100644
index 000000000000..af5b02dd8749
--- /dev/null
+++ b/net/openldap24-server/files/patch-its-6832
@@ -0,0 +1,68 @@
+Index: libraries/liblber/nt_err.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblber/nt_err.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- libraries/liblber/nt_err.c	4 Jan 2011 23:43:01 -0000	1.20
++++ libraries/liblber/nt_err.c	16 Feb 2011 23:36:30 -0000	1.21
+@@ -17,7 +17,7 @@
+ 
+ #ifdef HAVE_WINSOCK2
+ #include <winsock2.h>
+-#elif HAVE_WINSOCK
++#elif defined(HAVE_WINSOCK)
+ #include <winsock.h>
+ #endif /* HAVE_WINSOCK(2) */
+
+Index: libraries/libldap/init.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap/init.c,v
+retrieving revision 1.128
+retrieving revision 1.129
+diff -u -r1.128 -r1.129
+--- libraries/libldap/init.c	11 Jan 2011 20:34:55 -0000	1.128
++++ libraries/libldap/init.c	16 Feb 2011 23:36:30 -0000	1.129
+@@ -626,7 +626,7 @@
+ 	    return; 
+ 	}
+ }	/* The WinSock DLL is acceptable. Proceed. */
+-#elif HAVE_WINSOCK
++#elif defined(HAVE_WINSOCK)
+ {	WSADATA wsaData;
+ 	if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
+ 	    return;
+Index: libraries/liblutil/detach.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblutil/detach.c,v
+retrieving revision 1.24
+retrieving revision 1.25
+diff -u -r1.24 -r1.25
+--- libraries/liblutil/detach.c	4 Jan 2011 23:43:09 -0000	1.24
++++ libraries/liblutil/detach.c	16 Feb 2011 23:36:31 -0000	1.25
+@@ -128,7 +128,7 @@
+ 
+ #ifdef HAVE_SETSID
+ 		(void) setsid();
+-#elif TIOCNOTTY
++#elif defined(TIOCNOTTY)
+ 		if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) {
+ 			(void) ioctl( sd, TIOCNOTTY, NULL );
+ 			(void) close( sd );
+Index: libraries/liblutil/entropy.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/liblutil/entropy.c,v
+retrieving revision 1.34
+retrieving revision 1.35
+diff -u -r1.34 -r1.35
+--- libraries/liblutil/entropy.c	4 Jan 2011 23:43:09 -0000	1.34
++++ libraries/liblutil/entropy.c	16 Feb 2011 23:36:31 -0000	1.35
+@@ -73,7 +73,7 @@
+ 		close(fd);
+ 		return nbytes > 0 ? -1 : 0;
+ 	}
+-#elif PROV_RSA_FULL
++#elif defined(PROV_RSA_FULL)
+ 	{
+ 		/* Not used since _WIN32_WINNT not set... */
+ 		HCRYPTPROV hProv = 0;
-- 
cgit