From 6b72d0c997b1ebbd28a5f8aa5e3a44bbcb79e258 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Sun, 14 Sep 2003 21:52:25 +0000 Subject: Make OO1.1RC working. Many thanks to kan for the debugging session at the dev summit ! Approved by: joe (portsmgr) --- editors/openoffice-1.1-devel/Makefile | 48 +++++++++-------- editors/openoffice-1.1-devel/files/oo_setup.resp | 2 +- .../openoffice-1.1-devel/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice-1.1-devel/pkg-message | 26 ++++----- editors/openoffice-1.1/Makefile | 48 +++++++++-------- editors/openoffice-1.1/files/oo_setup.resp | 2 +- editors/openoffice-1.1/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice-1.1/pkg-message | 26 ++++----- editors/openoffice-2.0-devel/Makefile | 48 +++++++++-------- editors/openoffice-2.0-devel/files/oo_setup.resp | 2 +- .../openoffice-2.0-devel/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice-2.0-devel/pkg-message | 26 ++++----- editors/openoffice-3-devel/Makefile | 48 +++++++++-------- editors/openoffice-3-devel/files/oo_setup.resp | 2 +- .../openoffice-3-devel/files/openoffice-wrapper | 59 +++++++++++++++++++-- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice-3-devel/pkg-message | 26 ++++----- editors/openoffice-3/Makefile | 48 +++++++++-------- editors/openoffice-3/files/oo_setup.resp | 2 +- editors/openoffice-3/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice-3/pkg-message | 26 ++++----- editors/openoffice-devel/Makefile | 48 +++++++++-------- editors/openoffice-devel/files/oo_setup.resp | 2 +- editors/openoffice-devel/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice-devel/pkg-message | 26 ++++----- editors/openoffice.org-1.1-devel/Makefile | 48 +++++++++-------- .../openoffice.org-1.1-devel/files/oo_setup.resp | 2 +- .../files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-1.1-devel/pkg-message | 26 ++++----- editors/openoffice.org-1.1/Makefile | 48 +++++++++-------- editors/openoffice.org-1.1/files/oo_setup.resp | 2 +- .../openoffice.org-1.1/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-1.1/pkg-message | 26 ++++----- editors/openoffice.org-2-RC/Makefile | 48 +++++++++-------- editors/openoffice.org-2-RC/files/oo_setup.resp | 2 +- .../openoffice.org-2-RC/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-2-RC/pkg-message | 26 ++++----- editors/openoffice.org-2-devel/Makefile | 48 +++++++++-------- editors/openoffice.org-2-devel/files/oo_setup.resp | 2 +- .../files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-2-devel/pkg-message | 26 ++++----- editors/openoffice.org-2.0-devel/Makefile | 48 +++++++++-------- .../openoffice.org-2.0-devel/files/oo_setup.resp | 2 +- .../files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-2.0-devel/pkg-message | 26 ++++----- editors/openoffice.org-2.0/Makefile | 48 +++++++++-------- editors/openoffice.org-2.0/files/oo_setup.resp | 2 +- .../openoffice.org-2.0/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-2.0/pkg-message | 26 ++++----- editors/openoffice.org-2/Makefile | 48 +++++++++-------- editors/openoffice.org-2/files/oo_setup.resp | 2 +- editors/openoffice.org-2/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-2/pkg-message | 26 ++++----- editors/openoffice.org-3-RC/Makefile | 48 +++++++++-------- editors/openoffice.org-3-RC/files/oo_setup.resp | 2 +- .../openoffice.org-3-RC/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-3-RC/pkg-message | 26 ++++----- editors/openoffice.org-3-devel/Makefile | 48 +++++++++-------- editors/openoffice.org-3-devel/files/oo_setup.resp | 2 +- .../files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-3-devel/pkg-message | 26 ++++----- editors/openoffice.org-3/Makefile | 48 +++++++++-------- editors/openoffice.org-3/files/oo_setup.resp | 2 +- editors/openoffice.org-3/files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-3/pkg-message | 26 ++++----- editors/openoffice.org-vcltesttool/Makefile | 48 +++++++++-------- .../openoffice.org-vcltesttool/files/oo_setup.resp | 2 +- .../files/openoffice-wrapper | 61 +++++++++++++++++++--- .../patch-cppuhelper+source+gcc3_linux_intel.map | 10 ++++ editors/openoffice.org-vcltesttool/pkg-message | 26 ++++----- 85 files changed, 1767 insertions(+), 730 deletions(-) create mode 100644 editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-2.0/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-2/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-3-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-3/files/patch-cppuhelper+source+gcc3_linux_intel.map create mode 100644 editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+gcc3_linux_intel.map (limited to 'editors') diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice-1.1-devel/files/oo_setup.resp b/editors/openoffice-1.1-devel/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice-1.1-devel/files/oo_setup.resp +++ b/editors/openoffice-1.1-devel/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice-1.1-devel/files/openoffice-wrapper b/editors/openoffice-1.1-devel/files/openoffice-wrapper index 830c63f8bb47..441adc0580fc 100644 --- a/editors/openoffice-1.1-devel/files/openoffice-wrapper +++ b/editors/openoffice-1.1-devel/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi 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 new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice-1.1-devel/pkg-message b/editors/openoffice-1.1-devel/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice-1.1-devel/pkg-message +++ b/editors/openoffice-1.1-devel/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice-1.1/files/oo_setup.resp b/editors/openoffice-1.1/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice-1.1/files/oo_setup.resp +++ b/editors/openoffice-1.1/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice-1.1/files/openoffice-wrapper b/editors/openoffice-1.1/files/openoffice-wrapper index ccd680259250..2a9b355edfea 100644 --- a/editors/openoffice-1.1/files/openoffice-wrapper +++ b/editors/openoffice-1.1/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice-1.1/pkg-message b/editors/openoffice-1.1/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice-1.1/pkg-message +++ b/editors/openoffice-1.1/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice-2.0-devel/files/oo_setup.resp b/editors/openoffice-2.0-devel/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice-2.0-devel/files/oo_setup.resp +++ b/editors/openoffice-2.0-devel/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice-2.0-devel/files/openoffice-wrapper b/editors/openoffice-2.0-devel/files/openoffice-wrapper index 5088e178fa11..5720dcb45c32 100644 --- a/editors/openoffice-2.0-devel/files/openoffice-wrapper +++ b/editors/openoffice-2.0-devel/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-2.0-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-2.0-devel/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice-2.0-devel/pkg-message b/editors/openoffice-2.0-devel/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice-2.0-devel/pkg-message +++ b/editors/openoffice-2.0-devel/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice-3-devel/files/oo_setup.resp b/editors/openoffice-3-devel/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice-3-devel/files/oo_setup.resp +++ b/editors/openoffice-3-devel/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice-3-devel/files/openoffice-wrapper b/editors/openoffice-3-devel/files/openoffice-wrapper index 9983d80f8b12..14b18ed959cf 100644 --- a/editors/openoffice-3-devel/files/openoffice-wrapper +++ b/editors/openoffice-3-devel/files/openoffice-wrapper @@ -2,16 +2,65 @@ # # $FreeBSD$ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice-3-devel/pkg-message b/editors/openoffice-3-devel/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice-3-devel/pkg-message +++ b/editors/openoffice-3-devel/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice-3/files/oo_setup.resp b/editors/openoffice-3/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice-3/files/oo_setup.resp +++ b/editors/openoffice-3/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice-3/files/openoffice-wrapper b/editors/openoffice-3/files/openoffice-wrapper index 0af0a6894157..44e1815f8961 100644 --- a/editors/openoffice-3/files/openoffice-wrapper +++ b/editors/openoffice-3/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice-3/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice-3/pkg-message b/editors/openoffice-3/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice-3/pkg-message +++ b/editors/openoffice-3/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice-devel/files/oo_setup.resp b/editors/openoffice-devel/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice-devel/files/oo_setup.resp +++ b/editors/openoffice-devel/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice-devel/files/openoffice-wrapper b/editors/openoffice-devel/files/openoffice-wrapper index 4bd42ec0bed2..51efb54b7211 100644 --- a/editors/openoffice-devel/files/openoffice-wrapper +++ b/editors/openoffice-devel/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-devel/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice-devel/pkg-message b/editors/openoffice-devel/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice-devel/pkg-message +++ b/editors/openoffice-devel/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-1.1-devel/files/oo_setup.resp b/editors/openoffice.org-1.1-devel/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-1.1-devel/files/oo_setup.resp +++ b/editors/openoffice.org-1.1-devel/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-1.1-devel/files/openoffice-wrapper b/editors/openoffice.org-1.1-devel/files/openoffice-wrapper index 9075808b172b..f775a9f45b8d 100644 --- a/editors/openoffice.org-1.1-devel/files/openoffice-wrapper +++ b/editors/openoffice.org-1.1-devel/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-1.1-devel/pkg-message b/editors/openoffice.org-1.1-devel/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-1.1-devel/pkg-message +++ b/editors/openoffice.org-1.1-devel/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-1.1/files/oo_setup.resp b/editors/openoffice.org-1.1/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-1.1/files/oo_setup.resp +++ b/editors/openoffice.org-1.1/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-1.1/files/openoffice-wrapper b/editors/openoffice.org-1.1/files/openoffice-wrapper index e4eb31c7f54d..661ce1008d14 100644 --- a/editors/openoffice.org-1.1/files/openoffice-wrapper +++ b/editors/openoffice.org-1.1/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-1.1/pkg-message b/editors/openoffice.org-1.1/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-1.1/pkg-message +++ b/editors/openoffice.org-1.1/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-2-RC/files/oo_setup.resp b/editors/openoffice.org-2-RC/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-2-RC/files/oo_setup.resp +++ b/editors/openoffice.org-2-RC/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-2-RC/files/openoffice-wrapper b/editors/openoffice.org-2-RC/files/openoffice-wrapper index 8760fb2f79f4..8ad240086ba5 100644 --- a/editors/openoffice.org-2-RC/files/openoffice-wrapper +++ b/editors/openoffice.org-2-RC/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-RC/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-2-RC/pkg-message b/editors/openoffice.org-2-RC/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-2-RC/pkg-message +++ b/editors/openoffice.org-2-RC/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-2-devel/files/oo_setup.resp b/editors/openoffice.org-2-devel/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-2-devel/files/oo_setup.resp +++ b/editors/openoffice.org-2-devel/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-2-devel/files/openoffice-wrapper b/editors/openoffice.org-2-devel/files/openoffice-wrapper index 60b480aae883..e958618268cc 100644 --- a/editors/openoffice.org-2-devel/files/openoffice-wrapper +++ b/editors/openoffice.org-2-devel/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-2-devel/pkg-message b/editors/openoffice.org-2-devel/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-2-devel/pkg-message +++ b/editors/openoffice.org-2-devel/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-2.0-devel/files/oo_setup.resp b/editors/openoffice.org-2.0-devel/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-2.0-devel/files/oo_setup.resp +++ b/editors/openoffice.org-2.0-devel/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-2.0-devel/files/openoffice-wrapper b/editors/openoffice.org-2.0-devel/files/openoffice-wrapper index 67f885092453..60f6bf44a6a9 100644 --- a/editors/openoffice.org-2.0-devel/files/openoffice-wrapper +++ b/editors/openoffice.org-2.0-devel/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0-devel/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-2.0-devel/pkg-message b/editors/openoffice.org-2.0-devel/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-2.0-devel/pkg-message +++ b/editors/openoffice.org-2.0-devel/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-2.0/files/oo_setup.resp b/editors/openoffice.org-2.0/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-2.0/files/oo_setup.resp +++ b/editors/openoffice.org-2.0/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-2.0/files/openoffice-wrapper b/editors/openoffice.org-2.0/files/openoffice-wrapper index e170aa37d71a..068d789d77c8 100644 --- a/editors/openoffice.org-2.0/files/openoffice-wrapper +++ b/editors/openoffice.org-2.0/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2.0/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2.0/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-2.0/pkg-message b/editors/openoffice.org-2.0/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-2.0/pkg-message +++ b/editors/openoffice.org-2.0/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-2/files/oo_setup.resp b/editors/openoffice.org-2/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-2/files/oo_setup.resp +++ b/editors/openoffice.org-2/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-2/files/openoffice-wrapper b/editors/openoffice.org-2/files/openoffice-wrapper index 6d3e786bafb8..0e2c5816542e 100644 --- a/editors/openoffice.org-2/files/openoffice-wrapper +++ b/editors/openoffice.org-2/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-2/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-2/pkg-message b/editors/openoffice.org-2/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-2/pkg-message +++ b/editors/openoffice.org-2/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-3-RC/files/oo_setup.resp b/editors/openoffice.org-3-RC/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-3-RC/files/oo_setup.resp +++ b/editors/openoffice.org-3-RC/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-3-RC/files/openoffice-wrapper b/editors/openoffice.org-3-RC/files/openoffice-wrapper index d58c0143cd20..ab3bd69d309c 100644 --- a/editors/openoffice.org-3-RC/files/openoffice-wrapper +++ b/editors/openoffice.org-3-RC/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-3-RC/pkg-message b/editors/openoffice.org-3-RC/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-3-RC/pkg-message +++ b/editors/openoffice.org-3-RC/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-3-devel/files/oo_setup.resp b/editors/openoffice.org-3-devel/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-3-devel/files/oo_setup.resp +++ b/editors/openoffice.org-3-devel/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-3-devel/files/openoffice-wrapper b/editors/openoffice.org-3-devel/files/openoffice-wrapper index 2b3a5dafbc54..283dde87ed86 100644 --- a/editors/openoffice.org-3-devel/files/openoffice-wrapper +++ b/editors/openoffice.org-3-devel/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-3-devel/pkg-message b/editors/openoffice.org-3-devel/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-3-devel/pkg-message +++ b/editors/openoffice.org-3-devel/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-3/files/oo_setup.resp b/editors/openoffice.org-3/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-3/files/oo_setup.resp +++ b/editors/openoffice.org-3/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-3/files/openoffice-wrapper b/editors/openoffice.org-3/files/openoffice-wrapper index 3e80385eb48f..2f49969b600f 100644 --- a/editors/openoffice.org-3/files/openoffice-wrapper +++ b/editors/openoffice.org-3/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-3/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-3/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-3/pkg-message b/editors/openoffice.org-3/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-3/pkg-message +++ b/editors/openoffice.org-3/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 03c666c48b4a..da292600123e 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 645 +PORTVERSION= 1.1RC4 SNAPDATE= 20030815 CATEGORIES+= editors MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ @@ -17,8 +17,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz -MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ +MASTER_SITE_SUBDIR= ${BUILD_NR} +DISTFILES+= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ mozilla-vendor-1.0.2a.tgz:moz .if defined(L10NHELP) @@ -38,10 +38,10 @@ PASTE?= /usr/bin/paste .include -BROKEN= "Does not work yet, installation problems" -BUILD_NR= ${PORTVERSION} +BUILD_NR= 645 RELEASE_NR= 1.1 -INSTALLATION_BASEDIR= OpenOffice.org-${BUILD_NR} +FRELEASE_NR= 1.1.0 +INSTALLATION_BASEDIR= OpenOffice.org-${FRELEASE_NR} DIST_SUBDIR= openoffice DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ @@ -96,7 +96,7 @@ CC= gcc33 CXX= g++33 .endif -EXTRACT_ONLY= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 +EXTRACT_ONLY= oo_${BUILD_NR}_src_${SNAPDATE}.tar.bz2 MAINTAINER= openoffice@FreeBSD.org .if !defined(COMMENT) @@ -141,9 +141,9 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${PORTVERSION}_src/config_office +WRKSRC= ${WRKDIR}/oo_${BUILD_NR}_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ -LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/lib/ +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 @@ -503,7 +503,7 @@ pre-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PORTVERSION%%#${BUILD_NR}#g' \ ${WRKSRC}/../instsetoo/unxfbsd.pro/${LANG_EXT}/normal/oo_setup.resp - @${MKDIR} -p ${WRKSRC}/../solver/${PORTVERSION}/unxfbsd.pro/bin/${LANG_EXT}/osl/ + @${MKDIR} -p ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/${LANG_EXT}/osl/ do-install: .if !defined(DISPLAY) @@ -533,19 +533,21 @@ post-install: @${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%LANG%%#${USE_LANG}#g' ${WRKDIR}/openoffice @${SED} -i orig -e 's#%%BUILD_NR%%#${BUILD_NR}#g' ${WRKDIR}/openoffice - @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice_${RELEASE_NR} - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sagenda - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-scalc - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sdraw - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-setup - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sfax - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-smath - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-simpress - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-spadmin - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-sweb - @${LN} -fs ${PREFIX}/bin/openoffice_${RELEASE_NR} ${PREFIX}/bin/openoffice_${RELEASE_NR}-swriter - @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice_${RELEASE_NR} > ${TMPPLIST} - @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice_${RELEASE_NR} >> ${TMPPLIST} + @${SED} -i orig -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' ${WRKDIR}/openoffice + @${SED} -i orig -e 's#%%FRELEASE_NR%%#${FRELEASE_NR}#g' ${WRKDIR}/openoffice + @${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice-${RELEASE_NR} + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sagenda + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-scalc + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sdraw + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-setup + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sfax + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-smath + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-simpress + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-spadmin + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-sweb + @${LN} -fs ${PREFIX}/bin/openoffice-${RELEASE_NR} ${PREFIX}/bin/openoffice-${RELEASE_NR}-swriter + @cd ${PREFIX} && ${FIND} -s bin -type f | ${GREP} openoffice-${RELEASE_NR} > ${TMPPLIST} + @cd ${PREFIX} && ${FIND} -s bin -type l | ${GREP} openoffice-${RELEASE_NR} >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> ${TMPPLIST} @cd ${PREFIX} && ${FIND} -s ${INSTALLATION_BASEDIR} -type d > ${WRKDIR}/dir.tmp diff --git a/editors/openoffice.org-vcltesttool/files/oo_setup.resp b/editors/openoffice.org-vcltesttool/files/oo_setup.resp index b270165b44d6..9218fb9522a6 100644 --- a/editors/openoffice.org-vcltesttool/files/oo_setup.resp +++ b/editors/openoffice.org-vcltesttool/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = %%PREFIX%%/OpenOffice.org-645 +DestinationPath = %%PREFIX%%/OpenOffice.org1.1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-vcltesttool/files/openoffice-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice-wrapper index da4d68a0fcdd..7ad3105e1d4e 100644 --- a/editors/openoffice.org-vcltesttool/files/openoffice-wrapper +++ b/editors/openoffice.org-vcltesttool/files/openoffice-wrapper @@ -1,17 +1,66 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/openoffice-wrapper,v 1.8 2003-06-07 22:09:46 mbr Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/openoffice-wrapper,v 1.9 2003-09-14 21:52:25 mbr Exp $ -oopath=%%PREFIX%%/OpenOffice.org-%%BUILD_NR%%/program/ -program=`echo $0 | sed -e 's|.*-||'` +oopath=%%PREFIX%%/OpenOffice.org-%%FRELEASE_NR%%/program/ +program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` if [ ! $LANG ]; then export LANG=%%LANG%% fi -if [ -e $HOME/OpenOffice.org1.1/setup.log ]; then - if [ ! -e $HOME/OpenOffice.org1.1/user/config/soffice.cfg ]; then - touch $HOME/OpenOffice.org1.1/user/config/soffice.cfg +save_common_xcu() { +sed 's/^X//' > tmp/Common.xcu << 'END-of-Common.xcu' +X +X +X +X +X +X +X +X +X +X true +X +X +X +X +X +X +X +X +X +X +X %%mozilla%% +X +X +X +X +X +X +X +X +X +END-of-Common.xcu +mozilla=`which mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mozilla=`which linux-mozilla`; +if [ $? -eq 0 ]; then + sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' tmp/Common.xcu +fi +mv tmp/Common.xcu user/registry/data/org/openoffice/Office +} + +if [ -e $HOME/OpenOffice.org%%FRELEASE_NR%%/setup ]; then + cd $HOME/OpenOffice.org%%FRELEASE_NR%% + if [ ! -e $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg ]; then + touch $HOME/OpenOffice.org%%FRELEASE_NR%%/user/config/soffice.cfg + fi + if [ ! -e user/registry/data/org/openoffice/Office/Common.xcu ]; then + mkdir -p tmp; + save_common_xcu; fi fi diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+gcc3_linux_intel.map new file mode 100644 index 000000000000..da9fd94b39c0 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+gcc3_linux_intel.map @@ -0,0 +1,10 @@ +--- ../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; + _ZNK4cppu6UnoUrl13getObjectNameEv; ++_end; + + local: + *; diff --git a/editors/openoffice.org-vcltesttool/pkg-message b/editors/openoffice.org-vcltesttool/pkg-message index 0c50ff9d3143..8d787125606d 100644 --- a/editors/openoffice.org-vcltesttool/pkg-message +++ b/editors/openoffice.org-vcltesttool/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 644 Beta Personal Install How-To +OpenOffice.org Build 1.1RC4 Personal Install How-To Written by: Martin Blapp OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-644 +${PREFIX}/OpenOffice.org-1.1.0 1 User installation ------------------- @@ -12,7 +12,7 @@ Just type "openoffice" after you have successfully installed the package. If there is no installed OO.org dir in hour homedir, you'll be prompted to install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.1Beta" folder +The setup installs a "OpenOffice.org1.1.0" folder in your homedir. If the setup tells you there is already an installed @@ -29,16 +29,16 @@ There are some wrappers installed for fast startup. Add "${PREFIX}/bin/" to your PATH and you will be able to use them. -${PREFIX}/bin/openoffice_1.1 -${PREFIX}/bin/openoffice_1.1-sagenda -${PREFIX}/bin/openoffice_1.1-scalc -${PREFIX}/bin/openoffice_1.1-sdraw -${PREFIX}/bin/openoffice_1.1-setup -${PREFIX}/bin/openoffice_1.1-sfax -${PREFIX}/bin/openoffice_1.1-simpress -${PREFIX}/bin/openoffice_1.1-spadmin -${PREFIX}/bin/openoffice_1.1-sweb -${PREFIX}/bin/openoffice_1.1-swriter +${PREFIX}/bin/openoffice-1.1 +${PREFIX}/bin/openoffice-1.1-sagenda +${PREFIX}/bin/openoffice-1.1-scalc +${PREFIX}/bin/openoffice-1.1-sdraw +${PREFIX}/bin/openoffice-1.1-setup +${PREFIX}/bin/openoffice-1.1-sfax +${PREFIX}/bin/openoffice-1.1-simpress +${PREFIX}/bin/openoffice-1.1-spadmin +${PREFIX}/bin/openoffice-1.1-sweb +${PREFIX}/bin/openoffice-1.1-swriter OO.org does need $LANG to be set to a suitable value. If it is not already set, a default value is chosen. -- cgit v1.2.3