Now creates version independent name.

Requested by: nork, daichi and Peter Jeremy <PeterJeremy@optushome.com.au>

14 files changed, 67 insertions, 15 deletions

diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 1d4ddabf164..e840beab739 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -176,6 +176,7 @@ post-install:
 			${WRKDIR}/openoffice-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
 		${PREFIX}/bin/${EXECBASE}
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in
index 912adcf25ff..ff953c9a2cc 100644
--- a/editors/openoffice.org-2/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2/files/patch-config_office+configure.in
@@ -1,6 +1,10 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40176
-http://www.openoffice.org/issues/show_bug.cgi?id=40226
+#iZ and CWS data
+o http://www.openoffice.org/issues/show_bug.cgi?id=40176
+  http://www.openoffice.org/issues/show_bug.cgi?id=40226
+o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
+o configure4
 
+Description
 o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
 o CUPS support via --enable-cups
 
diff --git a/editors/openoffice.org-2/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2/files/patch-config_office+set_soenv.in
index 6309519a6a4..9b2a97774dc 100644
--- a/editors/openoffice.org-2/files/patch-config_office+set_soenv.in
+++ b/editors/openoffice.org-2/files/patch-config_office+set_soenv.in
@@ -1,4 +1,10 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=37731
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=37731
+o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
+o pj16
+
+Description
+Do not export LINK to environment
 
 Index: config_office/set_soenv.in
 ===================================================================
diff --git a/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in
index 06deae85723..21f9537262f 100644
--- a/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in
+++ b/editors/openoffice.org-2/files/patch-odk+setsdkenv_unix.in
@@ -1,5 +1,10 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24142
+#iZ and CWS data
+o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
+o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
+o sdksample
 
+Description
+N/A
 --- odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
 +++ odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
 @@ -2,7 +2,8 @@
diff --git a/editors/openoffice.org-2/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2/files/patch-odk+settings+settings.mk
index f67e65c31c2..d6ae684fcbd 100644
--- a/editors/openoffice.org-2/files/patch-odk+settings+settings.mk
+++ b/editors/openoffice.org-2/files/patch-odk+settings+settings.mk
@@ -1,5 +1,10 @@
-http://qa.openoffice.org/issues/show_bug.cgi?id=24142
+#iZ and CWS data
+o http://qa.openoffice.org/issues/show_bug.cgi?id=24142
+o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1274&Path=SRC680%2Fsdksample
+o sdksample
 
+Description
+N/A
 --- odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
 +++ odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
 @@ -368,3 +368,85 @@
diff --git a/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl b/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
index 3023414fc12..1e07bb2ef09 100644
--- a/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
+++ b/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XGraphicDevicd.idl
@@ -1,5 +1,9 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40177
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=40177
+o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1969&Path=SRC680%2Fpresperf01
+o presperf01
 
+Description
 Contains an illigal char.
 build breaks at odk project
 like
diff --git a/editors/openoffice.org-2/files/patch-project-bridges b/editors/openoffice.org-2/files/patch-project-bridges
index ba56a03f62d..890cab17189 100644
--- a/editors/openoffice.org-2/files/patch-project-bridges
+++ b/editors/openoffice.org-2/files/patch-project-bridges
@@ -1,5 +1,7 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40178
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=40178
 
+Description
 catch up recent version of
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
 Only difference is:
diff --git a/editors/openoffice.org-2/files/patch-project-extentions b/editors/openoffice.org-2/files/patch-project-extentions
index 3b66e952e4e..a8b9d7ee941 100644
--- a/editors/openoffice.org-2/files/patch-project-extentions
+++ b/editors/openoffice.org-2/files/patch-project-extentions
@@ -1,4 +1,9 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40179
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=40179
+o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
+o pj16
+
+Description
 
 o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
 o FreeBSD doesn't have -ldl
diff --git a/editors/openoffice.org-2/files/patch-project-jvmfwk b/editors/openoffice.org-2/files/patch-project-jvmfwk
index 0b9bab80105..c3715ba50ae 100644
--- a/editors/openoffice.org-2/files/patch-project-jvmfwk
+++ b/editors/openoffice.org-2/files/patch-project-jvmfwk
@@ -1,4 +1,7 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40180
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=40180
+
+Description
 
 Vendor name of FreeBSD's Java
 (http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/)
diff --git a/editors/openoffice.org-2/files/patch-project-python b/editors/openoffice.org-2/files/patch-project-python
index 19542025953..6487a9f9ddb 100644
--- a/editors/openoffice.org-2/files/patch-project-python
+++ b/editors/openoffice.org-2/files/patch-project-python
@@ -1,4 +1,9 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40181
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=40181
+o pyunofixes1
+
+Desctiption
+need FreeBSD's definition
 
 Index: python/Python-2.3.4.patch
 ===================================================================
diff --git a/editors/openoffice.org-2/files/patch-project-xmlsecurity b/editors/openoffice.org-2/files/patch-project-xmlsecurity
index 75fdc855d1a..b8dfc459e78 100644
--- a/editors/openoffice.org-2/files/patch-project-xmlsecurity
+++ b/editors/openoffice.org-2/files/patch-project-xmlsecurity
@@ -1,6 +1,9 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=39958
-http://www.openoffice.org/issues/show_bug.cgi?id=38417
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=39958
+o http://www.openoffice.org/issues/show_bug.cgi?id=38417
+o xmlsec08
 
+Description
 o Not for integration, we should provide configure based one
   Note: malloc.h is deprecated for FreeBSD.
 o use configure to produce config.h
diff --git a/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx
index bb1c195529e..42868189744 100644
--- a/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx
+++ b/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx
@@ -1,5 +1,8 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=27753
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=27753
+o vcl34
 
+Description
 The isnan() macro is a new feature of C99 and not yet part of C++.
 Index: source/helper/strhelper.cxx
 ===================================================================
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
index 31985c5013e..dcdd1ccdc42 100644
--- a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk
@@ -1,5 +1,7 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40182
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=40182
 
+Description
 o catch up recent unxlngi6.mk
 o -Wl,-z,defs -> comment out
 
diff --git a/editors/openoffice.org-2/files/patch-transex3+source+xmlparse.cxx b/editors/openoffice.org-2/files/patch-transex3+source+xmlparse.cxx
index 6d562f03198..de1864d5e9c 100644
--- a/editors/openoffice.org-2/files/patch-transex3+source+xmlparse.cxx
+++ b/editors/openoffice.org-2/files/patch-transex3+source+xmlparse.cxx
@@ -1,5 +1,9 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=40184
+#iZ and CWS
+o http://www.openoffice.org/issues/show_bug.cgi?id=40184
+o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=2030&Path=SRC680%2Fpj16
+o pj16
 
+Description
 FreeBSD doesn't have alloca.h
 
 Index: source/xmlparse.cxx