Update to SRC680_m170

20 files changed, 90 insertions, 400 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 23eadc09bb75..1ae5f7ed7a2d 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -15,16 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -44,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	amd64 i386
@@ -87,7 +87,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		169
+MILESTONE?=		170
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060512
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
@@ -162,7 +162,8 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+#WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -171,16 +172,17 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ENV+=      PATH="${WRKDIR}/gnugcj/bin:${PATH}"
 .endif
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
-
+CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
+
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
@@ -230,9 +232,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
 .endif
 
 do-install:
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 0e9c2afdda52..240d64fc57c3 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = e95ea71f3562f75f26d1b98b7fe579a1
-SHA256 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 31b27b40aca0c215fd8390fa4c4599a260fd7b4345964a42248df5d97070cbbc
-SIZE (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 307266363
+MD5 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = ff53b28a37bf23d8532c34b5a70e7faa
+SHA256 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = d1eb56103f41b921186ec503fd37d6d11c871585afe14a30557b189bfb63e693
+SIZE (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = 249826426
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others
index 78730d49073b..444a91beac69 100644
--- a/editors/openoffice-3-devel/files/Makefile.others
+++ b/editors/openoffice-3-devel/files/Makefile.others
@@ -48,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
diff --git a/editors/openoffice-3-devel/files/patch-i59368 b/editors/openoffice-3-devel/files/patch-i59368
deleted file mode 100644
index b1f04766668d..000000000000
--- a/editors/openoffice-3-devel/files/patch-i59368
+++ /dev/null
@@ -1,64 +0,0 @@
-cws latex
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
-retrieving revision 1.2
-diff -u -r1.2 ConvertData.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
-@@ -127,8 +127,8 @@
-      *           <code>Vector</code> of <code>Document</code> objects.
-      */
-     public Enumeration getDocumentEnumeration() {
--        Enumeration enum = v.elements();
--		return (enum);
-+        Enumeration enumer = v.elements();
-+		return (enumer);
- 	}
- 
- 
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 DocumentDeserializerImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -155,14 +155,14 @@
-      */
-     public Document deserialize() throws ConvertException, IOException {
- 	log("\nFound the XSLT deserializer");
--	Enumeration enum = cd.getDocumentEnumeration();
-+	Enumeration enumer = cd.getDocumentEnumeration();
- 	org.w3c.dom.Document domDoc=null;
- 	DOMDocument docOut=null;
- 	GenericOfficeDocument doc = null;
- 	ByteArrayOutputStream baos =null;
- 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
--	while (enum.hasMoreElements()) {       
--		 docOut = (DOMDocument) enum.nextElement();
-+	while (enumer.hasMoreElements()) {       
-+		 docOut = (DOMDocument) enumer.nextElement();
- 	}
- 	domDoc = docOut.getContentDOM();	
- 	try{
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 PluginFactoryImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -183,9 +183,9 @@
- 	String ext= ".txt";
- 	String mimeType = null;
- 	ConverterInfo ci = this.getConverterInfo();
--	Enumeration enum = ci.getDeviceMime();
--	while (enum.hasMoreElements()) {       
--	    mimeType= (String) enum.nextElement();
-+	Enumeration enumer = ci.getDeviceMime();
-+	while (enumer.hasMoreElements()) {       
-+	    mimeType= (String) enumer.nextElement();
- 	}
- 	try {
- 	    props.load(is);
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 23eadc09bb75..1ae5f7ed7a2d 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -15,16 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -44,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	amd64 i386
@@ -87,7 +87,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		169
+MILESTONE?=		170
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060512
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
@@ -162,7 +162,8 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+#WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -171,16 +172,17 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ENV+=      PATH="${WRKDIR}/gnugcj/bin:${PATH}"
 .endif
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
-
+CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
+
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
@@ -230,9 +232,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
 .endif
 
 do-install:
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 0e9c2afdda52..240d64fc57c3 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = e95ea71f3562f75f26d1b98b7fe579a1
-SHA256 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 31b27b40aca0c215fd8390fa4c4599a260fd7b4345964a42248df5d97070cbbc
-SIZE (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 307266363
+MD5 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = ff53b28a37bf23d8532c34b5a70e7faa
+SHA256 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = d1eb56103f41b921186ec503fd37d6d11c871585afe14a30557b189bfb63e693
+SIZE (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = 249826426
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2-devel/files/Makefile.others b/editors/openoffice.org-2-devel/files/Makefile.others
index 78730d49073b..444a91beac69 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.others
+++ b/editors/openoffice.org-2-devel/files/Makefile.others
@@ -48,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
diff --git a/editors/openoffice.org-2-devel/files/patch-i59368 b/editors/openoffice.org-2-devel/files/patch-i59368
deleted file mode 100644
index b1f04766668d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i59368
+++ /dev/null
@@ -1,64 +0,0 @@
-cws latex
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
-retrieving revision 1.2
-diff -u -r1.2 ConvertData.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
-@@ -127,8 +127,8 @@
-      *           <code>Vector</code> of <code>Document</code> objects.
-      */
-     public Enumeration getDocumentEnumeration() {
--        Enumeration enum = v.elements();
--		return (enum);
-+        Enumeration enumer = v.elements();
-+		return (enumer);
- 	}
- 
- 
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 DocumentDeserializerImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -155,14 +155,14 @@
-      */
-     public Document deserialize() throws ConvertException, IOException {
- 	log("\nFound the XSLT deserializer");
--	Enumeration enum = cd.getDocumentEnumeration();
-+	Enumeration enumer = cd.getDocumentEnumeration();
- 	org.w3c.dom.Document domDoc=null;
- 	DOMDocument docOut=null;
- 	GenericOfficeDocument doc = null;
- 	ByteArrayOutputStream baos =null;
- 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
--	while (enum.hasMoreElements()) {       
--		 docOut = (DOMDocument) enum.nextElement();
-+	while (enumer.hasMoreElements()) {       
-+		 docOut = (DOMDocument) enumer.nextElement();
- 	}
- 	domDoc = docOut.getContentDOM();	
- 	try{
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 PluginFactoryImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -183,9 +183,9 @@
- 	String ext= ".txt";
- 	String mimeType = null;
- 	ConverterInfo ci = this.getConverterInfo();
--	Enumeration enum = ci.getDeviceMime();
--	while (enum.hasMoreElements()) {       
--	    mimeType= (String) enum.nextElement();
-+	Enumeration enumer = ci.getDeviceMime();
-+	while (enumer.hasMoreElements()) {       
-+	    mimeType= (String) enumer.nextElement();
- 	}
- 	try {
- 	    props.load(is);
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 23eadc09bb75..1ae5f7ed7a2d 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -15,16 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -44,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	amd64 i386
@@ -87,7 +87,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		169
+MILESTONE?=		170
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060512
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
@@ -162,7 +162,8 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+#WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -171,16 +172,17 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ENV+=      PATH="${WRKDIR}/gnugcj/bin:${PATH}"
 .endif
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
-
+CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
+
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
@@ -230,9 +232,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
 .endif
 
 do-install:
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 0e9c2afdda52..240d64fc57c3 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = e95ea71f3562f75f26d1b98b7fe579a1
-SHA256 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 31b27b40aca0c215fd8390fa4c4599a260fd7b4345964a42248df5d97070cbbc
-SIZE (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 307266363
+MD5 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = ff53b28a37bf23d8532c34b5a70e7faa
+SHA256 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = d1eb56103f41b921186ec503fd37d6d11c871585afe14a30557b189bfb63e693
+SIZE (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = 249826426
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.others b/editors/openoffice.org-2.0-devel/files/Makefile.others
index 78730d49073b..444a91beac69 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.others
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.others
@@ -48,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-i59368 b/editors/openoffice.org-2.0-devel/files/patch-i59368
deleted file mode 100644
index b1f04766668d..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-i59368
+++ /dev/null
@@ -1,64 +0,0 @@
-cws latex
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
-retrieving revision 1.2
-diff -u -r1.2 ConvertData.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
-@@ -127,8 +127,8 @@
-      *           <code>Vector</code> of <code>Document</code> objects.
-      */
-     public Enumeration getDocumentEnumeration() {
--        Enumeration enum = v.elements();
--		return (enum);
-+        Enumeration enumer = v.elements();
-+		return (enumer);
- 	}
- 
- 
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 DocumentDeserializerImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -155,14 +155,14 @@
-      */
-     public Document deserialize() throws ConvertException, IOException {
- 	log("\nFound the XSLT deserializer");
--	Enumeration enum = cd.getDocumentEnumeration();
-+	Enumeration enumer = cd.getDocumentEnumeration();
- 	org.w3c.dom.Document domDoc=null;
- 	DOMDocument docOut=null;
- 	GenericOfficeDocument doc = null;
- 	ByteArrayOutputStream baos =null;
- 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
--	while (enum.hasMoreElements()) {       
--		 docOut = (DOMDocument) enum.nextElement();
-+	while (enumer.hasMoreElements()) {       
-+		 docOut = (DOMDocument) enumer.nextElement();
- 	}
- 	domDoc = docOut.getContentDOM();	
- 	try{
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 PluginFactoryImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -183,9 +183,9 @@
- 	String ext= ".txt";
- 	String mimeType = null;
- 	ConverterInfo ci = this.getConverterInfo();
--	Enumeration enum = ci.getDeviceMime();
--	while (enum.hasMoreElements()) {       
--	    mimeType= (String) enum.nextElement();
-+	Enumeration enumer = ci.getDeviceMime();
-+	while (enumer.hasMoreElements()) {       
-+	    mimeType= (String) enumer.nextElement();
- 	}
- 	try {
- 	    props.load(is);
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 23eadc09bb75..1ae5f7ed7a2d 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -15,16 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -44,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	amd64 i386
@@ -87,7 +87,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		169
+MILESTONE?=		170
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060512
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
@@ -162,7 +162,8 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+#WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -171,16 +172,17 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ENV+=      PATH="${WRKDIR}/gnugcj/bin:${PATH}"
 .endif
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
-
+CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
+
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
@@ -230,9 +232,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
 .endif
 
 do-install:
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 0e9c2afdda52..240d64fc57c3 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = e95ea71f3562f75f26d1b98b7fe579a1
-SHA256 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 31b27b40aca0c215fd8390fa4c4599a260fd7b4345964a42248df5d97070cbbc
-SIZE (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 307266363
+MD5 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = ff53b28a37bf23d8532c34b5a70e7faa
+SHA256 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = d1eb56103f41b921186ec503fd37d6d11c871585afe14a30557b189bfb63e693
+SIZE (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = 249826426
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3-devel/files/Makefile.others b/editors/openoffice.org-3-devel/files/Makefile.others
index 78730d49073b..444a91beac69 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.others
+++ b/editors/openoffice.org-3-devel/files/Makefile.others
@@ -48,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
diff --git a/editors/openoffice.org-3-devel/files/patch-i59368 b/editors/openoffice.org-3-devel/files/patch-i59368
deleted file mode 100644
index b1f04766668d..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i59368
+++ /dev/null
@@ -1,64 +0,0 @@
-cws latex
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
-retrieving revision 1.2
-diff -u -r1.2 ConvertData.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
-@@ -127,8 +127,8 @@
-      *           <code>Vector</code> of <code>Document</code> objects.
-      */
-     public Enumeration getDocumentEnumeration() {
--        Enumeration enum = v.elements();
--		return (enum);
-+        Enumeration enumer = v.elements();
-+		return (enumer);
- 	}
- 
- 
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 DocumentDeserializerImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -155,14 +155,14 @@
-      */
-     public Document deserialize() throws ConvertException, IOException {
- 	log("\nFound the XSLT deserializer");
--	Enumeration enum = cd.getDocumentEnumeration();
-+	Enumeration enumer = cd.getDocumentEnumeration();
- 	org.w3c.dom.Document domDoc=null;
- 	DOMDocument docOut=null;
- 	GenericOfficeDocument doc = null;
- 	ByteArrayOutputStream baos =null;
- 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
--	while (enum.hasMoreElements()) {       
--		 docOut = (DOMDocument) enum.nextElement();
-+	while (enumer.hasMoreElements()) {       
-+		 docOut = (DOMDocument) enumer.nextElement();
- 	}
- 	domDoc = docOut.getContentDOM();	
- 	try{
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 PluginFactoryImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -183,9 +183,9 @@
- 	String ext= ".txt";
- 	String mimeType = null;
- 	ConverterInfo ci = this.getConverterInfo();
--	Enumeration enum = ci.getDeviceMime();
--	while (enum.hasMoreElements()) {       
--	    mimeType= (String) enum.nextElement();
-+	Enumeration enumer = ci.getDeviceMime();
-+	while (enumer.hasMoreElements()) {       
-+	    mimeType= (String) enumer.nextElement();
- 	}
- 	try {
- 	    props.load(is);
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 23eadc09bb75..1ae5f7ed7a2d 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -15,16 +15,16 @@ MASTER_SITES+=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-#DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+DISTFILES+=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#DISTFILES+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
 .if defined(WITH_GNUGCJ)
 DISTFILES+=     ${ANT_DISTFILE}:antbin
 .endif
-#EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
-EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
+EXTRACT_ONLY=	OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX}
+#EXTRACT_ONLY+=	OOo_2.0.${MILESTONE}_src${EXTRACT_SUFX}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
@@ -44,7 +44,7 @@ USE_KDELIBS_VER=        3
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 ONLY_FOR_ARCHS=	amd64 i386
@@ -87,7 +87,7 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE?=		169
+MILESTONE?=		170
 OOOTAG?=		SRC680_m${MILESTONE}
 SNAPDATE=		20060512
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
@@ -162,7 +162,8 @@ LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
 
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+#WRKSRC?=		${WRKDIR}/SRC680_m${MILESTONE}
+WRKSRC?=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -171,16 +172,17 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ENV+=      PATH="${WRKDIR}/gnugcj/bin:${PATH}"
 .endif
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype 
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
-
+CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
+
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
@@ -230,9 +232,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
 .endif
 
 do-install:
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 0e9c2afdda52..240d64fc57c3 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = e95ea71f3562f75f26d1b98b7fe579a1
-SHA256 (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 31b27b40aca0c215fd8390fa4c4599a260fd7b4345964a42248df5d97070cbbc
-SIZE (openoffice.org2.0/OOo_2.0.169_src.tar.gz) = 307266363
+MD5 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = ff53b28a37bf23d8532c34b5a70e7faa
+SHA256 (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = d1eb56103f41b921186ec503fd37d6d11c871585afe14a30557b189bfb63e693
+SIZE (openoffice.org2.0/OOo_SRC680_m170_source.tar.bz2) = 249826426
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.others b/editors/openoffice.org-vcltesttool/files/Makefile.others
index 78730d49073b..444a91beac69 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.others
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.others
@@ -48,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i59368 b/editors/openoffice.org-vcltesttool/files/patch-i59368
deleted file mode 100644
index b1f04766668d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i59368
+++ /dev/null
@@ -1,64 +0,0 @@
-cws latex
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
-retrieving revision 1.2
-diff -u -r1.2 ConvertData.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
-@@ -127,8 +127,8 @@
-      *           <code>Vector</code> of <code>Document</code> objects.
-      */
-     public Enumeration getDocumentEnumeration() {
--        Enumeration enum = v.elements();
--		return (enum);
-+        Enumeration enumer = v.elements();
-+		return (enumer);
- 	}
- 
- 
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 DocumentDeserializerImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -155,14 +155,14 @@
-      */
-     public Document deserialize() throws ConvertException, IOException {
- 	log("\nFound the XSLT deserializer");
--	Enumeration enum = cd.getDocumentEnumeration();
-+	Enumeration enumer = cd.getDocumentEnumeration();
- 	org.w3c.dom.Document domDoc=null;
- 	DOMDocument docOut=null;
- 	GenericOfficeDocument doc = null;
- 	ByteArrayOutputStream baos =null;
- 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
--	while (enum.hasMoreElements()) {       
--		 docOut = (DOMDocument) enum.nextElement();
-+	while (enumer.hasMoreElements()) {       
-+		 docOut = (DOMDocument) enumer.nextElement();
- 	}
- 	domDoc = docOut.getContentDOM();	
- 	try{
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 PluginFactoryImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -183,9 +183,9 @@
- 	String ext= ".txt";
- 	String mimeType = null;
- 	ConverterInfo ci = this.getConverterInfo();
--	Enumeration enum = ci.getDeviceMime();
--	while (enum.hasMoreElements()) {       
--	    mimeType= (String) enum.nextElement();
-+	Enumeration enumer = ci.getDeviceMime();
-+	while (enumer.hasMoreElements()) {       
-+	    mimeType= (String) enumer.nextElement();
- 	}
- 	try {
- 	    props.load(is);