Update to m140

o use bison2 instead of bison-devel[1] o sdk is currently not buildable Submitted by: ade [1]
author: Maho Nakata <maho@FreeBSD.org> 2005-11-17 21:08:27 +0000
committer: Maho Nakata <maho@FreeBSD.org> 2005-11-17 21:08:27 +0000
commit: 9dd9234739e7be7ab02ec1da132a629020d458e5 (patch)
tree: 692c37613784ad0877bc8f3ee6f577465f5a38ae /editors
parent: my coordinates as requested by Diomidis (diff)
40 files changed, 1160 insertions, 2085 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 7b2b9f60d2c7..3ae90cd574da 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -60,8 +59,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		138
-SNAPDATE=		20051104
+MILESTONE=		140
+SNAPDATE=		20051116
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -110,7 +109,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison-devel:${PORTSDIR}/devel/bison-devel \
+		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index ca146d10fa6d..b20b1eeffc0d 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
-SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
+MD5 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 851e7428d756a5e0c8b55e72ab386bfd
+SIZE (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 232687335
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others
index e97ee054c437..5a5dd2495c91 100644
--- a/editors/openoffice-3-devel/files/Makefile.others
+++ b/editors/openoffice-3-devel/files/Makefile.others
@@ -22,8 +22,14 @@ package-canonical:
 
 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/SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
+		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
diff --git a/editors/openoffice-3-devel/files/patch-agg b/editors/openoffice-3-devel/files/patch-agg
deleted file mode 100644
index ee1098b822b5..000000000000
--- a/editors/openoffice-3-devel/files/patch-agg
+++ /dev/null
@@ -1,18 +0,0 @@
-Issuetracker : #i57388#
-CWS          : N/A
-Author:      : <rene@openoffice.org> (JCA)
-Description  : 
-
-Index: agg/prj/build.lst
-===================================================================
-RCS file: /cvs/external/agg/prj/build.lst,v
-retrieving revision 1.2
-diff -u -r1.2 build.lst
---- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
-+++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
-@@ -1,4 +1,4 @@
--ag	agg	:	soltools NULL
-+ag	agg	:	soltools xml2cmp sal NULL
- ag	agg										usr1	-	all	ag_mkout NULL
- ag	agg\inc									get		-	all	ag_inc NULL
- ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice-3-devel/files/patch-instsetoo b/editors/openoffice-3-devel/files/patch-instsetoo
index fe7e3b5f3845..c87abb43b6fd 100644
--- a/editors/openoffice-3-devel/files/patch-instsetoo
+++ b/editors/openoffice-3-devel/files/patch-instsetoo
@@ -13,88 +13,234 @@ 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
+retrieving revision 1.20
+diff -u -r1.20 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	11 Nov 2005 10:39:31 -0000	1.20
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	16 Nov 2005 21:54:35 -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"
+ solarisrequires = ""
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-mailcap,%UNIXPRODUCTNAMEWITHOUTDOT-core,%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+-requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++requires = "%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"
+@@ -50,7 +50,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-writer"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-writer"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -64,7 +63,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-calc"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-calc"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -78,7 +76,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-draw"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-draw"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -92,7 +89,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-impress"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-impress"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -106,7 +102,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-base"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-base"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -120,7 +115,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-math"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-math"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -133,7 +127,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-graphicfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-graphicfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -146,7 +139,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-testtool"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-testtool"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -159,7 +151,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-spellcheck"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-spellcheck"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -172,7 +163,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-xsltfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-xsltfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -185,7 +175,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-javafilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-javafilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -198,7 +187,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-gallery"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-gallery"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION"
+@@ -211,7 +199,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-lngutils"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-lngutils"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION"
+@@ -224,7 +211,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-activex"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-activex"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
+@@ -237,7 +223,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-pyuno"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-pyuno"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -245,25 +230,11 @@
+ End
+ 
+ Start
+-module = "gid_Module_Optional_Pymailmerge"
+-solarispackagename = "openofficeorg-emailmerge"
+-solarisrequires = "openofficeorg-pyuno"
+-packagename = "openoffice.org-emailmerge"
+-linuxreplaces = "openofficeorg-emailmerge"
+-requires = "openoffice.org-pyuno"
+-copyright = "1999-2005 by OpenOffice.org"
+-vendor = "OpenOffice.org"
+-description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
+-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+-End
+-
+-Start
+ module = "gid_Module_Root_Fonts_Ooo_Hidden"
+ solarispackagename = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-ooofonts"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -277,7 +248,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core02"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -290,7 +260,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core03"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -303,7 +272,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core04"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -316,7 +284,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core05"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -329,7 +296,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core06"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -342,7 +308,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core07"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -355,7 +320,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core08"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -368,7 +332,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core09"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -382,7 +345,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+-requires = "%UNIXPRODUCTNAME-core01"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
diff --git a/editors/openoffice-3-devel/files/patch-malloc b/editors/openoffice-3-devel/files/patch-malloc
deleted file mode 100644
index b923da9db5e6..000000000000
--- a/editors/openoffice-3-devel/files/patch-malloc
+++ /dev/null
@@ -1,25 +0,0 @@
-Issuetracker : #i57395#
-CWS          : N/A
-Author:      : <pjanik@openoffice.org> (JCA)
-Description  : 
-
-Index: canvas/source/tools/image.cxx
-===================================================================
-RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
-retrieving revision 1.2
-diff -u -r1.2 image.cxx
---- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
-+++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
-@@ -103,8 +103,11 @@
- // platform-dependend includes [wrapped into their own namepsaces]
- //////////////////////////////////////////////////////////////////////////////////
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>		// _alloca
--
-+#else
-+#include <stdlib.h>
-+#endif
- #if defined(WNT)
- 	namespace  win32 
-     {
diff --git a/editors/openoffice-3-devel/files/patch-pythonlink b/editors/openoffice-3-devel/files/patch-pythonlink
deleted file mode 100644
index 779d21c95f44..000000000000
--- a/editors/openoffice-3-devel/files/patch-pythonlink
+++ /dev/null
@@ -1,312 +0,0 @@
-Issuetracker : #i56955#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : Remove instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-
-It is desirable to prepare minimal shellscripts as far as possible at
-installation part, and possibly, no shellscripts. However,
-unfortunately three things had done at shellscripts_pyuno.txt.
-
-1. symlink to python.sh -> python
-2. chmod +x program/python-core-2.3.4/bin/python
-3. symlink to python-core-2.3.4 -> python-core
-
-solution
-
-0. apply following patch. full build confirmed for SRC680_m134, FreeBSD 5.4-RELEASE.
-1. Done in scp2 project: prepare scp2/source/python/shortcut_python.scp and scp2/util/makefile.mk,
-and make a symlink to python.sh -> python.
-(3. is impossible to solve in this way since we only have python-core-2.3.4.zip in files in scp2.)
-2. Do not use program/python-core-2.3.4/bin/python, use program/python.bin instead. python.sh
-now executes program/python.bin. this is usual way; see e.g., spadmin etc.
-3. change from symlinking python-core-2.3.4->python-core
-to adding version number (by replacing by sed) to python.sh which invoke python in OOo,
-and we don't have to make a symlink.
-
-suggestion (and not yet done):
-
-4. we can also remove symlink from python.sh to python and
-rename python.sh to python. apparently intermidiate python.sh is unnecessary.
-currently: python -> python.sh -> python.bin
-suggested: python -> python.bin
-delivering a shell script python can harm since we have python binary from python project
-as well. but this is safe since python (shell script) and python.bin are delivered,
-at the same time.
-
---- scp2/source/python/makefile.mk	Fri Sep  9 10:43:01 2005
-+++ scp2/source/python/makefile.mk	Wed Oct 26 17:12:52 2005
-@@ -60,7 +60,8 @@
- PARFILES=\
-         module_python.par              \
-         profileitem_python.par         \
--        file_python.par
-+        file_python.par                \
-+        shortcut_python.par
- 
- ULFFILES= \
-         module_python.ulf 
-
---- scp2/util/makefile.mk	Fri Sep  9 10:52:09 2005
-+++ scp2/util/makefile.mk	Thu Oct 27 07:25:25 2005
-@@ -87,7 +87,8 @@
-              file_xsltfilter.par           \
-              module_python.par             \
-              file_python.par               \
--             profileitem_python.par
-+             profileitem_python.par        \
-+             shortcut_python.par
- 
- .IF "$(SOLAR_JAVA)"!=""
- SCP1FILES +=                               \
-
---- /dev/null	Thu Oct 27 09:59:37 2005
-+++ scp2/source/python/shortcut_python.scp	Thu Oct 27 09:59:19 2005
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: shortcut_python.scp,v $
-+ *
-+ *  $Revision: 1.20 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2005/09/09 01:42:03 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef SYSTEM_PYTHON
-+#ifdef UNX
-+
-+Shortcut gid_Shortcut_Python_Sh
-+    FileID = gid_File_Python_Sh;
-+    Dir = gid_Dir_Program;
-+    Name = "python";
-+    Styles = (RELATIVE);
-+End
-+
-+#endif
-+#endif
-
---- instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt	Thu Aug 18 17:11:29 2005
-+++ /dev/null	Wed Oct 26 09:51:22 2005
-@@ -1,74 +0,0 @@
--%preinstall << END
--# echo Command before installing
--exit 0
--END
--
--%postinstall << END
--# echo Command after installing
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -d $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4 ]
--then
--  ln -s python-core-2.3.4 $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python.sh ]
--then
--  ln -s python.sh $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python ]
--then
--  chmod +x $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python
--fi
--
--exit 0
--END
--
--%preremove << END
--# echo Command before removing
--exit 0
--END
--
--%postremove << END
--# echo Command after removing
--
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--
--exit 0
--END
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	Wed Oct 26 17:34:58 2005
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	Thu Oct 27 06:25:32 2005
-@@ -233,7 +233,6 @@
- 
- Start
- module = "gid_Module_Optional_Pyuno"
--script = "shellscripts_pyuno.txt"
- solarispackagename = "openofficeorg-pyuno"
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-pyuno"
-
-
---- pyuno/zipcore/python.sh	Fri Sep  9 01:55:24 2005
-+++ pyuno/zipcore/python.sh	Thu Oct 27 14:48:08 2005
-@@ -101,14 +101,14 @@
-     ;;
- esac
- 
--PYTHONPATH="$sd_prog":"$sd_prog/python-core/lib":"$sd_prog/python-core/lib/lib-dynload":"$sd_prog/python-core/lib/lib-tk":"$PYTHONPATH"
-+PYTHONPATH="$sd_prog":"$sd_prog/python-core-%%PYVERSION%%/lib":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk":"$PYTHONPATH"
- export PYTHONPATH
- 
--PYTHONHOME="$sd_prog"/python-core
-+PYTHONHOME="$sd_prog"/python-core-%%PYVERSION%%
- export PYTHONHOME
- 
- # set path so that other apps can be started from soffice just by name
- PATH="$sd_prog":$PATH
- export PATH
--exec "$sd_prog/python-core/bin/python" "$@"
-+exec "$sd_prog/python.bin" "$@"
- 
---- pyuno/zipcore/makefile.mk	Thu Sep  9 01:55:34 2004
-+++ pyuno/zipcore/makefile.mk	Thu Oct 27 14:47:34 2005
-@@ -12,7 +12,11 @@
- 
- PYDIRNAME=python-core-$(PYVERSION)
- DESTROOT=$(BIN)$/python-core-$(PYVERSION)
-+.IF "$(GUI)" == "UNX"
-+PYTHONBINARY=$(BIN)$/python$(EXECPOST).bin
-+.ELSE
- PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
-+.ENDIF
- 
- FINDLIBFILES_TMP:=$(subst,/,$/ \
- 	$(shell +$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc ))
-@@ -29,6 +33,8 @@
- $(BIN)$/python.sh : python.sh
- 	-rm -f $@
- 	cat $? > $@
-+	sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ > $@.new
-+	mv $@.new $@
- .IF "$(GUI)" == "UNX"
- 	chmod +x $@
- .ENDIF
-@@ -47,15 +53,21 @@
- 	-rm -f $@
- 	cat $< > $@
- 
--$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+.IF "$(GUI)"== "UNX"
-+$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
- 	-+$(MKDIRHIER) $(@:d)
- 	-rm -f $@
- 	cat $< > $@
--.IF "$(GUI)"== "UNX"
- .IF "$(OS)" != "MACOSX"
- 	strip $@
- .ENDIF
- 	chmod +x $@
-+.ELSE
-+$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+	-+$(MKDIRHIER) $(@:d)
-+	-rm -f $@
-+	cat $< > $@
-+	strip $@
- .ENDIF
- 
- .ENDIF
---- pyuno/prj/d.lst	Wed Feb 16 03:46:13 2005
-+++ pyuno/prj/d.lst	Thu Oct 27 14:52:10 2005
-@@ -22,4 +22,5 @@
- ..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
- ..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
- ..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-+..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
- ..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\python.sh
-
- 
---- scp2/source/python/module_python.scp	Fri Sep  9 10:43:17 2005
-+++ scp2/source/python/module_python.scp	Thu Oct 27 14:54:41 2005
-@@ -38,7 +38,7 @@
- Module gid_Module_Optional_Pyuno
-     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
-     ParentID = gid_Module_Optional;
--    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-     Minimal = NO;
-     Default = YES;
-     Styles = ( );
-
---- scp2/source/python/file_python.scp	Fri Sep  9 10:42:31 2005
-+++ scp2/source/python/file_python.scp	Thu Oct 27 16:41:18 2005
-@@ -86,8 +86,17 @@
-     Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
-     Styles = (ARCHIVE);
- End
-+
-+#ifdef UNX
-+File gid_File_Py_Python_Bin
-+    BIN_FILE_BODY;
-+    Dir = gid_Dir_Program;
-+    Name = "python.bin";
-+    Styles = (PACKED);
-+End
- #endif
- 
-+#endif
- 
- // substitute for the python Windows basic scripts
- 
diff --git a/editors/openoffice-3-devel/files/patch-sdkoo b/editors/openoffice-3-devel/files/patch-sdkoo
new file mode 100644
index 000000000000..6abc48956024
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sdkoo
@@ -0,0 +1,19 @@
+building sdk is broken at the moment.
+
+Index: instsetoo_native/util/makefile.mk
+===================================================================
+RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
+retrieving revision 1.47
+diff -u -r1.47 makefile.mk
+--- instsetoo_native/util/makefile.mk	11 Nov 2005 10:39:44 -0000	1.47
++++ instsetoo_native/util/makefile.mk	17 Nov 2005 00:11:06 -0000
+@@ -96,7 +96,8 @@
+ 	@echo "No EPM: do no packaging at this stage"
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+-ALLTAR : openoffice sdkoo ure_en-US
++#ALLTAR : openoffice sdkoo ure_en-US
++ALLTAR : openoffice
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack
+ .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 7b2b9f60d2c7..3ae90cd574da 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -60,8 +59,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		138
-SNAPDATE=		20051104
+MILESTONE=		140
+SNAPDATE=		20051116
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -110,7 +109,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison-devel:${PORTSDIR}/devel/bison-devel \
+		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index ca146d10fa6d..b20b1eeffc0d 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
-SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
+MD5 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 851e7428d756a5e0c8b55e72ab386bfd
+SIZE (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 232687335
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-devel/files/Makefile.others b/editors/openoffice.org-2-devel/files/Makefile.others
index e97ee054c437..5a5dd2495c91 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.others
+++ b/editors/openoffice.org-2-devel/files/Makefile.others
@@ -22,8 +22,14 @@ package-canonical:
 
 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/SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
+		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
diff --git a/editors/openoffice.org-2-devel/files/patch-agg b/editors/openoffice.org-2-devel/files/patch-agg
deleted file mode 100644
index ee1098b822b5..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-agg
+++ /dev/null
@@ -1,18 +0,0 @@
-Issuetracker : #i57388#
-CWS          : N/A
-Author:      : <rene@openoffice.org> (JCA)
-Description  : 
-
-Index: agg/prj/build.lst
-===================================================================
-RCS file: /cvs/external/agg/prj/build.lst,v
-retrieving revision 1.2
-diff -u -r1.2 build.lst
---- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
-+++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
-@@ -1,4 +1,4 @@
--ag	agg	:	soltools NULL
-+ag	agg	:	soltools xml2cmp sal NULL
- ag	agg										usr1	-	all	ag_mkout NULL
- ag	agg\inc									get		-	all	ag_inc NULL
- ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice.org-2-devel/files/patch-instsetoo b/editors/openoffice.org-2-devel/files/patch-instsetoo
index fe7e3b5f3845..c87abb43b6fd 100644
--- a/editors/openoffice.org-2-devel/files/patch-instsetoo
+++ b/editors/openoffice.org-2-devel/files/patch-instsetoo
@@ -13,88 +13,234 @@ 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
+retrieving revision 1.20
+diff -u -r1.20 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	11 Nov 2005 10:39:31 -0000	1.20
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	16 Nov 2005 21:54:35 -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"
+ solarisrequires = ""
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-mailcap,%UNIXPRODUCTNAMEWITHOUTDOT-core,%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+-requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++requires = "%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"
+@@ -50,7 +50,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-writer"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-writer"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -64,7 +63,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-calc"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-calc"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -78,7 +76,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-draw"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-draw"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -92,7 +89,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-impress"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-impress"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -106,7 +102,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-base"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-base"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -120,7 +115,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-math"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-math"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -133,7 +127,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-graphicfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-graphicfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -146,7 +139,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-testtool"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-testtool"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -159,7 +151,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-spellcheck"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-spellcheck"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -172,7 +163,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-xsltfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-xsltfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -185,7 +175,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-javafilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-javafilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -198,7 +187,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-gallery"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-gallery"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION"
+@@ -211,7 +199,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-lngutils"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-lngutils"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION"
+@@ -224,7 +211,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-activex"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-activex"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
+@@ -237,7 +223,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-pyuno"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-pyuno"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -245,25 +230,11 @@
+ End
+ 
+ Start
+-module = "gid_Module_Optional_Pymailmerge"
+-solarispackagename = "openofficeorg-emailmerge"
+-solarisrequires = "openofficeorg-pyuno"
+-packagename = "openoffice.org-emailmerge"
+-linuxreplaces = "openofficeorg-emailmerge"
+-requires = "openoffice.org-pyuno"
+-copyright = "1999-2005 by OpenOffice.org"
+-vendor = "OpenOffice.org"
+-description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
+-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+-End
+-
+-Start
+ module = "gid_Module_Root_Fonts_Ooo_Hidden"
+ solarispackagename = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-ooofonts"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -277,7 +248,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core02"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -290,7 +260,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core03"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -303,7 +272,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core04"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -316,7 +284,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core05"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -329,7 +296,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core06"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -342,7 +308,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core07"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -355,7 +320,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core08"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -368,7 +332,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core09"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -382,7 +345,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+-requires = "%UNIXPRODUCTNAME-core01"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
diff --git a/editors/openoffice.org-2-devel/files/patch-malloc b/editors/openoffice.org-2-devel/files/patch-malloc
deleted file mode 100644
index b923da9db5e6..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-malloc
+++ /dev/null
@@ -1,25 +0,0 @@
-Issuetracker : #i57395#
-CWS          : N/A
-Author:      : <pjanik@openoffice.org> (JCA)
-Description  : 
-
-Index: canvas/source/tools/image.cxx
-===================================================================
-RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
-retrieving revision 1.2
-diff -u -r1.2 image.cxx
---- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
-+++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
-@@ -103,8 +103,11 @@
- // platform-dependend includes [wrapped into their own namepsaces]
- //////////////////////////////////////////////////////////////////////////////////
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>		// _alloca
--
-+#else
-+#include <stdlib.h>
-+#endif
- #if defined(WNT)
- 	namespace  win32 
-     {
diff --git a/editors/openoffice.org-2-devel/files/patch-pythonlink b/editors/openoffice.org-2-devel/files/patch-pythonlink
deleted file mode 100644
index 779d21c95f44..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-pythonlink
+++ /dev/null
@@ -1,312 +0,0 @@
-Issuetracker : #i56955#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : Remove instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-
-It is desirable to prepare minimal shellscripts as far as possible at
-installation part, and possibly, no shellscripts. However,
-unfortunately three things had done at shellscripts_pyuno.txt.
-
-1. symlink to python.sh -> python
-2. chmod +x program/python-core-2.3.4/bin/python
-3. symlink to python-core-2.3.4 -> python-core
-
-solution
-
-0. apply following patch. full build confirmed for SRC680_m134, FreeBSD 5.4-RELEASE.
-1. Done in scp2 project: prepare scp2/source/python/shortcut_python.scp and scp2/util/makefile.mk,
-and make a symlink to python.sh -> python.
-(3. is impossible to solve in this way since we only have python-core-2.3.4.zip in files in scp2.)
-2. Do not use program/python-core-2.3.4/bin/python, use program/python.bin instead. python.sh
-now executes program/python.bin. this is usual way; see e.g., spadmin etc.
-3. change from symlinking python-core-2.3.4->python-core
-to adding version number (by replacing by sed) to python.sh which invoke python in OOo,
-and we don't have to make a symlink.
-
-suggestion (and not yet done):
-
-4. we can also remove symlink from python.sh to python and
-rename python.sh to python. apparently intermidiate python.sh is unnecessary.
-currently: python -> python.sh -> python.bin
-suggested: python -> python.bin
-delivering a shell script python can harm since we have python binary from python project
-as well. but this is safe since python (shell script) and python.bin are delivered,
-at the same time.
-
---- scp2/source/python/makefile.mk	Fri Sep  9 10:43:01 2005
-+++ scp2/source/python/makefile.mk	Wed Oct 26 17:12:52 2005
-@@ -60,7 +60,8 @@
- PARFILES=\
-         module_python.par              \
-         profileitem_python.par         \
--        file_python.par
-+        file_python.par                \
-+        shortcut_python.par
- 
- ULFFILES= \
-         module_python.ulf 
-
---- scp2/util/makefile.mk	Fri Sep  9 10:52:09 2005
-+++ scp2/util/makefile.mk	Thu Oct 27 07:25:25 2005
-@@ -87,7 +87,8 @@
-              file_xsltfilter.par           \
-              module_python.par             \
-              file_python.par               \
--             profileitem_python.par
-+             profileitem_python.par        \
-+             shortcut_python.par
- 
- .IF "$(SOLAR_JAVA)"!=""
- SCP1FILES +=                               \
-
---- /dev/null	Thu Oct 27 09:59:37 2005
-+++ scp2/source/python/shortcut_python.scp	Thu Oct 27 09:59:19 2005
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: shortcut_python.scp,v $
-+ *
-+ *  $Revision: 1.20 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2005/09/09 01:42:03 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef SYSTEM_PYTHON
-+#ifdef UNX
-+
-+Shortcut gid_Shortcut_Python_Sh
-+    FileID = gid_File_Python_Sh;
-+    Dir = gid_Dir_Program;
-+    Name = "python";
-+    Styles = (RELATIVE);
-+End
-+
-+#endif
-+#endif
-
---- instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt	Thu Aug 18 17:11:29 2005
-+++ /dev/null	Wed Oct 26 09:51:22 2005
-@@ -1,74 +0,0 @@
--%preinstall << END
--# echo Command before installing
--exit 0
--END
--
--%postinstall << END
--# echo Command after installing
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -d $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4 ]
--then
--  ln -s python-core-2.3.4 $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python.sh ]
--then
--  ln -s python.sh $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python ]
--then
--  chmod +x $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python
--fi
--
--exit 0
--END
--
--%preremove << END
--# echo Command before removing
--exit 0
--END
--
--%postremove << END
--# echo Command after removing
--
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--
--exit 0
--END
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	Wed Oct 26 17:34:58 2005
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	Thu Oct 27 06:25:32 2005
-@@ -233,7 +233,6 @@
- 
- Start
- module = "gid_Module_Optional_Pyuno"
--script = "shellscripts_pyuno.txt"
- solarispackagename = "openofficeorg-pyuno"
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-pyuno"
-
-
---- pyuno/zipcore/python.sh	Fri Sep  9 01:55:24 2005
-+++ pyuno/zipcore/python.sh	Thu Oct 27 14:48:08 2005
-@@ -101,14 +101,14 @@
-     ;;
- esac
- 
--PYTHONPATH="$sd_prog":"$sd_prog/python-core/lib":"$sd_prog/python-core/lib/lib-dynload":"$sd_prog/python-core/lib/lib-tk":"$PYTHONPATH"
-+PYTHONPATH="$sd_prog":"$sd_prog/python-core-%%PYVERSION%%/lib":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk":"$PYTHONPATH"
- export PYTHONPATH
- 
--PYTHONHOME="$sd_prog"/python-core
-+PYTHONHOME="$sd_prog"/python-core-%%PYVERSION%%
- export PYTHONHOME
- 
- # set path so that other apps can be started from soffice just by name
- PATH="$sd_prog":$PATH
- export PATH
--exec "$sd_prog/python-core/bin/python" "$@"
-+exec "$sd_prog/python.bin" "$@"
- 
---- pyuno/zipcore/makefile.mk	Thu Sep  9 01:55:34 2004
-+++ pyuno/zipcore/makefile.mk	Thu Oct 27 14:47:34 2005
-@@ -12,7 +12,11 @@
- 
- PYDIRNAME=python-core-$(PYVERSION)
- DESTROOT=$(BIN)$/python-core-$(PYVERSION)
-+.IF "$(GUI)" == "UNX"
-+PYTHONBINARY=$(BIN)$/python$(EXECPOST).bin
-+.ELSE
- PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
-+.ENDIF
- 
- FINDLIBFILES_TMP:=$(subst,/,$/ \
- 	$(shell +$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc ))
-@@ -29,6 +33,8 @@
- $(BIN)$/python.sh : python.sh
- 	-rm -f $@
- 	cat $? > $@
-+	sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ > $@.new
-+	mv $@.new $@
- .IF "$(GUI)" == "UNX"
- 	chmod +x $@
- .ENDIF
-@@ -47,15 +53,21 @@
- 	-rm -f $@
- 	cat $< > $@
- 
--$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+.IF "$(GUI)"== "UNX"
-+$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
- 	-+$(MKDIRHIER) $(@:d)
- 	-rm -f $@
- 	cat $< > $@
--.IF "$(GUI)"== "UNX"
- .IF "$(OS)" != "MACOSX"
- 	strip $@
- .ENDIF
- 	chmod +x $@
-+.ELSE
-+$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+	-+$(MKDIRHIER) $(@:d)
-+	-rm -f $@
-+	cat $< > $@
-+	strip $@
- .ENDIF
- 
- .ENDIF
---- pyuno/prj/d.lst	Wed Feb 16 03:46:13 2005
-+++ pyuno/prj/d.lst	Thu Oct 27 14:52:10 2005
-@@ -22,4 +22,5 @@
- ..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
- ..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
- ..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-+..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
- ..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\python.sh
-
- 
---- scp2/source/python/module_python.scp	Fri Sep  9 10:43:17 2005
-+++ scp2/source/python/module_python.scp	Thu Oct 27 14:54:41 2005
-@@ -38,7 +38,7 @@
- Module gid_Module_Optional_Pyuno
-     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
-     ParentID = gid_Module_Optional;
--    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-     Minimal = NO;
-     Default = YES;
-     Styles = ( );
-
---- scp2/source/python/file_python.scp	Fri Sep  9 10:42:31 2005
-+++ scp2/source/python/file_python.scp	Thu Oct 27 16:41:18 2005
-@@ -86,8 +86,17 @@
-     Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
-     Styles = (ARCHIVE);
- End
-+
-+#ifdef UNX
-+File gid_File_Py_Python_Bin
-+    BIN_FILE_BODY;
-+    Dir = gid_Dir_Program;
-+    Name = "python.bin";
-+    Styles = (PACKED);
-+End
- #endif
- 
-+#endif
- 
- // substitute for the python Windows basic scripts
- 
diff --git a/editors/openoffice.org-2-devel/files/patch-sdkoo b/editors/openoffice.org-2-devel/files/patch-sdkoo
new file mode 100644
index 000000000000..6abc48956024
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sdkoo
@@ -0,0 +1,19 @@
+building sdk is broken at the moment.
+
+Index: instsetoo_native/util/makefile.mk
+===================================================================
+RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
+retrieving revision 1.47
+diff -u -r1.47 makefile.mk
+--- instsetoo_native/util/makefile.mk	11 Nov 2005 10:39:44 -0000	1.47
++++ instsetoo_native/util/makefile.mk	17 Nov 2005 00:11:06 -0000
+@@ -96,7 +96,8 @@
+ 	@echo "No EPM: do no packaging at this stage"
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+-ALLTAR : openoffice sdkoo ure_en-US
++#ALLTAR : openoffice sdkoo ure_en-US
++ALLTAR : openoffice
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack
+ .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 7b2b9f60d2c7..3ae90cd574da 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -60,8 +59,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		138
-SNAPDATE=		20051104
+MILESTONE=		140
+SNAPDATE=		20051116
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -110,7 +109,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison-devel:${PORTSDIR}/devel/bison-devel \
+		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index ca146d10fa6d..b20b1eeffc0d 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
-SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
+MD5 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 851e7428d756a5e0c8b55e72ab386bfd
+SIZE (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 232687335
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.others b/editors/openoffice.org-2.0-devel/files/Makefile.others
index e97ee054c437..5a5dd2495c91 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.others
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.others
@@ -22,8 +22,14 @@ package-canonical:
 
 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/SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
+		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-agg b/editors/openoffice.org-2.0-devel/files/patch-agg
deleted file mode 100644
index ee1098b822b5..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-agg
+++ /dev/null
@@ -1,18 +0,0 @@
-Issuetracker : #i57388#
-CWS          : N/A
-Author:      : <rene@openoffice.org> (JCA)
-Description  : 
-
-Index: agg/prj/build.lst
-===================================================================
-RCS file: /cvs/external/agg/prj/build.lst,v
-retrieving revision 1.2
-diff -u -r1.2 build.lst
---- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
-+++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
-@@ -1,4 +1,4 @@
--ag	agg	:	soltools NULL
-+ag	agg	:	soltools xml2cmp sal NULL
- ag	agg										usr1	-	all	ag_mkout NULL
- ag	agg\inc									get		-	all	ag_inc NULL
- ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice.org-2.0-devel/files/patch-instsetoo b/editors/openoffice.org-2.0-devel/files/patch-instsetoo
index fe7e3b5f3845..c87abb43b6fd 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-instsetoo
+++ b/editors/openoffice.org-2.0-devel/files/patch-instsetoo
@@ -13,88 +13,234 @@ 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
+retrieving revision 1.20
+diff -u -r1.20 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	11 Nov 2005 10:39:31 -0000	1.20
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	16 Nov 2005 21:54:35 -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"
+ solarisrequires = ""
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-mailcap,%UNIXPRODUCTNAMEWITHOUTDOT-core,%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+-requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++requires = "%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"
+@@ -50,7 +50,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-writer"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-writer"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -64,7 +63,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-calc"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-calc"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -78,7 +76,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-draw"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-draw"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -92,7 +89,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-impress"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-impress"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -106,7 +102,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-base"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-base"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -120,7 +115,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-math"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-math"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -133,7 +127,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-graphicfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-graphicfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -146,7 +139,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-testtool"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-testtool"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -159,7 +151,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-spellcheck"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-spellcheck"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -172,7 +163,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-xsltfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-xsltfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -185,7 +175,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-javafilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-javafilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -198,7 +187,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-gallery"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-gallery"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION"
+@@ -211,7 +199,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-lngutils"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-lngutils"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION"
+@@ -224,7 +211,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-activex"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-activex"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
+@@ -237,7 +223,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-pyuno"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-pyuno"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -245,25 +230,11 @@
+ End
+ 
+ Start
+-module = "gid_Module_Optional_Pymailmerge"
+-solarispackagename = "openofficeorg-emailmerge"
+-solarisrequires = "openofficeorg-pyuno"
+-packagename = "openoffice.org-emailmerge"
+-linuxreplaces = "openofficeorg-emailmerge"
+-requires = "openoffice.org-pyuno"
+-copyright = "1999-2005 by OpenOffice.org"
+-vendor = "OpenOffice.org"
+-description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
+-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+-End
+-
+-Start
+ module = "gid_Module_Root_Fonts_Ooo_Hidden"
+ solarispackagename = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-ooofonts"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -277,7 +248,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core02"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -290,7 +260,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core03"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -303,7 +272,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core04"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -316,7 +284,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core05"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -329,7 +296,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core06"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -342,7 +308,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core07"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -355,7 +320,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core08"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -368,7 +332,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core09"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -382,7 +345,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+-requires = "%UNIXPRODUCTNAME-core01"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
diff --git a/editors/openoffice.org-2.0-devel/files/patch-malloc b/editors/openoffice.org-2.0-devel/files/patch-malloc
deleted file mode 100644
index b923da9db5e6..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-malloc
+++ /dev/null
@@ -1,25 +0,0 @@
-Issuetracker : #i57395#
-CWS          : N/A
-Author:      : <pjanik@openoffice.org> (JCA)
-Description  : 
-
-Index: canvas/source/tools/image.cxx
-===================================================================
-RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
-retrieving revision 1.2
-diff -u -r1.2 image.cxx
---- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
-+++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
-@@ -103,8 +103,11 @@
- // platform-dependend includes [wrapped into their own namepsaces]
- //////////////////////////////////////////////////////////////////////////////////
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>		// _alloca
--
-+#else
-+#include <stdlib.h>
-+#endif
- #if defined(WNT)
- 	namespace  win32 
-     {
diff --git a/editors/openoffice.org-2.0-devel/files/patch-pythonlink b/editors/openoffice.org-2.0-devel/files/patch-pythonlink
deleted file mode 100644
index 779d21c95f44..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-pythonlink
+++ /dev/null
@@ -1,312 +0,0 @@
-Issuetracker : #i56955#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : Remove instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-
-It is desirable to prepare minimal shellscripts as far as possible at
-installation part, and possibly, no shellscripts. However,
-unfortunately three things had done at shellscripts_pyuno.txt.
-
-1. symlink to python.sh -> python
-2. chmod +x program/python-core-2.3.4/bin/python
-3. symlink to python-core-2.3.4 -> python-core
-
-solution
-
-0. apply following patch. full build confirmed for SRC680_m134, FreeBSD 5.4-RELEASE.
-1. Done in scp2 project: prepare scp2/source/python/shortcut_python.scp and scp2/util/makefile.mk,
-and make a symlink to python.sh -> python.
-(3. is impossible to solve in this way since we only have python-core-2.3.4.zip in files in scp2.)
-2. Do not use program/python-core-2.3.4/bin/python, use program/python.bin instead. python.sh
-now executes program/python.bin. this is usual way; see e.g., spadmin etc.
-3. change from symlinking python-core-2.3.4->python-core
-to adding version number (by replacing by sed) to python.sh which invoke python in OOo,
-and we don't have to make a symlink.
-
-suggestion (and not yet done):
-
-4. we can also remove symlink from python.sh to python and
-rename python.sh to python. apparently intermidiate python.sh is unnecessary.
-currently: python -> python.sh -> python.bin
-suggested: python -> python.bin
-delivering a shell script python can harm since we have python binary from python project
-as well. but this is safe since python (shell script) and python.bin are delivered,
-at the same time.
-
---- scp2/source/python/makefile.mk	Fri Sep  9 10:43:01 2005
-+++ scp2/source/python/makefile.mk	Wed Oct 26 17:12:52 2005
-@@ -60,7 +60,8 @@
- PARFILES=\
-         module_python.par              \
-         profileitem_python.par         \
--        file_python.par
-+        file_python.par                \
-+        shortcut_python.par
- 
- ULFFILES= \
-         module_python.ulf 
-
---- scp2/util/makefile.mk	Fri Sep  9 10:52:09 2005
-+++ scp2/util/makefile.mk	Thu Oct 27 07:25:25 2005
-@@ -87,7 +87,8 @@
-              file_xsltfilter.par           \
-              module_python.par             \
-              file_python.par               \
--             profileitem_python.par
-+             profileitem_python.par        \
-+             shortcut_python.par
- 
- .IF "$(SOLAR_JAVA)"!=""
- SCP1FILES +=                               \
-
---- /dev/null	Thu Oct 27 09:59:37 2005
-+++ scp2/source/python/shortcut_python.scp	Thu Oct 27 09:59:19 2005
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: shortcut_python.scp,v $
-+ *
-+ *  $Revision: 1.20 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2005/09/09 01:42:03 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef SYSTEM_PYTHON
-+#ifdef UNX
-+
-+Shortcut gid_Shortcut_Python_Sh
-+    FileID = gid_File_Python_Sh;
-+    Dir = gid_Dir_Program;
-+    Name = "python";
-+    Styles = (RELATIVE);
-+End
-+
-+#endif
-+#endif
-
---- instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt	Thu Aug 18 17:11:29 2005
-+++ /dev/null	Wed Oct 26 09:51:22 2005
-@@ -1,74 +0,0 @@
--%preinstall << END
--# echo Command before installing
--exit 0
--END
--
--%postinstall << END
--# echo Command after installing
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -d $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4 ]
--then
--  ln -s python-core-2.3.4 $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python.sh ]
--then
--  ln -s python.sh $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python ]
--then
--  chmod +x $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python
--fi
--
--exit 0
--END
--
--%preremove << END
--# echo Command before removing
--exit 0
--END
--
--%postremove << END
--# echo Command after removing
--
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--
--exit 0
--END
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	Wed Oct 26 17:34:58 2005
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	Thu Oct 27 06:25:32 2005
-@@ -233,7 +233,6 @@
- 
- Start
- module = "gid_Module_Optional_Pyuno"
--script = "shellscripts_pyuno.txt"
- solarispackagename = "openofficeorg-pyuno"
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-pyuno"
-
-
---- pyuno/zipcore/python.sh	Fri Sep  9 01:55:24 2005
-+++ pyuno/zipcore/python.sh	Thu Oct 27 14:48:08 2005
-@@ -101,14 +101,14 @@
-     ;;
- esac
- 
--PYTHONPATH="$sd_prog":"$sd_prog/python-core/lib":"$sd_prog/python-core/lib/lib-dynload":"$sd_prog/python-core/lib/lib-tk":"$PYTHONPATH"
-+PYTHONPATH="$sd_prog":"$sd_prog/python-core-%%PYVERSION%%/lib":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk":"$PYTHONPATH"
- export PYTHONPATH
- 
--PYTHONHOME="$sd_prog"/python-core
-+PYTHONHOME="$sd_prog"/python-core-%%PYVERSION%%
- export PYTHONHOME
- 
- # set path so that other apps can be started from soffice just by name
- PATH="$sd_prog":$PATH
- export PATH
--exec "$sd_prog/python-core/bin/python" "$@"
-+exec "$sd_prog/python.bin" "$@"
- 
---- pyuno/zipcore/makefile.mk	Thu Sep  9 01:55:34 2004
-+++ pyuno/zipcore/makefile.mk	Thu Oct 27 14:47:34 2005
-@@ -12,7 +12,11 @@
- 
- PYDIRNAME=python-core-$(PYVERSION)
- DESTROOT=$(BIN)$/python-core-$(PYVERSION)
-+.IF "$(GUI)" == "UNX"
-+PYTHONBINARY=$(BIN)$/python$(EXECPOST).bin
-+.ELSE
- PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
-+.ENDIF
- 
- FINDLIBFILES_TMP:=$(subst,/,$/ \
- 	$(shell +$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc ))
-@@ -29,6 +33,8 @@
- $(BIN)$/python.sh : python.sh
- 	-rm -f $@
- 	cat $? > $@
-+	sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ > $@.new
-+	mv $@.new $@
- .IF "$(GUI)" == "UNX"
- 	chmod +x $@
- .ENDIF
-@@ -47,15 +53,21 @@
- 	-rm -f $@
- 	cat $< > $@
- 
--$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+.IF "$(GUI)"== "UNX"
-+$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
- 	-+$(MKDIRHIER) $(@:d)
- 	-rm -f $@
- 	cat $< > $@
--.IF "$(GUI)"== "UNX"
- .IF "$(OS)" != "MACOSX"
- 	strip $@
- .ENDIF
- 	chmod +x $@
-+.ELSE
-+$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+	-+$(MKDIRHIER) $(@:d)
-+	-rm -f $@
-+	cat $< > $@
-+	strip $@
- .ENDIF
- 
- .ENDIF
---- pyuno/prj/d.lst	Wed Feb 16 03:46:13 2005
-+++ pyuno/prj/d.lst	Thu Oct 27 14:52:10 2005
-@@ -22,4 +22,5 @@
- ..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
- ..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
- ..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-+..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
- ..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\python.sh
-
- 
---- scp2/source/python/module_python.scp	Fri Sep  9 10:43:17 2005
-+++ scp2/source/python/module_python.scp	Thu Oct 27 14:54:41 2005
-@@ -38,7 +38,7 @@
- Module gid_Module_Optional_Pyuno
-     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
-     ParentID = gid_Module_Optional;
--    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-     Minimal = NO;
-     Default = YES;
-     Styles = ( );
-
---- scp2/source/python/file_python.scp	Fri Sep  9 10:42:31 2005
-+++ scp2/source/python/file_python.scp	Thu Oct 27 16:41:18 2005
-@@ -86,8 +86,17 @@
-     Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
-     Styles = (ARCHIVE);
- End
-+
-+#ifdef UNX
-+File gid_File_Py_Python_Bin
-+    BIN_FILE_BODY;
-+    Dir = gid_Dir_Program;
-+    Name = "python.bin";
-+    Styles = (PACKED);
-+End
- #endif
- 
-+#endif
- 
- // substitute for the python Windows basic scripts
- 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sdkoo b/editors/openoffice.org-2.0-devel/files/patch-sdkoo
new file mode 100644
index 000000000000..6abc48956024
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-sdkoo
@@ -0,0 +1,19 @@
+building sdk is broken at the moment.
+
+Index: instsetoo_native/util/makefile.mk
+===================================================================
+RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
+retrieving revision 1.47
+diff -u -r1.47 makefile.mk
+--- instsetoo_native/util/makefile.mk	11 Nov 2005 10:39:44 -0000	1.47
++++ instsetoo_native/util/makefile.mk	17 Nov 2005 00:11:06 -0000
+@@ -96,7 +96,8 @@
+ 	@echo "No EPM: do no packaging at this stage"
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+-ALLTAR : openoffice sdkoo ure_en-US
++#ALLTAR : openoffice sdkoo ure_en-US
++ALLTAR : openoffice
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack
+ .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 7b2b9f60d2c7..3ae90cd574da 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -60,8 +59,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		138
-SNAPDATE=		20051104
+MILESTONE=		140
+SNAPDATE=		20051116
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -110,7 +109,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison-devel:${PORTSDIR}/devel/bison-devel \
+		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index ca146d10fa6d..b20b1eeffc0d 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
-SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
+MD5 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 851e7428d756a5e0c8b55e72ab386bfd
+SIZE (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 232687335
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-devel/files/Makefile.others b/editors/openoffice.org-3-devel/files/Makefile.others
index e97ee054c437..5a5dd2495c91 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.others
+++ b/editors/openoffice.org-3-devel/files/Makefile.others
@@ -22,8 +22,14 @@ package-canonical:
 
 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/SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
+		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
diff --git a/editors/openoffice.org-3-devel/files/patch-agg b/editors/openoffice.org-3-devel/files/patch-agg
deleted file mode 100644
index ee1098b822b5..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-agg
+++ /dev/null
@@ -1,18 +0,0 @@
-Issuetracker : #i57388#
-CWS          : N/A
-Author:      : <rene@openoffice.org> (JCA)
-Description  : 
-
-Index: agg/prj/build.lst
-===================================================================
-RCS file: /cvs/external/agg/prj/build.lst,v
-retrieving revision 1.2
-diff -u -r1.2 build.lst
---- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
-+++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
-@@ -1,4 +1,4 @@
--ag	agg	:	soltools NULL
-+ag	agg	:	soltools xml2cmp sal NULL
- ag	agg										usr1	-	all	ag_mkout NULL
- ag	agg\inc									get		-	all	ag_inc NULL
- ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice.org-3-devel/files/patch-instsetoo b/editors/openoffice.org-3-devel/files/patch-instsetoo
index fe7e3b5f3845..c87abb43b6fd 100644
--- a/editors/openoffice.org-3-devel/files/patch-instsetoo
+++ b/editors/openoffice.org-3-devel/files/patch-instsetoo
@@ -13,88 +13,234 @@ 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
+retrieving revision 1.20
+diff -u -r1.20 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	11 Nov 2005 10:39:31 -0000	1.20
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	16 Nov 2005 21:54:35 -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"
+ solarisrequires = ""
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-mailcap,%UNIXPRODUCTNAMEWITHOUTDOT-core,%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+-requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++requires = "%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"
+@@ -50,7 +50,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-writer"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-writer"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -64,7 +63,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-calc"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-calc"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -78,7 +76,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-draw"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-draw"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -92,7 +89,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-impress"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-impress"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -106,7 +102,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-base"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-base"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -120,7 +115,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-math"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-math"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -133,7 +127,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-graphicfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-graphicfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -146,7 +139,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-testtool"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-testtool"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -159,7 +151,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-spellcheck"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-spellcheck"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -172,7 +163,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-xsltfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-xsltfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -185,7 +175,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-javafilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-javafilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -198,7 +187,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-gallery"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-gallery"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION"
+@@ -211,7 +199,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-lngutils"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-lngutils"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION"
+@@ -224,7 +211,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-activex"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-activex"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
+@@ -237,7 +223,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-pyuno"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-pyuno"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -245,25 +230,11 @@
+ End
+ 
+ Start
+-module = "gid_Module_Optional_Pymailmerge"
+-solarispackagename = "openofficeorg-emailmerge"
+-solarisrequires = "openofficeorg-pyuno"
+-packagename = "openoffice.org-emailmerge"
+-linuxreplaces = "openofficeorg-emailmerge"
+-requires = "openoffice.org-pyuno"
+-copyright = "1999-2005 by OpenOffice.org"
+-vendor = "OpenOffice.org"
+-description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
+-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+-End
+-
+-Start
+ module = "gid_Module_Root_Fonts_Ooo_Hidden"
+ solarispackagename = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-ooofonts"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -277,7 +248,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core02"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -290,7 +260,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core03"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -303,7 +272,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core04"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -316,7 +284,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core05"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -329,7 +296,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core06"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -342,7 +308,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core07"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -355,7 +320,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core08"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -368,7 +332,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core09"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -382,7 +345,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+-requires = "%UNIXPRODUCTNAME-core01"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
diff --git a/editors/openoffice.org-3-devel/files/patch-malloc b/editors/openoffice.org-3-devel/files/patch-malloc
deleted file mode 100644
index b923da9db5e6..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-malloc
+++ /dev/null
@@ -1,25 +0,0 @@
-Issuetracker : #i57395#
-CWS          : N/A
-Author:      : <pjanik@openoffice.org> (JCA)
-Description  : 
-
-Index: canvas/source/tools/image.cxx
-===================================================================
-RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
-retrieving revision 1.2
-diff -u -r1.2 image.cxx
---- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
-+++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
-@@ -103,8 +103,11 @@
- // platform-dependend includes [wrapped into their own namepsaces]
- //////////////////////////////////////////////////////////////////////////////////
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>		// _alloca
--
-+#else
-+#include <stdlib.h>
-+#endif
- #if defined(WNT)
- 	namespace  win32 
-     {
diff --git a/editors/openoffice.org-3-devel/files/patch-pythonlink b/editors/openoffice.org-3-devel/files/patch-pythonlink
deleted file mode 100644
index 779d21c95f44..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-pythonlink
+++ /dev/null
@@ -1,312 +0,0 @@
-Issuetracker : #i56955#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : Remove instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-
-It is desirable to prepare minimal shellscripts as far as possible at
-installation part, and possibly, no shellscripts. However,
-unfortunately three things had done at shellscripts_pyuno.txt.
-
-1. symlink to python.sh -> python
-2. chmod +x program/python-core-2.3.4/bin/python
-3. symlink to python-core-2.3.4 -> python-core
-
-solution
-
-0. apply following patch. full build confirmed for SRC680_m134, FreeBSD 5.4-RELEASE.
-1. Done in scp2 project: prepare scp2/source/python/shortcut_python.scp and scp2/util/makefile.mk,
-and make a symlink to python.sh -> python.
-(3. is impossible to solve in this way since we only have python-core-2.3.4.zip in files in scp2.)
-2. Do not use program/python-core-2.3.4/bin/python, use program/python.bin instead. python.sh
-now executes program/python.bin. this is usual way; see e.g., spadmin etc.
-3. change from symlinking python-core-2.3.4->python-core
-to adding version number (by replacing by sed) to python.sh which invoke python in OOo,
-and we don't have to make a symlink.
-
-suggestion (and not yet done):
-
-4. we can also remove symlink from python.sh to python and
-rename python.sh to python. apparently intermidiate python.sh is unnecessary.
-currently: python -> python.sh -> python.bin
-suggested: python -> python.bin
-delivering a shell script python can harm since we have python binary from python project
-as well. but this is safe since python (shell script) and python.bin are delivered,
-at the same time.
-
---- scp2/source/python/makefile.mk	Fri Sep  9 10:43:01 2005
-+++ scp2/source/python/makefile.mk	Wed Oct 26 17:12:52 2005
-@@ -60,7 +60,8 @@
- PARFILES=\
-         module_python.par              \
-         profileitem_python.par         \
--        file_python.par
-+        file_python.par                \
-+        shortcut_python.par
- 
- ULFFILES= \
-         module_python.ulf 
-
---- scp2/util/makefile.mk	Fri Sep  9 10:52:09 2005
-+++ scp2/util/makefile.mk	Thu Oct 27 07:25:25 2005
-@@ -87,7 +87,8 @@
-              file_xsltfilter.par           \
-              module_python.par             \
-              file_python.par               \
--             profileitem_python.par
-+             profileitem_python.par        \
-+             shortcut_python.par
- 
- .IF "$(SOLAR_JAVA)"!=""
- SCP1FILES +=                               \
-
---- /dev/null	Thu Oct 27 09:59:37 2005
-+++ scp2/source/python/shortcut_python.scp	Thu Oct 27 09:59:19 2005
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: shortcut_python.scp,v $
-+ *
-+ *  $Revision: 1.20 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2005/09/09 01:42:03 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef SYSTEM_PYTHON
-+#ifdef UNX
-+
-+Shortcut gid_Shortcut_Python_Sh
-+    FileID = gid_File_Python_Sh;
-+    Dir = gid_Dir_Program;
-+    Name = "python";
-+    Styles = (RELATIVE);
-+End
-+
-+#endif
-+#endif
-
---- instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt	Thu Aug 18 17:11:29 2005
-+++ /dev/null	Wed Oct 26 09:51:22 2005
-@@ -1,74 +0,0 @@
--%preinstall << END
--# echo Command before installing
--exit 0
--END
--
--%postinstall << END
--# echo Command after installing
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -d $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4 ]
--then
--  ln -s python-core-2.3.4 $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python.sh ]
--then
--  ln -s python.sh $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python ]
--then
--  chmod +x $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python
--fi
--
--exit 0
--END
--
--%preremove << END
--# echo Command before removing
--exit 0
--END
--
--%postremove << END
--# echo Command after removing
--
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--
--exit 0
--END
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	Wed Oct 26 17:34:58 2005
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	Thu Oct 27 06:25:32 2005
-@@ -233,7 +233,6 @@
- 
- Start
- module = "gid_Module_Optional_Pyuno"
--script = "shellscripts_pyuno.txt"
- solarispackagename = "openofficeorg-pyuno"
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-pyuno"
-
-
---- pyuno/zipcore/python.sh	Fri Sep  9 01:55:24 2005
-+++ pyuno/zipcore/python.sh	Thu Oct 27 14:48:08 2005
-@@ -101,14 +101,14 @@
-     ;;
- esac
- 
--PYTHONPATH="$sd_prog":"$sd_prog/python-core/lib":"$sd_prog/python-core/lib/lib-dynload":"$sd_prog/python-core/lib/lib-tk":"$PYTHONPATH"
-+PYTHONPATH="$sd_prog":"$sd_prog/python-core-%%PYVERSION%%/lib":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk":"$PYTHONPATH"
- export PYTHONPATH
- 
--PYTHONHOME="$sd_prog"/python-core
-+PYTHONHOME="$sd_prog"/python-core-%%PYVERSION%%
- export PYTHONHOME
- 
- # set path so that other apps can be started from soffice just by name
- PATH="$sd_prog":$PATH
- export PATH
--exec "$sd_prog/python-core/bin/python" "$@"
-+exec "$sd_prog/python.bin" "$@"
- 
---- pyuno/zipcore/makefile.mk	Thu Sep  9 01:55:34 2004
-+++ pyuno/zipcore/makefile.mk	Thu Oct 27 14:47:34 2005
-@@ -12,7 +12,11 @@
- 
- PYDIRNAME=python-core-$(PYVERSION)
- DESTROOT=$(BIN)$/python-core-$(PYVERSION)
-+.IF "$(GUI)" == "UNX"
-+PYTHONBINARY=$(BIN)$/python$(EXECPOST).bin
-+.ELSE
- PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
-+.ENDIF
- 
- FINDLIBFILES_TMP:=$(subst,/,$/ \
- 	$(shell +$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc ))
-@@ -29,6 +33,8 @@
- $(BIN)$/python.sh : python.sh
- 	-rm -f $@
- 	cat $? > $@
-+	sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ > $@.new
-+	mv $@.new $@
- .IF "$(GUI)" == "UNX"
- 	chmod +x $@
- .ENDIF
-@@ -47,15 +53,21 @@
- 	-rm -f $@
- 	cat $< > $@
- 
--$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+.IF "$(GUI)"== "UNX"
-+$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
- 	-+$(MKDIRHIER) $(@:d)
- 	-rm -f $@
- 	cat $< > $@
--.IF "$(GUI)"== "UNX"
- .IF "$(OS)" != "MACOSX"
- 	strip $@
- .ENDIF
- 	chmod +x $@
-+.ELSE
-+$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+	-+$(MKDIRHIER) $(@:d)
-+	-rm -f $@
-+	cat $< > $@
-+	strip $@
- .ENDIF
- 
- .ENDIF
---- pyuno/prj/d.lst	Wed Feb 16 03:46:13 2005
-+++ pyuno/prj/d.lst	Thu Oct 27 14:52:10 2005
-@@ -22,4 +22,5 @@
- ..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
- ..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
- ..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-+..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
- ..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\python.sh
-
- 
---- scp2/source/python/module_python.scp	Fri Sep  9 10:43:17 2005
-+++ scp2/source/python/module_python.scp	Thu Oct 27 14:54:41 2005
-@@ -38,7 +38,7 @@
- Module gid_Module_Optional_Pyuno
-     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
-     ParentID = gid_Module_Optional;
--    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-     Minimal = NO;
-     Default = YES;
-     Styles = ( );
-
---- scp2/source/python/file_python.scp	Fri Sep  9 10:42:31 2005
-+++ scp2/source/python/file_python.scp	Thu Oct 27 16:41:18 2005
-@@ -86,8 +86,17 @@
-     Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
-     Styles = (ARCHIVE);
- End
-+
-+#ifdef UNX
-+File gid_File_Py_Python_Bin
-+    BIN_FILE_BODY;
-+    Dir = gid_Dir_Program;
-+    Name = "python.bin";
-+    Styles = (PACKED);
-+End
- #endif
- 
-+#endif
- 
- // substitute for the python Windows basic scripts
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-sdkoo b/editors/openoffice.org-3-devel/files/patch-sdkoo
new file mode 100644
index 000000000000..6abc48956024
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-sdkoo
@@ -0,0 +1,19 @@
+building sdk is broken at the moment.
+
+Index: instsetoo_native/util/makefile.mk
+===================================================================
+RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
+retrieving revision 1.47
+diff -u -r1.47 makefile.mk
+--- instsetoo_native/util/makefile.mk	11 Nov 2005 10:39:44 -0000	1.47
++++ instsetoo_native/util/makefile.mk	17 Nov 2005 00:11:06 -0000
+@@ -96,7 +96,8 @@
+ 	@echo "No EPM: do no packaging at this stage"
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+-ALLTAR : openoffice sdkoo ure_en-US
++#ALLTAR : openoffice sdkoo ure_en-US
++ALLTAR : openoffice
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack
+ .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 7b2b9f60d2c7..3ae90cd574da 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	openoffice.org
 PORTVERSION=	2.0.${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -60,8 +59,8 @@ IGNORE=		Install lang/perl5.8 then try again
 
 CODELINE=		680
 RELEASE_NR=		2.0
-MILESTONE=		138
-SNAPDATE=		20051104
+MILESTONE=		140
+SNAPDATE=		20051116
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -110,7 +109,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison-devel:${PORTSDIR}/devel/bison-devel \
+		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
 .if !defined(WITHOUT_JAVA)
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index ca146d10fa6d..b20b1eeffc0d 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 6e46e04f9d9cf5036d6ea036e19fe49e
-SIZE (openoffice.org2.0/OOo_2.0m138_source.tar.bz2) = 232530035
+MD5 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 851e7428d756a5e0c8b55e72ab386bfd
+SIZE (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 232687335
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.others b/editors/openoffice.org-vcltesttool/files/Makefile.others
index e97ee054c437..5a5dd2495c91 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.others
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.others
@@ -22,8 +22,14 @@ package-canonical:
 
 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/SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
+		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
+		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
+		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}
 
 ure:
 	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-agg b/editors/openoffice.org-vcltesttool/files/patch-agg
deleted file mode 100644
index ee1098b822b5..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-agg
+++ /dev/null
@@ -1,18 +0,0 @@
-Issuetracker : #i57388#
-CWS          : N/A
-Author:      : <rene@openoffice.org> (JCA)
-Description  : 
-
-Index: agg/prj/build.lst
-===================================================================
-RCS file: /cvs/external/agg/prj/build.lst,v
-retrieving revision 1.2
-diff -u -r1.2 build.lst
---- agg/prj/build.lst	3 Nov 2005 15:52:11 -0000	1.2
-+++ agg/prj/build.lst	5 Nov 2005 01:06:20 -0000
-@@ -1,4 +1,4 @@
--ag	agg	:	soltools NULL
-+ag	agg	:	soltools xml2cmp sal NULL
- ag	agg										usr1	-	all	ag_mkout NULL
- ag	agg\inc									get		-	all	ag_inc NULL
- ag	agg\prj									get		-	all	ag_prj NULL
diff --git a/editors/openoffice.org-vcltesttool/files/patch-instsetoo b/editors/openoffice.org-vcltesttool/files/patch-instsetoo
index fe7e3b5f3845..c87abb43b6fd 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-instsetoo
+++ b/editors/openoffice.org-vcltesttool/files/patch-instsetoo
@@ -13,88 +13,234 @@ 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
+retrieving revision 1.20
+diff -u -r1.20 packagelist.txt
+--- instsetoo_native/inc_openoffice/unix/packagelist.txt	11 Nov 2005 10:39:31 -0000	1.20
++++ instsetoo_native/inc_openoffice/unix/packagelist.txt	16 Nov 2005 21:54:35 -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"
+ solarisrequires = ""
+ packagename = "%UNIXPRODUCTNAME-core01"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-mailcap,%UNIXPRODUCTNAMEWITHOUTDOT-core,%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+-requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08"
++requires = "%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"
+@@ -50,7 +50,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-writer"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-writer"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Writer module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -64,7 +63,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-calc"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-calc"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Calc module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -78,7 +76,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-draw"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-draw"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Draw module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -92,7 +89,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-impress"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-impress"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Impress module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -106,7 +102,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-base"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-base"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Base module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -120,7 +115,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01,%UNIXPRODUCTNAMEWITHOUTDOT-core02,%UNIXPRODUCTNAMEWITHOUTDOT-core03,%UNIXPRODUCTNAMEWITHOUTDOT-core04,%UNIXPRODUCTNAMEWITHOUTDOT-core05,%UNIXPRODUCTNAMEWITHOUTDOT-core06,%UNIXPRODUCTNAMEWITHOUTDOT-core07,%UNIXPRODUCTNAMEWITHOUTDOT-core08,%UNIXPRODUCTNAMEWITHOUTDOT-core09,%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+ packagename = "%UNIXPRODUCTNAME-math"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-math"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Math module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -133,7 +127,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-graphicfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-graphicfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -146,7 +139,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-testtool"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-testtool"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Testtool module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -159,7 +151,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-spellcheck"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-spellcheck"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "English spellchecker module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -172,7 +163,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-xsltfilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-xsltfilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -185,7 +175,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-javafilter"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-javafilter"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Java filter module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -198,7 +187,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-gallery"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-gallery"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Optional gallery for %PRODUCTNAME %PRODUCTVERSION"
+@@ -211,7 +199,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-lngutils"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-lngutils"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Language utilities for %PRODUCTNAME %PRODUCTVERSION"
+@@ -224,7 +211,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-activex"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-activex"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION"
+@@ -237,7 +223,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-pyuno"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-pyuno"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -245,25 +230,11 @@
+ End
+ 
+ Start
+-module = "gid_Module_Optional_Pymailmerge"
+-solarispackagename = "openofficeorg-emailmerge"
+-solarisrequires = "openofficeorg-pyuno"
+-packagename = "openoffice.org-emailmerge"
+-linuxreplaces = "openofficeorg-emailmerge"
+-requires = "openoffice.org-pyuno"
+-copyright = "1999-2005 by OpenOffice.org"
+-vendor = "OpenOffice.org"
+-description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
+-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+-End
+-
+-Start
+ module = "gid_Module_Root_Fonts_Ooo_Hidden"
+ solarispackagename = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-ooofonts"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-ooofonts"
+-requires = "%UNIXPRODUCTNAME-core01"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION"
+@@ -277,7 +248,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core02"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core02"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -290,7 +260,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core03"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core03"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -303,7 +272,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core04"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core04"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -316,7 +284,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core05"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core05"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -329,7 +296,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core06"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core06"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -342,7 +308,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core07"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core07"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -355,7 +320,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core08"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core08"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -368,7 +332,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core09"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core09"
+-requires = "%UNIXPRODUCTNAME-core01"
  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"
+@@ -382,7 +345,6 @@
+ solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-core01"
+ packagename = "%UNIXPRODUCTNAME-core10"
+ linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-core10"
+-requires = "%UNIXPRODUCTNAME-core01"
  copyright = "1999-2005 by OpenOffice.org"
  vendor = "OpenOffice.org"
  description = "Office core module for %PRODUCTNAME %PRODUCTVERSION"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-malloc b/editors/openoffice.org-vcltesttool/files/patch-malloc
deleted file mode 100644
index b923da9db5e6..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-malloc
+++ /dev/null
@@ -1,25 +0,0 @@
-Issuetracker : #i57395#
-CWS          : N/A
-Author:      : <pjanik@openoffice.org> (JCA)
-Description  : 
-
-Index: canvas/source/tools/image.cxx
-===================================================================
-RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
-retrieving revision 1.2
-diff -u -r1.2 image.cxx
---- canvas/source/tools/image.cxx	2 Nov 2005 12:52:42 -0000	1.2
-+++ canvas/source/tools/image.cxx	5 Nov 2005 07:54:50 -0000
-@@ -103,8 +103,11 @@
- // platform-dependend includes [wrapped into their own namepsaces]
- //////////////////////////////////////////////////////////////////////////////////
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>		// _alloca
--
-+#else
-+#include <stdlib.h>
-+#endif
- #if defined(WNT)
- 	namespace  win32 
-     {
diff --git a/editors/openoffice.org-vcltesttool/files/patch-pythonlink b/editors/openoffice.org-vcltesttool/files/patch-pythonlink
deleted file mode 100644
index 779d21c95f44..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-pythonlink
+++ /dev/null
@@ -1,312 +0,0 @@
-Issuetracker : #i56955#
-CWS          : N/A
-Author       : <maho@openoffice.org>
-Description  : Remove instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt
-
-It is desirable to prepare minimal shellscripts as far as possible at
-installation part, and possibly, no shellscripts. However,
-unfortunately three things had done at shellscripts_pyuno.txt.
-
-1. symlink to python.sh -> python
-2. chmod +x program/python-core-2.3.4/bin/python
-3. symlink to python-core-2.3.4 -> python-core
-
-solution
-
-0. apply following patch. full build confirmed for SRC680_m134, FreeBSD 5.4-RELEASE.
-1. Done in scp2 project: prepare scp2/source/python/shortcut_python.scp and scp2/util/makefile.mk,
-and make a symlink to python.sh -> python.
-(3. is impossible to solve in this way since we only have python-core-2.3.4.zip in files in scp2.)
-2. Do not use program/python-core-2.3.4/bin/python, use program/python.bin instead. python.sh
-now executes program/python.bin. this is usual way; see e.g., spadmin etc.
-3. change from symlinking python-core-2.3.4->python-core
-to adding version number (by replacing by sed) to python.sh which invoke python in OOo,
-and we don't have to make a symlink.
-
-suggestion (and not yet done):
-
-4. we can also remove symlink from python.sh to python and
-rename python.sh to python. apparently intermidiate python.sh is unnecessary.
-currently: python -> python.sh -> python.bin
-suggested: python -> python.bin
-delivering a shell script python can harm since we have python binary from python project
-as well. but this is safe since python (shell script) and python.bin are delivered,
-at the same time.
-
---- scp2/source/python/makefile.mk	Fri Sep  9 10:43:01 2005
-+++ scp2/source/python/makefile.mk	Wed Oct 26 17:12:52 2005
-@@ -60,7 +60,8 @@
- PARFILES=\
-         module_python.par              \
-         profileitem_python.par         \
--        file_python.par
-+        file_python.par                \
-+        shortcut_python.par
- 
- ULFFILES= \
-         module_python.ulf 
-
---- scp2/util/makefile.mk	Fri Sep  9 10:52:09 2005
-+++ scp2/util/makefile.mk	Thu Oct 27 07:25:25 2005
-@@ -87,7 +87,8 @@
-              file_xsltfilter.par           \
-              module_python.par             \
-              file_python.par               \
--             profileitem_python.par
-+             profileitem_python.par        \
-+             shortcut_python.par
- 
- .IF "$(SOLAR_JAVA)"!=""
- SCP1FILES +=                               \
-
---- /dev/null	Thu Oct 27 09:59:37 2005
-+++ scp2/source/python/shortcut_python.scp	Thu Oct 27 09:59:19 2005
-@@ -0,0 +1,49 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: shortcut_python.scp,v $
-+ *
-+ *  $Revision: 1.20 $
-+ *
-+ *  last change: $Author: rt $ $Date: 2005/09/09 01:42:03 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef SYSTEM_PYTHON
-+#ifdef UNX
-+
-+Shortcut gid_Shortcut_Python_Sh
-+    FileID = gid_File_Python_Sh;
-+    Dir = gid_Dir_Program;
-+    Name = "python";
-+    Styles = (RELATIVE);
-+End
-+
-+#endif
-+#endif
-
---- instsetoo_native/inc_openoffice/unix/shellscripts_pyuno.txt	Thu Aug 18 17:11:29 2005
-+++ /dev/null	Wed Oct 26 09:51:22 2005
-@@ -1,74 +0,0 @@
--%preinstall << END
--# echo Command before installing
--exit 0
--END
--
--%postinstall << END
--# echo Command after installing
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -d $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4 ]
--then
--  ln -s python-core-2.3.4 $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python.sh ]
--then
--  ln -s python.sh $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--if [ -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python ]
--then
--  chmod +x $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core-2.3.4/bin/python
--fi
--
--exit 0
--END
--
--%preremove << END
--# echo Command before removing
--exit 0
--END
--
--%postremove << END
--# echo Command after removing
--
--# searching for the PRODUCTINSTALLLOCATION for the different platforms
--platform=`uname -s`
--case $$platform in
--SunOS)
--  PRODUCTINSTALLLOCATION="$$BASEDIR"
--  ;;
--Linux)
--  PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
--  ;;
--*)
--  PRODUCTINSTALLLOCATION="$$BASEDIR" 
--  ;;
--esac
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python-core >/dev/null 2>&1
--fi
--
--if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python ]
--then
--  rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/program/python >/dev/null 2>&1
--fi
--
--
--exit 0
--END
---- instsetoo_native/inc_openoffice/unix/packagelist.txt	Wed Oct 26 17:34:58 2005
-+++ instsetoo_native/inc_openoffice/unix/packagelist.txt	Thu Oct 27 06:25:32 2005
-@@ -233,7 +233,6 @@
- 
- Start
- module = "gid_Module_Optional_Pyuno"
--script = "shellscripts_pyuno.txt"
- solarispackagename = "openofficeorg-pyuno"
- solarisrequires = "openofficeorg-core01"
- packagename = "openoffice.org-pyuno"
-
-
---- pyuno/zipcore/python.sh	Fri Sep  9 01:55:24 2005
-+++ pyuno/zipcore/python.sh	Thu Oct 27 14:48:08 2005
-@@ -101,14 +101,14 @@
-     ;;
- esac
- 
--PYTHONPATH="$sd_prog":"$sd_prog/python-core/lib":"$sd_prog/python-core/lib/lib-dynload":"$sd_prog/python-core/lib/lib-tk":"$PYTHONPATH"
-+PYTHONPATH="$sd_prog":"$sd_prog/python-core-%%PYVERSION%%/lib":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload":"$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk":"$PYTHONPATH"
- export PYTHONPATH
- 
--PYTHONHOME="$sd_prog"/python-core
-+PYTHONHOME="$sd_prog"/python-core-%%PYVERSION%%
- export PYTHONHOME
- 
- # set path so that other apps can be started from soffice just by name
- PATH="$sd_prog":$PATH
- export PATH
--exec "$sd_prog/python-core/bin/python" "$@"
-+exec "$sd_prog/python.bin" "$@"
- 
---- pyuno/zipcore/makefile.mk	Thu Sep  9 01:55:34 2004
-+++ pyuno/zipcore/makefile.mk	Thu Oct 27 14:47:34 2005
-@@ -12,7 +12,11 @@
- 
- PYDIRNAME=python-core-$(PYVERSION)
- DESTROOT=$(BIN)$/python-core-$(PYVERSION)
-+.IF "$(GUI)" == "UNX"
-+PYTHONBINARY=$(BIN)$/python$(EXECPOST).bin
-+.ELSE
- PYTHONBINARY=$(DESTROOT)$/bin$/python$(EXECPOST)
-+.ENDIF
- 
- FINDLIBFILES_TMP:=$(subst,/,$/ \
- 	$(shell +$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v .pyc ))
-@@ -29,6 +33,8 @@
- $(BIN)$/python.sh : python.sh
- 	-rm -f $@
- 	cat $? > $@
-+	sed 's/%%PYVERSION%%/$(PYVERSION)/g' < $@ > $@.new
-+	mv $@.new $@
- .IF "$(GUI)" == "UNX"
- 	chmod +x $@
- .ENDIF
-@@ -47,15 +53,21 @@
- 	-rm -f $@
- 	cat $< > $@
- 
--$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+.IF "$(GUI)"== "UNX"
-+$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
- 	-+$(MKDIRHIER) $(@:d)
- 	-rm -f $@
- 	cat $< > $@
--.IF "$(GUI)"== "UNX"
- .IF "$(OS)" != "MACOSX"
- 	strip $@
- .ENDIF
- 	chmod +x $@
-+.ELSE
-+$(DESTROOT)$/bin$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
-+	-+$(MKDIRHIER) $(@:d)
-+	-rm -f $@
-+	cat $< > $@
-+	strip $@
- .ENDIF
- 
- .ENDIF
---- pyuno/prj/d.lst	Wed Feb 16 03:46:13 2005
-+++ pyuno/prj/d.lst	Thu Oct 27 14:52:10 2005
-@@ -22,4 +22,5 @@
- ..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc
- ..\%__SRC%\misc\pyuno.ini %_DEST%\bin%_EXT%\pyuno.ini
- ..\%__SRC%\bin\python-core-*.zip %_DEST%\bin%_EXT%\python-core-*.zip
-+..\%__SRC%\bin\python.bin %_DEST%\bin%_EXT%\python.bin
- ..\%__SRC%\bin\python.sh %_DEST%\bin%_EXT%\python.sh
-
- 
---- scp2/source/python/module_python.scp	Fri Sep  9 10:43:17 2005
-+++ scp2/source/python/module_python.scp	Thu Oct 27 14:54:41 2005
-@@ -38,7 +38,7 @@
- Module gid_Module_Optional_Pyuno
-     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
-     ParentID = gid_Module_Optional;
--    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Python_Sh,gid_File_Lib_Python_So, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu,gid_File_Pythonmsi_Dll);
-     Minimal = NO;
-     Default = YES;
-     Styles = ( );
-
---- scp2/source/python/file_python.scp	Fri Sep  9 10:42:31 2005
-+++ scp2/source/python/file_python.scp	Thu Oct 27 16:41:18 2005
-@@ -86,8 +86,17 @@
-     Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
-     Styles = (ARCHIVE);
- End
-+
-+#ifdef UNX
-+File gid_File_Py_Python_Bin
-+    BIN_FILE_BODY;
-+    Dir = gid_Dir_Program;
-+    Name = "python.bin";
-+    Styles = (PACKED);
-+End
- #endif
- 
-+#endif
- 
- // substitute for the python Windows basic scripts
- 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sdkoo b/editors/openoffice.org-vcltesttool/files/patch-sdkoo
new file mode 100644
index 000000000000..6abc48956024
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-sdkoo
@@ -0,0 +1,19 @@
+building sdk is broken at the moment.
+
+Index: instsetoo_native/util/makefile.mk
+===================================================================
+RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
+retrieving revision 1.47
+diff -u -r1.47 makefile.mk
+--- instsetoo_native/util/makefile.mk	11 Nov 2005 10:39:44 -0000	1.47
++++ instsetoo_native/util/makefile.mk	17 Nov 2005 00:11:06 -0000
+@@ -96,7 +96,8 @@
+ 	@echo "No EPM: do no packaging at this stage"
+ .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
+ .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+-ALLTAR : openoffice sdkoo ure_en-US
++#ALLTAR : openoffice sdkoo ure_en-US
++ALLTAR : openoffice
+ .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
+ ALLTAR : updatepack
+ .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
author	Maho Nakata <maho@FreeBSD.org>	2005-11-17 21:08:27 +0000
committer	Maho Nakata <maho@FreeBSD.org>	2005-11-17 21:08:27 +0000
commit	9dd9234739e7be7ab02ec1da132a629020d458e5 (patch)
tree	692c37613784ad0877bc8f3ee6f577465f5a38ae /editors
parent	my coordinates as requested by Diomidis (diff)