From cb7d6ca1d7564c82b07f5749e65e7bce5979a47c Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Fri, 28 Jan 2005 08:42:21 +0000 Subject: update to m74 --- editors/openoffice-2.0-devel/Makefile | 4 ++-- editors/openoffice-2.0-devel/distinfo | 4 ++-- editors/openoffice-2.0-devel/files/Makefile.knobs | 5 +---- .../files/patch-project-jvmfwk | 2 +- .../files/patch-scp2+source+ooo+file_ooo.scp | 25 ++++++++++++++++++++++ 5 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 editors/openoffice-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp (limited to 'editors/openoffice-2.0-devel') diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 87bb4f1c010f..99258f1a78cc 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -19,7 +19,7 @@ EXTRACT_ONLY= OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version) -SNAPDATE= 20050123 +SNAPDATE= 20050127 NO_LATEST_LINK= yes USE_GNOME= gtk20 MOZILLA_PROJECT= cws_srx645_mozooo.20041016.tar.gz @@ -49,7 +49,7 @@ BROKEN= "rtld depends on _end symbol. type make -DBROKEN to see how to upgrade CODELINE= 680 RELEASE_NR= 1.9 -MILESTONE= 73 +MILESTONE= 74 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo index c9e7f5358b88..f637f04c2868 100644 --- a/editors/openoffice-2.0-devel/distinfo +++ b/editors/openoffice-2.0-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 0885bb45bd204b03b16f8276cbd922e0 -SIZE (openoffice.org2.0/OOo_1.9m73_source.tar.bz2) = 233756500 +MD5 (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330 +SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd diff --git a/editors/openoffice-2.0-devel/files/Makefile.knobs b/editors/openoffice-2.0-devel/files/Makefile.knobs index 0afc3acadf7e..0fd696fa080e 100644 --- a/editors/openoffice-2.0-devel/files/Makefile.knobs +++ b/editors/openoffice-2.0-devel/files/Makefile.knobs @@ -18,10 +18,7 @@ CONFIGURE_ARGS+= --enable-cups .endif .if defined(ALL_LOCALIZED_LANGS) -CONFIGURE_ARGS+= --with-lang="en-US ar ca cs da de el es et fi fr he hi-IN hu it ja ko pl pt pt-BR ru sk sl sv th tr zh-CN zh-TW" -#following langs still seem to be under development -#af bg cy eo eu gl kn-IN lt nb nl nn ns tn zu -#CONFIGURE_ARGS+= --with-lang=ALL +CONFIGURE_ARGS+= --with-lang=ALL .else CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG} .endif diff --git a/editors/openoffice-2.0-devel/files/patch-project-jvmfwk b/editors/openoffice-2.0-devel/files/patch-project-jvmfwk index c3715ba50aeb..65325d6056e8 100644 --- a/editors/openoffice-2.0-devel/files/patch-project-jvmfwk +++ b/editors/openoffice-2.0-devel/files/patch-project-jvmfwk @@ -1,6 +1,6 @@ #iZ and CWS o http://www.openoffice.org/issues/show_bug.cgi?id=40180 - +o jre5issues Description Vendor name of FreeBSD's Java diff --git a/editors/openoffice-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp new file mode 100644 index 000000000000..ada03742b6cb --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp @@ -0,0 +1,25 @@ +o #iZ XXXX +o CWS nativefixer3 +http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 + +Index: scp2/source/ooo/file_ooo.scp +=================================================================== +RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v +retrieving revision 1.66 +diff -u -r1.66 file_ooo.scp +--- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 ++++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 +@@ -371,13 +371,6 @@ + Styles = (PACKED); + End + +-File gid_File_Bin_Gnome_Set_Default_Application +- BIN_FILE_BODY; +- Dir = gid_Dir_Program; +- Name = "gnome-set-default-application"; +- Styles = (PACKED); +-End +- + #endif + + File gid_File_Bin_Senddoc -- cgit v1.2.3