5 files changed, 30 insertions, 12 deletions

diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 16a4908ea715..18dd49a51b54 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.3.2beta
+DISTVERSION=		2.3.3beta
 PORTREVISION=		${OPENLDAP_PORTREVISION}
-PORTREVISION=		1
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 			http://public.planetmirror.com/pub/openldap/%SUBDIR%/ \
@@ -55,7 +54,7 @@ CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.* \
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[!3].* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
 .else
-BROKEN=			Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}
+BROKEN=			"Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}"
 .endif
 
 .if !defined(NOPORTDOCS)
@@ -82,7 +81,7 @@ CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-server-2.* \
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-server-2.[!3].* \
 			${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.*
 .else
-BROKEN=			Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}
+BROKEN=			"Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}"
 .endif
 
 .endif
diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo
index 8f1ea248ed6a..b377104b7ace 100644
--- a/net/openldap23-server/distinfo
+++ b/net/openldap23-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (openldap-2.3.2beta.tgz) = e0648b2a42107e1fac4a4fde5c10ebbb
-Size (openldap-2.3.2beta.tgz) = 3045685
+MD5 (openldap-2.3.3beta.tgz) = a6e36d53c311faa47cb6306a540989ae
+Size (openldap-2.3.3beta.tgz) = 3432057
diff --git a/net/openldap23-server/files/patch-servers::slapd::Makefile.in b/net/openldap23-server/files/patch-servers::slapd::Makefile.in
index 3e0ef3eb771c..6dcf0d47f6ad 100644
--- a/net/openldap23-server/files/patch-servers::slapd::Makefile.in
+++ b/net/openldap23-server/files/patch-servers::slapd::Makefile.in
@@ -1,14 +1,14 @@
---- servers/slapd/Makefile.in.orig	Mon Dec 29 19:10:38 2003
-+++ servers/slapd/Makefile.in	Tue Jan 20 02:33:39 2004
-@@ -360,7 +360,6 @@
+--- servers/slapd/Makefile.in.orig	Fri May  6 20:42:50 2005
++++ servers/slapd/Makefile.in	Fri May 13 17:17:37 2005
+@@ -370,7 +370,6 @@
  
  install-slapd: FORCE
  	-$(MKDIR) $(DESTDIR)$(libexecdir)
 -	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
- 	$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
+ 	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
  		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
  	@for i in $(SUBDIRS); do \
-@@ -424,8 +423,6 @@
+@@ -434,8 +433,6 @@
  install-db-config: FORCE
  	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
  	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
diff --git a/net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in b/net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in
new file mode 100644
index 000000000000..7d08a026a743
--- /dev/null
+++ b/net/openldap23-server/files/patch-servers_slapd_overlays_Makefile.in
@@ -0,0 +1,19 @@
+--- servers/slapd/overlays/Makefile.in.orig	Fri May 13 17:44:48 2005
++++ servers/slapd/overlays/Makefile.in	Fri May 13 17:46:31 2005
+@@ -28,6 +28,9 @@
+ 	unique.c
+ OBJS = overlays.o \
+ 	@SLAPD_STATIC_OVERLAYS@
++LIBTOOL_OBJS = overlays.lo \
++	       glue.lo \
++	       version.lo
+ 
+ LDAP_INCDIR= ../../../include       
+ LDAP_LIBDIR= ../../../libraries
+@@ -104,5 +107,5 @@
+ 	$(LTCOMPILE_MOD) $<
+ 
+ $(LIBRARY): version.lo
+-	$(LTLINK_LIB) -o $@ $(OBJS) version.lo
++	$(LTLINK_LIB) -o $@ $(LIBTOOL_OBJS)
+ 
diff --git a/net/openldap23-server/pkg-plist.client b/net/openldap23-server/pkg-plist.client
index f6400594bea7..773caa4c0940 100644
--- a/net/openldap23-server/pkg-plist.client
+++ b/net/openldap23-server/pkg-plist.client
@@ -40,4 +40,4 @@ lib/libldap_r-2.3.so.0
 @comment share/openldap/ucdata/num.dat
 @comment @dirrm share/openldap/ucdata
 @comment @dirrm share/openldap
-@dirrm libexec/openldap
+@unexec rmdir %D/libexec/openldap 2>/dev/null || true