update to SRX645_m49 (will be 1.1.4)

a) Use CONFIGURE_WRKSRC. no longer need .. for patches.
b) Still weird though, WITH_CCACHE works.
c) Fix: build without X, Makefile invokes build twice.

10 files changed, 23 insertions, 38 deletions

diff --git a/editors/openoffice-1.1-devel/files/Makefile.mozilla b/editors/openoffice-1.1-devel/files/Makefile.mozilla
index 73637f27d724..9593c16dba89 100644
--- a/editors/openoffice-1.1-devel/files/Makefile.mozilla
+++ b/editors/openoffice-1.1-devel/files/Makefile.mozilla
@@ -32,9 +32,9 @@ build-mozilla:
 .endif
 
 install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
+	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/moz/zipped/
+	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/moz/zipped/
+	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/moz/zipped/
 
 register-mozilla:
 .if exists(${WRKDIR}/mozilla-runtime)
diff --git a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
deleted file mode 100644
index 054f342ecfe0..000000000000
--- a/editors/openoffice-1.1-devel/files/debugpatch-solenv+inc+unxfbsdi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../solenv/inc/unxfbsdi.mk.orig	Thu Jun  5 08:44:59 2003
-+++ ../solenv/inc/unxfbsdi.mk	Tue Jun 10 17:30:40 2003
-@@ -92,12 +92,12 @@
- CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
- 
- # flags for C and C++ Compile
--CFLAGS+= -w -c $(INCLUDE)
-+CFLAGS+= -g -ggdb -w -c $(INCLUDE)
- CFLAGS+= -I/usr/X11R6/include
- 
- # flags for the C++ Compiler
--CFLAGSCC= -pipe -fno-rtti
--CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti
-+CFLAGSCC= -g -ggdb -pipe -fno-rtti
-+CFLAGSCXX= -g -ggdb -pipe -fno-for-scope -fpermissive -fno-rtti
- 
- # Flags for enabling exception handling
- CFLAGSEXCEPTIONS= -fexceptions
diff --git a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
index da9fd94b39c0..bbbfeab36816 100644
--- a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
+++ b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
@@ -1,5 +1,5 @@
---- ../cppuhelper/source/gcc3_linux_intel.map.orig	Sat Sep 13 22:15:22 2003
-+++ ../cppuhelper/source/gcc3_linux_intel.map	Sat Sep 13 22:16:01 2003
+--- cppuhelper/source/gcc3_linux_intel.map.orig	Sat Sep 13 22:15:22 2003
++++ cppuhelper/source/gcc3_linux_intel.map	Sat Sep 13 22:16:01 2003
 @@ -299,6 +299,7 @@
  _ZNK4cppu6UnoUrl11getProtocolEv;
  _ZNK4cppu6UnoUrl13getConnectionEv;
diff --git a/editors/openoffice-1.1-devel/files/patch-odk+configure.pl b/editors/openoffice-1.1-devel/files/patch-odk+configure.pl
index eeebf346c600..bd269a961590 100644
--- a/editors/openoffice-1.1-devel/files/patch-odk+configure.pl
+++ b/editors/openoffice-1.1-devel/files/patch-odk+configure.pl
@@ -5,8 +5,8 @@ Index: configure.pl
 RCS file: /cvs/api/odk/configure.pl,v
 retrieving revision 1.4.12.3
 diff -u -r1.4.12.3 configure.pl
---- ../odk/configure.pl	18 May 2004 10:02:00 -0000	1.4.12.3
-+++ ../configure.pl	11 Aug 2004 08:21:04 -0000
+--- odk/configure.pl.orig	18 May 2004 10:02:00 -0000	1.4.12.3
++++ odk/configure.pl	11 Aug 2004 08:21:04 -0000
 @@ -19,7 +19,7 @@
  chop ($main::OFFICE_HOME_SUGGESTION);
  
