From a2bc1c2c4c0a84265208dc47cf38798043f21256 Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Sat, 12 Mar 2005 16:20:30 +0000
Subject: update to 1.9m84

---
 editors/openoffice-2.0-devel/Makefile                 |  5 ++---
 editors/openoffice-2.0-devel/distinfo                 |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice-3-devel/Makefile                   |  5 ++---
 editors/openoffice-3-devel/distinfo                   |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice-3/Makefile                         |  5 ++---
 editors/openoffice-3/distinfo                         |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-2-RC/Makefile                  |  5 ++---
 editors/openoffice.org-2-RC/distinfo                  |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-2-devel/Makefile               |  5 ++---
 editors/openoffice.org-2-devel/distinfo               |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-2.0-devel/Makefile             |  5 ++---
 editors/openoffice.org-2.0-devel/distinfo             |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-2.0/Makefile                   |  5 ++---
 editors/openoffice.org-2.0/distinfo                   |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-2/Makefile                     |  5 ++---
 editors/openoffice.org-2/distinfo                     |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-3-RC/Makefile                  |  5 ++---
 editors/openoffice.org-3-RC/distinfo                  |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-3-devel/Makefile               |  5 ++---
 editors/openoffice.org-3-devel/distinfo               |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-3/Makefile                     |  5 ++---
 editors/openoffice.org-3/distinfo                     |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 editors/openoffice.org-vcltesttool/Makefile           |  5 ++---
 editors/openoffice.org-vcltesttool/distinfo           |  4 ++--
 .../patch-extensions+source+config+ldap+makefile.mk   | 19 ++++++++++---------
 36 files changed, 168 insertions(+), 168 deletions(-)

(limited to 'editors')

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice-3/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice-3/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice-3/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2-devel/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-2-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2.0/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-2.0/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-RC/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-3-RC/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-3-RC/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-3/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-3/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 32a077ef9b9a..9a6a78b588d4 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050305
+SNAPDATE=	20050307
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -48,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		83
+MILESTONE=		84
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index adf947407783..762f36b369cc 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
-SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
+MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
+SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-vcltesttool/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-extensions+source+config+ldap+makefile.mk
index 8cb2d5095d9e..fb5f8b09a7ef 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-extensions+source+config+ldap+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-extensions+source+config+ldap+makefile.mk
@@ -1,19 +1,20 @@
 o llber50 is missing
 o http://www.openoffice.org/issues/show_bug.cgi?id=43037
 
-Index: extensions/source/config/ldap/makefile.mk
+Index: makefile.mk
 ===================================================================
 RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- extensions/source/config/ldap/makefile.mk	18 Jan 2005 15:18:56 -0000	1.5
-+++ extensions/source/config/ldap/makefile.mk	17 Feb 2005 23:21:16 -0000
-@@ -117,7 +117,7 @@
-         $(SALHELPERLIB) \
+retrieving revision 1.4.24.2
+diff -u -u -r1.4.24.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
++++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
+@@ -114,6 +114,9 @@
          $(SALLIB)
  .IF "$(OS)"=="FREEBSD"
--SHL1STDLIBS+=-lcompat
-+SHL1STDLIBS+=-lcompat -llber50
+ SHL1STDLIBS+=-lcompat
++.IF "$(WITH_OPENLDAP)" != "YES"
++SHL1STDLIBS+=-llber50
++.ENDIF
  .ENDIF
  
  DEF1NAME=$(SHL1TARGET)
-- 
cgit v1.2.3