diff options
Diffstat (limited to 'editors/openoffice.org-2-RC/files')
5 files changed, 75 insertions, 73 deletions
diff --git a/editors/openoffice.org-2-RC/files/Makefile.others b/editors/openoffice.org-2-RC/files/Makefile.others index dc10ab9d5f15..0432f503c88d 100644 --- a/editors/openoffice.org-2-RC/files/Makefile.others +++ b/editors/openoffice.org-2-RC/files/Makefile.others @@ -18,7 +18,7 @@ package-canonical: @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . - @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz . sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @@ -30,7 +30,7 @@ ure: @${RM} -fr ${WRKDIR}/ure_tmp @${MKDIR} ${WRKDIR}/ure_tmp @cd ${WRKDIR}/ure_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_ure/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz + ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz @cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ @@ -53,7 +53,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz + ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-2-RC/files/generate.pl b/editors/openoffice.org-2-RC/files/generate.pl index 2e113f499539..76119dfba92a 100644 --- a/editors/openoffice.org-2-RC/files/generate.pl +++ b/editors/openoffice.org-2-RC/files/generate.pl @@ -2,10 +2,11 @@ # generate full build shell script for OpenOffice.org # Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/generate.pl,v 1.4 2005-07-29 03:06:52 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/generate.pl,v 1.5 2005-08-28 08:41:59 maho Exp $ print "#!/bin/csh\n"; -print "/usr/bin/time -h make WITH_CCACHE=yes deinstall clean package package-rename solver sdk deinstall languagepack >& log.en\n"; +print "make deinstall clean\n"; +print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n"; print "rm work/.configure* work/.build* \n"; print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n"; @@ -15,7 +16,7 @@ while(<FILE>){ @tmp2=split ('"',$tmp[3]); if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1]; print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; - print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes deinstall languagepack package package-rename deinstall >& log.$LANG\n"; + print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n"; } } close FILE; diff --git a/editors/openoffice.org-2-RC/files/patch-Python-2.3.4.patch b/editors/openoffice.org-2-RC/files/patch-Python-2.3.4.patch index 664c4b9c4b2e..646b69d1385a 100644 --- a/editors/openoffice.org-2-RC/files/patch-Python-2.3.4.patch +++ b/editors/openoffice.org-2-RC/files/patch-Python-2.3.4.patch @@ -1,4 +1,4 @@ -Issutracker : #iXXXXX# +Issutracker : #i53287# CWS : N/A Author: : <maho@openoffice.org> (JCA) Description : Support for FreeBSD 6 and 7 diff --git a/editors/openoffice.org-2-RC/files/patch-instsetoo b/editors/openoffice.org-2-RC/files/patch-instsetoo index 1aa1622f2517..c9cebc0a5c3a 100644 --- a/editors/openoffice.org-2-RC/files/patch-instsetoo +++ b/editors/openoffice.org-2-RC/files/patch-instsetoo @@ -1,4 +1,4 @@ -Issutracker : #iXXXXX# +Issutracker : #i53288# CWS : N/A Author: : <maho@openoffice.org> (JCA) Description : remove circular dependency @@ -10,91 +10,92 @@ and pkg_add command is forked infinite times and eats up systems' resource. namely when core01 tries to install core02, core02 also tries to install core01. + Index: instsetoo_native/inc_openoffice/unix/packagelist.txt =================================================================== RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v -retrieving revision 1.14 -diff -u -r1.14 packagelist.txt ---- instsetoo_native/inc_openoffice/unix/packagelist.txt 21 Jun 2005 13:15:49 -0000 1.14 -+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 23 Jun 2005 01:11:03 -0000 -@@ -33,7 +33,7 @@ - solarispackagename = "openofficeorg-core01" - solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" - packagename = "openofficeorg-core01" --requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" -+requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" +retrieving revision 1.15 +diff -u -r1.15 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 18 Aug 2005 12:48:34 -0000 1.15 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 22 Aug 2005 07:01:29 -0000 +@@ -38,7 +38,7 @@ + packagename = "openoffice.org-core01" + linuxreplaces = "openofficeorg-core,openofficeorg-core01" + provides = "openofficeorg-core01" +-requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08" ++requires = "openoffice.org-core02,openoffice.org-core03,openoffice.org-core04,openoffice.org-core05,openoffice.org-core06,openoffice.org-core07,openoffice.org-core08,openoffice.org-core09,openoffice.org-core10" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -238,7 +238,6 @@ - solarispackagename = "openofficeorg-core02" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core02" --requires = "openofficeorg-core01" +@@ -284,7 +284,6 @@ + packagename = "openoffice.org-core02" + linuxreplaces = "openofficeorg-core02" + provides = "openofficeorg-core02" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -250,7 +249,6 @@ - solarispackagename = "openofficeorg-core03" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core03" --requires = "openofficeorg-core01" +@@ -298,7 +297,6 @@ + packagename = "openoffice.org-core03" + linuxreplaces = "openofficeorg-core03" + provides = "openofficeorg-core03" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -262,7 +260,6 @@ - solarispackagename = "openofficeorg-core04" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core04" --requires = "openofficeorg-core01" +@@ -312,7 +310,6 @@ + packagename = "openoffice.org-core04" + linuxreplaces = "openofficeorg-core04" + provides = "openofficeorg-core04" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -274,7 +271,6 @@ - solarispackagename = "openofficeorg-core05" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core05" --requires = "openofficeorg-core01" +@@ -326,7 +323,6 @@ + packagename = "openoffice.org-core05" + linuxreplaces = "openofficeorg-core05" + provides = "openofficeorg-core05" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -286,7 +282,6 @@ - solarispackagename = "openofficeorg-core06" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core06" --requires = "openofficeorg-core01" +@@ -340,7 +336,6 @@ + packagename = "openoffice.org-core06" + linuxreplaces = "openofficeorg-core06" + provides = "openofficeorg-core06" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -298,7 +293,6 @@ - solarispackagename = "openofficeorg-core07" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core07" --requires = "openofficeorg-core01" +@@ -354,7 +349,6 @@ + packagename = "openoffice.org-core07" + linuxreplaces = "openofficeorg-core07" + provides = "openofficeorg-core07" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -310,7 +304,6 @@ - solarispackagename = "openofficeorg-core08" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core08" --requires = "openofficeorg-core01" +@@ -368,7 +362,6 @@ + packagename = "openoffice.org-core08" + linuxreplaces = "openofficeorg-core08" + provides = "openofficeorg-core08" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -322,7 +315,6 @@ - solarispackagename = "openofficeorg-core09" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core09" --requires = "openofficeorg-core01" +@@ -382,7 +375,6 @@ + packagename = "openoffice.org-core09" + linuxreplaces = "openofficeorg-core09" + provides = "openofficeorg-core09" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -335,7 +327,6 @@ - solarispackagename = "openofficeorg-core10" - solarisrequires = "openofficeorg-core01" - packagename = "openofficeorg-core10" --requires = "openofficeorg-core01" +@@ -397,7 +389,6 @@ + packagename = "openoffice.org-core10" + linuxreplaces = "openofficeorg-core10" + provides = "openofficeorg-core10" +-requires = "openoffice.org-core01" copyright = "1999-2005 by OpenOffice.org" vendor = "OpenOffice.org" description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-2-RC/files/pkg-message.in b/editors/openoffice.org-2-RC/files/pkg-message.in index f95a56222371..ce2dd40c131e 100644 --- a/editors/openoffice.org-2-RC/files/pkg-message.in +++ b/editors/openoffice.org-2-RC/files/pkg-message.in @@ -16,13 +16,6 @@ install some files and choose an installed JDK. The setup installs a ".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" folder in your homedir. -If the setup tells you there is already an installed -version, you may look in the file ".sversionrc" located -in your homedir. In this file, OpenOffice and StarOffice -will have a line for each version that is installed. -After removing the problematic line you should be able to -install the package again. - 2. Starting OO.org ------------------ @@ -46,6 +39,13 @@ OO.org does need $LANG to be set to a suitable value. 3. If you run into problems -------------------------------------------------- If you somehow run into problems, please remove the already installed -".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir -along with the appropriate entry in ".sversionrc". Redo the user -installation and the problems should go away. +".openoffice.org%%RELEASE_NR%%.%%MILESTONE%%" dir in your homedir. +Redo the user installation and the problems should go away. + +4. Known issue +-------------------------------------------------- +If you invoke English version of OOo setting LANG as C or not +setting LANG environment, +`I18N: Operating system doesn't support locale "en_US"' +in this case you should set LANG as en_US.ISO8859-15 +or en_US.ISO8859-1. |