diff options
| author | maho <maho@FreeBSD.org> | 2004-10-12 15:20:54 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-10-12 15:20:54 +0800 |
| commit | ae72211ee6247a92d0a32b4a3c6ff33bb79e863b (patch) | |
| tree | 999fadba433466c1b0d823d56f907f6c5990c491 /editors | |
| parent | 2ec433585d36389798e1badfeb469f8322a226f1 (diff) | |
| download | freebsd-ports-gnome-ae72211ee6247a92d0a32b4a3c6ff33bb79e863b.tar.gz freebsd-ports-gnome-ae72211ee6247a92d0a32b4a3c6ff33bb79e863b.tar.zst freebsd-ports-gnome-ae72211ee6247a92d0a32b4a3c6ff33bb79e863b.zip | |
Update to 1.1.3
a) remove patches which not needed anymore
b) security vulnerablity by mozilla doesn't affect
this port (remove WITHOUT_MOZILLA by default)
see: http://www.openoffice.org/servlets/ReadMsg?list=dev&msgNo=12093
c) add files/geneate.pl, which generates shell script does
build complete localized packages
d) Use CONFIGURE_WRKSRC. no longer need .. for patches.
e) Still weird though, WITH_CCACHE works.
f) Fix: if you build without X, Makefile invokes build twice.
Diffstat (limited to 'editors')
44 files changed, 602 insertions, 1070 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 333628fb0f27..c8b9e47c816b 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -1,13 +1,12 @@ # New ports collection makefile for: OpenOffice.org -# Date created: 28 Februar 2002 +# Date created: 28 February 2002 # Whom: Martin Blapp # # $FreeBSD$ # PORTNAME= openoffice -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 CATEGORIES+= editors MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \ ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/%SUBDIR%/ \ @@ -22,8 +21,8 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \ ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help MASTER_SITE_SUBDIR= stable/${PORTVERSION} -DISTFILES+= OOo_${PORTVERSION}_source.tar.gz gpc231.tar.Z:gpc -EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.gz +DISTFILES+= OOo_${PORTVERSION}-1_source.tar.gz gpc231.tar.Z:gpc +EXTRACT_ONLY= OOo_${PORTVERSION}-1_source.tar.gz MAINTAINER= openoffice@FreeBSD.org @@ -37,8 +36,6 @@ USE_PERL5= yes USE_BISON= yes USE_GMAKE= yes USE_REINPLACE= yes -#mozilla 1.0 seems to have security vulnerability -WITHOUT_MOZILLA= yes .if !defined(WITHOUT_JAVA) USE_JAVA= 1.4+ @@ -48,6 +45,9 @@ NO_RUN_DEPENDS_JAVA= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> +LANG_EXT?= 01 +LANG_CONFIGURE_ARG?= ENUS + .if defined(L10NHELP) DISTFILES+= ${L10NHELP}:help .endif @@ -69,20 +69,14 @@ L10NHELPS= helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ .endif COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser - BUILD_NR= 645 RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} DIST_SUBDIR= openoffice1.1 -SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//' -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif +SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 -USE_GCC=3.2 + +# FIXME .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache CC= ccache gcc32 @@ -91,7 +85,6 @@ CXX= ccache g++32 CC= gcc32 CXX= g++32 .endif - BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ @@ -111,7 +104,8 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant GNU_CONFIGURE= yes USE_AUTOCONF_VER= 259 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office +WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src +CONFIGURE_WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src/config_office ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh ZIP?= ${PREFIX}/bin/zip @@ -136,14 +130,10 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" CONFIGURE_ARGS+= --disable-mozilla .endif -.if defined(LANG_EXT) -CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS -.else -LANG_EXT= 01 -.endif - .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL +.else +CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} .endif .if defined(WITH_DEBUG) @@ -208,8 +198,8 @@ pre-everything:: post-extract: @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ - @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ .if defined(L10NHELP) @${ECHO_MSG} "===> Extracting L10NHELP sub project" @${MKDIR} ${WRKDIR}/L10NHELP @@ -226,8 +216,8 @@ post-extract: .endif post-patch: - @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk - @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/odk/settings/settings.mk .if defined(WITH_TTF_BYTECODE_ENABLED) @if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \ ${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \ @@ -239,9 +229,9 @@ post-patch: .endif .if !defined(WITHOUT_MOZILLA) && ( \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) || \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) || \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip) ) + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIruntime.zip) || \ + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIlib.zip) || \ + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIinc.zip) ) .include <${FILESDIR}/Makefile.mozilla> do-build: mozilla .else @@ -258,25 +248,20 @@ do-build: ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 .endif - @cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap + @cd ${WRKSRC} ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS) - @${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck + @${MKDIR} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck .endif .if !defined(DISPLAY) - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}' @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}' .endif -.if defined(LANG_PKGNAME) - @cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ - ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd instsetoo/util ; ${BUILD} LANGEXT=${LANG_EXT}' -.endif - do-install: .if !defined(DISPLAY) # @@ -284,12 +269,12 @@ do-install: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} .endif @@ -299,17 +284,13 @@ install-user: post-install: @${ECHO_MSG} "===> Add wrapper scripts"; @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ - @${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%LANG%%#${USE_LANG}#g' \ -e 's#%%BUILD_NR%%#${BUILD_NR}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ - ${WRKDIR}/openoffice-wrapper \ - ${WRKDIR}/freebsd-local.sh + ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ ${PREFIX}/bin/openoffice-${RELEASE_NR} - @${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \ - ${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh @${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 @@ -342,19 +323,12 @@ package-rename: sdk: @${ECHO_MSG} "===> Make SDK of OOo" -.if !defined(DISPLAY) - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl' - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.else - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ - ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl' -.endif - @${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz + @${MV} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz solver: @${ECHO_MSG} "===> Make Solver of OOo" - @cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver + @cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver .include <bsd.port.post.mk> diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo index 0ddd232a4f5f..8e31b2f1a226 100644 --- a/editors/openoffice-1.1/distinfo +++ b/editors/openoffice-1.1/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice1.1/OOo_1.1.2_source.tar.gz) = d6fd3f6cb34bdbc14287460e1cfa3f76 -SIZE (openoffice1.1/OOo_1.1.2_source.tar.gz) = 220632989 +MD5 (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 9df288bb534964d4b96efdf7bf029456 +SIZE (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 215360913 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice1.1/gpc231.tar.Z) = 27917 MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice-1.1/files/Makefile.localized b/editors/openoffice-1.1/files/Makefile.localized index cb4baac91cc4..d01203363382 100644 --- a/editors/openoffice-1.1/files/Makefile.localized +++ b/editors/openoffice-1.1/files/Makefile.localized @@ -17,12 +17,38 @@ LANG_EXT= 96 LANG_CONFIGURE_ARG= ARAB .endif ################################################################ +.if ${LOCALIZED_LANG} == "eu" +LANG_PKGNAME= eu +LANG_EXT= 10 +LANG_CONFIGURE_ARG= BASQUE +.endif +################################################################ .if ${LOCALIZED_LANG} == "ca" LANG_PKGNAME= ca LANG_EXT= 37 LANG_CONFIGURE_ARG= CAT .endif ################################################################ +.if ${LOCALIZED_LANG} == "zh-CN" +CATEGORIES= chinese +LANG_PKGNAME= zh +LANG_SUFFIX= CN +LANG_EXT= 86 +LANG_CONFIGURE_ARG= CHINSIM +BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ +.if ${LOCALIZED_LANG} == "zh-TW" +CATEGORIES= chinese +LANG_PKGNAME= zh +LANG_SUFFIX= TW +LANG_EXT= 88 +LANG_CONFIGURE_ARG= CHINTRAD +BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ .if ${LOCALIZED_LANG} == "cs" LANG_PKGNAME= cs LANG_EXT= 42 @@ -35,17 +61,11 @@ LANG_EXT= 45 LANG_CONFIGURE_ARG= DAN .endif ################################################################ -.if ${LOCALIZED_LANG} == "el" -LANG_PKGNAME= el -LANG_EXT= 30 -LANG_CONFIGURE_ARG= GREEK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "es" -LANG_PKGNAME= es -LANG_EXT= 34 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SPAN +.if ${LOCALIZED_LANG} == "nl" +LANG_PKGNAME= nl +LANG_EXT= 31 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= DTCH .endif ################################################################ .if ${LOCALIZED_LANG} == "et" @@ -68,6 +88,13 @@ L10NHELP= helpcontent_${LANG_EXT}_unix.tgz LANG_CONFIGURE_ARG= FREN .endif ################################################################ +.if ${LOCALIZED_LANG} == "gl-ES" +LANG_PKGNAME= gl +LANG_SUFFIX= ES +LANG_EXT= 38 +LANG_CONFIGURE_ARG= GAL +.endif +################################################################ .if ${LOCALIZED_LANG} == "de" CATEGORIES= german LANG_PKGNAME= de @@ -78,12 +105,24 @@ COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und P PKGMESSAGE= ${FILESDIR}/pkg-message.de .endif ################################################################ +.if ${LOCALIZED_LANG} == "el" +LANG_PKGNAME= el +LANG_EXT= 30 +LANG_CONFIGURE_ARG= GREEK +.endif +################################################################ .if ${LOCALIZED_LANG} == "he" LANG_PKGNAME= he LANG_EXT= 97 LANG_CONFIGURE_ARG= HEBREW .endif ################################################################ +.if ${LOCALIZED_LANG} == "hi-IN" +LANG_PKGNAME= hi +LANG_EXT= 91 +LANG_CONFIGURE_ARG= HINDI +.endif +################################################################ .if ${LOCALIZED_LANG} == "hu" CATEGORIES= hungarian LANG_PKGNAME= hu @@ -108,6 +147,13 @@ RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTS L10NHELP= helpcontent_${LANG_EXT}_unix.tgz .endif ################################################################ +.if ${LOCALIZED_LANG} == "kn-IN" +LANG_PKGNAME= kn +LANG_SUFFIX= IN +LANG_EXT= 93 +LANG_CONFIGURE_ARG= KANNADA +.endif +################################################################ .if ${LOCALIZED_LANG} == "ko" CATEGORIES= korean LANG_PKGNAME= ko @@ -116,19 +162,18 @@ LANG_CONFIGURE_ARG= KOREAN L10NHELP= helpcontent_${LANG_EXT}_unix.tgz .endif ################################################################ +.if ${LOCALIZED_LANG} == "lt" +LANG_PKGNAME= lt +LANG_EXT= 58 +LANG_CONFIGURE_ARG= LITHUANIAN +.endif +################################################################ .if ${LOCALIZED_LANG} == "nb" LANG_PKGNAME= nb LANG_EXT= 47 LANG_CONFIGURE_ARG= NORBOK .endif ################################################################ -.if ${LOCALIZED_LANG} == "nl" -LANG_PKGNAME= nl -LANG_EXT= 31 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= DTCH -.endif -################################################################ .if ${LOCALIZED_LANG} == "nn" LANG_PKGNAME= nn LANG_EXT= 79 @@ -173,6 +218,13 @@ LANG_EXT= 07 LANG_CONFIGURE_ARG= RUSS .endif ################################################################ +.if ${LOCALIZED_LANG} == "es" +LANG_PKGNAME= es +LANG_EXT= 34 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= SPAN +.endif +################################################################ .if ${LOCALIZED_LANG} == "sv" LANG_PKGNAME= sv LANG_EXT= 46 @@ -193,6 +245,18 @@ LANG_EXT= 50 LANG_CONFIGURE_ARG= SLOVENIAN .endif ################################################################ +.if ${LOCALIZED_LANG} == "th" +LANG_PKGNAME= th +LANG_EXT= 66 +LANG_CONFIGURE_ARG= THAI +.endif +################################################################ +.if ${LOCALIZED_LANG} == "tn" +LANG_PKGNAME= tn +LANG_EXT= 29 +LANG_CONFIGURE_ARG= TSWANA +.endif +################################################################ .if ${LOCALIZED_LANG} == "tr" LANG_PKGNAME= tr LANG_EXT= 90 @@ -205,31 +269,17 @@ LANG_EXT= 53 LANG_CONFIGURE_ARG= WELSH .endif ################################################################ -.if ${LOCALIZED_LANG} == "zh-CN" -CATEGORIES= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= CN -LANG_EXT= 86 -LANG_CONFIGURE_ARG= CHINSIM -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-TW" -CATEGORIES= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= TW -LANG_EXT= 88 -LANG_CONFIGURE_ARG= CHINTRAD -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ .if ${LOCALIZED_LANG} == "zu" LANG_PKGNAME= zu LANG_EXT= 28 LANG_CONFIGURE_ARG= ZULU .endif ################################################################ +.if defined(LANG_PKGNAME) +PKGNAMEPREFIX= ${LANG_PKGNAME}- +.endif +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX?= -${LANG_SUFFIX} +.endif .endif diff --git a/editors/openoffice-1.1/files/Makefile.mozilla b/editors/openoffice-1.1/files/Makefile.mozilla index 73637f27d724..9593c16dba89 100644 --- a/editors/openoffice-1.1/files/Makefile.mozilla +++ b/editors/openoffice-1.1/files/Makefile.mozilla @@ -32,9 +32,9 @@ build-mozilla: .endif install-mozilla: - @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/moz/zipped/ register-mozilla: .if exists(${WRKDIR}/mozilla-runtime) diff --git a/editors/openoffice-1.1/files/freebsd-local.sh b/editors/openoffice-1.1/files/freebsd-local.sh deleted file mode 100644 index e4d951ae481f..000000000000 --- a/editors/openoffice-1.1/files/freebsd-local.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# $FreeBSD $ - -save_common_xcu() { -sed 's/^X//' > $OOHOME/tmp/Common.xcu << 'END-of-Common.xcu' -X<?xml version="1.0" encoding="UTF-8"?> -X<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office"> -X <node oor:name="Internal"> -X <prop oor:name="CurrentTempURL" oor:type="xs:string"> -X <value/> -X </prop> -X </node> -X <node oor:name="Misc"> -X <prop oor:name="FirstRun" oor:type="xs:boolean"> -X <value>true</value> -X </prop> -X </node> -X <node oor:name="ExternalApps"> -X <prop oor:name="file" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="ftp" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="http" oor:type="xs:string"> -X <value>%%mozilla%%</value> -X </prop> -X <prop oor:name="https" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="mailto" oor:type="xs:string"> -X <value/> -X </prop> -X </node> -X</oor:component-data> -END-of-Common.xcu -mozilla=`which mozilla`; -if [ $? -eq 0 ]; then - sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' $OOHOME/tmp/Common.xcu -fi -mozilla=`which linux-mozilla`; -if [ $? -eq 0 ]; then - sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' $OOHOME/tmp/Common.xcu -fi -mv $OOHOME/tmp/Common.xcu $OOHOME/user/registry/data/org/openoffice/Office -} - -# -# Set default lang to en_US.ISO8859-15 -# -if [ ! $LANG ]; then - export LANG=en_US.ISO8859-15 -fi - -# -# Create soffice.cfg if it does not exist. -# -if [ ! -z $OOHOME ] && [ -e $OOHOME/setup ]; then - if [ ! -d $OOHOME/user/config/soffice.cfg ]; then - mkdir $OOHOME/user/config/soffice.cfg - fi -fi - -# -# Detect installed mozilla -# -if [ ! -z $OOHOME ] && [ ! -e $OOHOME/user/registry/data/org/openoffice/Office/Common.xcu ]; then - mkdir -p $OOHOME/tmp; - save_common_xcu; -fi diff --git a/editors/openoffice-1.1/files/generate.pl b/editors/openoffice-1.1/files/generate.pl new file mode 100644 index 000000000000..2f05835d76ba --- /dev/null +++ b/editors/openoffice-1.1/files/generate.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl + +# generate full build shell script for OpenOffice.org +# Whom: Maho Nakata <maho@FreeBSD.org> +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/generate.pl,v 1.1 2004-10-12 07:20:54 maho Exp $ + +print "#!/bin/csh\n"; +print "/usr/bin/time make WITH_CCACHE=yes package package-rename solver sdk deinstall clean >& log.en\n"; +print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n"; + +open ( FILE, "< Makefile.localized") ; +while(<FILE>){ +@tmp=split (' ',$_); +@tmp2=split ('"',$tmp[3]); +if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; + print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; + print "/usr/bin/time make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; + } +} +close FILE; + diff --git a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk deleted file mode 100644 index 2f79f5a07f6e..000000000000 --- a/editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Apr 15 19:39:14 2003 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 31 22:34:31 2003 -@@ -64,8 +64,8 @@ - #mozilla specific stuff. - MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) - MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla --#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib --#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla - #End of mozilla specific stuff. - - PRJ=..$/..$/..$/.. -@@ -132,7 +132,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -150,7 +150,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS+= -DMOZILLA_CLIENT \ - -DOSTYPE=\"Linux2.2.14-5\" -DOJI - .IF "$(OS)" == "LINUX" -@@ -166,6 +166,13 @@ - -fno-rtti -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "FREEBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread - CDEFS += -DTRACING - .ENDIF - .ENDIF 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 index da9fd94b39c0..bbbfeab36816 100644 --- 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 @@ -1,5 +1,5 @@ ---- ../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 +--- 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; diff --git a/editors/openoffice-1.1/files/patch-desktop+scripts+soffice.sh b/editors/openoffice-1.1/files/patch-desktop+scripts+soffice.sh deleted file mode 100644 index ad1235c24e01..000000000000 --- a/editors/openoffice-1.1/files/patch-desktop+scripts+soffice.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../desktop/scripts/soffice.sh.orig Wed Sep 17 05:21:54 2003 -+++ ../desktop/scripts/soffice.sh Wed Sep 17 05:24:59 2003 -@@ -233,6 +233,8 @@ - PATH="$sd_prog":$PATH - export PATH - -+. $sd_prog/freebsd-local.sh -+ - # execute soffice binary - exec "$sd_prog/$sd_binary" "$@" - diff --git a/editors/openoffice-1.1/files/patch-odk+configure.pl b/editors/openoffice-1.1/files/patch-odk+configure.pl index eeebf346c600..bd269a961590 100644 --- a/editors/openoffice-1.1/files/patch-odk+configure.pl +++ b/editors/openoffice-1.1/files/patch-odk+configure.pl @@ -5,8 +5,8 @@ Index: configure.pl RCS file: /cvs/api/odk/configure.pl,v retrieving revision 1.4.12.3 diff -u -r1.4.12.3 configure.pl ---- ../odk/configure.pl 18 May 2004 10:02:00 -0000 1.4.12.3 -+++ ../configure.pl 11 Aug 2004 08:21:04 -0000 +--- odk/configure.pl.orig 18 May 2004 10:02:00 -0000 1.4.12.3 ++++ odk/configure.pl 11 Aug 2004 08:21:04 -0000 @@ -19,7 +19,7 @@ chop ($main::OFFICE_HOME_SUGGESTION); diff --git a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in index dbcad91a1fb4..59269742ab37 100644 --- a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in +++ b/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in @@ -1,7 +1,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 +--- odk/setsdkenv_unix.in.orig Sun Jan 25 18:41:01 2004 ++++ odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 @@ -2,7 +2,8 @@ # This script starts a new shell and sets all enviroment variables, which diff --git a/editors/openoffice-1.1/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1/files/patch-odk+settings+settings.mk index 22fd7fd2f816..78814a4cfaee 100644 --- a/editors/openoffice-1.1/files/patch-odk+settings+settings.mk +++ b/editors/openoffice-1.1/files/patch-odk+settings+settings.mk @@ -1,7 +1,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 +--- odk/settings/settings.mk.orig Sun Jan 25 18:41:02 2004 ++++ odk/settings/settings.mk Sun Jan 25 18:45:09 2004 @@ -368,3 +368,85 @@ endif diff --git a/editors/openoffice-1.1/files/patch-sch_setLogicRectHack b/editors/openoffice-1.1/files/patch-sch_setLogicRectHack index 34b26e9cfc39..44de26bd9cfd 100644 --- a/editors/openoffice-1.1/files/patch-sch_setLogicRectHack +++ b/editors/openoffice-1.1/files/patch-sch_setLogicRectHack @@ -1,5 +1,7 @@ ---- ../sch/source/ui/unoidl/ChXChartObject.cxx 7 Aug 2002 16:01:42 -0000 1.34 -+++ ../sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 +#iZ 9462 + +--- sch/source/ui/unoidl/ChXChartObject.cxx.orig 7 Aug 2002 16:01:42 -0000 1.34 ++++ sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 @@ -161,9 +161,11 @@ // XShape diff --git a/editors/openoffice-1.1/files/patch-security-tmp-dir b/editors/openoffice-1.1/files/patch-security-tmp-dir deleted file mode 100644 index b1ee4020a451..000000000000 --- a/editors/openoffice-1.1/files/patch-security-tmp-dir +++ /dev/null @@ -1,207 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=33357 -Insecure permissions on temporary files at runtime -*** SECURTY FIX *** - ---- ../sal/util/sal.map 9 Jan 2004 18:31:53 -0000 1.42.70.1 -+++ ../sal/util/sal.map 30 Aug 2004 13:59:22 -0000 -@@ -402,6 +403,7 @@ - osl_writeFile; - osl_closeFile; - osl_createDirectory; -+ osl_createDirectoryWithMode; - osl_removeDirectory; - osl_removeFile; - osl_copyFile; -Index: ../sal/inc/osl/file.h -=================================================================== -RCS file: /cvs/porting/sal/inc/osl/file.h,v -retrieving revision 1.27.48.1 -diff -u -r1.27.48.1 file.h ---- ../sal/inc/osl/file.h 9 Jan 2004 18:31:45 -0000 1.27.48.1 -+++ ../sal/inc/osl/file.h 30 Aug 2004 13:59:25 -0000 -@@ -1036,6 +1036,8 @@ - - oslFileError SAL_CALL osl_createDirectory( rtl_uString* pustrDirectoryURL ); - -+oslFileError SAL_CALL osl_createDirectoryWithMode( rtl_uString* pustrDirectoryURL, sal_uInt64 uAttributes ); -+ - - /** Remove an empty directory. - -Index: ../sal/inc/osl/file.hxx -=================================================================== -RCS file: /cvs/porting/sal/inc/osl/file.hxx,v -retrieving revision 1.30.48.1 -diff -u -r1.30.48.1 file.hxx ---- ../sal/inc/osl/file.hxx 9 Jan 2004 18:31:45 -0000 1.30.48.1 -+++ ../sal/inc/osl/file.hxx 30 Aug 2004 13:59:32 -0000 -@@ -1819,6 +1819,12 @@ - inline static RC create( const ::rtl::OUString& ustrDirectoryURL ) - { - return (RC) osl_createDirectory( ustrDirectoryURL.pData ); -+ } -+ -+ inline static RC createWithMode( const ::rtl::OUString& ustrDirectoryURL, -+ sal_uInt64 uAttributes ) -+ { -+ return (RC) osl_createDirectoryWithMode( ustrDirectoryURL.pData, uAttributes ); - } - - /** Remove an empty directory. -Index: ../sal/osl/unx/file.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/Attic/file.c,v -retrieving revision 1.72.28.1 -diff -u -r1.72.28.1 file.c ---- ../sal/osl/unx/file.c 9 Jan 2004 18:31:46 -0000 1.72.28.1 -+++ ../sal/osl/unx/file.c 30 Aug 2004 13:59:41 -0000 -@@ -246,7 +246,7 @@ - - static oslFileError osl_psz_getVolumeInformation(const sal_Char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask); - static oslFileError osl_psz_removeFile(const sal_Char* pszPath); --static oslFileError osl_psz_createDirectory(const sal_Char* pszPath); -+static oslFileError osl_psz_createDirectory(const sal_Char* pszPath, sal_uInt64 uAttributes); - static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath); - static oslFileError osl_psz_copyFile(const sal_Char* pszPath, const sal_Char* pszDestPath); - static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath); -@@ -853,7 +853,7 @@ - /* osl_createDirectory */ - /****************************************************************************/ - --oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL ) -+oslFileError osl_createDirectoryWithMode( rtl_uString* ustrDirectoryURL, sal_uInt64 uAttributes ) - { - char path[PATH_MAX]; - oslFileError eRet; -@@ -865,7 +865,13 @@ - if( eRet != osl_File_E_None ) - return eRet; - -- return osl_psz_createDirectory( path ); -+ return osl_psz_createDirectory( path, uAttributes ); -+} -+ -+/* Broken, insecure, deprecated version */ -+oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL ) -+{ -+ return osl_createDirectoryWithMode( ustrDirectoryURL, 0xffffffff ); - } - - /****************************************************************************/ -@@ -1383,12 +1389,9 @@ - * osl_psz_setFileAttributes - ************************************/ - --static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_uInt64 uAttributes ) -+static int osl_getNativeMode( sal_uInt64 uAttributes ) - { -- oslFileError osl_error = osl_File_E_None; -- mode_t nNewMode = 0; -- -- OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix"); -+ mode_t nNewMode = 0; - - if (uAttributes & osl_File_Attribute_OwnRead) - nNewMode |= S_IRUSR; -@@ -1417,7 +1420,17 @@ - if (uAttributes & osl_File_Attribute_OthExe) - nNewMode|=S_IXOTH; - -- if (chmod(pszFilePath, nNewMode) < 0) -+ -+ return nNewMode; -+} -+ -+static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_uInt64 uAttributes ) -+{ -+ oslFileError osl_error = osl_File_E_None; -+ -+ OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix"); -+ -+ if (chmod(pszFilePath, osl_getNativeMode( uAttributes )) < 0) - osl_error = oslTranslateFileError(OSL_FET_ERROR, errno); - - return osl_error; -@@ -1543,13 +1558,12 @@ - * osl_psz_createDirectory - ****************************************/ - --static oslFileError osl_psz_createDirectory( const sal_Char* pszPath ) -+static oslFileError osl_psz_createDirectory( const sal_Char* pszPath, sal_uInt64 uAttributes ) - { - int nRet=0; -- int mode = S_IRWXU | S_IRWXG | S_IRWXO; - -- nRet = mkdir(pszPath,mode); -+ nRet = mkdir(pszPath, osl_getNativeMode( uAttributes )); - - if ( nRet < 0 ) - { - nRet=errno; -Index: unotools/source/ucbhelper/tempfile.cxx -=================================================================== -RCS file: /cvs/util/unotools/source/ucbhelper/tempfile.cxx,v -retrieving revision 1.14 -diff -u -r1.14 tempfile.cxx ---- ../unotools/source/ucbhelper/tempfile.cxx 9 Sep 2002 10:25:47 -0000 1.14 -+++ ../unotools/source/ucbhelper/tempfile.cxx 30 Aug 2004 14:00:58 -0000 -@@ -125,7 +125,10 @@ - return sal_True; - - // try to create the directory -- nError = osl::Directory::create( aPath ); -+ nError = osl::Directory::createWithMode( aPath, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - sal_Bool bSuccess = ( nError == osl::File::E_None || nError == osl::FileBase::E_EXIST ); - if( !bSuccess ) - { -@@ -139,7 +142,10 @@ - if ( bSuccess ) - { - // Parent directory exists, retry creation of directory -- nError = osl::Directory::create( aPath ); -+ nError = osl::Directory::createWithMode( aPath, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - bSuccess =( nError == osl::File::E_None || nError == osl::FileBase::E_EXIST ); - } - } -@@ -222,7 +228,10 @@ - - if ( bDir ) - { -- FileBase::RC err = Directory::create( aTmp ); -+ FileBase::RC err = Directory::createWithMode( aTmp, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - if ( err == FileBase::E_None ) - { - // !bKeep: only for creating a name, not a file or directory -@@ -305,7 +314,10 @@ - aTmp += String::CreateFromAscii( ".tmp" ); - if ( bDirectory ) - { -- FileBase::RC err = Directory::create( aTmp ); -+ FileBase::RC err = osl::Directory::createWithMode( aTmp, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - if ( err == FileBase::E_None ) - { - pImp->aName = aTmp; -@@ -401,7 +413,10 @@ - - // try to create the directory - sal_Bool bRet = sal_False; -- osl::FileBase::RC err = osl::Directory::create( aUnqPath ); -+ osl::FileBase::RC err = osl::Directory::createWithMode( aUnqPath, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - if ( err != FileBase::E_None && err != FileBase::E_EXIST ) - // perhaps parent(s) don't exist - bRet = ensuredir( aUnqPath ); diff --git a/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx index be38de290a51..420c61cc7b7b 100644 --- a/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx +++ b/editors/openoffice-1.1/files/patch-sfx2+source+config+cfgmgr.cxx @@ -1,8 +1,8 @@ -Wired bug? +Weird bug? http://qa.openoffice.org/issues/show_bug.cgi?id=22253 ---- ../sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 -+++ ../sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 +--- sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 ++++ sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 @@ -118,6 +118,10 @@ catch(com::sun::star::ucb::InteractiveAugmentedIOException&) { diff --git a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx index c07cab2ab7e8..196084c1657b 100644 --- a/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ b/editors/openoffice-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx @@ -1,5 +1,5 @@ ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 +--- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 ++++ shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 @@ -188,9 +188,12 @@ write_xml_start_tag(TAG_RECENT_ITEM, file, true); write_xml_tag(TAG_URI, uri_, file); diff --git a/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk deleted file mode 100644 index 996e282b350b..000000000000 --- a/editors/openoffice-1.1/files/patch-solenv+bin+addsym.awk +++ /dev/null @@ -1,16 +0,0 @@ ---- ../solenv/bin/addsym.awk.orig Tue Mar 11 15:11:44 2003 -+++ ../solenv/bin/addsym.awk Tue Mar 11 15:13:19 2003 -@@ -72,11 +72,11 @@ - END { - if (state == 0) { - print "# Weak RTTI symbols for C++ exceptions:" -- print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };" -+ print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};" - } - } - state == 2 { -- print " _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions" -+ print " _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions" - state = 3 - } - /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 } diff --git a/editors/openoffice-1.1/files/patch-svx_setLogicRectHack b/editors/openoffice-1.1/files/patch-svx_setLogicRectHack index 035db5e5e21c..e8c2725e58ab 100644 --- a/editors/openoffice-1.1/files/patch-svx_setLogicRectHack +++ b/editors/openoffice-1.1/files/patch-svx_setLogicRectHack @@ -1,5 +1,6 @@ ---- ../svx/source/unodraw/unoshape.cxx 4 Feb 2004 13:21:23 -0000 1.109 -+++ ../svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 +#i9462# +--- svx/source/unodraw/unoshape.cxx.orig 4 Feb 2004 13:21:23 -0000 1.109 ++++ svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 @@ -1067,8 +1067,10 @@ // XShape diff --git a/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx deleted file mode 100644 index 43a78f4c538b..000000000000 --- a/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../tools/source/string/tstring.cxx.orig Thu Mar 27 18:04:53 2003 -+++ ../tools/source/string/tstring.cxx Sat May 31 23:04:05 2003 -@@ -103,6 +103,9 @@ - xub_StrLen ImplStringLen( const sal_Char* pStr ) - { - const sal_Char* pTempStr = pStr; -+ -+ if (pStr == NULL) -+ return(0); - while( *pTempStr ) - ++pTempStr; - return (xub_StrLen)(pTempStr-pStr); -@@ -113,6 +116,9 @@ - xub_StrLen ImplStringLen( const sal_Unicode* pStr ) - { - const sal_Unicode* pTempStr = pStr; -+ -+ if (pStr == NULL) -+ return(0); - while( *pTempStr ) - ++pTempStr; - return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-1.1/files/patch-translation_limit_64k b/editors/openoffice-1.1/files/patch-translation_limit_64k new file mode 100644 index 000000000000..ce15548f052b --- /dev/null +++ b/editors/openoffice-1.1/files/patch-translation_limit_64k @@ -0,0 +1,121 @@ +#iZ 33228# +#iZ 34210# + +Index: inc/sc.hrc +=================================================================== +RCS file: /cvs/sc/sc/inc/sc.hrc,v +retrieving revision 1.35 +retrieving revision 1.35.288.2 +diff -u -r1.35 -r1.35.288.2 +--- sc/inc/sc.hrc 3 Dec 2002 15:26:06 -0000 1.35 ++++ sc/inc/sc.hrc 17 Sep 2004 14:25:38 -0000 1.35.288.2 +@@ -1141,8 +1141,12 @@ + #define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) + #define RID_BMP_REFBTN1 (SC_RESOURCE_START+41) + #define RID_BMP_REFBTN2 (SC_RESOURCE_START+42) +-#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) +-#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) ++// #i34210# split function resources due to 64k limit, don't reuse old values ++// to have obviously empty function lists in case some localisation used the ++// old values for any reason. Don't even reuse the exact name because of the ++// translation database IDs. ++//#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) ++//#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) + #define RID_POPUP_CONTROL (SC_RESOURCE_START+45) + #define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) + #define RID_OBJECTBAR_DRAWFORM (SC_RESOURCE_START+47) +@@ -1158,6 +1162,10 @@ + #define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) + #define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58) + #define RID_OBJECTMENU_EDIT (SC_RESOURCE_START+59) ++#define RID_SC_FUNCTION_DESCRIPTIONS_1 (SC_RESOURCE_START+60) ++#define RID_SC_FUNCTION_DESCRIPTIONS_2 (SC_RESOURCE_START+61) ++#define RID_SC_FUNCTION_DESCRIPTIONS_3 (SC_RESOURCE_START+62) ++#define RID_SC_FUNCTION_DESCRIPTIONS_4 (SC_RESOURCE_START+63) + + #define STR_START (SC_RESOURCE_START+100) + #define STR_ROWHEIGHT (STR_START) +Index: source/core/data/global.cxx +=================================================================== +RCS file: /cvs/sc/sc/source/core/data/global.cxx,v +retrieving revision 1.31 +retrieving revision 1.31.166.2 +diff -u -r1.31 -r1.31.166.2 +--- sc/source/core/data/global.cxx 17 Apr 2003 09:54:45 -0000 1.31 ++++ sc/source/core/data/global.cxx 17 Sep 2004 14:25:38 -0000 1.31.166.2 +@@ -1475,10 +1475,12 @@ + USHORT i,j; + USHORT nDescBlock[] = + { +- RID_SC_FUNCTION_DESCRIPTIONS1, +- RID_SC_FUNCTION_DESCRIPTIONS2 ++ RID_SC_FUNCTION_DESCRIPTIONS_1, ++ RID_SC_FUNCTION_DESCRIPTIONS_2, ++ RID_SC_FUNCTION_DESCRIPTIONS_3, ++ RID_SC_FUNCTION_DESCRIPTIONS_4 + }; +- const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT); ++ const USHORT nBlocks = sizeof(nDescBlock) / sizeof(nDescBlock[0]); + + aFunctionList.Clear(); + +Index: source/ui/src/scfuncs.src +=================================================================== +RCS file: /cvs/sc/sc/source/ui/src/scfuncs.src,v +retrieving revision 1.76.22.8 +retrieving revision 1.76.22.8.4.2 +diff -u -r1.76.22.8 -r1.76.22.8.4.2 +--- sc/source/ui/src/scfuncs.src 10 Sep 2004 14:45:52 -0000 1.76.22.8 ++++ sc/source/ui/src/scfuncs.src 17 Sep 2004 14:25:39 -0000 1.76.22.8.4.2 +@@ -93,10 +93,16 @@ + // RID_SC_FUNCTION_DESCRIPTIONS1 + // RID_SC_FUNCTION_DESCRIPTIONS2 + ++ // #i34210# again splitted resources due to 64k limit ++ // RID_SC_FUNCTION_DESCRIPTIONS_1 ++ // RID_SC_FUNCTION_DESCRIPTIONS_2 ++ // RID_SC_FUNCTION_DESCRIPTIONS_3 ++ // RID_SC_FUNCTION_DESCRIPTIONS_4 ++ + #include "scfuncs.hrc" // ID_FUNCTION_GRP_XXX, HID_FUNC_XXX + #include "compiler.hrc" // SC_OPCODE_XXX + +-Resource RID_SC_FUNCTION_DESCRIPTIONS1 ++Resource RID_SC_FUNCTION_DESCRIPTIONS_1 + { + // -=*# Resource for function DBANZAHL #*=- + Resource SC_OPCODE_DB_COUNT +@@ -15963,6 +15969,11 @@ + Text[ galician ] = "Valor 1; Valor 2;... son de 1 a 30 argumentos que representan os pagamentos e ingresos."; + }; + }; ++}; ++ ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_2 ++{ + // -=*# Resource for function IKV #*=- + Resource SC_OPCODE_IKV + { +@@ -32174,7 +32185,8 @@ + }; + }; + +-Resource RID_SC_FUNCTION_DESCRIPTIONS2 ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_3 + { + // -=*# Resource for function DBANZAHL2 #*=- + // -=*# Resource for function HÄUFIGKEIT #*=- +@@ -49230,6 +49242,11 @@ + Text[ galician ] = "é o n—ãro de graos de liberdade."; + }; + }; ++}; ++ ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_4 ++{ + // -=*# Resource for function STANDARDISIERUNG #*=- + Resource SC_OPCODE_STANDARD + { diff --git a/editors/openoffice-1.1/files/patch-unoil+makefile.pmk b/editors/openoffice-1.1/files/patch-unoil+makefile.pmk deleted file mode 100644 index 7febdabf7b4b..000000000000 --- a/editors/openoffice-1.1/files/patch-unoil+makefile.pmk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../unoil/makefile.pmk.orig Fri Aug 31 18:04:43 2001 -+++ ../unoil/makefile.pmk Thu Sep 12 12:17:50 2002 -@@ -74,8 +74,8 @@ - JAVAFILESLIST := $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java) - .ENDIF # "$(L10N_framework)"=="" - --GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) --GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) -+GENJAVAFILES += $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) -+GENCLASSFILES += $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) - - # --- Targets ------------------------------------------------------ - diff --git a/editors/openoffice-1.1/pkg-message b/editors/openoffice-1.1/pkg-message index d4b50a091614..4df90e05670b 100644 --- a/editors/openoffice-1.1/pkg-message +++ b/editors/openoffice-1.1/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 1.1.2 Personal Install How-To +OpenOffice.org Build 1.1.3 Personal Install How-To Written by: Martin Blapp <mbr@freebsd.org> -OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-1.1.2 +OpenOffice.org 1.1.3 will soon been installed in +${PREFIX}/OpenOffice.org-1.1.3 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.1.0" folder +The setup installs a "OpenOffice.org1.1.3" folder in your homedir. If the setup tells you there is already an installed @@ -29,31 +29,13 @@ 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.2 -${PREFIX}/bin/openoffice-1.1.2-sagenda -${PREFIX}/bin/openoffice-1.1.2-scalc -${PREFIX}/bin/openoffice-1.1.2-sdraw -${PREFIX}/bin/openoffice-1.1.2-setup -${PREFIX}/bin/openoffice-1.1.2-sfax -${PREFIX}/bin/openoffice-1.1.2-simpress -${PREFIX}/bin/openoffice-1.1.2-spadmin -${PREFIX}/bin/openoffice-1.1.2-sweb -${PREFIX}/bin/openoffice-1.1.2-swriter - -3 Setup problems (FreeBSD < 4.7-RELEASE only) ---------------------------------------------- - -If the setup complains about a missing file "setup.ins", -it's time to upgrade your FreeBSD system to the latest -version. You will encounter this bug only if your OS is -older than FreeBSD 4.7-RELEASE. - -4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only) ----------------------------------------------------------- - -OO.org can crash if you enter a non existing path -or URL in the location bar. To fix these crashes -you need the following patch. You will see this -bug only if your OS is older than FreeBSD 4.7-RELEASE. - -http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff +${PREFIX}/bin/openoffice-1.1.3 +${PREFIX}/bin/openoffice-1.1.3-sagenda +${PREFIX}/bin/openoffice-1.1.3-scalc +${PREFIX}/bin/openoffice-1.1.3-sdraw +${PREFIX}/bin/openoffice-1.1.3-setup +${PREFIX}/bin/openoffice-1.1.3-sfax +${PREFIX}/bin/openoffice-1.1.3-simpress +${PREFIX}/bin/openoffice-1.1.3-spadmin +${PREFIX}/bin/openoffice-1.1.3-sweb +${PREFIX}/bin/openoffice-1.1.3-swriter diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 333628fb0f27..c8b9e47c816b 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -1,13 +1,12 @@ # New ports collection makefile for: OpenOffice.org -# Date created: 28 Februar 2002 +# Date created: 28 February 2002 # Whom: Martin Blapp # # $FreeBSD$ # PORTNAME= openoffice -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 CATEGORIES+= editors MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \ ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/%SUBDIR%/ \ @@ -22,8 +21,8 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \ ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help MASTER_SITE_SUBDIR= stable/${PORTVERSION} -DISTFILES+= OOo_${PORTVERSION}_source.tar.gz gpc231.tar.Z:gpc -EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.gz +DISTFILES+= OOo_${PORTVERSION}-1_source.tar.gz gpc231.tar.Z:gpc +EXTRACT_ONLY= OOo_${PORTVERSION}-1_source.tar.gz MAINTAINER= openoffice@FreeBSD.org @@ -37,8 +36,6 @@ USE_PERL5= yes USE_BISON= yes USE_GMAKE= yes USE_REINPLACE= yes -#mozilla 1.0 seems to have security vulnerability -WITHOUT_MOZILLA= yes .if !defined(WITHOUT_JAVA) USE_JAVA= 1.4+ @@ -48,6 +45,9 @@ NO_RUN_DEPENDS_JAVA= yes .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> +LANG_EXT?= 01 +LANG_CONFIGURE_ARG?= ENUS + .if defined(L10NHELP) DISTFILES+= ${L10NHELP}:help .endif @@ -69,20 +69,14 @@ L10NHELPS= helpcontent_31_unix.tgz helpcontent_33_unix.tgz \ .endif COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser - BUILD_NR= 645 RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} DIST_SUBDIR= openoffice1.1 -SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//' -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif +SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 -USE_GCC=3.2 + +# FIXME .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache CC= ccache gcc32 @@ -91,7 +85,6 @@ CXX= ccache g++32 CC= gcc32 CXX= g++32 .endif - BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ @@ -111,7 +104,8 @@ BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant GNU_CONFIGURE= yes USE_AUTOCONF_VER= 259 WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work -WRKSRC= ${WRKDIR}/oo_${RELEASE_NR}_src/config_office +WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src +CONFIGURE_WRKSRC= ${WRKDIR}/OOo_${RELEASE_NR}_src/config_office ANT?= ${LOCALBASE}/bin/ant TCSH?= /bin/tcsh ZIP?= ${PREFIX}/bin/zip @@ -136,14 +130,10 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" CONFIGURE_ARGS+= --disable-mozilla .endif -.if defined(LANG_EXT) -CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG},ENUS -.else -LANG_EXT= 01 -.endif - .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL +.else +CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} .endif .if defined(WITH_DEBUG) @@ -208,8 +198,8 @@ pre-everything:: post-extract: @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ - @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ + @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ .if defined(L10NHELP) @${ECHO_MSG} "===> Extracting L10NHELP sub project" @${MKDIR} ${WRKDIR}/L10NHELP @@ -226,8 +216,8 @@ post-extract: .endif post-patch: - @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/../odk/settings/settings.mk - @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/../odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/odk/settings/settings.mk + @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g' ${WRKSRC}/odk/settings/settings.mk .if defined(WITH_TTF_BYTECODE_ENABLED) @if [ "`echo ${PATCHDIR}/optpatch-*`" != "${PATCHDIR}/optpatch-*" ]; then \ ${ECHO_MSG} "===> Applying additional TTF bytecode patches for ${PKGNAME}" ; \ @@ -239,9 +229,9 @@ post-patch: .endif .if !defined(WITHOUT_MOZILLA) && ( \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) || \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) || \ - !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip) ) + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIruntime.zip) || \ + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIlib.zip) || \ + !exists(${WRKSRC}/moz/zipped/FREEBSDGCCIinc.zip) ) .include <${FILESDIR}/Makefile.mozilla> do-build: mozilla .else @@ -258,25 +248,20 @@ do-build: ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 .endif - @cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap + @cd ${WRKSRC} ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) || defined(ALL_LOCALIZED_LANGS) - @${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck - @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck + @${MKDIR} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck .endif .if !defined(DISPLAY) - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}' @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; ${BUILD}' .endif -.if defined(LANG_PKGNAME) - @cd ${WRKSRC}/.. ; PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ - ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd instsetoo/util ; ${BUILD} LANGEXT=${LANG_EXT}' -.endif - do-install: .if !defined(DISPLAY) # @@ -284,12 +269,12 @@ do-install: # ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else - @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ + @cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal/ ; \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX} .endif @@ -299,17 +284,13 @@ install-user: post-install: @${ECHO_MSG} "===> Add wrapper scripts"; @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ - @${CP} ${FILESDIR}/freebsd-local.sh ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%LANG%%#${USE_LANG}#g' \ -e 's#%%BUILD_NR%%#${BUILD_NR}#g' \ -e 's#%%RELEASE_NR%%#${RELEASE_NR}#g' \ - ${WRKDIR}/openoffice-wrapper \ - ${WRKDIR}/freebsd-local.sh + ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ ${PREFIX}/bin/openoffice-${RELEASE_NR} - @${INSTALL_SCRIPT} ${WRKDIR}/freebsd-local.sh \ - ${PREFIX}/${INSTALLATION_BASEDIR}/program/freebsd-local.sh @${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 @@ -342,19 +323,12 @@ package-rename: sdk: @${ECHO_MSG} "===> Make SDK of OOo" -.if !defined(DISPLAY) - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ + @cd ${WRKSRC} ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl' - @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill - @${RM} -f ${WRKDIR}/.Xvfb.pid -.else - @cd ${WRKSRC}/.. ; DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ; \ - ${TCSH} -c 'source FreeBSDEnv.Set ; unsetenv TOP ; cd sdk_oo ; build.pl ; deliver.pl' -.endif - @${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz + @${MV} ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${RELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz solver: @${ECHO_MSG} "===> Make Solver of OOo" - @cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver + @cd ${WRKSRC} ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver .include <bsd.port.post.mk> diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo index 0ddd232a4f5f..8e31b2f1a226 100644 --- a/editors/openoffice.org-1.1/distinfo +++ b/editors/openoffice.org-1.1/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice1.1/OOo_1.1.2_source.tar.gz) = d6fd3f6cb34bdbc14287460e1cfa3f76 -SIZE (openoffice1.1/OOo_1.1.2_source.tar.gz) = 220632989 +MD5 (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 9df288bb534964d4b96efdf7bf029456 +SIZE (openoffice1.1/OOo_1.1.3-1_source.tar.gz) = 215360913 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SIZE (openoffice1.1/gpc231.tar.Z) = 27917 MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a diff --git a/editors/openoffice.org-1.1/files/Makefile.localized b/editors/openoffice.org-1.1/files/Makefile.localized index cb4baac91cc4..d01203363382 100644 --- a/editors/openoffice.org-1.1/files/Makefile.localized +++ b/editors/openoffice.org-1.1/files/Makefile.localized @@ -17,12 +17,38 @@ LANG_EXT= 96 LANG_CONFIGURE_ARG= ARAB .endif ################################################################ +.if ${LOCALIZED_LANG} == "eu" +LANG_PKGNAME= eu +LANG_EXT= 10 +LANG_CONFIGURE_ARG= BASQUE +.endif +################################################################ .if ${LOCALIZED_LANG} == "ca" LANG_PKGNAME= ca LANG_EXT= 37 LANG_CONFIGURE_ARG= CAT .endif ################################################################ +.if ${LOCALIZED_LANG} == "zh-CN" +CATEGORIES= chinese +LANG_PKGNAME= zh +LANG_SUFFIX= CN +LANG_EXT= 86 +LANG_CONFIGURE_ARG= CHINSIM +BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ +.if ${LOCALIZED_LANG} == "zh-TW" +CATEGORIES= chinese +LANG_PKGNAME= zh +LANG_SUFFIX= TW +LANG_EXT= 88 +LANG_CONFIGURE_ARG= CHINTRAD +BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +.endif +################################################################ .if ${LOCALIZED_LANG} == "cs" LANG_PKGNAME= cs LANG_EXT= 42 @@ -35,17 +61,11 @@ LANG_EXT= 45 LANG_CONFIGURE_ARG= DAN .endif ################################################################ -.if ${LOCALIZED_LANG} == "el" -LANG_PKGNAME= el -LANG_EXT= 30 -LANG_CONFIGURE_ARG= GREEK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "es" -LANG_PKGNAME= es -LANG_EXT= 34 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SPAN +.if ${LOCALIZED_LANG} == "nl" +LANG_PKGNAME= nl +LANG_EXT= 31 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= DTCH .endif ################################################################ .if ${LOCALIZED_LANG} == "et" @@ -68,6 +88,13 @@ L10NHELP= helpcontent_${LANG_EXT}_unix.tgz LANG_CONFIGURE_ARG= FREN .endif ################################################################ +.if ${LOCALIZED_LANG} == "gl-ES" +LANG_PKGNAME= gl +LANG_SUFFIX= ES +LANG_EXT= 38 +LANG_CONFIGURE_ARG= GAL +.endif +################################################################ .if ${LOCALIZED_LANG} == "de" CATEGORIES= german LANG_PKGNAME= de @@ -78,12 +105,24 @@ COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und P PKGMESSAGE= ${FILESDIR}/pkg-message.de .endif ################################################################ +.if ${LOCALIZED_LANG} == "el" +LANG_PKGNAME= el +LANG_EXT= 30 +LANG_CONFIGURE_ARG= GREEK +.endif +################################################################ .if ${LOCALIZED_LANG} == "he" LANG_PKGNAME= he LANG_EXT= 97 LANG_CONFIGURE_ARG= HEBREW .endif ################################################################ +.if ${LOCALIZED_LANG} == "hi-IN" +LANG_PKGNAME= hi +LANG_EXT= 91 +LANG_CONFIGURE_ARG= HINDI +.endif +################################################################ .if ${LOCALIZED_LANG} == "hu" CATEGORIES= hungarian LANG_PKGNAME= hu @@ -108,6 +147,13 @@ RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTS L10NHELP= helpcontent_${LANG_EXT}_unix.tgz .endif ################################################################ +.if ${LOCALIZED_LANG} == "kn-IN" +LANG_PKGNAME= kn +LANG_SUFFIX= IN +LANG_EXT= 93 +LANG_CONFIGURE_ARG= KANNADA +.endif +################################################################ .if ${LOCALIZED_LANG} == "ko" CATEGORIES= korean LANG_PKGNAME= ko @@ -116,19 +162,18 @@ LANG_CONFIGURE_ARG= KOREAN L10NHELP= helpcontent_${LANG_EXT}_unix.tgz .endif ################################################################ +.if ${LOCALIZED_LANG} == "lt" +LANG_PKGNAME= lt +LANG_EXT= 58 +LANG_CONFIGURE_ARG= LITHUANIAN +.endif +################################################################ .if ${LOCALIZED_LANG} == "nb" LANG_PKGNAME= nb LANG_EXT= 47 LANG_CONFIGURE_ARG= NORBOK .endif ################################################################ -.if ${LOCALIZED_LANG} == "nl" -LANG_PKGNAME= nl -LANG_EXT= 31 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= DTCH -.endif -################################################################ .if ${LOCALIZED_LANG} == "nn" LANG_PKGNAME= nn LANG_EXT= 79 @@ -173,6 +218,13 @@ LANG_EXT= 07 LANG_CONFIGURE_ARG= RUSS .endif ################################################################ +.if ${LOCALIZED_LANG} == "es" +LANG_PKGNAME= es +LANG_EXT= 34 +L10NHELP= helpcontent_${LANG_EXT}_unix.tgz +LANG_CONFIGURE_ARG= SPAN +.endif +################################################################ .if ${LOCALIZED_LANG} == "sv" LANG_PKGNAME= sv LANG_EXT= 46 @@ -193,6 +245,18 @@ LANG_EXT= 50 LANG_CONFIGURE_ARG= SLOVENIAN .endif ################################################################ +.if ${LOCALIZED_LANG} == "th" +LANG_PKGNAME= th +LANG_EXT= 66 +LANG_CONFIGURE_ARG= THAI +.endif +################################################################ +.if ${LOCALIZED_LANG} == "tn" +LANG_PKGNAME= tn +LANG_EXT= 29 +LANG_CONFIGURE_ARG= TSWANA +.endif +################################################################ .if ${LOCALIZED_LANG} == "tr" LANG_PKGNAME= tr LANG_EXT= 90 @@ -205,31 +269,17 @@ LANG_EXT= 53 LANG_CONFIGURE_ARG= WELSH .endif ################################################################ -.if ${LOCALIZED_LANG} == "zh-CN" -CATEGORIES= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= CN -LANG_EXT= 86 -LANG_CONFIGURE_ARG= CHINSIM -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-TW" -CATEGORIES= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= TW -LANG_EXT= 88 -LANG_CONFIGURE_ARG= CHINTRAD -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ .if ${LOCALIZED_LANG} == "zu" LANG_PKGNAME= zu LANG_EXT= 28 LANG_CONFIGURE_ARG= ZULU .endif ################################################################ +.if defined(LANG_PKGNAME) +PKGNAMEPREFIX= ${LANG_PKGNAME}- +.endif +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX?= -${LANG_SUFFIX} +.endif .endif diff --git a/editors/openoffice.org-1.1/files/Makefile.mozilla b/editors/openoffice.org-1.1/files/Makefile.mozilla index 73637f27d724..9593c16dba89 100644 --- a/editors/openoffice.org-1.1/files/Makefile.mozilla +++ b/editors/openoffice.org-1.1/files/Makefile.mozilla @@ -32,9 +32,9 @@ build-mozilla: .endif install-mozilla: - @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ - @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/moz/zipped/ + @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/moz/zipped/ register-mozilla: .if exists(${WRKDIR}/mozilla-runtime) diff --git a/editors/openoffice.org-1.1/files/freebsd-local.sh b/editors/openoffice.org-1.1/files/freebsd-local.sh deleted file mode 100644 index e4d951ae481f..000000000000 --- a/editors/openoffice.org-1.1/files/freebsd-local.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# $FreeBSD $ - -save_common_xcu() { -sed 's/^X//' > $OOHOME/tmp/Common.xcu << 'END-of-Common.xcu' -X<?xml version="1.0" encoding="UTF-8"?> -X<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office"> -X <node oor:name="Internal"> -X <prop oor:name="CurrentTempURL" oor:type="xs:string"> -X <value/> -X </prop> -X </node> -X <node oor:name="Misc"> -X <prop oor:name="FirstRun" oor:type="xs:boolean"> -X <value>true</value> -X </prop> -X </node> -X <node oor:name="ExternalApps"> -X <prop oor:name="file" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="ftp" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="http" oor:type="xs:string"> -X <value>%%mozilla%%</value> -X </prop> -X <prop oor:name="https" oor:type="xs:string"> -X <value/> -X </prop> -X <prop oor:name="mailto" oor:type="xs:string"> -X <value/> -X </prop> -X </node> -X</oor:component-data> -END-of-Common.xcu -mozilla=`which mozilla`; -if [ $? -eq 0 ]; then - sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' $OOHOME/tmp/Common.xcu -fi -mozilla=`which linux-mozilla`; -if [ $? -eq 0 ]; then - sed -i orig -e 's#%%mozilla%%#'$mozilla'#g' $OOHOME/tmp/Common.xcu -fi -mv $OOHOME/tmp/Common.xcu $OOHOME/user/registry/data/org/openoffice/Office -} - -# -# Set default lang to en_US.ISO8859-15 -# -if [ ! $LANG ]; then - export LANG=en_US.ISO8859-15 -fi - -# -# Create soffice.cfg if it does not exist. -# -if [ ! -z $OOHOME ] && [ -e $OOHOME/setup ]; then - if [ ! -d $OOHOME/user/config/soffice.cfg ]; then - mkdir $OOHOME/user/config/soffice.cfg - fi -fi - -# -# Detect installed mozilla -# -if [ ! -z $OOHOME ] && [ ! -e $OOHOME/user/registry/data/org/openoffice/Office/Common.xcu ]; then - mkdir -p $OOHOME/tmp; - save_common_xcu; -fi diff --git a/editors/openoffice.org-1.1/files/generate.pl b/editors/openoffice.org-1.1/files/generate.pl new file mode 100644 index 000000000000..93a4e41d9a92 --- /dev/null +++ b/editors/openoffice.org-1.1/files/generate.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl + +# generate full build shell script for OpenOffice.org +# Whom: Maho Nakata <maho@FreeBSD.org> +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/generate.pl,v 1.1 2004-10-12 07:20:54 maho Exp $ + +print "#!/bin/csh\n"; +print "/usr/bin/time make WITH_CCACHE=yes package package-rename solver sdk deinstall clean >& log.en\n"; +print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n"; + +open ( FILE, "< Makefile.localized") ; +while(<FILE>){ +@tmp=split (' ',$_); +@tmp2=split ('"',$tmp[3]); +if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; + print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; + print "/usr/bin/time make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; + } +} +close FILE; + diff --git a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk deleted file mode 100644 index 2f79f5a07f6e..000000000000 --- a/editors/openoffice.org-1.1/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Apr 15 19:39:14 2003 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 31 22:34:31 2003 -@@ -64,8 +64,8 @@ - #mozilla specific stuff. - MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) - MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla --#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib --#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla - #End of mozilla specific stuff. - - PRJ=..$/..$/..$/.. -@@ -132,7 +132,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -150,7 +150,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS+= -DMOZILLA_CLIENT \ - -DOSTYPE=\"Linux2.2.14-5\" -DOJI - .IF "$(OS)" == "LINUX" -@@ -166,6 +166,13 @@ - -fno-rtti -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "FREEBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread - CDEFS += -DTRACING - .ENDIF - .ENDIF 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 index da9fd94b39c0..bbbfeab36816 100644 --- 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 @@ -1,5 +1,5 @@ ---- ../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 +--- 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; diff --git a/editors/openoffice.org-1.1/files/patch-desktop+scripts+soffice.sh b/editors/openoffice.org-1.1/files/patch-desktop+scripts+soffice.sh deleted file mode 100644 index ad1235c24e01..000000000000 --- a/editors/openoffice.org-1.1/files/patch-desktop+scripts+soffice.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../desktop/scripts/soffice.sh.orig Wed Sep 17 05:21:54 2003 -+++ ../desktop/scripts/soffice.sh Wed Sep 17 05:24:59 2003 -@@ -233,6 +233,8 @@ - PATH="$sd_prog":$PATH - export PATH - -+. $sd_prog/freebsd-local.sh -+ - # execute soffice binary - exec "$sd_prog/$sd_binary" "$@" - diff --git a/editors/openoffice.org-1.1/files/patch-odk+configure.pl b/editors/openoffice.org-1.1/files/patch-odk+configure.pl index eeebf346c600..bd269a961590 100644 --- a/editors/openoffice.org-1.1/files/patch-odk+configure.pl +++ b/editors/openoffice.org-1.1/files/patch-odk+configure.pl @@ -5,8 +5,8 @@ Index: configure.pl RCS file: /cvs/api/odk/configure.pl,v retrieving revision 1.4.12.3 diff -u -r1.4.12.3 configure.pl ---- ../odk/configure.pl 18 May 2004 10:02:00 -0000 1.4.12.3 -+++ ../configure.pl 11 Aug 2004 08:21:04 -0000 +--- odk/configure.pl.orig 18 May 2004 10:02:00 -0000 1.4.12.3 ++++ odk/configure.pl 11 Aug 2004 08:21:04 -0000 @@ -19,7 +19,7 @@ chop ($main::OFFICE_HOME_SUGGESTION); diff --git a/editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in index dbcad91a1fb4..59269742ab37 100644 --- a/editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in +++ b/editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in @@ -1,7 +1,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/setsdkenv_unix.in Sun Jan 25 18:41:01 2004 -+++ ../odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 +--- odk/setsdkenv_unix.in.orig Sun Jan 25 18:41:01 2004 ++++ odk/setsdkenv_unix.in Sun Jan 25 18:42:00 2004 @@ -2,7 +2,8 @@ # This script starts a new shell and sets all enviroment variables, which diff --git a/editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk b/editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk index 22fd7fd2f816..78814a4cfaee 100644 --- a/editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk +++ b/editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk @@ -1,7 +1,7 @@ http://www.openoffice.org/issues/show_bug.cgi?id=24142 ---- ../odk/settings/settings.mk Sun Jan 25 18:41:02 2004 -+++ ../odk/settings/settings.mk Sun Jan 25 18:45:09 2004 +--- odk/settings/settings.mk.orig Sun Jan 25 18:41:02 2004 ++++ odk/settings/settings.mk Sun Jan 25 18:45:09 2004 @@ -368,3 +368,85 @@ endif diff --git a/editors/openoffice.org-1.1/files/patch-sch_setLogicRectHack b/editors/openoffice.org-1.1/files/patch-sch_setLogicRectHack index 34b26e9cfc39..44de26bd9cfd 100644 --- a/editors/openoffice.org-1.1/files/patch-sch_setLogicRectHack +++ b/editors/openoffice.org-1.1/files/patch-sch_setLogicRectHack @@ -1,5 +1,7 @@ ---- ../sch/source/ui/unoidl/ChXChartObject.cxx 7 Aug 2002 16:01:42 -0000 1.34 -+++ ../sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 +#iZ 9462 + +--- sch/source/ui/unoidl/ChXChartObject.cxx.orig 7 Aug 2002 16:01:42 -0000 1.34 ++++ sch/source/ui/unoidl/ChXChartObject.cxx 20 Feb 2004 00:43:10 -0000 @@ -161,9 +161,11 @@ // XShape diff --git a/editors/openoffice.org-1.1/files/patch-security-tmp-dir b/editors/openoffice.org-1.1/files/patch-security-tmp-dir deleted file mode 100644 index b1ee4020a451..000000000000 --- a/editors/openoffice.org-1.1/files/patch-security-tmp-dir +++ /dev/null @@ -1,207 +0,0 @@ -http://www.openoffice.org/issues/show_bug.cgi?id=33357 -Insecure permissions on temporary files at runtime -*** SECURTY FIX *** - ---- ../sal/util/sal.map 9 Jan 2004 18:31:53 -0000 1.42.70.1 -+++ ../sal/util/sal.map 30 Aug 2004 13:59:22 -0000 -@@ -402,6 +403,7 @@ - osl_writeFile; - osl_closeFile; - osl_createDirectory; -+ osl_createDirectoryWithMode; - osl_removeDirectory; - osl_removeFile; - osl_copyFile; -Index: ../sal/inc/osl/file.h -=================================================================== -RCS file: /cvs/porting/sal/inc/osl/file.h,v -retrieving revision 1.27.48.1 -diff -u -r1.27.48.1 file.h ---- ../sal/inc/osl/file.h 9 Jan 2004 18:31:45 -0000 1.27.48.1 -+++ ../sal/inc/osl/file.h 30 Aug 2004 13:59:25 -0000 -@@ -1036,6 +1036,8 @@ - - oslFileError SAL_CALL osl_createDirectory( rtl_uString* pustrDirectoryURL ); - -+oslFileError SAL_CALL osl_createDirectoryWithMode( rtl_uString* pustrDirectoryURL, sal_uInt64 uAttributes ); -+ - - /** Remove an empty directory. - -Index: ../sal/inc/osl/file.hxx -=================================================================== -RCS file: /cvs/porting/sal/inc/osl/file.hxx,v -retrieving revision 1.30.48.1 -diff -u -r1.30.48.1 file.hxx ---- ../sal/inc/osl/file.hxx 9 Jan 2004 18:31:45 -0000 1.30.48.1 -+++ ../sal/inc/osl/file.hxx 30 Aug 2004 13:59:32 -0000 -@@ -1819,6 +1819,12 @@ - inline static RC create( const ::rtl::OUString& ustrDirectoryURL ) - { - return (RC) osl_createDirectory( ustrDirectoryURL.pData ); -+ } -+ -+ inline static RC createWithMode( const ::rtl::OUString& ustrDirectoryURL, -+ sal_uInt64 uAttributes ) -+ { -+ return (RC) osl_createDirectoryWithMode( ustrDirectoryURL.pData, uAttributes ); - } - - /** Remove an empty directory. -Index: ../sal/osl/unx/file.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/Attic/file.c,v -retrieving revision 1.72.28.1 -diff -u -r1.72.28.1 file.c ---- ../sal/osl/unx/file.c 9 Jan 2004 18:31:46 -0000 1.72.28.1 -+++ ../sal/osl/unx/file.c 30 Aug 2004 13:59:41 -0000 -@@ -246,7 +246,7 @@ - - static oslFileError osl_psz_getVolumeInformation(const sal_Char* , oslVolumeInfo* pInfo, sal_uInt32 uFieldMask); - static oslFileError osl_psz_removeFile(const sal_Char* pszPath); --static oslFileError osl_psz_createDirectory(const sal_Char* pszPath); -+static oslFileError osl_psz_createDirectory(const sal_Char* pszPath, sal_uInt64 uAttributes); - static oslFileError osl_psz_removeDirectory(const sal_Char* pszPath); - static oslFileError osl_psz_copyFile(const sal_Char* pszPath, const sal_Char* pszDestPath); - static oslFileError osl_psz_moveFile(const sal_Char* pszPath, const sal_Char* pszDestPath); -@@ -853,7 +853,7 @@ - /* osl_createDirectory */ - /****************************************************************************/ - --oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL ) -+oslFileError osl_createDirectoryWithMode( rtl_uString* ustrDirectoryURL, sal_uInt64 uAttributes ) - { - char path[PATH_MAX]; - oslFileError eRet; -@@ -865,7 +865,13 @@ - if( eRet != osl_File_E_None ) - return eRet; - -- return osl_psz_createDirectory( path ); -+ return osl_psz_createDirectory( path, uAttributes ); -+} -+ -+/* Broken, insecure, deprecated version */ -+oslFileError osl_createDirectory( rtl_uString* ustrDirectoryURL ) -+{ -+ return osl_createDirectoryWithMode( ustrDirectoryURL, 0xffffffff ); - } - - /****************************************************************************/ -@@ -1383,12 +1389,9 @@ - * osl_psz_setFileAttributes - ************************************/ - --static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_uInt64 uAttributes ) -+static int osl_getNativeMode( sal_uInt64 uAttributes ) - { -- oslFileError osl_error = osl_File_E_None; -- mode_t nNewMode = 0; -- -- OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix"); -+ mode_t nNewMode = 0; - - if (uAttributes & osl_File_Attribute_OwnRead) - nNewMode |= S_IRUSR; -@@ -1417,7 +1420,17 @@ - if (uAttributes & osl_File_Attribute_OthExe) - nNewMode|=S_IXOTH; - -- if (chmod(pszFilePath, nNewMode) < 0) -+ -+ return nNewMode; -+} -+ -+static oslFileError osl_psz_setFileAttributes( const sal_Char* pszFilePath, sal_uInt64 uAttributes ) -+{ -+ oslFileError osl_error = osl_File_E_None; -+ -+ OSL_ENSURE(!(osl_File_Attribute_Hidden & uAttributes), "osl_File_Attribute_Hidden doesn't work under Unix"); -+ -+ if (chmod(pszFilePath, osl_getNativeMode( uAttributes )) < 0) - osl_error = oslTranslateFileError(OSL_FET_ERROR, errno); - - return osl_error; -@@ -1543,13 +1558,12 @@ - * osl_psz_createDirectory - ****************************************/ - --static oslFileError osl_psz_createDirectory( const sal_Char* pszPath ) -+static oslFileError osl_psz_createDirectory( const sal_Char* pszPath, sal_uInt64 uAttributes ) - { - int nRet=0; -- int mode = S_IRWXU | S_IRWXG | S_IRWXO; - -- nRet = mkdir(pszPath,mode); -+ nRet = mkdir(pszPath, osl_getNativeMode( uAttributes )); - - if ( nRet < 0 ) - { - nRet=errno; -Index: unotools/source/ucbhelper/tempfile.cxx -=================================================================== -RCS file: /cvs/util/unotools/source/ucbhelper/tempfile.cxx,v -retrieving revision 1.14 -diff -u -r1.14 tempfile.cxx ---- ../unotools/source/ucbhelper/tempfile.cxx 9 Sep 2002 10:25:47 -0000 1.14 -+++ ../unotools/source/ucbhelper/tempfile.cxx 30 Aug 2004 14:00:58 -0000 -@@ -125,7 +125,10 @@ - return sal_True; - - // try to create the directory -- nError = osl::Directory::create( aPath ); -+ nError = osl::Directory::createWithMode( aPath, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - sal_Bool bSuccess = ( nError == osl::File::E_None || nError == osl::FileBase::E_EXIST ); - if( !bSuccess ) - { -@@ -139,7 +142,10 @@ - if ( bSuccess ) - { - // Parent directory exists, retry creation of directory -- nError = osl::Directory::create( aPath ); -+ nError = osl::Directory::createWithMode( aPath, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - bSuccess =( nError == osl::File::E_None || nError == osl::FileBase::E_EXIST ); - } - } -@@ -222,7 +228,10 @@ - - if ( bDir ) - { -- FileBase::RC err = Directory::create( aTmp ); -+ FileBase::RC err = Directory::createWithMode( aTmp, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - if ( err == FileBase::E_None ) - { - // !bKeep: only for creating a name, not a file or directory -@@ -305,7 +314,10 @@ - aTmp += String::CreateFromAscii( ".tmp" ); - if ( bDirectory ) - { -- FileBase::RC err = Directory::create( aTmp ); -+ FileBase::RC err = osl::Directory::createWithMode( aTmp, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - if ( err == FileBase::E_None ) - { - pImp->aName = aTmp; -@@ -401,7 +413,10 @@ - - // try to create the directory - sal_Bool bRet = sal_False; -- osl::FileBase::RC err = osl::Directory::create( aUnqPath ); -+ osl::FileBase::RC err = osl::Directory::createWithMode( aUnqPath, -+ osl_File_Attribute_OwnWrite | -+ osl_File_Attribute_OwnRead | -+ osl_File_Attribute_OwnExe ); - if ( err != FileBase::E_None && err != FileBase::E_EXIST ) - // perhaps parent(s) don't exist - bRet = ensuredir( aUnqPath ); diff --git a/editors/openoffice.org-1.1/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-1.1/files/patch-sfx2+source+config+cfgmgr.cxx index be38de290a51..420c61cc7b7b 100644 --- a/editors/openoffice.org-1.1/files/patch-sfx2+source+config+cfgmgr.cxx +++ b/editors/openoffice.org-1.1/files/patch-sfx2+source+config+cfgmgr.cxx @@ -1,8 +1,8 @@ -Wired bug? +Weird bug? http://qa.openoffice.org/issues/show_bug.cgi?id=22253 ---- ../sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 -+++ ../sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 +--- sfx2/source/config/cfgmgr.cxx.org Fri Nov 7 19:11:25 2003 ++++ sfx2/source/config/cfgmgr.cxx Fri Nov 7 19:30:26 2003 @@ -118,6 +118,10 @@ catch(com::sun::star::ucb::InteractiveAugmentedIOException&) { diff --git a/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx index c07cab2ab7e8..196084c1657b 100644 --- a/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx +++ b/editors/openoffice.org-1.1/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx @@ -1,5 +1,5 @@ ---- ../shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 -+++ ../shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 +--- shell/source/unix/sysshell/recently_used_file_handler.cxx.orig Tue Jan 13 00:56:37 2004 ++++ shell/source/unix/sysshell/recently_used_file_handler.cxx Tue Jan 13 00:57:26 2004 @@ -188,9 +188,12 @@ write_xml_start_tag(TAG_RECENT_ITEM, file, true); write_xml_tag(TAG_URI, uri_, file); diff --git a/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk b/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk deleted file mode 100644 index 996e282b350b..000000000000 --- a/editors/openoffice.org-1.1/files/patch-solenv+bin+addsym.awk +++ /dev/null @@ -1,16 +0,0 @@ ---- ../solenv/bin/addsym.awk.orig Tue Mar 11 15:11:44 2003 -+++ ../solenv/bin/addsym.awk Tue Mar 11 15:13:19 2003 -@@ -72,11 +72,11 @@ - END { - if (state == 0) { - print "# Weak RTTI symbols for C++ exceptions:" -- print "UDK_3_0_0 { global: _ZTI*; _ZTS*; };" -+ print "UDK_3_0_0 { global: _ZTI*; _ZTS*; GetVersionInfo;};" - } - } - state == 2 { -- print " _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions" -+ print " _ZTI*; _ZTS*; GetVersionInfo;# weak RTTI symbols for C++ exceptions" - state = 3 - } - /^[\t ]*UDK_3_0_0[\t ]*{/ { state = 1 } diff --git a/editors/openoffice.org-1.1/files/patch-svx_setLogicRectHack b/editors/openoffice.org-1.1/files/patch-svx_setLogicRectHack index 035db5e5e21c..e8c2725e58ab 100644 --- a/editors/openoffice.org-1.1/files/patch-svx_setLogicRectHack +++ b/editors/openoffice.org-1.1/files/patch-svx_setLogicRectHack @@ -1,5 +1,6 @@ ---- ../svx/source/unodraw/unoshape.cxx 4 Feb 2004 13:21:23 -0000 1.109 -+++ ../svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 +#i9462# +--- svx/source/unodraw/unoshape.cxx.orig 4 Feb 2004 13:21:23 -0000 1.109 ++++ svx/source/unodraw/unoshape.cxx 20 Feb 2004 00:43:50 -0000 @@ -1067,8 +1067,10 @@ // XShape diff --git a/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx deleted file mode 100644 index 43a78f4c538b..000000000000 --- a/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../tools/source/string/tstring.cxx.orig Thu Mar 27 18:04:53 2003 -+++ ../tools/source/string/tstring.cxx Sat May 31 23:04:05 2003 -@@ -103,6 +103,9 @@ - xub_StrLen ImplStringLen( const sal_Char* pStr ) - { - const sal_Char* pTempStr = pStr; -+ -+ if (pStr == NULL) -+ return(0); - while( *pTempStr ) - ++pTempStr; - return (xub_StrLen)(pTempStr-pStr); -@@ -113,6 +116,9 @@ - xub_StrLen ImplStringLen( const sal_Unicode* pStr ) - { - const sal_Unicode* pTempStr = pStr; -+ -+ if (pStr == NULL) -+ return(0); - while( *pTempStr ) - ++pTempStr; - return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-1.1/files/patch-translation_limit_64k b/editors/openoffice.org-1.1/files/patch-translation_limit_64k new file mode 100644 index 000000000000..ce15548f052b --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-translation_limit_64k @@ -0,0 +1,121 @@ +#iZ 33228# +#iZ 34210# + +Index: inc/sc.hrc +=================================================================== +RCS file: /cvs/sc/sc/inc/sc.hrc,v +retrieving revision 1.35 +retrieving revision 1.35.288.2 +diff -u -r1.35 -r1.35.288.2 +--- sc/inc/sc.hrc 3 Dec 2002 15:26:06 -0000 1.35 ++++ sc/inc/sc.hrc 17 Sep 2004 14:25:38 -0000 1.35.288.2 +@@ -1141,8 +1141,12 @@ + #define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) + #define RID_BMP_REFBTN1 (SC_RESOURCE_START+41) + #define RID_BMP_REFBTN2 (SC_RESOURCE_START+42) +-#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) +-#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) ++// #i34210# split function resources due to 64k limit, don't reuse old values ++// to have obviously empty function lists in case some localisation used the ++// old values for any reason. Don't even reuse the exact name because of the ++// translation database IDs. ++//#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) ++//#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) + #define RID_POPUP_CONTROL (SC_RESOURCE_START+45) + #define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) + #define RID_OBJECTBAR_DRAWFORM (SC_RESOURCE_START+47) +@@ -1158,6 +1162,10 @@ + #define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) + #define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58) + #define RID_OBJECTMENU_EDIT (SC_RESOURCE_START+59) ++#define RID_SC_FUNCTION_DESCRIPTIONS_1 (SC_RESOURCE_START+60) ++#define RID_SC_FUNCTION_DESCRIPTIONS_2 (SC_RESOURCE_START+61) ++#define RID_SC_FUNCTION_DESCRIPTIONS_3 (SC_RESOURCE_START+62) ++#define RID_SC_FUNCTION_DESCRIPTIONS_4 (SC_RESOURCE_START+63) + + #define STR_START (SC_RESOURCE_START+100) + #define STR_ROWHEIGHT (STR_START) +Index: source/core/data/global.cxx +=================================================================== +RCS file: /cvs/sc/sc/source/core/data/global.cxx,v +retrieving revision 1.31 +retrieving revision 1.31.166.2 +diff -u -r1.31 -r1.31.166.2 +--- sc/source/core/data/global.cxx 17 Apr 2003 09:54:45 -0000 1.31 ++++ sc/source/core/data/global.cxx 17 Sep 2004 14:25:38 -0000 1.31.166.2 +@@ -1475,10 +1475,12 @@ + USHORT i,j; + USHORT nDescBlock[] = + { +- RID_SC_FUNCTION_DESCRIPTIONS1, +- RID_SC_FUNCTION_DESCRIPTIONS2 ++ RID_SC_FUNCTION_DESCRIPTIONS_1, ++ RID_SC_FUNCTION_DESCRIPTIONS_2, ++ RID_SC_FUNCTION_DESCRIPTIONS_3, ++ RID_SC_FUNCTION_DESCRIPTIONS_4 + }; +- const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT); ++ const USHORT nBlocks = sizeof(nDescBlock) / sizeof(nDescBlock[0]); + + aFunctionList.Clear(); + +Index: source/ui/src/scfuncs.src +=================================================================== +RCS file: /cvs/sc/sc/source/ui/src/scfuncs.src,v +retrieving revision 1.76.22.8 +retrieving revision 1.76.22.8.4.2 +diff -u -r1.76.22.8 -r1.76.22.8.4.2 +--- sc/source/ui/src/scfuncs.src 10 Sep 2004 14:45:52 -0000 1.76.22.8 ++++ sc/source/ui/src/scfuncs.src 17 Sep 2004 14:25:39 -0000 1.76.22.8.4.2 +@@ -93,10 +93,16 @@ + // RID_SC_FUNCTION_DESCRIPTIONS1 + // RID_SC_FUNCTION_DESCRIPTIONS2 + ++ // #i34210# again splitted resources due to 64k limit ++ // RID_SC_FUNCTION_DESCRIPTIONS_1 ++ // RID_SC_FUNCTION_DESCRIPTIONS_2 ++ // RID_SC_FUNCTION_DESCRIPTIONS_3 ++ // RID_SC_FUNCTION_DESCRIPTIONS_4 ++ + #include "scfuncs.hrc" // ID_FUNCTION_GRP_XXX, HID_FUNC_XXX + #include "compiler.hrc" // SC_OPCODE_XXX + +-Resource RID_SC_FUNCTION_DESCRIPTIONS1 ++Resource RID_SC_FUNCTION_DESCRIPTIONS_1 + { + // -=*# Resource for function DBANZAHL #*=- + Resource SC_OPCODE_DB_COUNT +@@ -15963,6 +15969,11 @@ + Text[ galician ] = "Valor 1; Valor 2;... son de 1 a 30 argumentos que representan os pagamentos e ingresos."; + }; + }; ++}; ++ ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_2 ++{ + // -=*# Resource for function IKV #*=- + Resource SC_OPCODE_IKV + { +@@ -32174,7 +32185,8 @@ + }; + }; + +-Resource RID_SC_FUNCTION_DESCRIPTIONS2 ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_3 + { + // -=*# Resource for function DBANZAHL2 #*=- + // -=*# Resource for function HÄUFIGKEIT #*=- +@@ -49230,6 +49242,11 @@ + Text[ galician ] = "é o n—ãro de graos de liberdade."; + }; + }; ++}; ++ ++ ++Resource RID_SC_FUNCTION_DESCRIPTIONS_4 ++{ + // -=*# Resource for function STANDARDISIERUNG #*=- + Resource SC_OPCODE_STANDARD + { diff --git a/editors/openoffice.org-1.1/files/patch-unoil+makefile.pmk b/editors/openoffice.org-1.1/files/patch-unoil+makefile.pmk deleted file mode 100644 index 7febdabf7b4b..000000000000 --- a/editors/openoffice.org-1.1/files/patch-unoil+makefile.pmk +++ /dev/null @@ -1,13 +0,0 @@ ---- ../unoil/makefile.pmk.orig Fri Aug 31 18:04:43 2001 -+++ ../unoil/makefile.pmk Thu Sep 12 12:17:50 2002 -@@ -74,8 +74,8 @@ - JAVAFILESLIST := $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java) - .ENDIF # "$(L10N_framework)"=="" - --GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) --GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) -+GENJAVAFILES += $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) -+GENCLASSFILES += $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class) - - # --- Targets ------------------------------------------------------ - diff --git a/editors/openoffice.org-1.1/pkg-message b/editors/openoffice.org-1.1/pkg-message index d4b50a091614..4df90e05670b 100644 --- a/editors/openoffice.org-1.1/pkg-message +++ b/editors/openoffice.org-1.1/pkg-message @@ -1,9 +1,9 @@ -OpenOffice.org Build 1.1.2 Personal Install How-To +OpenOffice.org Build 1.1.3 Personal Install How-To Written by: Martin Blapp <mbr@freebsd.org> -OpenOffice.org 1.1Beta will soon been installed in -${PREFIX}/OpenOffice.org-1.1.2 +OpenOffice.org 1.1.3 will soon been installed in +${PREFIX}/OpenOffice.org-1.1.3 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.1.0" folder +The setup installs a "OpenOffice.org1.1.3" folder in your homedir. If the setup tells you there is already an installed @@ -29,31 +29,13 @@ 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.2 -${PREFIX}/bin/openoffice-1.1.2-sagenda -${PREFIX}/bin/openoffice-1.1.2-scalc -${PREFIX}/bin/openoffice-1.1.2-sdraw -${PREFIX}/bin/openoffice-1.1.2-setup -${PREFIX}/bin/openoffice-1.1.2-sfax -${PREFIX}/bin/openoffice-1.1.2-simpress -${PREFIX}/bin/openoffice-1.1.2-spadmin -${PREFIX}/bin/openoffice-1.1.2-sweb -${PREFIX}/bin/openoffice-1.1.2-swriter - -3 Setup problems (FreeBSD < 4.7-RELEASE only) ---------------------------------------------- - -If the setup complains about a missing file "setup.ins", -it's time to upgrade your FreeBSD system to the latest -version. You will encounter this bug only if your OS is -older than FreeBSD 4.7-RELEASE. - -4 Crashes in URL-location bar (FreeBSD < 4.7-RELEASE only) ----------------------------------------------------------- - -OO.org can crash if you enter a non existing path -or URL in the location bar. To fix these crashes -you need the following patch. You will see this -bug only if your OS is older than FreeBSD 4.7-RELEASE. - -http://people.freebsd.org/~mbr/ooo/rtld-symlookup.diff +${PREFIX}/bin/openoffice-1.1.3 +${PREFIX}/bin/openoffice-1.1.3-sagenda +${PREFIX}/bin/openoffice-1.1.3-scalc +${PREFIX}/bin/openoffice-1.1.3-sdraw +${PREFIX}/bin/openoffice-1.1.3-setup +${PREFIX}/bin/openoffice-1.1.3-sfax +${PREFIX}/bin/openoffice-1.1.3-simpress +${PREFIX}/bin/openoffice-1.1.3-spadmin +${PREFIX}/bin/openoffice-1.1.3-sweb +${PREFIX}/bin/openoffice-1.1.3-swriter |