6 files changed, 139 insertions, 22 deletions

diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 1ce874dd855d..0a28802420b8 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -76,12 +76,12 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
-MILESTONE?=		104
+MILESTONE?=		105
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20110324
+SNAPDATE=		20110331
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 52c1685c6bd3..1021206d9273 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice.org3/OOo_DEV300_m104_source.tar.bz2) = 24bde1f65ad9aade208dc9c3b579290b342d8bc8054975a41c9f651ccc286efe
-SIZE (openoffice.org3/OOo_DEV300_m104_source.tar.bz2) = 227252116
+SHA256 (openoffice.org3/OOo_DEV300_m105_source.tar.bz2) = 996f9186a0fff9e20f79167fee72104da72afc8f186b7f6ade86ed5cf7660ffa
+SIZE (openoffice.org3/OOo_DEV300_m105_source.tar.bz2) = 227175534
 SHA256 (openoffice.org3/ext_sources.20110331.tar.bz2) = 0ffa08f29a13a3d7e9bdcc8feb120b31398c46de4a1ba2be6665258f5caeeac3
 SIZE (openoffice.org3/ext_sources.20110331.tar.bz2) = 260892348
 SHA256 (openoffice.org3/l10n.20110611.tar.bz2) = 4bcbe042fd41f532e2a14f65b27d691af8d66eb402942319090747cfbc526297
diff --git a/editors/openoffice.org-3-devel/files/patch-i65514 b/editors/openoffice.org-3-devel/files/patch-i65514
index f12266b5fede..1db72be7b5bd 100644
--- a/editors/openoffice.org-3-devel/files/patch-i65514
+++ b/editors/openoffice.org-3-devel/files/patch-i65514
@@ -1,9 +1,9 @@
---- berkeleydb/makefile.mk	2009-09-26 08:52:35.000000000 +0900
-+++ berkeleydb/makefile.mk	2009-09-26 08:54:31.000000000 +0900
-@@ -102,6 +102,9 @@
+--- berkeleydb/makefile.mk	2011-06-13 13:30:42.000000000 +0900
++++ berkeleydb/makefile.mk	2011-06-13 13:33:39.000000000 +0900
+@@ -97,6 +97,9 @@
  CONFIGURE_ACTION= \
  	..$/dist$/configure
- CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 CC='$(CC) $(SOLARLIB)'
 +.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-i91861 b/editors/openoffice.org-3-devel/files/patch-i91861
