4 files changed, 17 insertions, 71 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 4a26a1b950e0..84a1083efdaa 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.24
+DISTVERSION=		2.4.25
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index db2fad110bcd..cb08a1caa0f4 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.24.tgz) = fdcecb64082a0d8e124f13b31fccf4765901e29decaf4224b28d4cff90a14614
-SIZE (openldap-2.4.24.tgz) = 5240643
+SHA256 (openldap-2.4.25.tgz) = 615acc9970ae2f612bae7e8012d63f3194ef02a2a638bc1fd9ca7f31d85c1075
+SIZE (openldap-2.4.25.tgz) = 5250595
diff --git a/net/openldap24-server/files/patch-its-6832 b/net/openldap24-server/files/patch-its-6832
deleted file mode 100644
index af5b02dd8749..000000000000
--- a/net/openldap24-server/files/patch-its-6832
+++ /dev/null
@@ -1,68 +0,0 @@
-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;
diff --git a/net/openldap24-server/files/patch-shlib-version b/net/openldap24-server/files/patch-shlib-version
new file mode 100644
index 000000000000..d2bdb1a9c529
--- /dev/null
+++ b/net/openldap24-server/files/patch-shlib-version
@@ -0,0 +1,14 @@
+# I have checked all headers and don't think the shared library
+# bump is a needed one.  We patch it back to prevent large
+# rebuild need.
+--- build/version.var.orig	2011-03-25 14:08:12.000000000 -0700
++++ build/version.var	2011-03-28 01:23:08.215863119 -0700
+@@ -17,7 +17,7 @@
+ ol_minor=4
+ ol_patch=25
+ ol_api_inc=20425
+-ol_api_current=9
++ol_api_current=8
+ ol_api_revision=0
+ ol_api_age=7
+ ol_release_date="2011/03/26"