update to m111

cleaning up dependency a bit

36 files changed, 384 insertions, 96 deletions

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index bf2963d01afc..c516c9fe0541 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.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice-2.0-devel/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index bf2963d01afc..c516c9fe0541 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice-3-devel/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index bf2963d01afc..c516c9fe0541 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice-3/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice-3/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index bf2963d01afc..c516c9fe0541 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.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-2-RC/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index bf2963d01afc..c516c9fe0541 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.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-2-devel/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index bf2963d01afc..c516c9fe0541 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.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-2.0-devel/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index bf2963d01afc..c516c9fe0541 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.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-2.0/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index bf2963d01afc..c516c9fe0541 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-2/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index bf2963d01afc..c516c9fe0541 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.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-3-RC/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index bf2963d01afc..c516c9fe0541 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.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-3-devel/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index bf2963d01afc..c516c9fe0541 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-3/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index e524f7ff875b..41c9f901bbb5 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -23,11 +23,13 @@ MOZILLA_VERSION=	1.7.5
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 .if !defined(WITHOUT_MOZILLA)
 DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
+USE_GNOME+=	libidl
 .endif
 
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=        3
 .endif
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -51,8 +53,8 @@ BROKEN=		"Please deinstall fltk, currently causes a build failure"
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		110
-SNAPDATE=		20050616
+MILESTONE=		111
+SNAPDATE=		20050621
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -82,11 +84,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
-		xmkmf:${X_IMAKE_PORT} \
-		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison-devel:${PORTSDIR}/devel/bison-devel
-LIB_DEPENDS+=	IDL-2.0:${PORTSDIR}/devel/libIDL
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -102,7 +101,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index bf2963d01afc..c516c9fe0541 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = d98ff2ad2430446e3e105120e34d8c6e
-SIZE (openoffice.org2.0/OOo_1.9m110_source.tar.bz2) = 210617913
+MD5 (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = a4cf270230ef18c2fc091b27d7e11994
+SIZE (openoffice.org2.0/OOo_1.9m111_source.tar.bz2) = 212651405
 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-scp2+source+ure+ure.scp b/editors/openoffice.org-vcltesttool/files/patch-scp2+source+ure+ure.scp
new file mode 100644
index 000000000000..aa55e9eeac99
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-scp2+source+ure+ure.scp
@@ -0,0 +1,25 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author:     : <maho@openoffice.org> (JCA)
+Description : libxml2 is not deliver'ed for FreeBSD and Mac OS X
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ure/ure.scp	17 Jun 2005 10:18:35 -0000	1.2
++++ scp2/source/ure/ure.scp	21 Jun 2005 22:24:56 -0000
+@@ -601,7 +601,11 @@
+ #if defined WNT
+     Name = SCP2_URE_DL_NORMAL(libxml2);
+ #else
+-    Name = SCP2_URE_DL_VER(xml2, 2);
++    #ifdef MACOSX
++       Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));
++    #else
++       Name = SCP2_URE_DL_VER(xml2,2.6.17);
++    #endif
+ #endif
+     Styles = (PACKED);
+ End