Update to 2.0.1

42 files changed, 1248 insertions, 606 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index c1d8bb8c5005..a3751c7150d0 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.0
-PORTREVISION=	1
+PORTVERSION?=	2.0.1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.0_src.tar.gz
+DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_2.0.0_src.tar.gz
+EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -59,7 +58,8 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-INSTALLATION_BASEDIR?=	openoffice.org${PORTVERSION}
+OOOTAG?=		OOA680_m1
+INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
@@ -119,7 +119,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/OOo_2.0.0rc3_src
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -174,11 +174,11 @@ do-build:
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@@ -189,7 +189,6 @@ post-install:
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -204,11 +203,6 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
-# python post-install script start
-# consult instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-	@cd ${PREFIX}/${INSTALLATION_BASEDIR}/program ; ${LN} -s python-core-2.3.4 ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core; ${LN} -s python.sh ${PREFIX}/${INSTALLATION_BASEDIR}/program/python
-	@${CHMOD} +x ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core-2.3.4/bin/python
-# python post-install script end
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@@ -220,7 +214,6 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 515827d37f20..57e81d2f6a7b 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = a68933afc2bf432d11b2043ac99ba0aa
-SHA256 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 276498822e69830fd5b5404a98f234a49e7aaadd708e727745e10559798d9b8b
-SIZE (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 275666325
+MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3e70ee68abc95fb7299cb9a05e8c2f4f
+SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3ad604d70fc9b53f68615b46c970b5ad387255bee1adb8fcfeae12ef539f39ea
+SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 286685853
 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/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index 1f3ae9cce1a4..8fc898b33521 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -89,11 +89,11 @@ pre-fetch:
 	@${ECHO} "You can select the language for OOo by making it with:"
 	@${ECHO} "make LOCALIZED_LANG=xx" 
 	@${ECHO} "while xx can be one of the following"
-	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB en-US eo es"
-	@${ECHO} "et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN"
-	@${ECHO} "ko lo lt ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw"
-	@${ECHO} "sk sl sh-YU sr-CS ss st sv sw-TZ ta-IN th tn tr ts ve"
-	@${ECHO} "vi xh zh-CN zh-TW zu"
+	@${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
+	@${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN"
+	@${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr"
+	@${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv"
+	@${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized
index a3f90e791abe..d1a0fa4e670b 100644
--- a/editors/openoffice-3/files/Makefile.localized
+++ b/editors/openoffice-3/files/Makefile.localized
@@ -14,15 +14,34 @@ CATEGORIES+=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bn"
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BY
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "be-BY"
+.if ${LOCALIZED_LANG} == "br"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bg"
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-BD"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BD
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-IN"
+LANG_PKGNAME=	bn
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -53,11 +72,18 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	GB
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-US"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	US
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "en-ZA"
+LANG_PKGNAME=	en
+LANG_SUFFIX=	ZA
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
@@ -94,7 +120,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gu-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	gu
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "he"
@@ -102,7 +129,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	hi
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hr"
@@ -138,10 +166,22 @@ CATEGORIES+=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lo"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lv"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mk"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -171,7 +211,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pa-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	pa
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pl"
@@ -183,7 +224,6 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES+=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
-LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
@@ -212,11 +252,13 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sh
+LANG_SUFFIX=	YU
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sr-CS"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sr
+LANG_SUFFIX=	CS
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ss"
@@ -231,12 +273,22 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "sw"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sw-TZ"
+LANG_PKGNAME=	sw
+LANG_SUFFIX=	TZ
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sx"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	ta
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "th"
diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others
index 0432f503c88d..0b5736d98822 100644
--- a/editors/openoffice-3/files/Makefile.others
+++ b/editors/openoffice-3/files/Makefile.others
@@ -16,21 +16,26 @@ package-rename:
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
 
 sdk:
 	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org2.0_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
+	@${RM} -fr ${WRKDIR}/sdk_tmp
+	@${MKDIR} ${WRKDIR}/sdk_tmp
+	@cd ${WRKDIR}/sdk_tmp ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
+		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -43,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
@@ -53,7 +58,7 @@ languagepack:
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
diff --git a/editors/openoffice-3/files/generate.pl b/editors/openoffice-3/files/generate.pl
index 2202f8265b00..e7a4fc2886e6 100644
--- a/editors/openoffice-3/files/generate.pl
+++ b/editors/openoffice-3/files/generate.pl
@@ -1,12 +1,15 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.7 2005-12-23 04:14:28 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
 print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "rm work/.configure* work/.build* \n";
+#print "rm work/.configure* work/.build* \n";
+#workaround for breakage at odk sdk_oo
+print "make deinstall clean\n";
+
 print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
diff --git a/editors/openoffice-3/files/patch-instsetoo b/editors/openoffice-3/files/patch-instsetoo
index fe7e3b5f3845..77fcd635acfa 100644
--- a/editors/openoffice-3/files/patch-instsetoo
+++ b/editors/openoffice-3/files/patch-instsetoo
@@ -9,92 +9,146 @@ depends on core01. for FreeBSD this is regarded as circular dependency
 and pkg_add command is forked infinite times and eats up systems' resource.
 namely when core01 tries to install core02, core02 also tries to
 install core01.
-
 Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
 ===================================================================
 RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
-retrieving revision 1.16
-diff -u -r1.16 packagelist.txt
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Aug 2005 08:52:34 -0000	1.16
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	7 Sep 2005 10:20:37 -0000
-@@ -36,7 +36,7 @@
- solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08"
- packagename = "openoffice.org-core01"
- linuxreplaces = "openofficeorg-mailcap,openofficeorg-core,openofficeorg-core01"
--requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08"
-+requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10"
+retrieving revision 1.21
+diff -u -r1.21 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Nov 2005 13:21:44 -0000	1.21
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	3 Dec 2005 22:26:12 -0000
+@@ -37,6 +37,7 @@
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
+ requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -265,7 +265,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core02"
- linuxreplaces = "openofficeorg-core02"
--requires = "openoffice.org-core01"
+@@ -278,6 +279,7 @@
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -278,7 +277,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core03"
- linuxreplaces = "openofficeorg-core03"
--requires = "openoffice.org-core01"
+@@ -291,6 +293,7 @@
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -291,7 +289,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core04"
- linuxreplaces = "openofficeorg-core04"
--requires = "openoffice.org-core01"
+@@ -304,6 +307,7 @@
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -304,7 +301,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core05"
- linuxreplaces = "openofficeorg-core05"
--requires = "openoffice.org-core01"
+@@ -317,6 +321,7 @@
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -317,7 +313,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core06"
- linuxreplaces = "openofficeorg-core06"
--requires = "openoffice.org-core01"
+@@ -330,6 +335,7 @@
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -330,7 +325,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core07"
- linuxreplaces = "openofficeorg-core07"
--requires = "openoffice.org-core01"
+@@ -343,6 +349,7 @@
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -343,7 +337,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core08"
- linuxreplaces = "openofficeorg-core08"
--requires = "openoffice.org-core01"
+@@ -356,6 +363,7 @@
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -356,7 +349,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core09"
- linuxreplaces = "openofficeorg-core09"
--requires = "openoffice.org-core01"
+@@ -369,6 +377,7 @@
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -370,7 +362,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core10"
- linuxreplaces = "openofficeorg-core10"
--requires = "openoffice.org-core01"
+@@ -383,6 +392,7 @@
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
+retrieving revision 1.42
+diff -u -r1.42 epmfile.pm
+--- solenv/bin/modules/installer/epmfile.pm	9 Nov 2005 09:09:49 -0000	1.42
++++ solenv/bin/modules/installer/epmfile.pm	3 Dec 2005 22:26:52 -0000
+@@ -395,6 +395,11 @@
+ 		$provides = "solarisprovides";	 # the name in the packagelist	
+ 		$requires = "solarisrequires";	 # the name in the packagelist	
+ 	}
++	elsif ( $installer::globals::isfreebsdpkgbuild )
++	{
++		$provides = "freebsdprovides";	 # the name in the packagelist	
++		$requires = "freebsdrequires";	 # the name in the packagelist	
++	}
+ 	else
+ 	{
+ 		$provides = "provides";	 		# the name in the packagelist	
+Index: solenv/bin/modules/installer/globals.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
+retrieving revision 1.47
+diff -u -r1.47 globals.pm
+--- solenv/bin/modules/installer/globals.pm	9 Nov 2005 09:10:01 -0000	1.47
++++ solenv/bin/modules/installer/globals.pm	3 Dec 2005 22:26:52 -0000
+@@ -80,6 +80,7 @@
+ 	$issolarispkgbuild = 0;
+ 	$issolarissparcbuild = 0;
+ 	$issolarisx86build = 0;
++	$isfreebsdpkgbuild = 0;
+ 	$unpackpath = "";
+ 	$idttemplatepath = "";
+ 	$idtlanguagepath = "";
+
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.29
+diff -u -r1.29 parameter.pm
+--- solenv/bin/modules/installer/parameter.pm	9 Nov 2005 09:10:12 -0000	1.29
++++ solenv/bin/modules/installer/parameter.pm	10 Dec 2005 13:11:30 -0000
+@@ -304,6 +304,13 @@
+ 			$installer::globals::epmoutpath = "packages";
+ 		}
+ 	}
++	if ( $installer::globals::compiler =~ /unxfbsdi/ )
++	{
++		if ( $installer::globals::packageformat eq "bsd" )
++		{
++			$installer::globals::isfreebsdpkgbuild = 1;
++		}
++	}
+ 
+ 	if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }
+ 	
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index c1d8bb8c5005..a3751c7150d0 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.0
-PORTREVISION=	1
+PORTVERSION?=	2.0.1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.0_src.tar.gz
+DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_2.0.0_src.tar.gz
+EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -59,7 +58,8 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-INSTALLATION_BASEDIR?=	openoffice.org${PORTVERSION}
+OOOTAG?=		OOA680_m1
+INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
@@ -119,7 +119,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/OOo_2.0.0rc3_src
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -174,11 +174,11 @@ do-build:
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@@ -189,7 +189,6 @@ post-install:
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -204,11 +203,6 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
-# python post-install script start
-# consult instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-	@cd ${PREFIX}/${INSTALLATION_BASEDIR}/program ; ${LN} -s python-core-2.3.4 ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core; ${LN} -s python.sh ${PREFIX}/${INSTALLATION_BASEDIR}/program/python
-	@${CHMOD} +x ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core-2.3.4/bin/python
-# python post-install script end
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@@ -220,7 +214,6 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 515827d37f20..57e81d2f6a7b 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = a68933afc2bf432d11b2043ac99ba0aa
-SHA256 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 276498822e69830fd5b5404a98f234a49e7aaadd708e727745e10559798d9b8b
-SIZE (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 275666325
+MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3e70ee68abc95fb7299cb9a05e8c2f4f
+SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3ad604d70fc9b53f68615b46c970b5ad387255bee1adb8fcfeae12ef539f39ea
+SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 286685853
 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-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index 1f3ae9cce1a4..8fc898b33521 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -89,11 +89,11 @@ pre-fetch:
 	@${ECHO} "You can select the language for OOo by making it with:"
 	@${ECHO} "make LOCALIZED_LANG=xx" 
 	@${ECHO} "while xx can be one of the following"
-	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB en-US eo es"
-	@${ECHO} "et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN"
-	@${ECHO} "ko lo lt ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw"
-	@${ECHO} "sk sl sh-YU sr-CS ss st sv sw-TZ ta-IN th tn tr ts ve"
-	@${ECHO} "vi xh zh-CN zh-TW zu"
+	@${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
+	@${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN"
+	@${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr"
+	@${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv"
+	@${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
diff --git a/editors/openoffice.org-2-RC/files/Makefile.localized b/editors/openoffice.org-2-RC/files/Makefile.localized
index a3f90e791abe..d1a0fa4e670b 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.localized
+++ b/editors/openoffice.org-2-RC/files/Makefile.localized
@@ -14,15 +14,34 @@ CATEGORIES+=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bn"
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BY
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "be-BY"
+.if ${LOCALIZED_LANG} == "br"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bg"
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-BD"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BD
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-IN"
+LANG_PKGNAME=	bn
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -53,11 +72,18 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	GB
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-US"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	US
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "en-ZA"
+LANG_PKGNAME=	en
+LANG_SUFFIX=	ZA
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
@@ -94,7 +120,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gu-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	gu
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "he"
@@ -102,7 +129,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	hi
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hr"
@@ -138,10 +166,22 @@ CATEGORIES+=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lo"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lv"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mk"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -171,7 +211,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pa-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	pa
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pl"
@@ -183,7 +224,6 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES+=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
-LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
@@ -212,11 +252,13 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sh
+LANG_SUFFIX=	YU
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sr-CS"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sr
+LANG_SUFFIX=	CS
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ss"
@@ -231,12 +273,22 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "sw"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sw-TZ"
+LANG_PKGNAME=	sw
+LANG_SUFFIX=	TZ
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sx"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	ta
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "th"
diff --git a/editors/openoffice.org-2-RC/files/Makefile.others b/editors/openoffice.org-2-RC/files/Makefile.others
index 0432f503c88d..0b5736d98822 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.others
+++ b/editors/openoffice.org-2-RC/files/Makefile.others
@@ -16,21 +16,26 @@ package-rename:
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
 
 sdk:
 	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org2.0_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
+	@${RM} -fr ${WRKDIR}/sdk_tmp
+	@${MKDIR} ${WRKDIR}/sdk_tmp
+	@cd ${WRKDIR}/sdk_tmp ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
+		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -43,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
@@ -53,7 +58,7 @@ languagepack:
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
diff --git a/editors/openoffice.org-2-RC/files/generate.pl b/editors/openoffice.org-2-RC/files/generate.pl
index 11b9c75d169e..82a176e65b4e 100644
--- a/editors/openoffice.org-2-RC/files/generate.pl
+++ b/editors/openoffice.org-2-RC/files/generate.pl
@@ -1,12 +1,15 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/generate.pl,v 1.7 2005-12-23 04:14:28 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
 print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "rm work/.configure* work/.build* \n";
+#print "rm work/.configure* work/.build* \n";
+#workaround for breakage at odk sdk_oo
+print "make deinstall clean\n";
+
 print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
diff --git a/editors/openoffice.org-2-RC/files/patch-instsetoo b/editors/openoffice.org-2-RC/files/patch-instsetoo
index fe7e3b5f3845..77fcd635acfa 100644
--- a/editors/openoffice.org-2-RC/files/patch-instsetoo
+++ b/editors/openoffice.org-2-RC/files/patch-instsetoo
@@ -9,92 +9,146 @@ depends on core01. for FreeBSD this is regarded as circular dependency
 and pkg_add command is forked infinite times and eats up systems' resource.
 namely when core01 tries to install core02, core02 also tries to
 install core01.
-
 Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
 ===================================================================
 RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
-retrieving revision 1.16
-diff -u -r1.16 packagelist.txt
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Aug 2005 08:52:34 -0000	1.16
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	7 Sep 2005 10:20:37 -0000
-@@ -36,7 +36,7 @@
- solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08"
- packagename = "openoffice.org-core01"
- linuxreplaces = "openofficeorg-mailcap,openofficeorg-core,openofficeorg-core01"
--requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08"
-+requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10"
+retrieving revision 1.21
+diff -u -r1.21 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Nov 2005 13:21:44 -0000	1.21
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	3 Dec 2005 22:26:12 -0000
+@@ -37,6 +37,7 @@
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
+ requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -265,7 +265,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core02"
- linuxreplaces = "openofficeorg-core02"
--requires = "openoffice.org-core01"
+@@ -278,6 +279,7 @@
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -278,7 +277,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core03"
- linuxreplaces = "openofficeorg-core03"
--requires = "openoffice.org-core01"
+@@ -291,6 +293,7 @@
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -291,7 +289,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core04"
- linuxreplaces = "openofficeorg-core04"
--requires = "openoffice.org-core01"
+@@ -304,6 +307,7 @@
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -304,7 +301,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core05"
- linuxreplaces = "openofficeorg-core05"
--requires = "openoffice.org-core01"
+@@ -317,6 +321,7 @@
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -317,7 +313,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core06"
- linuxreplaces = "openofficeorg-core06"
--requires = "openoffice.org-core01"
+@@ -330,6 +335,7 @@
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -330,7 +325,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core07"
- linuxreplaces = "openofficeorg-core07"
--requires = "openoffice.org-core01"
+@@ -343,6 +349,7 @@
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -343,7 +337,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core08"
- linuxreplaces = "openofficeorg-core08"
--requires = "openoffice.org-core01"
+@@ -356,6 +363,7 @@
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -356,7 +349,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core09"
- linuxreplaces = "openofficeorg-core09"
--requires = "openoffice.org-core01"
+@@ -369,6 +377,7 @@
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -370,7 +362,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core10"
- linuxreplaces = "openofficeorg-core10"
--requires = "openoffice.org-core01"
+@@ -383,6 +392,7 @@
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
+retrieving revision 1.42
+diff -u -r1.42 epmfile.pm
+--- solenv/bin/modules/installer/epmfile.pm	9 Nov 2005 09:09:49 -0000	1.42
++++ solenv/bin/modules/installer/epmfile.pm	3 Dec 2005 22:26:52 -0000
+@@ -395,6 +395,11 @@
+ 		$provides = "solarisprovides";	 # the name in the packagelist	
+ 		$requires = "solarisrequires";	 # the name in the packagelist	
+ 	}
++	elsif ( $installer::globals::isfreebsdpkgbuild )
++	{
++		$provides = "freebsdprovides";	 # the name in the packagelist	
++		$requires = "freebsdrequires";	 # the name in the packagelist	
++	}
+ 	else
+ 	{
+ 		$provides = "provides";	 		# the name in the packagelist	
+Index: solenv/bin/modules/installer/globals.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
+retrieving revision 1.47
+diff -u -r1.47 globals.pm
+--- solenv/bin/modules/installer/globals.pm	9 Nov 2005 09:10:01 -0000	1.47
++++ solenv/bin/modules/installer/globals.pm	3 Dec 2005 22:26:52 -0000
+@@ -80,6 +80,7 @@
+ 	$issolarispkgbuild = 0;
+ 	$issolarissparcbuild = 0;
+ 	$issolarisx86build = 0;
++	$isfreebsdpkgbuild = 0;
+ 	$unpackpath = "";
+ 	$idttemplatepath = "";
+ 	$idtlanguagepath = "";
+
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.29
+diff -u -r1.29 parameter.pm
+--- solenv/bin/modules/installer/parameter.pm	9 Nov 2005 09:10:12 -0000	1.29
++++ solenv/bin/modules/installer/parameter.pm	10 Dec 2005 13:11:30 -0000
+@@ -304,6 +304,13 @@
+ 			$installer::globals::epmoutpath = "packages";
+ 		}
+ 	}
++	if ( $installer::globals::compiler =~ /unxfbsdi/ )
++	{
++		if ( $installer::globals::packageformat eq "bsd" )
++		{
++			$installer::globals::isfreebsdpkgbuild = 1;
++		}
++	}
+ 
+ 	if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }
+ 	
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index c1d8bb8c5005..a3751c7150d0 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.0
-PORTREVISION=	1
+PORTVERSION?=	2.0.1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.0_src.tar.gz
+DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_2.0.0_src.tar.gz
+EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -59,7 +58,8 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-INSTALLATION_BASEDIR?=	openoffice.org${PORTVERSION}
+OOOTAG?=		OOA680_m1
+INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
@@ -119,7 +119,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/OOo_2.0.0rc3_src
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -174,11 +174,11 @@ do-build:
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@@ -189,7 +189,6 @@ post-install:
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -204,11 +203,6 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
-# python post-install script start
-# consult instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-	@cd ${PREFIX}/${INSTALLATION_BASEDIR}/program ; ${LN} -s python-core-2.3.4 ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core; ${LN} -s python.sh ${PREFIX}/${INSTALLATION_BASEDIR}/program/python
-	@${CHMOD} +x ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core-2.3.4/bin/python
-# python post-install script end
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@@ -220,7 +214,6 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 515827d37f20..57e81d2f6a7b 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = a68933afc2bf432d11b2043ac99ba0aa
-SHA256 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 276498822e69830fd5b5404a98f234a49e7aaadd708e727745e10559798d9b8b
-SIZE (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 275666325
+MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3e70ee68abc95fb7299cb9a05e8c2f4f
+SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3ad604d70fc9b53f68615b46c970b5ad387255bee1adb8fcfeae12ef539f39ea
+SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 286685853
 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/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs
index 1f3ae9cce1a4..8fc898b33521 100644
--- a/editors/openoffice.org-2.0/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0/files/Makefile.knobs
@@ -89,11 +89,11 @@ pre-fetch:
 	@${ECHO} "You can select the language for OOo by making it with:"
 	@${ECHO} "make LOCALIZED_LANG=xx" 
 	@${ECHO} "while xx can be one of the following"
-	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB en-US eo es"
-	@${ECHO} "et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN"
-	@${ECHO} "ko lo lt ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw"
-	@${ECHO} "sk sl sh-YU sr-CS ss st sv sw-TZ ta-IN th tn tr ts ve"
-	@${ECHO} "vi xh zh-CN zh-TW zu"
+	@${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
+	@${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN"
+	@${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr"
+	@${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv"
+	@${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
diff --git a/editors/openoffice.org-2.0/files/Makefile.localized b/editors/openoffice.org-2.0/files/Makefile.localized
index a3f90e791abe..d1a0fa4e670b 100644
--- a/editors/openoffice.org-2.0/files/Makefile.localized
+++ b/editors/openoffice.org-2.0/files/Makefile.localized
@@ -14,15 +14,34 @@ CATEGORIES+=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bn"
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BY
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "be-BY"
+.if ${LOCALIZED_LANG} == "br"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bg"
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-BD"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BD
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-IN"
+LANG_PKGNAME=	bn
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -53,11 +72,18 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	GB
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-US"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	US
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "en-ZA"
+LANG_PKGNAME=	en
+LANG_SUFFIX=	ZA
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
@@ -94,7 +120,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gu-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	gu
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "he"
@@ -102,7 +129,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	hi
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hr"
@@ -138,10 +166,22 @@ CATEGORIES+=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lo"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lv"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mk"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -171,7 +211,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pa-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	pa
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pl"
@@ -183,7 +224,6 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES+=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
-LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
@@ -212,11 +252,13 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sh
+LANG_SUFFIX=	YU
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sr-CS"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sr
+LANG_SUFFIX=	CS
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ss"
@@ -231,12 +273,22 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "sw"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sw-TZ"
+LANG_PKGNAME=	sw
+LANG_SUFFIX=	TZ
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sx"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	ta
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "th"
diff --git a/editors/openoffice.org-2.0/files/Makefile.others b/editors/openoffice.org-2.0/files/Makefile.others
index 0432f503c88d..0b5736d98822 100644
--- a/editors/openoffice.org-2.0/files/Makefile.others
+++ b/editors/openoffice.org-2.0/files/Makefile.others
@@ -16,21 +16,26 @@ package-rename:
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
 
 sdk:
 	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org2.0_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
+	@${RM} -fr ${WRKDIR}/sdk_tmp
+	@${MKDIR} ${WRKDIR}/sdk_tmp
+	@cd ${WRKDIR}/sdk_tmp ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
+		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -43,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
@@ -53,7 +58,7 @@ languagepack:
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
diff --git a/editors/openoffice.org-2.0/files/generate.pl b/editors/openoffice.org-2.0/files/generate.pl
index 605a1edcaaf0..36355363e866 100644
--- a/editors/openoffice.org-2.0/files/generate.pl
+++ b/editors/openoffice.org-2.0/files/generate.pl
@@ -1,12 +1,15 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/generate.pl,v 1.7 2005-12-23 04:14:28 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
 print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "rm work/.configure* work/.build* \n";
+#print "rm work/.configure* work/.build* \n";
+#workaround for breakage at odk sdk_oo
+print "make deinstall clean\n";
+
 print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
diff --git a/editors/openoffice.org-2.0/files/patch-instsetoo b/editors/openoffice.org-2.0/files/patch-instsetoo
index fe7e3b5f3845..77fcd635acfa 100644
--- a/editors/openoffice.org-2.0/files/patch-instsetoo
+++ b/editors/openoffice.org-2.0/files/patch-instsetoo
@@ -9,92 +9,146 @@ depends on core01. for FreeBSD this is regarded as circular dependency
 and pkg_add command is forked infinite times and eats up systems' resource.
 namely when core01 tries to install core02, core02 also tries to
 install core01.
-
 Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
 ===================================================================
 RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
-retrieving revision 1.16
-diff -u -r1.16 packagelist.txt
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Aug 2005 08:52:34 -0000	1.16
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	7 Sep 2005 10:20:37 -0000
-@@ -36,7 +36,7 @@
- solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08"
- packagename = "openoffice.org-core01"
- linuxreplaces = "openofficeorg-mailcap,openofficeorg-core,openofficeorg-core01"
--requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08"
-+requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10"
+retrieving revision 1.21
+diff -u -r1.21 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Nov 2005 13:21:44 -0000	1.21
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	3 Dec 2005 22:26:12 -0000
+@@ -37,6 +37,7 @@
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
+ requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -265,7 +265,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core02"
- linuxreplaces = "openofficeorg-core02"
--requires = "openoffice.org-core01"
+@@ -278,6 +279,7 @@
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -278,7 +277,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core03"
- linuxreplaces = "openofficeorg-core03"
--requires = "openoffice.org-core01"
+@@ -291,6 +293,7 @@
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -291,7 +289,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core04"
- linuxreplaces = "openofficeorg-core04"
--requires = "openoffice.org-core01"
+@@ -304,6 +307,7 @@
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -304,7 +301,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core05"
- linuxreplaces = "openofficeorg-core05"
--requires = "openoffice.org-core01"
+@@ -317,6 +321,7 @@
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -317,7 +313,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core06"
- linuxreplaces = "openofficeorg-core06"
--requires = "openoffice.org-core01"
+@@ -330,6 +335,7 @@
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -330,7 +325,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core07"
- linuxreplaces = "openofficeorg-core07"
--requires = "openoffice.org-core01"
+@@ -343,6 +349,7 @@
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -343,7 +337,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core08"
- linuxreplaces = "openofficeorg-core08"
--requires = "openoffice.org-core01"
+@@ -356,6 +363,7 @@
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -356,7 +349,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core09"
- linuxreplaces = "openofficeorg-core09"
--requires = "openoffice.org-core01"
+@@ -369,6 +377,7 @@
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -370,7 +362,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core10"
- linuxreplaces = "openofficeorg-core10"
--requires = "openoffice.org-core01"
+@@ -383,6 +392,7 @@
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
+retrieving revision 1.42
+diff -u -r1.42 epmfile.pm
+--- solenv/bin/modules/installer/epmfile.pm	9 Nov 2005 09:09:49 -0000	1.42
++++ solenv/bin/modules/installer/epmfile.pm	3 Dec 2005 22:26:52 -0000
+@@ -395,6 +395,11 @@
+ 		$provides = "solarisprovides";	 # the name in the packagelist	
+ 		$requires = "solarisrequires";	 # the name in the packagelist	
+ 	}
++	elsif ( $installer::globals::isfreebsdpkgbuild )
++	{
++		$provides = "freebsdprovides";	 # the name in the packagelist	
++		$requires = "freebsdrequires";	 # the name in the packagelist	
++	}
+ 	else
+ 	{
+ 		$provides = "provides";	 		# the name in the packagelist	
+Index: solenv/bin/modules/installer/globals.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
+retrieving revision 1.47
+diff -u -r1.47 globals.pm
+--- solenv/bin/modules/installer/globals.pm	9 Nov 2005 09:10:01 -0000	1.47
++++ solenv/bin/modules/installer/globals.pm	3 Dec 2005 22:26:52 -0000
+@@ -80,6 +80,7 @@
+ 	$issolarispkgbuild = 0;
+ 	$issolarissparcbuild = 0;
+ 	$issolarisx86build = 0;
++	$isfreebsdpkgbuild = 0;
+ 	$unpackpath = "";
+ 	$idttemplatepath = "";
+ 	$idtlanguagepath = "";
+
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.29
+diff -u -r1.29 parameter.pm
+--- solenv/bin/modules/installer/parameter.pm	9 Nov 2005 09:10:12 -0000	1.29
++++ solenv/bin/modules/installer/parameter.pm	10 Dec 2005 13:11:30 -0000
+@@ -304,6 +304,13 @@
+ 			$installer::globals::epmoutpath = "packages";
+ 		}
+ 	}
++	if ( $installer::globals::compiler =~ /unxfbsdi/ )
++	{
++		if ( $installer::globals::packageformat eq "bsd" )
++		{
++			$installer::globals::isfreebsdpkgbuild = 1;
++		}
++	}
+ 
+ 	if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }
+ 	
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index c1d8bb8c5005..a3751c7150d0 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.0
-PORTREVISION=	1
+PORTVERSION?=	2.0.1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.0_src.tar.gz
+DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_2.0.0_src.tar.gz
+EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -59,7 +58,8 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-INSTALLATION_BASEDIR?=	openoffice.org${PORTVERSION}
+OOOTAG?=		OOA680_m1
+INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
@@ -119,7 +119,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/OOo_2.0.0rc3_src
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -174,11 +174,11 @@ do-build:
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@@ -189,7 +189,6 @@ post-install:
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -204,11 +203,6 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
-# python post-install script start
-# consult instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-	@cd ${PREFIX}/${INSTALLATION_BASEDIR}/program ; ${LN} -s python-core-2.3.4 ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core; ${LN} -s python.sh ${PREFIX}/${INSTALLATION_BASEDIR}/program/python
-	@${CHMOD} +x ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core-2.3.4/bin/python
-# python post-install script end
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@@ -220,7 +214,6 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 515827d37f20..57e81d2f6a7b 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = a68933afc2bf432d11b2043ac99ba0aa
-SHA256 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 276498822e69830fd5b5404a98f234a49e7aaadd708e727745e10559798d9b8b
-SIZE (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 275666325
+MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3e70ee68abc95fb7299cb9a05e8c2f4f
+SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3ad604d70fc9b53f68615b46c970b5ad387255bee1adb8fcfeae12ef539f39ea
+SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 286685853
 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/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 1f3ae9cce1a4..8fc898b33521 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -89,11 +89,11 @@ pre-fetch:
 	@${ECHO} "You can select the language for OOo by making it with:"
 	@${ECHO} "make LOCALIZED_LANG=xx" 
 	@${ECHO} "while xx can be one of the following"
-	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB en-US eo es"
-	@${ECHO} "et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN"
-	@${ECHO} "ko lo lt ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw"
-	@${ECHO} "sk sl sh-YU sr-CS ss st sv sw-TZ ta-IN th tn tr ts ve"
-	@${ECHO} "vi xh zh-CN zh-TW zu"
+	@${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
+	@${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN"
+	@${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr"
+	@${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv"
+	@${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
diff --git a/editors/openoffice.org-2/files/Makefile.localized b/editors/openoffice.org-2/files/Makefile.localized
index a3f90e791abe..d1a0fa4e670b 100644
--- a/editors/openoffice.org-2/files/Makefile.localized
+++ b/editors/openoffice.org-2/files/Makefile.localized
@@ -14,15 +14,34 @@ CATEGORIES+=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bn"
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BY
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "be-BY"
+.if ${LOCALIZED_LANG} == "br"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bg"
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-BD"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BD
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-IN"
+LANG_PKGNAME=	bn
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -53,11 +72,18 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	GB
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-US"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	US
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "en-ZA"
+LANG_PKGNAME=	en
+LANG_SUFFIX=	ZA
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
@@ -94,7 +120,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gu-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	gu
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "he"
@@ -102,7 +129,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	hi
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hr"
@@ -138,10 +166,22 @@ CATEGORIES+=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lo"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lv"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mk"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -171,7 +211,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pa-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	pa
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pl"
@@ -183,7 +224,6 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES+=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
-LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
@@ -212,11 +252,13 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sh
+LANG_SUFFIX=	YU
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sr-CS"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sr
+LANG_SUFFIX=	CS
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ss"
@@ -231,12 +273,22 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "sw"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sw-TZ"
+LANG_PKGNAME=	sw
+LANG_SUFFIX=	TZ
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sx"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	ta
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "th"
diff --git a/editors/openoffice.org-2/files/Makefile.others b/editors/openoffice.org-2/files/Makefile.others
index 0432f503c88d..0b5736d98822 100644
--- a/editors/openoffice.org-2/files/Makefile.others
+++ b/editors/openoffice.org-2/files/Makefile.others
@@ -16,21 +16,26 @@ package-rename:
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
 
 sdk:
 	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org2.0_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
+	@${RM} -fr ${WRKDIR}/sdk_tmp
+	@${MKDIR} ${WRKDIR}/sdk_tmp
+	@cd ${WRKDIR}/sdk_tmp ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
+		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -43,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
@@ -53,7 +58,7 @@ languagepack:
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
diff --git a/editors/openoffice.org-2/files/generate.pl b/editors/openoffice.org-2/files/generate.pl
index ff4ebc247121..77d649df087e 100644
--- a/editors/openoffice.org-2/files/generate.pl
+++ b/editors/openoffice.org-2/files/generate.pl
@@ -1,12 +1,15 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/generate.pl,v 1.7 2005-12-23 04:14:28 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
 print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "rm work/.configure* work/.build* \n";
+#print "rm work/.configure* work/.build* \n";
+#workaround for breakage at odk sdk_oo
+print "make deinstall clean\n";
+
 print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
diff --git a/editors/openoffice.org-2/files/patch-instsetoo b/editors/openoffice.org-2/files/patch-instsetoo
index fe7e3b5f3845..77fcd635acfa 100644
--- a/editors/openoffice.org-2/files/patch-instsetoo
+++ b/editors/openoffice.org-2/files/patch-instsetoo
@@ -9,92 +9,146 @@ depends on core01. for FreeBSD this is regarded as circular dependency
 and pkg_add command is forked infinite times and eats up systems' resource.
 namely when core01 tries to install core02, core02 also tries to
 install core01.
-
 Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
 ===================================================================
 RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
-retrieving revision 1.16
-diff -u -r1.16 packagelist.txt
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Aug 2005 08:52:34 -0000	1.16
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	7 Sep 2005 10:20:37 -0000
-@@ -36,7 +36,7 @@
- solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08"
- packagename = "openoffice.org-core01"
- linuxreplaces = "openofficeorg-mailcap,openofficeorg-core,openofficeorg-core01"
--requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08"
-+requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10"
+retrieving revision 1.21
+diff -u -r1.21 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Nov 2005 13:21:44 -0000	1.21
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	3 Dec 2005 22:26:12 -0000
+@@ -37,6 +37,7 @@
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
+ requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -265,7 +265,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core02"
- linuxreplaces = "openofficeorg-core02"
--requires = "openoffice.org-core01"
+@@ -278,6 +279,7 @@
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -278,7 +277,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core03"
- linuxreplaces = "openofficeorg-core03"
--requires = "openoffice.org-core01"
+@@ -291,6 +293,7 @@
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -291,7 +289,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core04"
- linuxreplaces = "openofficeorg-core04"
--requires = "openoffice.org-core01"
+@@ -304,6 +307,7 @@
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -304,7 +301,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core05"
- linuxreplaces = "openofficeorg-core05"
--requires = "openoffice.org-core01"
+@@ -317,6 +321,7 @@
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -317,7 +313,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core06"
- linuxreplaces = "openofficeorg-core06"
--requires = "openoffice.org-core01"
+@@ -330,6 +335,7 @@
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -330,7 +325,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core07"
- linuxreplaces = "openofficeorg-core07"
--requires = "openoffice.org-core01"
+@@ -343,6 +349,7 @@
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -343,7 +337,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core08"
- linuxreplaces = "openofficeorg-core08"
--requires = "openoffice.org-core01"
+@@ -356,6 +363,7 @@
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -356,7 +349,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core09"
- linuxreplaces = "openofficeorg-core09"
--requires = "openoffice.org-core01"
+@@ -369,6 +377,7 @@
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -370,7 +362,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core10"
- linuxreplaces = "openofficeorg-core10"
--requires = "openoffice.org-core01"
+@@ -383,6 +392,7 @@
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
+retrieving revision 1.42
+diff -u -r1.42 epmfile.pm
+--- solenv/bin/modules/installer/epmfile.pm	9 Nov 2005 09:09:49 -0000	1.42
++++ solenv/bin/modules/installer/epmfile.pm	3 Dec 2005 22:26:52 -0000
+@@ -395,6 +395,11 @@
+ 		$provides = "solarisprovides";	 # the name in the packagelist	
+ 		$requires = "solarisrequires";	 # the name in the packagelist	
+ 	}
++	elsif ( $installer::globals::isfreebsdpkgbuild )
++	{
++		$provides = "freebsdprovides";	 # the name in the packagelist	
++		$requires = "freebsdrequires";	 # the name in the packagelist	
++	}
+ 	else
+ 	{
+ 		$provides = "provides";	 		# the name in the packagelist	
+Index: solenv/bin/modules/installer/globals.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
+retrieving revision 1.47
+diff -u -r1.47 globals.pm
+--- solenv/bin/modules/installer/globals.pm	9 Nov 2005 09:10:01 -0000	1.47
++++ solenv/bin/modules/installer/globals.pm	3 Dec 2005 22:26:52 -0000
+@@ -80,6 +80,7 @@
+ 	$issolarispkgbuild = 0;
+ 	$issolarissparcbuild = 0;
+ 	$issolarisx86build = 0;
++	$isfreebsdpkgbuild = 0;
+ 	$unpackpath = "";
+ 	$idttemplatepath = "";
+ 	$idtlanguagepath = "";
+
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.29
+diff -u -r1.29 parameter.pm
+--- solenv/bin/modules/installer/parameter.pm	9 Nov 2005 09:10:12 -0000	1.29
++++ solenv/bin/modules/installer/parameter.pm	10 Dec 2005 13:11:30 -0000
+@@ -304,6 +304,13 @@
+ 			$installer::globals::epmoutpath = "packages";
+ 		}
+ 	}
++	if ( $installer::globals::compiler =~ /unxfbsdi/ )
++	{
++		if ( $installer::globals::packageformat eq "bsd" )
++		{
++			$installer::globals::isfreebsdpkgbuild = 1;
++		}
++	}
+ 
+ 	if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }
+ 	
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index c1d8bb8c5005..a3751c7150d0 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.0
-PORTREVISION=	1
+PORTVERSION?=	2.0.1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.0_src.tar.gz
+DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_2.0.0_src.tar.gz
+EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -59,7 +58,8 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-INSTALLATION_BASEDIR?=	openoffice.org${PORTVERSION}
+OOOTAG?=		OOA680_m1
+INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
@@ -119,7 +119,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/OOo_2.0.0rc3_src
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -174,11 +174,11 @@ do-build:
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@@ -189,7 +189,6 @@ post-install:
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -204,11 +203,6 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
-# python post-install script start
-# consult instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-	@cd ${PREFIX}/${INSTALLATION_BASEDIR}/program ; ${LN} -s python-core-2.3.4 ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core; ${LN} -s python.sh ${PREFIX}/${INSTALLATION_BASEDIR}/program/python
-	@${CHMOD} +x ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core-2.3.4/bin/python
-# python post-install script end
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@@ -220,7 +214,6 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 515827d37f20..57e81d2f6a7b 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = a68933afc2bf432d11b2043ac99ba0aa
-SHA256 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 276498822e69830fd5b5404a98f234a49e7aaadd708e727745e10559798d9b8b
-SIZE (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 275666325
+MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3e70ee68abc95fb7299cb9a05e8c2f4f
+SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3ad604d70fc9b53f68615b46c970b5ad387255bee1adb8fcfeae12ef539f39ea
+SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 286685853
 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-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index 1f3ae9cce1a4..8fc898b33521 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -89,11 +89,11 @@ pre-fetch:
 	@${ECHO} "You can select the language for OOo by making it with:"
 	@${ECHO} "make LOCALIZED_LANG=xx" 
 	@${ECHO} "while xx can be one of the following"
-	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB en-US eo es"
-	@${ECHO} "et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN"
-	@${ECHO} "ko lo lt ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw"
-	@${ECHO} "sk sl sh-YU sr-CS ss st sv sw-TZ ta-IN th tn tr ts ve"
-	@${ECHO} "vi xh zh-CN zh-TW zu"
+	@${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
+	@${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN"
+	@${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr"
+	@${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv"
+	@${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
diff --git a/editors/openoffice.org-3-RC/files/Makefile.localized b/editors/openoffice.org-3-RC/files/Makefile.localized
index a3f90e791abe..d1a0fa4e670b 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.localized
+++ b/editors/openoffice.org-3-RC/files/Makefile.localized
@@ -14,15 +14,34 @@ CATEGORIES+=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bn"
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BY
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "be-BY"
+.if ${LOCALIZED_LANG} == "br"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bg"
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-BD"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BD
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-IN"
+LANG_PKGNAME=	bn
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -53,11 +72,18 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	GB
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-US"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	US
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "en-ZA"
+LANG_PKGNAME=	en
+LANG_SUFFIX=	ZA
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
@@ -94,7 +120,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gu-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	gu
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "he"
@@ -102,7 +129,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	hi
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hr"
@@ -138,10 +166,22 @@ CATEGORIES+=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lo"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lv"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mk"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -171,7 +211,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pa-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	pa
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pl"
@@ -183,7 +224,6 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES+=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
-LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
@@ -212,11 +252,13 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sh
+LANG_SUFFIX=	YU
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sr-CS"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sr
+LANG_SUFFIX=	CS
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ss"
@@ -231,12 +273,22 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "sw"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sw-TZ"
+LANG_PKGNAME=	sw
+LANG_SUFFIX=	TZ
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sx"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	ta
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "th"
diff --git a/editors/openoffice.org-3-RC/files/Makefile.others b/editors/openoffice.org-3-RC/files/Makefile.others
index 0432f503c88d..0b5736d98822 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.others
+++ b/editors/openoffice.org-3-RC/files/Makefile.others
@@ -16,21 +16,26 @@ package-rename:
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
 
 sdk:
 	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org2.0_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
+	@${RM} -fr ${WRKDIR}/sdk_tmp
+	@${MKDIR} ${WRKDIR}/sdk_tmp
+	@cd ${WRKDIR}/sdk_tmp ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
+		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -43,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
@@ -53,7 +58,7 @@ languagepack:
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
diff --git a/editors/openoffice.org-3-RC/files/generate.pl b/editors/openoffice.org-3-RC/files/generate.pl
index 99bb6bbd330b..b8a936d5f689 100644
--- a/editors/openoffice.org-3-RC/files/generate.pl
+++ b/editors/openoffice.org-3-RC/files/generate.pl
@@ -1,12 +1,15 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/generate.pl,v 1.7 2005-12-23 04:14:28 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
 print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "rm work/.configure* work/.build* \n";
+#print "rm work/.configure* work/.build* \n";
+#workaround for breakage at odk sdk_oo
+print "make deinstall clean\n";
+
 print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
diff --git a/editors/openoffice.org-3-RC/files/patch-instsetoo b/editors/openoffice.org-3-RC/files/patch-instsetoo
index fe7e3b5f3845..77fcd635acfa 100644
--- a/editors/openoffice.org-3-RC/files/patch-instsetoo
+++ b/editors/openoffice.org-3-RC/files/patch-instsetoo
@@ -9,92 +9,146 @@ depends on core01. for FreeBSD this is regarded as circular dependency
 and pkg_add command is forked infinite times and eats up systems' resource.
 namely when core01 tries to install core02, core02 also tries to
 install core01.
-
 Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
 ===================================================================
 RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
-retrieving revision 1.16
-diff -u -r1.16 packagelist.txt
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Aug 2005 08:52:34 -0000	1.16
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	7 Sep 2005 10:20:37 -0000
-@@ -36,7 +36,7 @@
- solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08"
- packagename = "openoffice.org-core01"
- linuxreplaces = "openofficeorg-mailcap,openofficeorg-core,openofficeorg-core01"
--requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08"
-+requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10"
+retrieving revision 1.21
+diff -u -r1.21 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Nov 2005 13:21:44 -0000	1.21
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	3 Dec 2005 22:26:12 -0000
+@@ -37,6 +37,7 @@
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
+ requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -265,7 +265,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core02"
- linuxreplaces = "openofficeorg-core02"
--requires = "openoffice.org-core01"
+@@ -278,6 +279,7 @@
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -278,7 +277,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core03"
- linuxreplaces = "openofficeorg-core03"
--requires = "openoffice.org-core01"
+@@ -291,6 +293,7 @@
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -291,7 +289,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core04"
- linuxreplaces = "openofficeorg-core04"
--requires = "openoffice.org-core01"
+@@ -304,6 +307,7 @@
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -304,7 +301,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core05"
- linuxreplaces = "openofficeorg-core05"
--requires = "openoffice.org-core01"
+@@ -317,6 +321,7 @@
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -317,7 +313,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core06"
- linuxreplaces = "openofficeorg-core06"
--requires = "openoffice.org-core01"
+@@ -330,6 +335,7 @@
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -330,7 +325,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core07"
- linuxreplaces = "openofficeorg-core07"
--requires = "openoffice.org-core01"
+@@ -343,6 +349,7 @@
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -343,7 +337,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core08"
- linuxreplaces = "openofficeorg-core08"
--requires = "openoffice.org-core01"
+@@ -356,6 +363,7 @@
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -356,7 +349,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core09"
- linuxreplaces = "openofficeorg-core09"
--requires = "openoffice.org-core01"
+@@ -369,6 +377,7 @@
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -370,7 +362,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core10"
- linuxreplaces = "openofficeorg-core10"
--requires = "openoffice.org-core01"
+@@ -383,6 +392,7 @@
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
+retrieving revision 1.42
+diff -u -r1.42 epmfile.pm
+--- solenv/bin/modules/installer/epmfile.pm	9 Nov 2005 09:09:49 -0000	1.42
++++ solenv/bin/modules/installer/epmfile.pm	3 Dec 2005 22:26:52 -0000
+@@ -395,6 +395,11 @@
+ 		$provides = "solarisprovides";	 # the name in the packagelist	
+ 		$requires = "solarisrequires";	 # the name in the packagelist	
+ 	}
++	elsif ( $installer::globals::isfreebsdpkgbuild )
++	{
++		$provides = "freebsdprovides";	 # the name in the packagelist	
++		$requires = "freebsdrequires";	 # the name in the packagelist	
++	}
+ 	else
+ 	{
+ 		$provides = "provides";	 		# the name in the packagelist	
+Index: solenv/bin/modules/installer/globals.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
+retrieving revision 1.47
+diff -u -r1.47 globals.pm
+--- solenv/bin/modules/installer/globals.pm	9 Nov 2005 09:10:01 -0000	1.47
++++ solenv/bin/modules/installer/globals.pm	3 Dec 2005 22:26:52 -0000
+@@ -80,6 +80,7 @@
+ 	$issolarispkgbuild = 0;
+ 	$issolarissparcbuild = 0;
+ 	$issolarisx86build = 0;
++	$isfreebsdpkgbuild = 0;
+ 	$unpackpath = "";
+ 	$idttemplatepath = "";
+ 	$idtlanguagepath = "";
+
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.29
+diff -u -r1.29 parameter.pm
+--- solenv/bin/modules/installer/parameter.pm	9 Nov 2005 09:10:12 -0000	1.29
++++ solenv/bin/modules/installer/parameter.pm	10 Dec 2005 13:11:30 -0000
+@@ -304,6 +304,13 @@
+ 			$installer::globals::epmoutpath = "packages";
+ 		}
+ 	}
++	if ( $installer::globals::compiler =~ /unxfbsdi/ )
++	{
++		if ( $installer::globals::packageformat eq "bsd" )
++		{
++			$installer::globals::isfreebsdpkgbuild = 1;
++		}
++	}
+ 
+ 	if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }
+ 	
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index c1d8bb8c5005..a3751c7150d0 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME?=	openoffice.org
-PORTVERSION?=	2.0.0
-PORTREVISION=	1
+PORTVERSION?=	2.0.1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/}
 MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
-DISTFILES+=	OOo_2.0.0_src.tar.gz
+DISTFILES+=	OOo_${PORTVERSION}_src.tar.gz
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	OOo_2.0.0_src.tar.gz
+EXTRACT_ONLY=	OOo_${PORTVERSION}_src.tar.gz
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -59,7 +58,8 @@ IGNORE=		install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-INSTALLATION_BASEDIR?=	openoffice.org${PORTVERSION}
+OOOTAG?=		OOA680_m1
+INSTALLATION_BASEDIR?=	openoffice.org-${PORTVERSION}
 EXECBASE?=		openoffice.org-${PORTVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
@@ -119,7 +119,7 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
 .endif
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/OOo_2.0.0rc3_src
+WRKSRC=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
 ZIP?=		${PREFIX}/bin/zip
@@ -174,11 +174,11 @@ do-build:
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@@ -189,7 +189,6 @@ post-install:
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%PORTVERSION%%#${PORTVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -204,11 +203,6 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
-# python post-install script start
-# consult instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-	@cd ${PREFIX}/${INSTALLATION_BASEDIR}/program ; ${LN} -s python-core-2.3.4 ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core; ${LN} -s python.sh ${PREFIX}/${INSTALLATION_BASEDIR}/program/python
-	@${CHMOD} +x ${PREFIX}/${INSTALLATION_BASEDIR}/program/python-core-2.3.4/bin/python
-# python post-install script end
 	@${PRINTF} "bin/openoffice.org\n" > ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
@@ -220,7 +214,6 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%MILESTONE%%#${MILESTONE}#g' \
 			-e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 515827d37f20..57e81d2f6a7b 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = a68933afc2bf432d11b2043ac99ba0aa
-SHA256 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 276498822e69830fd5b5404a98f234a49e7aaadd708e727745e10559798d9b8b
-SIZE (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 275666325
+MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3e70ee68abc95fb7299cb9a05e8c2f4f
+SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3ad604d70fc9b53f68615b46c970b5ad387255bee1adb8fcfeae12ef539f39ea
+SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 286685853
 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/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index 1f3ae9cce1a4..8fc898b33521 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -89,11 +89,11 @@ pre-fetch:
 	@${ECHO} "You can select the language for OOo by making it with:"
 	@${ECHO} "make LOCALIZED_LANG=xx" 
 	@${ECHO} "while xx can be one of the following"
-	@${ECHO} "af ar bn be-BY bg ca cs cy da de el en-GB en-US eo es"
-	@${ECHO} "et eu fi fr ga gl gu-IN he hi-IN hr hu it ja km kn-IN"
-	@${ECHO} "ko lo lt ms ne nb nl nn nr ns pa-IN pl pt pt-BR ru rw"
-	@${ECHO} "sk sl sh-YU sr-CS ss st sv sw-TZ ta-IN th tn tr ts ve"
-	@${ECHO} "vi xh zh-CN zh-TW zu"
+	@${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el"
+	@${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN"
+	@${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr"
+	@${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv"
+	@${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 #XXX currently broken
 #.if !defined(WITHOUT_JAVA)
diff --git a/editors/openoffice.org-3/files/Makefile.localized b/editors/openoffice.org-3/files/Makefile.localized
index a3f90e791abe..d1a0fa4e670b 100644
--- a/editors/openoffice.org-3/files/Makefile.localized
+++ b/editors/openoffice.org-3/files/Makefile.localized
@@ -14,15 +14,34 @@ CATEGORIES+=	arabic
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bn"
+.if ${LOCALIZED_LANG} == "be-BY"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BY
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bg"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "be-BY"
+.if ${LOCALIZED_LANG} == "br"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "bg"
+.if ${LOCALIZED_LANG} == "bn"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-BD"
+LANG_PKGNAME=	be
+LANG_SUFFIX=	BD
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bn-IN"
+LANG_PKGNAME=	bn
+LANG_SUFFIX=	IN
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "bs"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -53,11 +72,18 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-GB"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	GB
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "en-US"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	en
+LANG_SUFFIX=	US
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "en-ZA"
+LANG_PKGNAME=	en
+LANG_SUFFIX=	ZA
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "eo"
@@ -94,7 +120,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "gu-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	gu
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "he"
@@ -102,7 +129,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hi-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	hi
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hr"
@@ -138,10 +166,22 @@ CATEGORIES+=     korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lo"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "lt"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lv"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "mk"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ms"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
@@ -171,7 +211,8 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pa-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	pa
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pl"
@@ -183,7 +224,6 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES+=	portuguese
 LANG_PKGNAME=	${LOCALIZED_LANG}
-LANG_EXT=	03
 LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
@@ -212,11 +252,13 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sh-YU"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sh
+LANG_SUFFIX=	YU
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "sr-CS"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	sr
+LANG_SUFFIX=	CS
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ss"
@@ -231,12 +273,22 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "sw"
+LANG_PKGNAME=	${LOCALIZED_LANG}
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sw-TZ"
+LANG_PKGNAME=	sw
+LANG_SUFFIX=	TZ
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "sx"
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ta-IN"
-LANG_PKGNAME=	${LOCALIZED_LANG}
+LANG_PKGNAME=	ta
+LANG_SUFFIX=	IN
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "th"
diff --git a/editors/openoffice.org-3/files/Makefile.others b/editors/openoffice.org-3/files/Makefile.others
index 0432f503c88d..0b5736d98822 100644
--- a/editors/openoffice.org-3/files/Makefile.others
+++ b/editors/openoffice.org-3/files/Makefile.others
@@ -16,21 +16,26 @@ package-rename:
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
-	@${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz .
 
 sdk:
 	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl'
-	@${MV} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/bin/OpenOffice.org2.0_SDK.tar.gz ${WRKDIR}/../${PACKAGE_BASENAME}_sdk.tar.gz
+	@${RM} -fr ${WRKDIR}/sdk_tmp
+	@${MKDIR} ${WRKDIR}/sdk_tmp
+	@cd ${WRKDIR}/sdk_tmp ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
+		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -43,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
@@ -53,7 +58,7 @@ languagepack:
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
diff --git a/editors/openoffice.org-3/files/generate.pl b/editors/openoffice.org-3/files/generate.pl
index 38c143b5f533..e0566b95edd7 100644
--- a/editors/openoffice.org-3/files/generate.pl
+++ b/editors/openoffice.org-3/files/generate.pl
@@ -1,12 +1,15 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/generate.pl,v 1.6 2005-08-29 01:06:13 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/generate.pl,v 1.7 2005-12-23 04:14:28 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
 print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "rm work/.configure* work/.build* \n";
+#print "rm work/.configure* work/.build* \n";
+#workaround for breakage at odk sdk_oo
+print "make deinstall clean\n";
+
 print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
diff --git a/editors/openoffice.org-3/files/patch-instsetoo b/editors/openoffice.org-3/files/patch-instsetoo
index fe7e3b5f3845..77fcd635acfa 100644
--- a/editors/openoffice.org-3/files/patch-instsetoo
+++ b/editors/openoffice.org-3/files/patch-instsetoo
@@ -9,92 +9,146 @@ depends on core01. for FreeBSD this is regarded as circular dependency
 and pkg_add command is forked infinite times and eats up systems' resource.
 namely when core01 tries to install core02, core02 also tries to
 install core01.
-
 Index: instsetoo_native/inc_openoffice/unix/packagelist.txt
 ===================================================================
 RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
-retrieving revision 1.16
-diff -u -r1.16 packagelist.txt
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Aug 2005 08:52:34 -0000	1.16
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	7 Sep 2005 10:20:37 -0000
-@@ -36,7 +36,7 @@
- solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08"
- packagename = "openoffice.org-core01"
- linuxreplaces = "openofficeorg-mailcap,openofficeorg-core,openofficeorg-core01"
--requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08"
-+requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10"
+retrieving revision 1.21
+diff -u -r1.21 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	30 Nov 2005 13:21:44 -0000	1.21
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	3 Dec 2005 22:26:12 -0000
+@@ -37,6 +37,7 @@
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01"
+ requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -265,7 +265,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core02"
- linuxreplaces = "openofficeorg-core02"
--requires = "openoffice.org-core01"
+@@ -278,6 +279,7 @@
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -278,7 +277,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core03"
- linuxreplaces = "openofficeorg-core03"
--requires = "openoffice.org-core01"
+@@ -291,6 +293,7 @@
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -291,7 +289,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core04"
- linuxreplaces = "openofficeorg-core04"
--requires = "openoffice.org-core01"
+@@ -304,6 +307,7 @@
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -304,7 +301,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core05"
- linuxreplaces = "openofficeorg-core05"
--requires = "openoffice.org-core01"
+@@ -317,6 +321,7 @@
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -317,7 +313,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core06"
- linuxreplaces = "openofficeorg-core06"
--requires = "openoffice.org-core01"
+@@ -330,6 +335,7 @@
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -330,7 +325,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core07"
- linuxreplaces = "openofficeorg-core07"
--requires = "openoffice.org-core01"
+@@ -343,6 +349,7 @@
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -343,7 +337,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core08"
- linuxreplaces = "openofficeorg-core08"
--requires = "openoffice.org-core01"
+@@ -356,6 +363,7 @@
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -356,7 +349,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core09"
- linuxreplaces = "openofficeorg-core09"
--requires = "openoffice.org-core01"
+@@ -369,6 +377,7 @@
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
-@@ -370,7 +362,6 @@
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-core10"
- linuxreplaces = "openofficeorg-core10"
--requires = "openoffice.org-core01"
+@@ -383,6 +392,7 @@
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10"
+ requires = "%UNIXPRODUCTNAME-core01"
++freebsdrequires = ""
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
+Index: solenv/bin/modules/installer/epmfile.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v
+retrieving revision 1.42
+diff -u -r1.42 epmfile.pm
+--- solenv/bin/modules/installer/epmfile.pm	9 Nov 2005 09:09:49 -0000	1.42
++++ solenv/bin/modules/installer/epmfile.pm	3 Dec 2005 22:26:52 -0000
+@@ -395,6 +395,11 @@
+ 		$provides = "solarisprovides";	 # the name in the packagelist	
+ 		$requires = "solarisrequires";	 # the name in the packagelist	
+ 	}
++	elsif ( $installer::globals::isfreebsdpkgbuild )
++	{
++		$provides = "freebsdprovides";	 # the name in the packagelist	
++		$requires = "freebsdrequires";	 # the name in the packagelist	
++	}
+ 	else
+ 	{
+ 		$provides = "provides";	 		# the name in the packagelist	
+Index: solenv/bin/modules/installer/globals.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
+retrieving revision 1.47
+diff -u -r1.47 globals.pm
+--- solenv/bin/modules/installer/globals.pm	9 Nov 2005 09:10:01 -0000	1.47
++++ solenv/bin/modules/installer/globals.pm	3 Dec 2005 22:26:52 -0000
+@@ -80,6 +80,7 @@
+ 	$issolarispkgbuild = 0;
+ 	$issolarissparcbuild = 0;
+ 	$issolarisx86build = 0;
++	$isfreebsdpkgbuild = 0;
+ 	$unpackpath = "";
+ 	$idttemplatepath = "";
+ 	$idtlanguagepath = "";
+
+Index: solenv/bin/modules/installer/parameter.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
+retrieving revision 1.29
+diff -u -r1.29 parameter.pm
+--- solenv/bin/modules/installer/parameter.pm	9 Nov 2005 09:10:12 -0000	1.29
++++ solenv/bin/modules/installer/parameter.pm	10 Dec 2005 13:11:30 -0000
+@@ -304,6 +304,13 @@
+ 			$installer::globals::epmoutpath = "packages";
+ 		}
+ 	}
++	if ( $installer::globals::compiler =~ /unxfbsdi/ )
++	{
++		if ( $installer::globals::packageformat eq "bsd" )
++		{
++			$installer::globals::isfreebsdpkgbuild = 1;
++		}
++	}
+ 
+ 	if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; }
+