Update to DEV300_m53.

* enable mozilla for amd64 by introducing cws moz2seamonkey01.

14 files changed, 482 insertions, 308 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 7be27f854afe..05dafc11a899 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -9,34 +9,39 @@ PORTNAME?=	openoffice.org
 PORTVERSION?=	3.2.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
+		http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \
+		${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
-MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
+MASTER_SITE_SUBDIR+=	seamonkey/releases/${SEAMONKEY_VERSION}/:mozsrc
 DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
 .if defined(WITH_GPC)
 DISTFILES+=	gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
-.if defined(WITH_CWS)
-PORTNAME:=	openoffice.org-${WITH_CWS}
-DISTFILES+=	${CWSARCHIVE}:cws
+EXTRATC_ONLY?=	${OOOSRC}
+
+.if defined(CWS)
+PORTNAME:=	openoffice.org-${CWS}
+OOOSRC=		OOo_${CWS}_source.tar.bz2:cws
+OOOTAG=		${CWS}
 .endif
-CWSARCHIVE=	${WITH_CWS}.tar.gz
 
 NO_LATEST_LINK=	yes
-USE_GNOME=	desktopfileutils gtk20
-MOZILLA_VERSION=	1.7.5
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
+
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+=	libidl
+SEAMONKEY_VERSION=	1.1.14
+SEAMONKEY_SOURCE=	seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2
+DISTFILES+=		${SEAMONKEY_SOURCE}:mozsrc
+USE_GNOME+=		libidl
 .endif
 
+USE_GNOME=	desktopfileutils gtk20
+
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=	3
 .endif
@@ -69,17 +74,13 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		52
+MILESTONE?=		53
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090711
+SNAPDATE=		20090723
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
-.if defined(WITH_CWS)
-INSTALLATION_BASEDIR=	openoffice.org-${OOOTAG}-${WITH_CWS}
-EXECBASE=		openoffice.org-${OOOTAG}-${WITH_CWS}
-.endif
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
@@ -123,7 +124,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gtar:${PORTSDIR}/archivers/gtar \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		ant:${PORTSDIR}/devel/apache-ant
-
+#see #i85469# for gperf
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -144,6 +145,7 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-system-zlib				\
 			--with-system-stdlibs				\
 			--with-epm=internal				\
+			--enable-hids					\
 			--enable-minimizer 				\
 			--enable-presenter-console			\
 			--enable-pdfimport				\
@@ -157,7 +159,6 @@ OOOEXTENSIONS+=		swext/wiki-publisher.oxt
 OOOEXTENSIONS+=		sun-report-builder.oxt
 
 .if ${ARCH} == amd64
-WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
@@ -195,25 +196,23 @@ post-extract:
 		cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's#
##g' $$i ; \
 	done
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
-.if defined(WITH_CWS)
-	cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
-.endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 pre-configure:
 #Workaround for gperf. #i85469#
 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
+#see #i103782# for the reason of TMP
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
 
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
@@ -235,6 +234,9 @@ do-install:
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@${INSTALL_DATA} ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 .else
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
@@ -247,7 +249,8 @@ do-install:
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .endif
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@cd ${WRKSRC}/solver/300/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@${INSTALL_DATA} ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 6c0f1cb19eeb..46aed03564ab 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,12 +1,12 @@
-MD5 (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 9787fa04e7f19d86f10fe5c65eb0b803
-SHA256 (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 107cc5e8e9eeef37cf72acb74218a6d134f30ea6d07e6fbbe08bcd9951565710
-SIZE (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 419940049
+MD5 (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 25277c1c6ec46503704075d04252c942
+SHA256 (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 2307a9edb7139f50d40f97e4d47fdf9ce0bdf80e3ff5a406904b5499f09a493f
+SIZE (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 419914457
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
 MD5 (openoffice.org3/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org3/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org3/gpc231.tar.Z) = 27917
-MD5 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 38721366
+MD5 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 31eb6ce742dc73609884dab11b1f2712
+SHA256 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 82d5166b227d0157c1108dc03809a89bea23cfd21f31c7e6767ef5ce1983ca28
+SIZE (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 38063082
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index b5585ab8725f..417750f182d9 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -66,7 +66,7 @@ pre-fetch:
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${ECHO}
-	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "You can compile OOo without Mozilla/Mozilla NSS-using components"
 	@${ECHO} "make -DWITHOUT_MOZILLA"
 .endif
 .if !defined(WITHOUT_GNOME)
diff --git a/editors/openoffice-3-devel/files/patch-i100407 b/editors/openoffice-3-devel/files/patch-i100407
deleted file mode 100644
index 1e26d6d900e1..000000000000
--- a/editors/openoffice-3-devel/files/patch-i100407
+++ /dev/null
@@ -1,11 +0,0 @@
---- moz/extractfiles.mk~	2009-02-25 02:58:20.000000000 +0900
-+++ moz/extractfiles.mk	2009-03-20 18:39:47.000000000 +0900
-@@ -266,7 +266,7 @@
- .ENDIF
- 
- # zip runtime files to mozruntime.zip
--.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- # regxpcom needs to find libxpcom.so next to itself:
- .IF "$(USE_SHELL)"=="bash"
-     cd $(RUNTIME_DIR) && \
diff --git a/editors/openoffice-3-devel/files/patch-i103467 b/editors/openoffice-3-devel/files/patch-i103467
deleted file mode 100644
index 55c2ae7f3f0a..000000000000
--- a/editors/openoffice-3-devel/files/patch-i103467
+++ /dev/null
@@ -1,110 +0,0 @@
-Index: source/drivers/mozab/makefile.mk
-===================================================================
---- connectivity/source/drivers/mozab/makefile.mk	(revision 273857)
-+++ connectivity/source/drivers/mozab/makefile.mk	(working copy)
-@@ -83,6 +83,11 @@
- ENABLE_EXCEPTIONS=TRUE
- VISIBILITY_HIDDEN=TRUE
- 
-+.IF "$(OS)"!="WNT" 
-+COMPONENT_CONFIG_DATA=$(TARGET)2.xcu
-+COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
-+.ENDIF
-+
- # --- Settings ----------------------------------
- 
- .IF "$(DBGUTIL_OJ)"!=""
-@@ -94,24 +99,10 @@
- .INCLUDE :  $(PRJ)$/version.mk
- 
- # --- Files -------------------------------------
--# redefine because win and linux differ
--.IF "$(OS)"=="WNT" 
--LOCALIZEDFILES= \
--    $(TARGET).xcu
--.ELSE
--LOCALIZEDFILES= \
--    $(TARGET)2.xcu
--.ENDIF
- 
--XCUFILES= \
--    $(LOCALIZEDFILES) \
--
--
--
- SLOFILES=\
- 		$(SLO)$/MDriver.obj						\
- 		$(SLO)$/MServices.obj
--
- 			
- # --- MOZAB BASE Library -----------------------------------
- 
-@@ -201,17 +192,6 @@
- 
- .INCLUDE : $(PRJ)$/target.pmk
- 
--.IF "$(GUI)"=="WNT" 
--.ELSE
--ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET)2.xcs" "$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET).xcu"
--"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET)2.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
--    @@-$(MKDIRHIER) $(@:d)
--    $(COPY) $< $@
--"$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET).xcu" : "$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET)2.xcu" 
--    @@-$(MKDIRHIER) $(@:d)
--    $(COPY) $< $@
--.ENDIF
--
- # --- filter file ------------------------------
- 
- $(MISC)$/$(SHL1TARGET).flt: makefile.mk
-Index: makefile.pmk
-===================================================================
---- connectivity/makefile.pmk	(revision 273857)
-+++ connectivity/makefile.pmk	(working copy)
-@@ -55,8 +55,10 @@
- PACKAGE=org.openoffice.Office.DataAccess
- .INCLUDE :  settings.mk
- 
-+COMPONENT_CONFIG_DATA*=$(TARGET).xcu
-+
- LOCALIZEDFILES= \
--    $(TARGET).xcu
-+    $(COMPONENT_CONFIG_DATA)
- 
- XCUFILES= \
-     $(LOCALIZEDFILES) \
-Index: target.pmk
-===================================================================
---- connectivity/target.pmk	(revision 273857)
-+++ connectivity/target.pmk	(working copy)
-@@ -31,7 +31,10 @@
- 
- .INCLUDE : target.mk
- 
--ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET).xcs"
--"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET).xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
-+COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs
-+
-+ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)"
-+"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
-+
-
-
-Index: source/ooo/file_library_ooo.scp
-===================================================================
---- scp2/source/ooo/file_library_ooo.scp	(revision 273857)
-+++ scp2/source/ooo/file_library_ooo.scp	(working copy)
-@@ -958,7 +958,11 @@
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-     Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-+#ifdef WNT
-     Name = "/registry/spool/DataAccess/mozab.xcu";
-+#else
-+    Name = "/registry/spool/DataAccess/mozab2.xcu";
-+#endif
- End
- 
- STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
diff --git a/editors/openoffice-3-devel/files/patch-i103736 b/editors/openoffice-3-devel/files/patch-i103736
new file mode 100644
index 000000000000..5e51609ef668
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i103736
@@ -0,0 +1,36 @@
+--- solenv/inc/_tg_srs.mk.orig	2009-07-23 09:51:27.000000000 +0900
++++ solenv/inc/_tg_srs.mk	2009-07-25 06:59:51.000000000 +0900
+@@ -41,7 +41,7 @@
+ 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+ 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+ 		-fp=$@.$(INPATH) \
+-		$< \
++ 		$(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
+ 	)
+ 	-$(RM) $@
+ 	$(RENAME) $@.$(INPATH) $@
+
+--- starmath/source/makefile.mk	2009-07-23 09:48:08.000000000 +0900
++++ starmath/source/makefile.mk	2009-07-25 07:27:40.000000000 +0900
+@@ -113,9 +113,6 @@
+ 
+ # --- Targets -------------------------------------------------------
+ 
+-LOCALIZE_ME =  menu_tmpl.src
+-
+-
+ .INCLUDE :  target.mk
+ 
+ $(INCCOM)$/dllname.hxx: makefile.mk
+
+--- starmath/source/smres.src	2009-07-23 09:48:08.000000000 +0900
++++ starmath/source/smres.src	2009-07-25 07:26:49.000000000 +0900
+@@ -3501,8 +3501,6 @@
+ 	Text [ en-US ] = "'RIGHT' expected" ;
+ };
+ 
+-#include "menu.src"
+-
+ ToolBox RID_MATH_TOOLBOX
+ {
+ 	HelpId = RID_MATH_TOOLBOX ;
diff --git a/editors/openoffice-3-devel/files/patch-i103792 b/editors/openoffice-3-devel/files/patch-i103792
new file mode 100644
index 000000000000..9eb065f8f451
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i103792
@@ -0,0 +1,169 @@
+adding -lpangox-1.0 see http://www.openoffice.org/issues/show_bug.cgi?id=103772
+
+--- moz/seamonkey-source-1.1.14.patch	2009-06-27 09:39:41.000000000 +0900
++++ moz/seamonkey-source-1.1.14.patch	2009-07-02 11:12:36.000000000 +0900
+@@ -6345,3 +6345,164 @@
+  
+  clean clobber::
+  	rm -rf $(DIST)/$(APP_NAME).app
++
++
++###################MAHO's FREEBSD PART###################
++--- misc/mozilla/gfx/src/gtk/Makefile.in	2007-10-08 21:09:58.000000000 +0200
+++++ misc/build/mozilla/gfx/src/gtk/Makefile.in	2008-08-18 14:10:04.000000000 +0200
++@@ -207,7 +207,7 @@
++ EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
++ endif
++ 
++-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
+++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) -lpangox-1.0
++ CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
++ CFLAGS		+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
++
++--- misc/mozilla/config/config.mk	2009-06-28 16:28:27.000000000 +0900
+++++ misc/build/mozilla/config/config.mk	2009-06-28 16:18:04.000000000 +0900
++@@ -774,6 +774,13 @@
++ endif # IS_COMPONENT
++ endif # SunOS
++ 
+++ifeq ($(OS_ARCH),FreeBSD)
+++EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+++ifdef IS_COMPONENT
+++EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
+++endif # IS_COMPONENT
+++endif # FreeBSD
+++
++ #
++ # Include any personal overrides the user might think are needed.
++ #
++--- misc/mozilla/nsprpub/lib/ds/Makefile.in	2009-06-28 16:28:27.000000000 +0900
+++++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in	2009-06-28 16:22:16.000000000 +0900
++@@ -83,6 +83,10 @@
++ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ endif
++ 
+++ifeq ($(OS_ARCH),FreeBSD)
+++MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+++endif
+++
++ ifeq ($(OS_ARCH),SunOS)
++ OS_LIBS = -lc
++ MAPFILE = $(OBJDIR)/pldsmap.sun
++--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in	2009-06-28 16:28:27.000000000 +0900
+++++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in	2009-06-28 16:23:31.000000000 +0900
++@@ -93,6 +93,10 @@
++ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ endif
++ 
+++ifeq ($(OS_ARCH),FreeBSD)
+++MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+++endif
+++
++ ifeq ($(OS_ARCH),SunOS)
++ OS_LIBS = -lc
++ MAPFILE = $(OBJDIR)/plcmap.sun
++--- misc/mozilla/security/coreconf/FreeBSD.mk	2009-06-28 16:28:27.000000000 +0900
+++++ misc/build/mozilla/security/coreconf/FreeBSD.mk	2009-06-28 16:25:10.000000000 +0900
++@@ -52,6 +52,7 @@
++ 
++ DSO_CFLAGS		= -fPIC
++ DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
+++DSO_LDOPTS		+= -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ 
++ #
++ # The default implementation strategy for FreeBSD is pthreads.
++--- misc/mozilla/config/mkdepend/imakemdep.h	2009-06-29 02:48:45.000000000 +0900
+++++ misc/build/mozilla/config/mkdepend/imakemdep.h	2009-06-29 02:48:01.000000000 +0900
++@@ -277,8 +277,8 @@
++ # ifdef __i386__
++ 	"-D__i386__",
++ # endif
++-# ifdef __x86_64__
++-	"-D__x86_64__",
+++# if defined(__amd64__) || defined(__x86_64__)
+++       "-D__amd64__ -D__x86_64__",
++ # endif
++ # ifdef __GNUC__
++ 	"-traditional",
++
++--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-07-02 10:03:28.000000000 +0900
+++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-07-02 10:14:17.000000000 +0900
++@@ -249,6 +249,10 @@
++ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
++ endif
++ 
+++ifeq ($(OS_ARCH), FreeBSD)
+++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
+++endif
+++
++ ###########################################################################
++ 
++ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
++
++########################################
++following is re_comp issue. FBSD has re_comp in /usr/lib/libcompat.a,
++but since re_comp, re_exec are deprecated, shared libs are not provided.
++This causes a problem for amd64 arch at extension project like following:
++
++Making: ../../../unxfbsdx.pro/lib/ldapbe2.uno.so
++ccache c++ -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../../../unxfbsdx.pro/lib -L../lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solver/300/unxfbsdx.pro/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/usr/local/diablo-jdk1.6.0/lib -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64 -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/server -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/native_threads -L/usr/local/lib ../../../unxfbsdx.pro/slo/ldapbe2.uno_version.o -o ../../../unxfbsdx.pro/lib/ldapbe2.uno.so ../../../unxfbsdx.pro/slo/ldapuserprofilebe.o ../../../unxfbsdx.pro/slo/ldapuserprof.o ../../../unxfbsdx.pro/slo/ldapaccess.o ../../../unxfbsdx.pro/slo/ldapuserprofilelayer.o ../../../unxfbsdx.pro/slo/propertysethelper.o ../../../unxfbsdx.pro/slo/componentdef.o -lldap50 -luno_cppuhelpergcc3 -luno_cppu -luno_salhelpergcc3 -luno_sal -lcompat -Wl,-Bstatic -llber50 -pthread -lm -Wl,-Bdynamic -lstlport_gcc
++/usr/bin/ld: /usr/lib/libcompat.a(regex.o): relocation R_X86_64_32 can not be used when making a shared object; recompile with -fPIC
++/usr/lib/libcompat.a: could not read symbols: Bad value
++dmake:  Error code 1, while making '../../../unxfbsdx.pro/lib/ldapbe2.uno.so'
++.
++
++However, simply activating via "#define NEED_BSDREGEX" doesn't work as
++regex.h in seamonkey and /usr/include/unistd.h conflicts. We cannot
++stop include unistd.h :-(
++
++In file included from getfilter.c:53:
++../../../ldap/include/regex.h:76: error: conflicting types for 're_comp'
++/usr/include/unistd.h:516: error: previous declaration of 're_comp' was here
++../../../ldap/include/regex.h:77: error: conflicting types for 're_exec'
++/usr/include/unistd.h:517: error: previous declaration of 're_exec' was here
++
++--- misc/mozilla/directory/c-sdk/ldap/include/portable.h	2006-02-03 23:44:40.000000000 +0900
+++++ misc/build/mozilla/directory/c-sdk/ldap/include/portable.h	2009-07-02 10:35:23.000000000 +0900
++@@ -131,7 +131,7 @@
++  * some systems don't have the BSD re_comp and re_exec routines
++  */
++ #ifndef NEED_BSDREGEX
++-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
+++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++ #define NEED_BSDREGEX
++ #endif
++ #endif
++
++--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c	2006-02-03 23:44:42.000000000 +0900
+++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c	2009-07-02 11:05:54.000000000 +0900
++@@ -267,7 +267,7 @@
++  
++ char *     
++ LDAP_CALL
++-re_comp( char *pat )
+++re_comp( const char *pat )
++ {
++ 	register REGEXCHAR *p;          /* pattern pointer   */
++ 	register REGEXCHAR *mp=nfa;     /* nfa pointer       */
++@@ -513,7 +513,7 @@
++ 
++ int
++ LDAP_CALL
++-re_exec( char *lp )
+++re_exec( const char *lp )
++ {
++ 	register REGEXCHAR c;
++ 	register REGEXCHAR *ep = 0;
++--- misc/mozilla/directory/c-sdk/ldap/include/regex.h	2006-02-03 23:44:40.000000000 +0900
+++++ misc/build/mozilla/directory/c-sdk/ldap/include/regex.h	2009-07-02 11:05:24.000000000 +0900
++@@ -73,8 +73,8 @@
++ int re_init( void );
++ void re_lock( void );
++ int re_unlock( void );
++-char * LDAP_CALL re_comp( char *pat );
++-int LDAP_CALL re_exec( char *lp );
+++char * LDAP_CALL re_comp( const char *pat );
+++int LDAP_CALL re_exec( const char *lp );
++ void LDAP_CALL re_modw( char *s );
++ int LDAP_CALL re_subs( char *src, char *dst );
++ #else /* NEEDPROTOS */
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 7be27f854afe..05dafc11a899 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -9,34 +9,39 @@ PORTNAME?=	openoffice.org
 PORTVERSION?=	3.2.${SNAPDATE}
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
+		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
+		http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \
+		${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg
-MASTER_SITE_SUBDIR+=	mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc
+MASTER_SITE_SUBDIR+=	seamonkey/releases/${SEAMONKEY_VERSION}/:mozsrc
 DISTFILES+=	${OOOSRC} unowinreg.dll:unowinreg
 .if defined(WITH_GPC)
 DISTFILES+=	gpc231.tar.Z:gpc
 .endif
-EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
 
-.if defined(WITH_CWS)
-PORTNAME:=	openoffice.org-${WITH_CWS}
-DISTFILES+=	${CWSARCHIVE}:cws
+EXTRATC_ONLY?=	${OOOSRC}
+
+.if defined(CWS)
+PORTNAME:=	openoffice.org-${CWS}
+OOOSRC=		OOo_${CWS}_source.tar.bz2:cws
+OOOTAG=		${CWS}
 .endif
-CWSARCHIVE=	${WITH_CWS}.tar.gz
 
 NO_LATEST_LINK=	yes
-USE_GNOME=	desktopfileutils gtk20
-MOZILLA_VERSION=	1.7.5
-MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
+
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
-USE_GNOME+=	libidl
+SEAMONKEY_VERSION=	1.1.14
+SEAMONKEY_SOURCE=	seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2
+DISTFILES+=		${SEAMONKEY_SOURCE}:mozsrc
+USE_GNOME+=		libidl
 .endif
 
+USE_GNOME=	desktopfileutils gtk20
+
 .if defined(WITH_KDE)
 USE_KDELIBS_VER=	3
 .endif
@@ -69,17 +74,13 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		52
+MILESTONE?=		53
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090711
+SNAPDATE=		20090723
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
-.if defined(WITH_CWS)
-INSTALLATION_BASEDIR=	openoffice.org-${OOOTAG}-${WITH_CWS}
-EXECBASE=		openoffice.org-${OOOTAG}-${WITH_CWS}
-.endif
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
@@ -123,7 +124,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gtar:${PORTSDIR}/archivers/gtar \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		ant:${PORTSDIR}/devel/apache-ant
-
+#see #i85469# for gperf
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -144,6 +145,7 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-system-zlib				\
 			--with-system-stdlibs				\
 			--with-epm=internal				\
+			--enable-hids					\
 			--enable-minimizer 				\
 			--enable-presenter-console			\
 			--enable-pdfimport				\
@@ -157,7 +159,6 @@ OOOEXTENSIONS+=		swext/wiki-publisher.oxt
 OOOEXTENSIONS+=		sun-report-builder.oxt
 
 .if ${ARCH} == amd64
-WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
 .endif
@@ -195,25 +196,23 @@ post-extract:
 		cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's#
##g' $$i ; \
 	done
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
-.if defined(WITH_CWS)
-	cd ${WRKSRC} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/${CWSARCHIVE}
-.endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .endif
 .if !defined(WITHOUT_MOZILLA)
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 pre-configure:
 #Workaround for gperf. #i85469#
 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
+#see #i103782# for the reason of TMP
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput -- -P${MAKE_JOBS_NUMBER}"
 
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
@@ -235,6 +234,9 @@ do-install:
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@${INSTALL_DATA} ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 .else
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
@@ -247,7 +249,8 @@ do-install:
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .endif
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
-	@cd ${WRKSRC}/solver/300/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
+	@${INSTALL_DATA} ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR}
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 6c0f1cb19eeb..46aed03564ab 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,12 +1,12 @@
-MD5 (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 9787fa04e7f19d86f10fe5c65eb0b803
-SHA256 (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 107cc5e8e9eeef37cf72acb74218a6d134f30ea6d07e6fbbe08bcd9951565710
-SIZE (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 419940049
+MD5 (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 25277c1c6ec46503704075d04252c942
+SHA256 (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 2307a9edb7139f50d40f97e4d47fdf9ce0bdf80e3ff5a406904b5499f09a493f
+SIZE (openoffice.org3/OOo_DEV300_m53_source.tar.bz2) = 419914457
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
 MD5 (openoffice.org3/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org3/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org3/gpc231.tar.Z) = 27917
-MD5 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 38721366
+MD5 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 31eb6ce742dc73609884dab11b1f2712
+SHA256 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 82d5166b227d0157c1108dc03809a89bea23cfd21f31c7e6767ef5ce1983ca28
+SIZE (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 38063082
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index b5585ab8725f..417750f182d9 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -66,7 +66,7 @@ pre-fetch:
 .endif
 .if !defined(WITHOUT_MOZILLA)
 	@${ECHO}
-	@${ECHO} "You can compile OOo without Mozilla connectivity with"
+	@${ECHO} "You can compile OOo without Mozilla/Mozilla NSS-using components"
 	@${ECHO} "make -DWITHOUT_MOZILLA"
 .endif
 .if !defined(WITHOUT_GNOME)
diff --git a/editors/openoffice.org-3-devel/files/patch-i100407 b/editors/openoffice.org-3-devel/files/patch-i100407
deleted file mode 100644
index 1e26d6d900e1..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i100407
+++ /dev/null
@@ -1,11 +0,0 @@
---- moz/extractfiles.mk~	2009-02-25 02:58:20.000000000 +0900
-+++ moz/extractfiles.mk	2009-03-20 18:39:47.000000000 +0900
-@@ -266,7 +266,7 @@
- .ENDIF
- 
- # zip runtime files to mozruntime.zip
--.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- # regxpcom needs to find libxpcom.so next to itself:
- .IF "$(USE_SHELL)"=="bash"
-     cd $(RUNTIME_DIR) && \
diff --git a/editors/openoffice.org-3-devel/files/patch-i103467 b/editors/openoffice.org-3-devel/files/patch-i103467
deleted file mode 100644
index 55c2ae7f3f0a..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i103467
+++ /dev/null
@@ -1,110 +0,0 @@
-Index: source/drivers/mozab/makefile.mk
-===================================================================
---- connectivity/source/drivers/mozab/makefile.mk	(revision 273857)
-+++ connectivity/source/drivers/mozab/makefile.mk	(working copy)
-@@ -83,6 +83,11 @@
- ENABLE_EXCEPTIONS=TRUE
- VISIBILITY_HIDDEN=TRUE
- 
-+.IF "$(OS)"!="WNT" 
-+COMPONENT_CONFIG_DATA=$(TARGET)2.xcu
-+COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
-+.ENDIF
-+
- # --- Settings ----------------------------------
- 
- .IF "$(DBGUTIL_OJ)"!=""
-@@ -94,24 +99,10 @@
- .INCLUDE :  $(PRJ)$/version.mk
- 
- # --- Files -------------------------------------
--# redefine because win and linux differ
--.IF "$(OS)"=="WNT" 
--LOCALIZEDFILES= \
--    $(TARGET).xcu
--.ELSE
--LOCALIZEDFILES= \
--    $(TARGET)2.xcu
--.ENDIF
- 
--XCUFILES= \
--    $(LOCALIZEDFILES) \
--
--
--
- SLOFILES=\
- 		$(SLO)$/MDriver.obj						\
- 		$(SLO)$/MServices.obj
--
- 			
- # --- MOZAB BASE Library -----------------------------------
- 
-@@ -201,17 +192,6 @@
- 
- .INCLUDE : $(PRJ)$/target.pmk
- 
--.IF "$(GUI)"=="WNT" 
--.ELSE
--ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET)2.xcs" "$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET).xcu"
--"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET)2.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
--    @@-$(MKDIRHIER) $(@:d)
--    $(COPY) $< $@
--"$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET).xcu" : "$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET)2.xcu" 
--    @@-$(MKDIRHIER) $(@:d)
--    $(COPY) $< $@
--.ENDIF
--
- # --- filter file ------------------------------
- 
- $(MISC)$/$(SHL1TARGET).flt: makefile.mk
-Index: makefile.pmk
-===================================================================
---- connectivity/makefile.pmk	(revision 273857)
-+++ connectivity/makefile.pmk	(working copy)
-@@ -55,8 +55,10 @@
- PACKAGE=org.openoffice.Office.DataAccess
- .INCLUDE :  settings.mk
- 
-+COMPONENT_CONFIG_DATA*=$(TARGET).xcu
-+
- LOCALIZEDFILES= \
--    $(TARGET).xcu
-+    $(COMPONENT_CONFIG_DATA)
- 
- XCUFILES= \
-     $(LOCALIZEDFILES) \
-Index: target.pmk
-===================================================================
---- connectivity/target.pmk	(revision 273857)
-+++ connectivity/target.pmk	(working copy)
-@@ -31,7 +31,10 @@
- 
- .INCLUDE : target.mk
- 
--ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET).xcs"
--"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET).xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
-+COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs
-+
-+ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)"
-+"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
-+
-
-
-Index: source/ooo/file_library_ooo.scp
-===================================================================
---- scp2/source/ooo/file_library_ooo.scp	(revision 273857)
-+++ scp2/source/ooo/file_library_ooo.scp	(working copy)
-@@ -958,7 +958,11 @@
-     TXT_FILE_BODY;
-     Styles = (PACKED);
-     Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
-+#ifdef WNT
-     Name = "/registry/spool/DataAccess/mozab.xcu";
-+#else
-+    Name = "/registry/spool/DataAccess/mozab2.xcu";
-+#endif
- End
- 
- STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
diff --git a/editors/openoffice.org-3-devel/files/patch-i103736 b/editors/openoffice.org-3-devel/files/patch-i103736
new file mode 100644
index 000000000000..5e51609ef668
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i103736
@@ -0,0 +1,36 @@
+--- solenv/inc/_tg_srs.mk.orig	2009-07-23 09:51:27.000000000 +0900
++++ solenv/inc/_tg_srs.mk	2009-07-25 06:59:51.000000000 +0900
+@@ -41,7 +41,7 @@
+ 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
+ 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
+ 		-fp=$@.$(INPATH) \
+-		$< \
++ 		$(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
+ 	)
+ 	-$(RM) $@
+ 	$(RENAME) $@.$(INPATH) $@
+
+--- starmath/source/makefile.mk	2009-07-23 09:48:08.000000000 +0900
++++ starmath/source/makefile.mk	2009-07-25 07:27:40.000000000 +0900
+@@ -113,9 +113,6 @@
+ 
+ # --- Targets -------------------------------------------------------
+ 
+-LOCALIZE_ME =  menu_tmpl.src
+-
+-
+ .INCLUDE :  target.mk
+ 
+ $(INCCOM)$/dllname.hxx: makefile.mk
+
+--- starmath/source/smres.src	2009-07-23 09:48:08.000000000 +0900
++++ starmath/source/smres.src	2009-07-25 07:26:49.000000000 +0900
+@@ -3501,8 +3501,6 @@
+ 	Text [ en-US ] = "'RIGHT' expected" ;
+ };
+ 
+-#include "menu.src"
+-
+ ToolBox RID_MATH_TOOLBOX
+ {
+ 	HelpId = RID_MATH_TOOLBOX ;
diff --git a/editors/openoffice.org-3-devel/files/patch-i103792 b/editors/openoffice.org-3-devel/files/patch-i103792
new file mode 100644
index 000000000000..9eb065f8f451
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i103792
@@ -0,0 +1,169 @@
+adding -lpangox-1.0 see http://www.openoffice.org/issues/show_bug.cgi?id=103772
+
+--- moz/seamonkey-source-1.1.14.patch	2009-06-27 09:39:41.000000000 +0900
++++ moz/seamonkey-source-1.1.14.patch	2009-07-02 11:12:36.000000000 +0900
+@@ -6345,3 +6345,164 @@
+  
+  clean clobber::
+  	rm -rf $(DIST)/$(APP_NAME).app
++
++
++###################MAHO's FREEBSD PART###################
++--- misc/mozilla/gfx/src/gtk/Makefile.in	2007-10-08 21:09:58.000000000 +0200
+++++ misc/build/mozilla/gfx/src/gtk/Makefile.in	2008-08-18 14:10:04.000000000 +0200
++@@ -207,7 +207,7 @@
++ EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
++ endif
++ 
++-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
+++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) -lpangox-1.0
++ CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
++ CFLAGS		+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
++
++--- misc/mozilla/config/config.mk	2009-06-28 16:28:27.000000000 +0900
+++++ misc/build/mozilla/config/config.mk	2009-06-28 16:18:04.000000000 +0900
++@@ -774,6 +774,13 @@
++ endif # IS_COMPONENT
++ endif # SunOS
++ 
+++ifeq ($(OS_ARCH),FreeBSD)
+++EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+++ifdef IS_COMPONENT
+++EXTRA_DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
+++endif # IS_COMPONENT
+++endif # FreeBSD
+++
++ #
++ # Include any personal overrides the user might think are needed.
++ #
++--- misc/mozilla/nsprpub/lib/ds/Makefile.in	2009-06-28 16:28:27.000000000 +0900
+++++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in	2009-06-28 16:22:16.000000000 +0900
++@@ -83,6 +83,10 @@
++ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ endif
++ 
+++ifeq ($(OS_ARCH),FreeBSD)
+++MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+++endif
+++
++ ifeq ($(OS_ARCH),SunOS)
++ OS_LIBS = -lc
++ MAPFILE = $(OBJDIR)/pldsmap.sun
++--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in	2009-06-28 16:28:27.000000000 +0900
+++++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in	2009-06-28 16:23:31.000000000 +0900
++@@ -93,6 +93,10 @@
++ MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ endif
++ 
+++ifeq ($(OS_ARCH),FreeBSD)
+++MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+++endif
+++
++ ifeq ($(OS_ARCH),SunOS)
++ OS_LIBS = -lc
++ MAPFILE = $(OBJDIR)/plcmap.sun
++--- misc/mozilla/security/coreconf/FreeBSD.mk	2009-06-28 16:28:27.000000000 +0900
+++++ misc/build/mozilla/security/coreconf/FreeBSD.mk	2009-06-28 16:25:10.000000000 +0900
++@@ -52,6 +52,7 @@
++ 
++ DSO_CFLAGS		= -fPIC
++ DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
+++DSO_LDOPTS		+= -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ 
++ #
++ # The default implementation strategy for FreeBSD is pthreads.
++--- misc/mozilla/config/mkdepend/imakemdep.h	2009-06-29 02:48:45.000000000 +0900
+++++ misc/build/mozilla/config/mkdepend/imakemdep.h	2009-06-29 02:48:01.000000000 +0900
++@@ -277,8 +277,8 @@
++ # ifdef __i386__
++ 	"-D__i386__",
++ # endif
++-# ifdef __x86_64__
++-	"-D__x86_64__",
+++# if defined(__amd64__) || defined(__x86_64__)
+++       "-D__amd64__ -D__x86_64__",
++ # endif
++ # ifdef __GNUC__
++ 	"-traditional",
++
++--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-07-02 10:03:28.000000000 +0900
+++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-07-02 10:14:17.000000000 +0900
++@@ -249,6 +249,10 @@
++ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
++ endif
++ 
+++ifeq ($(OS_ARCH), FreeBSD)
+++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
+++endif
+++
++ ###########################################################################
++ 
++ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
++
++########################################
++following is re_comp issue. FBSD has re_comp in /usr/lib/libcompat.a,
++but since re_comp, re_exec are deprecated, shared libs are not provided.
++This causes a problem for amd64 arch at extension project like following:
++
++Making: ../../../unxfbsdx.pro/lib/ldapbe2.uno.so
++ccache c++ -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../../../unxfbsdx.pro/lib -L../lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solver/300/unxfbsdx.pro/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/usr/local/diablo-jdk1.6.0/lib -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64 -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/server -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/native_threads -L/usr/local/lib ../../../unxfbsdx.pro/slo/ldapbe2.uno_version.o -o ../../../unxfbsdx.pro/lib/ldapbe2.uno.so ../../../unxfbsdx.pro/slo/ldapuserprofilebe.o ../../../unxfbsdx.pro/slo/ldapuserprof.o ../../../unxfbsdx.pro/slo/ldapaccess.o ../../../unxfbsdx.pro/slo/ldapuserprofilelayer.o ../../../unxfbsdx.pro/slo/propertysethelper.o ../../../unxfbsdx.pro/slo/componentdef.o -lldap50 -luno_cppuhelpergcc3 -luno_cppu -luno_salhelpergcc3 -luno_sal -lcompat -Wl,-Bstatic -llber50 -pthread -lm -Wl,-Bdynamic -lstlport_gcc
++/usr/bin/ld: /usr/lib/libcompat.a(regex.o): relocation R_X86_64_32 can not be used when making a shared object; recompile with -fPIC
++/usr/lib/libcompat.a: could not read symbols: Bad value
++dmake:  Error code 1, while making '../../../unxfbsdx.pro/lib/ldapbe2.uno.so'
++.
++
++However, simply activating via "#define NEED_BSDREGEX" doesn't work as
++regex.h in seamonkey and /usr/include/unistd.h conflicts. We cannot
++stop include unistd.h :-(
++
++In file included from getfilter.c:53:
++../../../ldap/include/regex.h:76: error: conflicting types for 're_comp'
++/usr/include/unistd.h:516: error: previous declaration of 're_comp' was here
++../../../ldap/include/regex.h:77: error: conflicting types for 're_exec'
++/usr/include/unistd.h:517: error: previous declaration of 're_exec' was here
++
++--- misc/mozilla/directory/c-sdk/ldap/include/portable.h	2006-02-03 23:44:40.000000000 +0900
+++++ misc/build/mozilla/directory/c-sdk/ldap/include/portable.h	2009-07-02 10:35:23.000000000 +0900
++@@ -131,7 +131,7 @@
++  * some systems don't have the BSD re_comp and re_exec routines
++  */
++ #ifndef NEED_BSDREGEX
++-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
+++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++ #define NEED_BSDREGEX
++ #endif
++ #endif
++
++--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c	2006-02-03 23:44:42.000000000 +0900
+++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c	2009-07-02 11:05:54.000000000 +0900
++@@ -267,7 +267,7 @@
++  
++ char *     
++ LDAP_CALL
++-re_comp( char *pat )
+++re_comp( const char *pat )
++ {
++ 	register REGEXCHAR *p;          /* pattern pointer   */
++ 	register REGEXCHAR *mp=nfa;     /* nfa pointer       */
++@@ -513,7 +513,7 @@
++ 
++ int
++ LDAP_CALL
++-re_exec( char *lp )
+++re_exec( const char *lp )
++ {
++ 	register REGEXCHAR c;
++ 	register REGEXCHAR *ep = 0;
++--- misc/mozilla/directory/c-sdk/ldap/include/regex.h	2006-02-03 23:44:40.000000000 +0900
+++++ misc/build/mozilla/directory/c-sdk/ldap/include/regex.h	2009-07-02 11:05:24.000000000 +0900
++@@ -73,8 +73,8 @@
++ int re_init( void );
++ void re_lock( void );
++ int re_unlock( void );
++-char * LDAP_CALL re_comp( char *pat );
++-int LDAP_CALL re_exec( char *lp );
+++char * LDAP_CALL re_comp( const char *pat );
+++int LDAP_CALL re_exec( const char *lp );
++ void LDAP_CALL re_modw( char *s );
++ int LDAP_CALL re_subs( char *src, char *dst );
++ #else /* NEEDPROTOS */