Fix SDK part, so that really usable

4 files changed, 174 insertions, 0 deletions

diff --git a/editors/openoffice.org-3-devel/files/patch-odk+configure.pl b/editors/openoffice.org-3-devel/files/patch-odk+configure.pl
new file mode 100644
index 000000000000..9753da461aa6
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-odk+configure.pl
@@ -0,0 +1,28 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author      : NAKATA Maho <maho@openoffice.org> (JCA)
+Description : canonical name by config.guess for FreeBSD is
+% ./config.guess
+i386-unknown-freebsd5.3
+so, $main::operatingSystem is
+% ./config.guess | cut -d"-" -f3,4
+freebsd5.3
+then, if ( $main::operatingSystem eq "FreeBSD" ) is not correct,
+and if ( $main::operatingSystem =~ /freebsd/ ) is correct
+
+Index: odk/configure.pl
+===================================================================
+RCS file: /cvs/api/odk/configure.pl,v
+retrieving revision 1.11
+diff -u -r1.11 configure.pl
+--- odk/configure.pl	29 Mar 2005 12:03:00 -0000	1.11
++++ odk/configure.pl	15 May 2005 08:46:20 -0000
+@@ -45,7 +45,7 @@
+ 
+ $main::OO_SDK_MAKE_HOME = "";
+ $main::makeName = "make";
+-if ( $main::operatingSystem eq "FreeBSD" )
++if ( $main::operatingSystem =~ /freebsd/ )
+ {
+     $main::makeName = "gmake";
+ }
diff --git a/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix b/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix
new file mode 100644
index 000000000000..cb62a4753a49
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-odk+setsdkenv_unix
@@ -0,0 +1,39 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author      : NAKATA Maho <maho@openoffice.org> (JCA)
+Description :
+in odk project, machine type is determined by config.guess,
+for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
+
+Index: odk/setsdkenv_unix.sh.in
+===================================================================
+RCS file: /cvs/api/odk/setsdkenv_unix.sh.in,v
+retrieving revision 1.5
+diff -u -r1.5 setsdkenv_unix.sh.in
+--- odk/setsdkenv_unix.sh.in	29 Mar 2005 12:03:27 -0000	1.5
++++ odk/setsdkenv_unix.sh.in	15 May 2005 09:06:22 -0000
+@@ -130,7 +130,7 @@
+     export LD_LIBRARY_PATH
+     ;;
+ 
+-  freebsd)
++  freebsd*)
+     if [ -n "$OO_SDK_CPP_HOME" ]
+     then
+ 	SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+Index: odk/setsdkenv_unix.csh.in
+===================================================================
+RCS file: /cvs/api/odk/setsdkenv_unix.csh.in,v
+retrieving revision 1.5
+diff -u -r1.5 setsdkenv_unix.csh.in
+--- odk/setsdkenv_unix.csh.in	29 Mar 2005 12:03:14 -0000	1.5
++++ odk/setsdkenv_unix.csh.in	15 May 2005 09:06:38 -0000
+@@ -114,7 +114,7 @@
+     endif
+   breaksw
+ 
+-  case "freebsd":
++  case "freebsd*":
+     if ( $?OO_SDK_CPP_HOME == 0) then
+ 	set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+ 	setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path}
diff --git a/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk
new file mode 100644
index 000000000000..a551ef77ef3b
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-odk+settings+settings.mk
@@ -0,0 +1,47 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author      : NAKATA Maho <maho@openoffice.org> (JCA)
+Description :
+in odk project, machine type is determined by config.guess,
+for FreeBSD, it returns freebsd5.3 or freebsd4.11 etc.
+and adding missing things.
+
+Index: odk/settings/settings.mk
+===================================================================
+RCS file: /cvs/api/odk/settings/settings.mk,v
+retrieving revision 1.14
+diff -u -r1.14 settings.mk
+--- odk/settings/settings.mk	29 Mar 2005 12:19:26 -0000	1.14
++++ odk/settings/settings.mk	15 May 2005 13:54:38 -0000
+@@ -397,7 +397,7 @@
+ # FreeBSD specific settings
+ #
+ ###########################################################################
+-ifeq "$(PLATFORM)" "freebsd"
++ifneq (,$(findstring freebsd,$(PLATFORM)))
+ # Settings for FreeBSD using gcc compiler
+ 
+ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
+@@ -435,6 +435,7 @@
+ CSEP=\>
+ QUOTE=$(subst S,\,S)
+ QM=\"
++SQM='
+ ECHOLINE=@echo
+ P2BG=&
+ 
+@@ -446,10 +447,10 @@
+ # Include UDK version numbers
+ include $(PRJ)/include/udkversion.mk
+ 
+-SALLIB=-lsal
+-CPPULIB=-lcppu
+-CPPUHELPERLIB=-lcppuhelper$(COMID)
+-SALHELPERLIB=-lsalhelper$(COMID)
++SALLIB=-luno_sal
++CPPULIB=-luno_cppu
++CPPUHELPERLIB=-luno_cppuhelper$(COMID)
++SALHELPERLIB=-luno_salhelper$(COMID)
+ REGLIB=-lreg
+ STORELIB=-lstore
+ STLPORTLIB=-lstlport_gcc
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
new file mode 100644
index 000000000000..92eed9f640be
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -0,0 +1,60 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author      : NAKATA Maho <maho@openoffice.org> (JCA)
+Description : Update to recent version of unxlngi6.mk
+($Revision: 1.12 and $Author: obo $ $Date: 2005/05/06 09:37:55 $)
+
+Index: solenv/inc/unxfbsdi.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
+retrieving revision 1.13
+diff -u -r1.13 unxfbsdi.mk
+--- solenv/inc/unxfbsdi.mk	11 Feb 2005 15:27:55 -0000	1.13
++++ solenv/inc/unxfbsdi.mk	15 May 2005 04:51:41 -0000
+@@ -99,9 +99,6 @@
+ CC+:=$(CFLAGS_SYSBASE)
+ .ENDIF          # "$(SYSBASE)"!=""
+ CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+-.IF "$(PRODUCT)"!=""
+-CFLAGS+=-Wuninitialized
+-.ENDIF
+ 
+ # flags to enable build with symbols; required for crashdump feature
+ .IF "$(ENABLE_SYMBOLS)"=="SMALL"
+@@ -122,6 +119,9 @@
+ CFLAGSCXX= -pipe -mtune=pentiumpro
+ CFLAGSCXX+= -Wno-ctor-dtor-privacy
+ PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ 
+ # Compiler flags for compiling static object in single threaded environment with graphical user interface
+ CFLAGSOBJGUIST=
+@@ -143,6 +143,7 @@
+ # Compiler flags for enabling optimazations
+ .IF "$(PRODUCT)"!=""
+ CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
++CFLAGSOPT+=-Wuninitialized				# not supported without optimization
+ .ELSE 	# "$(PRODUCT)"!=""
+ CFLAGSOPT=   							# no optimizing for non products
+ .ENDIF	# "$(PRODUCT)"!=""
+@@ -161,11 +162,12 @@
+ 
+ # name of linker
+ LINK*=$(CXX)
++LINKC*=$(CC)
+ 
+ # default linker flags
+ LINKFLAGSDEFS*=#-Wl,-z,defs
+ LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+-LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+ LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+@@ -237,3 +239,4 @@
+ DLLPOSTFIX=fi
+ DLLPRE=lib
+ DLLPOST=.so
++