diff options
15 files changed, 156 insertions, 9 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index d98175e..bb26f84 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES+= editors MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \ diff --git a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx index 5e02222..e3159c2 100644 --- a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx +++ b/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx @@ -9,3 +9,11 @@ #include <sys/poll.h> #else #include <poll.h> +@@ -175,6 +175,7 @@ + { 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 }, + // eastern european encodings + { 0, "text/plain;charset=koi8-r", "KOI8-R", 8 }, ++ { 0, "text/plain;charset=koi8-u", "KOI8-U", 8 }, + // String (== iso8859-1) + { XA_STRING, "text/plain;charset=string", "STRING", 8 }, + // special for compound text diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c index 7fa1cd5..9bebad2 100644 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c @@ -109,8 +109,8 @@ + { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ ++ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ @@ -137,8 +137,8 @@ + { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ ++ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ @@ -166,7 +166,15 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +945,6 @@ +@@ -684,6 +742,7 @@ + { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, + { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, + { "koi8-r", RTL_TEXTENCODING_KOI8_R }, ++ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, + { "pck", RTL_TEXTENCODING_MS_932 }, + #if (0) + { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, +@@ -887,6 +946,6 @@ return 0; } diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c index 7cf80c1..03825fb 100644 --- a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c +++ b/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c @@ -1,5 +1,13 @@ --- ../sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 +++ ../sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 +@@ -532,6 +532,7 @@ + static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] = + { + { "r", RTL_TEXTENCODING_KOI8_R }, ++ { "u", RTL_TEXTENCODING_KOI8_U }, + { NULL, RTL_TEXTENCODING_DONTKNOW } + }; + @@ -695,6 +695,10 @@ /* characters. The function search for the first equal string in */ /* the table. In this table are only the most used mime types. */ @@ -11,3 +19,19 @@ static ImplStrCharsetDef const aVIPMimeCharsetTab[] = { { "usascii", RTL_TEXTENCODING_ASCII_US }, +@@ -741,6 +742,7 @@ + { "windows1256", RTL_TEXTENCODING_MS_1256 }, + { "windows1257", RTL_TEXTENCODING_MS_1257 }, + { "windows1258", RTL_TEXTENCODING_MS_1258 }, ++ { "koi8u", RTL_TEXTENCODING_KOI8_U }, + { NULL, RTL_TEXTENCODING_DONTKNOW } + }; + +@@ -815,6 +817,7 @@ + { "iso10646us", RTL_TEXTENCODING_ASCII_US }, + { "iso646irv", RTL_TEXTENCODING_ASCII_US }, + { "cskoi8r", RTL_TEXTENCODING_KOI8_R }, ++ { "cskoi8u", RTL_TEXTENCODING_KOI8_U }, + { "ibm437", RTL_TEXTENCODING_IBM_437 }, + { "cp437", RTL_TEXTENCODING_IBM_437 }, + { "437", RTL_TEXTENCODING_IBM_437 }, diff --git a/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx index 732f77f..e749740 100644 --- a/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx +++ b/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx @@ -9,3 +9,11 @@ #include <locale.h> #include <langinfo.h> #endif +@@ -143,6 +143,7 @@ + { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, + { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, + { "koi8-r", RTL_TEXTENCODING_KOI8_R }, ++ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, + { "pck", RTL_TEXTENCODING_MS_932 }, + #if (0) + { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index d98175e..bb26f84 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES+= editors MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \ diff --git a/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx index 5e02222..e3159c2 100644 --- a/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx +++ b/editors/openoffice.org-1.0/files/patch-dtrans+source+X11+X11_selection.cxx @@ -9,3 +9,11 @@ #include <sys/poll.h> #else #include <poll.h> +@@ -175,6 +175,7 @@ + { 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 }, + // eastern european encodings + { 0, "text/plain;charset=koi8-r", "KOI8-R", 8 }, ++ { 0, "text/plain;charset=koi8-u", "KOI8-U", 8 }, + // String (== iso8859-1) + { XA_STRING, "text/plain;charset=string", "STRING", 8 }, + // special for compound text diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c index 7fa1cd5..9bebad2 100644 --- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+nlsupport.c @@ -109,8 +109,8 @@ + { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ ++ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ @@ -137,8 +137,8 @@ + { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ ++ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ @@ -166,7 +166,15 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +945,6 @@ +@@ -684,6 +742,7 @@ + { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, + { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, + { "koi8-r", RTL_TEXTENCODING_KOI8_R }, ++ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, + { "pck", RTL_TEXTENCODING_MS_932 }, + #if (0) + { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, +@@ -887,6 +946,6 @@ return 0; } diff --git a/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c b/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c index 7cf80c1..03825fb 100644 --- a/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c +++ b/editors/openoffice.org-1.0/files/patch-sal+textenc+tencinfo.c @@ -1,5 +1,13 @@ --- ../sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 +++ ../sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 +@@ -532,6 +532,7 @@ + static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] = + { + { "r", RTL_TEXTENCODING_KOI8_R }, ++ { "u", RTL_TEXTENCODING_KOI8_U }, + { NULL, RTL_TEXTENCODING_DONTKNOW } + }; + @@ -695,6 +695,10 @@ /* characters. The function search for the first equal string in */ /* the table. In this table are only the most used mime types. */ @@ -11,3 +19,19 @@ static ImplStrCharsetDef const aVIPMimeCharsetTab[] = { { "usascii", RTL_TEXTENCODING_ASCII_US }, +@@ -741,6 +742,7 @@ + { "windows1256", RTL_TEXTENCODING_MS_1256 }, + { "windows1257", RTL_TEXTENCODING_MS_1257 }, + { "windows1258", RTL_TEXTENCODING_MS_1258 }, ++ { "koi8u", RTL_TEXTENCODING_KOI8_U }, + { NULL, RTL_TEXTENCODING_DONTKNOW } + }; + +@@ -815,6 +817,7 @@ + { "iso10646us", RTL_TEXTENCODING_ASCII_US }, + { "iso646irv", RTL_TEXTENCODING_ASCII_US }, + { "cskoi8r", RTL_TEXTENCODING_KOI8_R }, ++ { "cskoi8u", RTL_TEXTENCODING_KOI8_U }, + { "ibm437", RTL_TEXTENCODING_IBM_437 }, + { "cp437", RTL_TEXTENCODING_IBM_437 }, + { "437", RTL_TEXTENCODING_IBM_437 }, diff --git a/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx index 732f77f..e749740 100644 --- a/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx +++ b/editors/openoffice.org-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx @@ -9,3 +9,11 @@ #include <locale.h> #include <langinfo.h> #endif +@@ -143,6 +143,7 @@ + { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, + { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, + { "koi8-r", RTL_TEXTENCODING_KOI8_R }, ++ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, + { "pck", RTL_TEXTENCODING_MS_932 }, + #if (0) + { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index d98175e..bb26f84 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -7,6 +7,7 @@ PORTNAME= openoffice PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES+= editors MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://ftp.gwdg.de/pub/misc/openoffice/%SUBDIR%/ \ diff --git a/editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx index 5e02222..e3159c2 100644 --- a/editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx +++ b/editors/openoffice/files/patch-dtrans+source+X11+X11_selection.cxx @@ -9,3 +9,11 @@ #include <sys/poll.h> #else #include <poll.h> +@@ -175,6 +175,7 @@ + { 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 }, + // eastern european encodings + { 0, "text/plain;charset=koi8-r", "KOI8-R", 8 }, ++ { 0, "text/plain;charset=koi8-u", "KOI8-U", 8 }, + // String (== iso8859-1) + { XA_STRING, "text/plain;charset=string", "STRING", 8 }, + // special for compound text diff --git a/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c index 7fa1cd5..9bebad2 100644 --- a/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c +++ b/editors/openoffice/files/patch-sal+osl+unx+nlsupport.c @@ -109,8 +109,8 @@ + { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ ++ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ @@ -137,8 +137,8 @@ + { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ + { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ + { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI-U", RTL_TEXTENCODING_DONTKNOW }, /* Not supported at the moment */ + { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ ++ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ + { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ + { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ + { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ @@ -166,7 +166,15 @@ /* * This implementation of osl_getTextEncodingFromLocale maps -@@ -887,6 +945,6 @@ +@@ -684,6 +742,7 @@ + { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, + { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, + { "koi8-r", RTL_TEXTENCODING_KOI8_R }, ++ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, + { "pck", RTL_TEXTENCODING_MS_932 }, + #if (0) + { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, +@@ -887,6 +946,6 @@ return 0; } diff --git a/editors/openoffice/files/patch-sal+textenc+tencinfo.c b/editors/openoffice/files/patch-sal+textenc+tencinfo.c index 7cf80c1..03825fb 100644 --- a/editors/openoffice/files/patch-sal+textenc+tencinfo.c +++ b/editors/openoffice/files/patch-sal+textenc+tencinfo.c @@ -1,5 +1,13 @@ --- ../sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 +++ ../sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 +@@ -532,6 +532,7 @@ + static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] = + { + { "r", RTL_TEXTENCODING_KOI8_R }, ++ { "u", RTL_TEXTENCODING_KOI8_U }, + { NULL, RTL_TEXTENCODING_DONTKNOW } + }; + @@ -695,6 +695,10 @@ /* characters. The function search for the first equal string in */ /* the table. In this table are only the most used mime types. */ @@ -11,3 +19,19 @@ static ImplStrCharsetDef const aVIPMimeCharsetTab[] = { { "usascii", RTL_TEXTENCODING_ASCII_US }, +@@ -741,6 +742,7 @@ + { "windows1256", RTL_TEXTENCODING_MS_1256 }, + { "windows1257", RTL_TEXTENCODING_MS_1257 }, + { "windows1258", RTL_TEXTENCODING_MS_1258 }, ++ { "koi8u", RTL_TEXTENCODING_KOI8_U }, + { NULL, RTL_TEXTENCODING_DONTKNOW } + }; + +@@ -815,6 +817,7 @@ + { "iso10646us", RTL_TEXTENCODING_ASCII_US }, + { "iso646irv", RTL_TEXTENCODING_ASCII_US }, + { "cskoi8r", RTL_TEXTENCODING_KOI8_R }, ++ { "cskoi8u", RTL_TEXTENCODING_KOI8_U }, + { "ibm437", RTL_TEXTENCODING_IBM_437 }, + { "cp437", RTL_TEXTENCODING_IBM_437 }, + { "437", RTL_TEXTENCODING_IBM_437 }, diff --git a/editors/openoffice/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice/files/patch-sysui+tools+lngconv+lngconv.cxx index 732f77f..e749740 100644 --- a/editors/openoffice/files/patch-sysui+tools+lngconv+lngconv.cxx +++ b/editors/openoffice/files/patch-sysui+tools+lngconv+lngconv.cxx @@ -9,3 +9,11 @@ #include <locale.h> #include <langinfo.h> #endif +@@ -143,6 +143,7 @@ + { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, + { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, + { "koi8-r", RTL_TEXTENCODING_KOI8_R }, ++ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, + { "pck", RTL_TEXTENCODING_MS_932 }, + #if (0) + { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, |
