4 files changed, 17 insertions, 41 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index db6014bde6c6..7cce0fbee34b 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -72,7 +72,7 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 OOOSRC=			ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
 EXTSRC=			ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SVNREVISION=		1391327
+SVNREVISION=		1403191
 INSTALLATION_BASEDIR?=	openoffice-r${SVNREVISION}
 EXECBASE?=		openoffice-r${SVNREVISION}
 DIST_SUBDIR=		openoffice
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 15322cf2e6e4..8b4de97fae5f 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openoffice/ApacheOpenOffice.r1391327.tar.bz2) = f75e6f6843e94314689724b4bf7aed42b1608280282bbba8427a63ca0fe7cb95
-SIZE (openoffice/ApacheOpenOffice.r1391327.tar.bz2) = 273952802
-SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1391327.tar.bz2) = 4df5bad2bd5aac0ddb67a6100f1e261c63a90566605fdc98e669792ce5e4bf40
-SIZE (openoffice/ApacheOpenOffice.ext_sources.r1391327.tar.bz2) = 174433246
+SHA256 (openoffice/ApacheOpenOffice.r1403191.tar.bz2) = 55a2b821c9f88633c16389960b28ed2868c76f31094699d55c7f88162647fd73
+SIZE (openoffice/ApacheOpenOffice.r1403191.tar.bz2) = 283239549
+SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1403191.tar.bz2) = 33a675d0c5ef8f544b430ded3a06e663bc24f3a0d9a9f77967396c547895f9ca
+SIZE (openoffice/ApacheOpenOffice.ext_sources.r1403191.tar.bz2) = 84307208
 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-freebsd.mk b/editors/openoffice-3-devel/files/patch-freebsd.mk
index 81ad7207f48a..427de633d0a4 100644
--- a/editors/openoffice-3-devel/files/patch-freebsd.mk
+++ b/editors/openoffice-3-devel/files/patch-freebsd.mk
@@ -1,19 +1,10 @@
---- solenv/gbuild/platform/freebsd.mk~	2011-12-24 18:45:27.000000000 +0900
-+++ solenv/gbuild/platform/freebsd.mk	2011-12-25 11:01:37.000000000 +0900
-@@ -120,6 +120,7 @@
+--- solenv/gbuild/platform/freebsd.mk	2012-10-31 10:39:44.000000000 +0900
++++ solenv/gbuild/platform/freebsd.mk	2012-10-31 17:40:48.000000000 +0900
+@@ -121,6 +121,7 @@
  	-Wl,-z,combreloc \
  	-Wl,-z,defs \
  	$(subst -L../lib , ,$(SOLARLIB)) \
 +	%%RPATH%% \
+ 	 \
  
  ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
- gb_LinkTarget_LDFLAGS += \
-@@ -302,7 +302,7 @@
- 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
- 
- define gb_Library_get_rpath
--'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
-+-Wl,-z,origin '-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))' \
- '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
- endef
- 
diff --git a/editors/openoffice-3-devel/files/patch-unxfbsd.mk b/editors/openoffice-3-devel/files/patch-unxfbsd.mk
index 76b9d3969704..55a159337693 100644
--- a/editors/openoffice-3-devel/files/patch-unxfbsd.mk
+++ b/editors/openoffice-3-devel/files/patch-unxfbsd.mk
@@ -1,10 +1,10 @@
---- solenv/inc/unxfbsd.mk.orig	2011-12-21 09:47:20.000000000 +0900
-+++ solenv/inc/unxfbsd.mk	2011-12-25 20:48:29.000000000 +0900
-@@ -84,14 +84,14 @@
+--- solenv/inc/unxfbsd.mk~	2012-10-31 10:39:44.000000000 +0900
++++ solenv/inc/unxfbsd.mk	2012-10-31 17:42:59.000000000 +0900
+@@ -80,14 +80,14 @@
  .ENDIF
  
  # flags for the C++ Compiler
--CFLAGSCC= -pipe $(ARCH_FLAGS)
+-CFLAGSCC= -pipe $(ARCH_FLAGS) 
 +CFLAGSCC= -pipe $(ARCH_FLAGS) %%RPATH%%
  # Flags for enabling exception handling
  CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
@@ -12,31 +12,16 @@
  CFLAGS_NO_EXCEPTIONS=-fno-exceptions
  
  # -fpermissive should be removed as soon as possible
--CFLAGSCXX= -pipe $(ARCH_FLAGS)
+-CFLAGSCXX= -pipe $(ARCH_FLAGS) 
 +CFLAGSCXX= -pipe $(ARCH_FLAGS) %%RPATH%%
  .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
  CFLAGSCXX += -fvisibility-inlines-hidden
  .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-@@ -140,16 +140,16 @@
- LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
- .ENDIF          # "$(SYSBASE)"!=""
- LINKFLAGSDEFS*=-Wl,-z,defs
--LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-     #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
--LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
--LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
--LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
-+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-+LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
-+LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
+@@ -145,7 +145,7 @@
  LINKFLAGSRUNPATH_OXT=
--LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
-+LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
+ LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
  LINKFLAGSRUNPATH_NONE=
--LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
+-LINKFLAGS=-Wl,-z,combreloc  $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
 +LINKFLAGS=-Wl,-z,combreloc %%RPATH%% $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
  
  # linker flags for linking applications