deleted file mode 100644
index 85dfde19f963..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i91861
+++ /dev/null
@@ -1,14 +0,0 @@
---- vcl/source/glyphs/makefile.mk~	2009-11-18 13:58:31.000000000 +0900
-+++ vcl/source/glyphs/makefile.mk	2009-11-29 20:13:21.000000000 +0900
-@@ -41,7 +41,11 @@
- .INCLUDE :  settings.mk
- .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
- 
-+.IF "$(OS)" != "FREEBSD"
- CFLAGS+= $(FREETYPE_CFLAGS)
-+.ELSE
-+ADDCDEFS+= $(FREETYPE_CFLAGS)
-+.ENDIF
- 
- # --- Files --------------------------------------------------------
- 
diff --git a/editors/openoffice.org-3-devel/files/patch-icu b/editors/openoffice.org-3-devel/files/patch-icu
new file mode 100644
index 000000000000..b04a701dd71a
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-icu
@@ -0,0 +1,26 @@
+--- icu/icu4c-4_0_1-src.patch	2011-04-15 19:58:10.000000000 +0900
++++ icu/icu4c-4_0_1-src.patch	2011-06-14 17:12:52.000000000 +0900
+@@ -1,3 +1,23 @@
++--- misc/icu/source/config/mh-bsd-gcc	2009-01-15 16:46:10.000000000 +0900
+++++ misc/build/icu/source/config/mh-bsd-gcc	2011-06-14 17:12:14.000000000 +0900
++@@ -18,7 +18,15 @@
++ 
++ ## Compiler switch to embed a runtime search path
++ LD_RPATH=	
++-LD_RPATH_PRE=	-Wl,-rpath,
+++LD_RPATH_PRE=	-Wl,-z,origin -Wl,-rpath,
+++
+++## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
+++## (incl. the C++ runtime libs potentially found in the URE lib dir):
+++ENABLE_RPATH=YES
+++RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'
+++
+++#SH#  ENABLE_RPATH=YES
+++#SH#  RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'"
++ 
++ ## Compiler switch to embed a library name
++ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
++
+ --- misc/icu/source/common/putil.c	2008-07-01 03:41:12.000000000 +0200
+ +++ misc/build/icu/source/common/putil.c	2008-09-02 07:01:29.335795765 +0200
+ @@ -52,7 +52,7 @@
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl b/editors/openoffice.org-3-devel/files/patch-vcl
new file mode 100644
index 000000000000..a1725e63b396
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-vcl
@@ -0,0 +1,105 @@
+--- vcl/Library_desktop_detector.mk	2011-04-15 19:59:29.000000000 +0900
++++ vcl/Library_desktop_detector.mk	2011-06-13 17:21:06.000000000 +0900
+@@ -65,10 +65,6 @@
+ 	cppu \
+ 	sal \
+ 	vos3 \
+-    X11 \
+-    Xext \
+-    SM \
+-    ICE \
+ ))
+ 
+ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+
+--- vcl/Library_vcl.mk	2011-04-15 19:59:29.000000000 +0900
++++ vcl/Library_vcl.mk	2011-06-14 15:35:47.000000000 +0900
+@@ -45,13 +45,8 @@
+ 	-I$(OUTDIR)/inc/offuh \
+ 	-I$(OUTDIR)/inc/stl \
+ 	-I$(OUTDIR)/inc \
++        $$(FREETYPE_CFLAGS) \
+ ))
+-ifeq ($(GUIBASE),unx)
+-$(eval $(call gb_Library_set_cxxflags,vcl,\
+-    $$(CXXFLAGS) \
+-    $$(FREETYPE_CFLAGS) \
+-))
+-endif
+ 
+ $(eval $(call gb_Library_set_defs,vcl,\
+ 	$$(DEFS) \
+@@ -88,8 +83,9 @@
+ endif
+ endif
+ ifeq ($(GUIBASE),unx)
+-$(eval $(call gb_Library_add_linked_libs,vcl,\
+-    freetype \
++$(eval $(call gb_Library_set_ldflags,vcl,\
++    $$(LDFLAGS) \
++    $(FREETYPE_LIBS) \
+ ))
+ endif
+ 
+
+--- vcl/Library_vclplug_gen.mk	2011-04-15 19:59:29.000000000 +0900
++++ vcl/Library_vclplug_gen.mk	2011-06-14 15:51:10.000000000 +0900
+@@ -56,10 +56,6 @@
+ 	cppu \
+ 	sal \
+ 	vos3 \
+-    X11 \
+-    Xext \
+-    SM \
+-    ICE \
+ ))
+ 
+ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
+@@ -202,4 +198,14 @@
+ 	pthread \
+ ))
+ endif
++
++ifeq ($(OS),FREEBSD)
++$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
++     $$(SOLARLIB) \
++    -lX11 \
++    -lXext \
++    -lSM \
++    -lICE \
++))
++endif
+ # vim: set noet sw=4 ts=4:
+
+
+--- vcl/Library_vclplug_gtk.mk	2011-04-15 19:59:29.000000000 +0900
++++ vcl/Library_vclplug_gtk.mk	2011-06-13 17:21:25.000000000 +0900
+@@ -84,10 +84,6 @@
+ 	cppu \
+ 	sal \
+ 	vos3 \
+-    X11 \
+-    Xext \
+-    SM \
+-    ICE \
+ ))
+ 
+ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
+
+
+--- vcl/Library_vclplug_svp.mk	2011-04-15 19:59:29.000000000 +0900
++++ vcl/Library_vclplug_svp.mk	2011-06-13 17:20:54.000000000 +0900
+@@ -62,10 +62,6 @@
+ 	cppu \
+ 	sal \
+ 	vos3 \
+-    X11 \
+-    Xext \
+-    SM \
+-    ICE \
+ ))
+ 
+ $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
+
+
+