diff --git a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
index dbcad91a1fb4..59269742ab37 100644
--- a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
+++ b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
@@ -1,7 +1,7 @@
 http://www.openoffice.org/issues/show_bug.cgi?id=24142
 
---- ../odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
-+++ ../odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
+--- odk/setsdkenv_unix.in.orig	Sun Jan 25 18:41:01 2004
++++ odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
 @@ -2,7 +2,8 @@
  
  # This script starts a new shell and sets all enviroment variables, which
diff --git a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
index 22fd7fd2f816..78814a4cfaee 100644
--- a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
+++ b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
@@ -1,7 +1,7 @@
 http://www.openoffice.org/issues/show_bug.cgi?id=24142
 
---- ../odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
-+++ ../odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
+--- odk/settings/settings.mk.orig	Sun Jan 25 18:41:02 2004
++++ odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
 @@ -368,3 +368,85 @@
  
  endif
diff --git a/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack b/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack
index 34b26e9cfc39..44de26bd9cfd 100644
--- a/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack
+++ b/editors/openoffice-1.1-devel/files/patch-sch_setLogicRectHack
@@ -1,5 +1,7 @@
---- ../sch/source/ui/unoidl/ChXChartObject.cxx	7 Aug 2002 16:01:42 -0000	1.34
-+++ ../sch/source/ui/unoidl/ChXChartObject.cxx	20 Feb 2004 00:43:10 -0000
+#iZ 9462
+
+--- sch/source/ui/unoidl/ChXChartObject.cxx.orig	7 Aug 2002 16:01:42 -0000	1.34
++++ sch/source/ui/unoidl/ChXChartObject.cxx	20 Feb 2004 00:43:10 -0000
 @@ -161,9 +161,11 @@
  // XShape
  
diff --git a/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx
index be38de290a51..420c61cc7b7b 100644
--- a/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-sfx2+source+config+cfgmgr.cxx
@@ -1,8 +1,8 @@
-Wired bug?
+Weird bug?
 http://qa.openoffice.org/issues/show_bug.cgi?id=22253
 
---- ../sfx2/source/config/cfgmgr.cxx.org	Fri Nov  7 19:11:25 2003
-+++ ../sfx2/source/config/cfgmgr.cxx	Fri Nov  7 19:30:26 2003
+--- sfx2/source/config/cfgmgr.cxx.org	Fri Nov  7 19:11:25 2003
++++ sfx2/source/config/cfgmgr.cxx	Fri Nov  7 19:30:26 2003
 @@ -118,6 +118,10 @@
  		catch(com::sun::star::ucb::InteractiveAugmentedIOException&)
  		{
diff --git a/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
index c07cab2ab7e8..196084c1657b 100644
--- a/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ b/editors/openoffice-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
@@ -1,5 +1,5 @@
---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
-+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
+--- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig	Tue Jan 13 00:56:37 2004
++++ shell/source/unix/sysshell/recently_used_file_handler.cxx	Tue Jan 13 00:57:26 2004
 @@ -188,9 +188,12 @@
              write_xml_start_tag(TAG_RECENT_ITEM, file, true);
              write_xml_tag(TAG_URI, uri_, file);
diff --git a/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack b/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack
index 035db5e5e21c..e8c2725e58ab 100644
--- a/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack
+++ b/editors/openoffice-1.1-devel/files/patch-svx_setLogicRectHack
@@ -1,5 +1,6 @@
---- ../svx/source/unodraw/unoshape.cxx	4 Feb 2004 13:21:23 -0000	1.109
-+++ ../svx/source/unodraw/unoshape.cxx	20 Feb 2004 00:43:50 -0000
+#i9462#
+--- svx/source/unodraw/unoshape.cxx.orig	4 Feb 2004 13:21:23 -0000	1.109
++++ svx/source/unodraw/unoshape.cxx	20 Feb 2004 00:43:50 -0000
 @@ -1067,8 +1067,10 @@
  // XShape