3 files changed, 46 insertions, 51 deletions

diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 0a28802420b8..9e012bbfc921 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?=		105
+MILESTONE?=		106
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOTAG2=		${OOOTAG:C/_//g}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20110331
+SNAPDATE=		20110405
 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 1021206d9273..eeed13141cf3 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openoffice.org3/OOo_DEV300_m105_source.tar.bz2) = 996f9186a0fff9e20f79167fee72104da72afc8f186b7f6ade86ed5cf7660ffa
-SIZE (openoffice.org3/OOo_DEV300_m105_source.tar.bz2) = 227175534
+SHA256 (openoffice.org3/OOo_DEV300_m106_source.tar.bz2) = 135a88287594d6b93b2b5cdb816324d20f987cc17d0bd50cbc652755faf0ddaf
+SIZE (openoffice.org3/OOo_DEV300_m106_source.tar.bz2) = 227231122
 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-vcl b/editors/openoffice.org-3-devel/files/patch-vcl
index a1725e63b396..a0035611add9 100644
--- a/editors/openoffice.org-3-devel/files/patch-vcl
+++ b/editors/openoffice.org-3-devel/files/patch-vcl
@@ -1,5 +1,5 @@
---- 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
+--- vcl/Library_desktop_detector.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_desktop_detector.mk	2011-06-15 06:04:43.000000000 +0900
 @@ -65,10 +65,6 @@
  	cppu \
  	sal \
@@ -12,38 +12,9 @@
  
  $(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
+--- vcl/Library_vclplug_gen.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_vclplug_gen.mk	2011-06-15 06:27:38.000000000 +0900
 @@ -56,10 +56,6 @@
  	cppu \
  	sal \
@@ -52,10 +23,10 @@
 -    Xext \
 -    SM \
 -    ICE \
+ 	$(gb_STDLIBS) \
  ))
  
- $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
-@@ -202,4 +198,14 @@
+@@ -203,4 +199,14 @@
  	pthread \
  ))
  endif
@@ -72,9 +43,9 @@
  # 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 @@
+--- vcl/Library_vclplug_gtk.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_vclplug_gtk.mk	2011-06-15 06:28:07.000000000 +0900
+@@ -85,10 +85,6 @@
  	cppu \
  	sal \
  	vos3 \
@@ -82,13 +53,11 @@
 -    Xext \
 -    SM \
 -    ICE \
+     $(gb_STDLIBS) \
  ))
  
- $(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
+--- vcl/Library_vclplug_svp.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_vclplug_svp.mk	2011-06-15 06:28:20.000000000 +0900
 @@ -62,10 +62,6 @@
  	cppu \
  	sal \
@@ -97,9 +66,35 @@
 -    Xext \
 -    SM \
 -    ICE \
+ 	$(gb_STDLIBS) \
  ))
  
- $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
-
-
-
+--- vcl/Library_vcl.mk	2011-04-15 21:51:38.000000000 +0900
++++ vcl/Library_vcl.mk	2011-06-16 12:18:00.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) \
+@@ -89,8 +84,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
+