diff options
Diffstat (limited to 'editors/openoffice.org-3-devel/files')
13 files changed, 0 insertions, 2448 deletions
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs deleted file mode 100644 index 1d119fc69a6a..000000000000 --- a/editors/openoffice.org-3-devel/files/Makefile.knobs +++ /dev/null @@ -1,135 +0,0 @@ -# Makefile for knobs -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -.if !defined(WITHOUT_JAVA) && !defined(WITH_GNUGCJ) -CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant -.endif -.if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ) -CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/gcc41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" --disable-qadevooo -.endif -.if defined(WITHOUT_JAVA) -CONFIGURE_ARGS+= --without-java -.endif - -.if !defined(WITH_GPC) -CONFIGURE_ARGS+= --enable-libart -.endif - -.if defined(WITH_KDE) -CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}" -.endif - -.if defined(WITH_CUPS) -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base -CONFIGURE_ARGS+= --enable-cups=yes -.else -CONFIGURE_ARGS+= --enable-cups=no -.endif - -.if defined(WITHOUT_MOZILLA) -CONFIGURE_ARGS+= --disable-mozilla -.else -CONFIGURE_ARGS+= --enable-build-mozilla -.endif - -.if defined(ALL_LOCALIZED_LANGS) -CONFIGURE_ARGS+= --with-lang=ALL -.else -CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG} -.endif - -.if defined(WITH_DEBUG) -.if ${WITH_DEBUG} == 2 -CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --enable-symbols -.endif -.endif - -pre-fetch: -.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000) - @${ECHO} - @${ECHO} "WARNING" - @${ECHO} "Your rtld seems to be old." - @${ECHO} "Please remake your rtld by:" - @${ECHO} "[1] if you use 4-series:" - @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4" - @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4" - @${ECHO} "# make ; make depend ; make install" - @${ECHO} "[2] if you use 5-series:" - @${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng5" - @${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng5" - @${ECHO} "# make ; make depend ; make install" - @${ECHO} "AT YOUR OWN RISK!" -.endif - @${ECHO} "OPTIONS:" -.if !defined(WITH_DEBUG) - @${ECHO} - @${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1" - @${ECHO} - @${ECHO} "If you set WITH_DEBUG=2, you add internal" - @${ECHO} "OOo debug support." -.endif -.if !defined(WITHOUT_MOZILLA) - @${ECHO} - @${ECHO} "You can compile OOo without Mozilla connectivity with" - @${ECHO} "make -DWITHOUT_MOZILLA" -.endif -#.if !defined(WITH_TTF_BYTECODE_ENABLED) -# @${ECHO} -# @${ECHO} "You may get better quality of glyphs" -# @${ECHO} "at small bitmap sizes if you have" -# @${ECHO} "licensed the Apple patents" -# @${ECHO} "US05155805 US05159668 and US05325479, with" -# @${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED" -# @${ECHO} "See http://www.freetype.org/patents.html for details" -#.endif - @${ECHO} - @${ECHO} "You can select the language for OOo by making it with:" - @${ECHO} "make LOCALIZED_LANG=xx" - @${ECHO} "while xx can be one of the following" - @${ECHO} "af ar be-BY bg br bn bn-BD bn-IN bs ca cs cy da de el" - @${ECHO} "en-GB en-US en-ZA eo es et eu fi fr ga gl gu-IN he hi-IN" - @${ECHO} "hr hu it ja km kn-IN ko lo lt lv mk ms ne nb nl nn nr" - @${ECHO} "ns pa-IN pl pt pt-BR ru rw sk sl sh-YU sr-CS ss st sv" - @${ECHO} "sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN zh-TW zu" - @${ECHO} "Default: en-US" -#XXX currently broken -#.if !defined(WITHOUT_JAVA) -# @${ECHO} -# @${ECHO} "You can compile OOo without Java support with" -# @${ECHO} "make -DWITHOUT_JAVA" -#.endif -#XXX currently broken -#.if !defined(WITH_GNUGCJ) -# @${ECHO} -# @${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with" -# @${ECHO} "make -DWITH_GNUGCJ" -#.endif -#XXX currently broken -#.if !defined(WITH_CUPS) -# @${ECHO} -# @${ECHO} "You can compile OOo with CUPS support with" -# @${ECHO} "make -DWITH_CUPS" -#.endif -.if !defined(WITH_KDE) - @${ECHO} - @${ECHO} "You can compile OOo to use Qt/KDE vclplug with" - @${ECHO} "make -DWITH_KDE" -.endif -.if !defined(WITH_GPC) - @${ECHO} - @${ECHO} "You can compile OOo with gpc instead of libart by" - @${ECHO} "make -DWITH_GPC" -.endif - @${ECHO} - @${ECHO} "NOTICE:" - @${ECHO} - @${ECHO} "To build OOo, you should have a lot" -.if defined(WITH_DEBUG) - @${ECHO} "of free diskspace (~ 18GB)." -.else - @${ECHO} "of free diskspace (~ 9GB)." -.endif - @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver" diff --git a/editors/openoffice.org-3-devel/files/Makefile.localized b/editors/openoffice.org-3-devel/files/Makefile.localized deleted file mode 100644 index d1a0fa4e670b..000000000000 --- a/editors/openoffice.org-3-devel/files/Makefile.localized +++ /dev/null @@ -1,340 +0,0 @@ -# localized makefile -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ -################################################################ -#See solenv/inc/postset.mk for details -################################################################ -.if defined(LOCALIZED_LANG) -.if ${LOCALIZED_LANG} == "af" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ar" -CATEGORIES+= arabic -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "be-BY" -LANG_PKGNAME= be -LANG_SUFFIX= BY -.endif -################################################################ -.if ${LOCALIZED_LANG} == "bg" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "br" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "bn" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "bn-BD" -LANG_PKGNAME= be -LANG_SUFFIX= BD -.endif -################################################################ -.if ${LOCALIZED_LANG} == "bn-IN" -LANG_PKGNAME= bn -LANG_SUFFIX= IN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "bs" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ca" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "cs" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "cy" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "da" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "de" -CATEGORIES+= german -LANG_PKGNAME= ${LOCALIZED_LANG} -COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm -.endif -################################################################ -.if ${LOCALIZED_LANG} == "el" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "en-GB" -LANG_PKGNAME= en -LANG_SUFFIX= GB -.endif -################################################################ -.if ${LOCALIZED_LANG} == "en-US" -LANG_PKGNAME= en -LANG_SUFFIX= US -.endif -################################################################ -.if ${LOCALIZED_LANG} == "en-ZA" -LANG_PKGNAME= en -LANG_SUFFIX= ZA -.endif -################################################################ -.if ${LOCALIZED_LANG} == "eo" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "es" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "et" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "eu" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fi" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fr" -CATEGORIES+= french -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ga" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "gl" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "gu-IN" -LANG_PKGNAME= gu -LANG_SUFFIX= IN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "he" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "hi-IN" -LANG_PKGNAME= hi -LANG_SUFFIX= IN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "hr" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "hu" -CATEGORIES+= hungarian -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "it" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ja" -CATEGORIES+= japanese -LANG_PKGNAME= ${LOCALIZED_LANG} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf -.endif -################################################################ -.if ${LOCALIZED_LANG} == "km" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "kn-IN" -LANG_PKGNAME= kn -LANG_SUFFIX= IN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ko" -CATEGORIES+= korean -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "lo" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "lt" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "lv" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "mk" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ms" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ne" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nb" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nl" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nn" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nr" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ns" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pa-IN" -LANG_PKGNAME= pa -LANG_SUFFIX= IN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pl" -CATEGORIES+= polish -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES+= portuguese -LANG_PKGNAME= ${LOCALIZED_LANG} -LANG_CONFIGURE_ARG= PORT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt-BR" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES+= portuguese -LANG_PKGNAME= pt -LANG_SUFFIX= BR -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ru" -CATEGORIES+= russian -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "rw" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sk" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sl" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sh-YU" -LANG_PKGNAME= sh -LANG_SUFFIX= YU -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sr-CS" -LANG_PKGNAME= sr -LANG_SUFFIX= CS -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ss" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "st" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sv" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sw" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sw-TZ" -LANG_PKGNAME= sw -LANG_SUFFIX= TZ -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sx" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ta-IN" -LANG_PKGNAME= ta -LANG_SUFFIX= IN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "th" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tn" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tr" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ts" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ve" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "vi" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "xh" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-CN" -CATEGORIES+= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= CN -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-TW" -CATEGORIES+= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= TW -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zu" -LANG_PKGNAME= ${LOCALIZED_LANG} -.endif -################################################################ -.endif diff --git a/editors/openoffice.org-3-devel/files/Makefile.others b/editors/openoffice.org-3-devel/files/Makefile.others deleted file mode 100644 index 0b5736d98822..000000000000 --- a/editors/openoffice.org-3-devel/files/Makefile.others +++ /dev/null @@ -1,67 +0,0 @@ -# Makefile for other stuffs -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD$ - -#other stuffs which are not directly related to making ports -#package-rename: rename package for uploading -#package-canonical: making official packages (WIP) -#ure: URE (Uno Runtime Environment) packages (WIP) -#solver: solver -#languagepack: language pack - -package-rename: - @${ECHO_MSG} "===> Rename package for OpenOffice.org mirror upload"; - @${MV} ${PKGFILE} \ - ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} - -package-canonical: - @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . - -sdk: - @${ECHO_MSG} "===> Make SDK of OpenOffice.org" - @${RM} -fr ${WRKDIR}/sdk_tmp - @${MKDIR} ${WRKDIR}/sdk_tmp - @cd ${WRKDIR}/sdk_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz - @cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \ - ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \ - ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_SDK.tar.bz2 ${INSTALLATION_BASEDIR}_sdk - -ure: - @${ECHO_MSG} "===> Make Uno Runtime Environment of OpenOffice.org" - @${RM} -fr ${WRKDIR}/ure_tmp - @${MKDIR} ${WRKDIR}/ure_tmp - @cd ${WRKDIR}/ure_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz - @cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \ - ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ - ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_URE.tar.bz2 ${INSTALLATION_BASEDIR} - -solver: - @${ECHO_MSG} "===> Make Solver of OpenOffice.org" - @cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.bz2 solver - -languagepack: - @${ECHO_MSG} "===> Make languagepack of OpenOffice.org" -.if defined (ALL_LOCALIZED_LANGS) - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack' -.else - @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}' -.endif - -.if !defined (ALL_LOCALIZED_LANGS) - @${RM} -fr ${WRKDIR}/langpack_tmp - @${MKDIR} ${WRKDIR}/langpack_tmp -.if defined (LOCALIZED_LANG) - @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz - @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ - ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ - ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR} -.endif -.endif diff --git a/editors/openoffice.org-3-devel/files/fbsd4-workaroundpatch b/editors/openoffice.org-3-devel/files/fbsd4-workaroundpatch deleted file mode 100644 index d69388828582..000000000000 --- a/editors/openoffice.org-3-devel/files/fbsd4-workaroundpatch +++ /dev/null @@ -1,42 +0,0 @@ -Issutracker : #iXXXXX# -CWS : N/A -Author: : -Description : - -making libbf_svx680fi.so fails for FreeBSD 4.11 like: - -Making: ../../unxfbsd.pro/lib/libbf_svx680fi.so -ccache g++-ooo -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN' -shared -L../../unxfbsd.pro/lib -L../lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solenv/unxfbsd/lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solver/680/unxfbsd.pro/lib -L/work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/solenv/unxfbsd/lib -L/usr/local/jdk1.4.2/lib -L/usr/local/jdk1.4.2/jre/lib/i386 -L/usr/local/jdk1.4.2/jre/lib/i386/client -L/usr/local/jdk1.4.2/jre/lib/i386/native_threads -L/usr/X11R6/lib ../../unxfbsd.pro/slo/bf_svx_dflt_version.o ../../unxfbsd.pro/slo/bf_svx_dflt_description.o -o ../../unxfbsd.pro/lib/libbf_svx680fi.so ../../unxfbsd.pro/slo/svx_writingmodeitem.o ../../unxfbsd.pro/slo/svx_frmitems.o ../../unxfbsd.pro/slo/svx_paraitem.o ../../unxfbsd.pro/slo/svx_textitem.o ../../unxfbsd.pro/slo/svx_postattr.o ../../unxfbsd.pro/slo/svx_flditem.o ../../unxfbsd.pro/slo/svx_hlnkitem.o ../../unxfbsd.pro/slo/svx_svxfont.o ../../unxfbsd.pro/slo/svx_pageitem.o ../../unxfbsd.pro/slo/svx_paperinf.o ../../unxfbsd.pro/slo/svx_drawitem.o ../../unxfbsd.pro/slo/svx_algitem.o ../../unxfbsd.pro/slo/svx_itemtype.o ../../unxfbsd.pro/slo/svx_rotmodit.o ../../unxfbsd.pro/slo/svx_numinf.o ../../unxfbsd.pro/slo/svx_svxerr.o ../../unxfbsd.pro/slo/svx_numfmtsh.o ../../unxfbsd.pro/slo/svx_zoomitem.o ../../unxfbsd.pro/slo/svx_chrtitem.o ../../unxfbsd.pro/slo/svx_bulitem.o ../../unxfbsd.pro/slo/svx_e3ditem.o ../../unxfbsd.pro/slo/svx_numitem.o ../../unxfbsd.pro/slo/svx_grfitem.o ../../unxfbsd.pro/slo/svx_clipfmtitem.o ../../unxfbsd.pro/slo/svx_svxempty.o ../../unxfbsd.pro/slo/svx_xmlcnitm.o ../../unxfbsd.pro/slo/svx_linkmgr.o ../../unxfbsd.pro/slo/svx_fileobj.o ../../unxfbsd.pro/slo/svx_txtrange.o ../../unxfbsd.pro/slo/svx_svxacorr.o ../../unxfbsd.pro/slo/svx_SvXMLAutoCorrectImport.o ../../unxfbsd.pro/slo/svx_forbiddencharacterstable.o ../../unxfbsd.pro/slo/svx_swafopt.o ../../unxfbsd.pro/slo/svx_editattr.o ../../unxfbsd.pro/slo/svx_editdbg.o ../../unxfbsd.pro/slo/svx_editdoc.o ../../unxfbsd.pro/slo/svx_editdoc2.o ../../unxfbsd.pro/slo/svx_editeng.o ../../unxfbsd.pro/slo/svx_editobj.o ../../unxfbsd.pro/slo/svx_editsel.o ../../unxfbsd.pro/slo/svx_editundo.o ../../unxfbsd.pro/slo/svx_edtspell.o ../../unxfbsd.pro/slo/svx_editview.o ../../unxfbsd.pro/slo/svx_eerdll.o ../../unxfbsd.pro/slo/svx_impedit.o ../../unxfbsd.pro/slo/svx_impedit2.o ../../unxfbsd.pro/slo/svx_impedit3.o ../../unxfbsd.pro/slo/svx_impedit4.o ../../unxfbsd.pro/slo/svx_impedit5.o ../../unxfbsd.pro/slo/svx_unolingu.o ../../unxfbsd.pro/slo/svx_outliner.o ../../unxfbsd.pro/slo/svx_outlin2.o ../../unxfbsd.pro/slo/svx_paralist.o ../../unxfbsd.pro/slo/svx_outlvw.o ../../unxfbsd.pro/slo/svx_outleeng.o ../../unxfbsd.pro/slo/svx_outlobj.o ../../unxfbsd.pro/slo/svx__bmpmask.o ../../unxfbsd.pro/slo/svx__contdlg.o ../../unxfbsd.pro/slo/svx_charmap.o ../../unxfbsd.pro/slo/svx_hyperdlg.o ../../unxfbsd.pro/slo/svx_imapdlg.o ../../unxfbsd.pro/slo/svx_dlgutil.o ../../unxfbsd.pro/slo/svx_fontwork.o ../../unxfbsd.pro/slo/svx_impgrf.o ../../unxfbsd.pro/slo/svx_rlrcitem.o ../../unxfbsd.pro/slo/svx_rulritem.o ../../unxfbsd.pro/slo/svx_rubydialog.o ../../unxfbsd.pro/slo/svx_srchdlg.o ../../unxfbsd.pro/slo/svx_svxruler.o ../../unxfbsd.pro/slo/svx_txencbox.o ../../unxfbsd.pro/slo/svx_clipboardctl.o ../../unxfbsd.pro/slo/svx_fntctl.o ../../unxfbsd.pro/slo/svx_fntszctl.o ../../unxfbsd.pro/slo/svx_asiancfg.o ../../unxfbsd.pro/slo/svx_adritem.o ../../unxfbsd.pro/slo/svx_optgrid.o ../../unxfbsd.pro/slo/svx_insctrl.o ../../unxfbsd.pro/slo/svx_zoomctrl.o ../../unxfbsd.pro/slo/svx_pszctrl.o ../../unxfbsd.pro/slo/svx_selctrl.o ../../unxfbsd.pro/slo/svx_modctrl.o ../../unxfbsd.pro/slo/svx_colrctrl.o ../../unxfbsd.pro/slo/svx_fillctrl.o ../../unxfbsd.pro/slo/svx_grafctrl.o ../../unxfbsd.pro/slo/svx_itemwin.o ../../unxfbsd.pro/slo/svx_layctrl.o ../../unxfbsd.pro/slo/svx_lboxctrl.o ../../unxfbsd.pro/slo/svx_linectrl.o ../../unxfbsd.pro/slo/svx_tbcontrl.o ../../unxfbsd.pro/slo/svx_tbxalign.o ../../unxfbsd.pro/slo/svx_tbxdraw.o ../../unxfbsd.pro/slo/svx_tbxdrctl.o ../../unxfbsd.pro/slo/svx_verttexttbxctrl.o ../../unxfbsd.pro/slo/svx_UnoForbiddenCharsTable.o ../../unxfbsd.pro/slo/svx_unoedsrc.o ../../unxfbsd.pro/slo/svx_unoedhlp.o ../../unxfbsd.pro/slo/svx_unopracc.o ../../unxfbsd.pro/slo/svx_unoedprx.o ../../unxfbsd.pro/slo/svx_unoviwed.o ../../unxfbsd.pro/slo/svx_unoviwou.o ../../unxfbsd.pro/slo/svx_unofored.o ../../unxfbsd.pro/slo/svx_unoforou.o ../../unxfbsd.pro/slo/svx_unotext.o ../../unxfbsd.pro/slo/svx_unotext2.o ../../unxfbsd.pro/slo/svx_unofield.o ../../unxfbsd.pro/slo/svx_UnoNamespaceMap.o ../../unxfbsd.pro/slo/svx_UnoGraphicExporter.o ../../unxfbsd.pro/slo/svx_unopool.o ../../unxfbsd.pro/slo/svx_XPropertyTable.o ../../unxfbsd.pro/slo/svx_UnoNameItemTable.o ../../unxfbsd.pro/slo/svx_unoshape.o ../../unxfbsd.pro/slo/svx_unoipset.o ../../unxfbsd.pro/slo/svx_unoctabl.o ../../unxfbsd.pro/slo/svx_unoshap2.o ../../unxfbsd.pro/slo/svx_unoshap3.o ../../unxfbsd.pro/slo/svx_unoshap4.o ../../unxfbsd.pro/slo/svx_unopage.o ../../unxfbsd.pro/slo/svx_unoshtxt.o ../../unxfbsd.pro/slo/svx_unoshcol.o ../../unxfbsd.pro/slo/svx_unoprov.o ../../unxfbsd.pro/slo/svx_unomod.o ../../unxfbsd.pro/slo/svx_unonrule.o ../../unxfbsd.pro/slo/svx_unofdesc.o ../../unxfbsd.pro/slo/svx_unomlstr.o ../../unxfbsd.pro/slo/svx_unogtabl.o ../../unxfbsd.pro/slo/svx_unohtabl.o ../../unxfbsd.pro/slo/svx_unobtabl.o ../../unxfbsd.pro/slo/svx_unottabl.o ../../unxfbsd.pro/slo/svx_unomtabl.o ../../unxfbsd.pro/slo/svx_unodtabl.o ../../unxfbsd.pro/slo/svx_gluepts.o ../../unxfbsd.pro/slo/svx_galexpl.o ../../unxfbsd.pro/slo/svx_galdlg.o ../../unxfbsd.pro/slo/svx_galctrl.o ../../unxfbsd.pro/slo/svx_gallery1.o ../../unxfbsd.pro/slo/svx_galtheme.o ../../unxfbsd.pro/slo/svx_galmisc.o ../../unxfbsd.pro/slo/svx_galobj.o ../../unxfbsd.pro/slo/svx_codec.o ../../unxfbsd.pro/slo/svx_galbrws.o ../../unxfbsd.pro/slo/svx_galbrws1.o ../../unxfbsd.pro/slo/svx_galbrws2.o ../../unxfbsd.pro/slo/svx_svdoutlinercache.o ../../unxfbsd.pro/slo/svx_dialdll.o ../../unxfbsd.pro/slo/svx_gradtrns.o ../../unxfbsd.pro/slo/svx_svdattr.o ../../unxfbsd.pro/slo/svx_svdcrtmt.o ../../unxfbsd.pro/slo/svx_svdcrtv.o ../../unxfbsd.pro/slo/svx_svddrag.o ../../unxfbsd.pro/slo/svx_svddrgmt.o ../../unxfbsd.pro/slo/svx_svddrgv.o ../../unxfbsd.pro/slo/svx_svdedtv.o ../../unxfbsd.pro/slo/svx_svdedtv1.o ../../unxfbsd.pro/slo/svx_svdedtv2.o ../../unxfbsd.pro/slo/svx_svdedxv.o ../../unxfbsd.pro/slo/svx_svdetc.o ../../unxfbsd.pro/slo/svx_svdfmtf.o ../../unxfbsd.pro/slo/svx_svdfppt.o ../../unxfbsd.pro/slo/svx_svdglev.o ../../unxfbsd.pro/slo/svx_svdglue.o ../../unxfbsd.pro/slo/svx_svdhdl.o ../../unxfbsd.pro/slo/svx_svdhlpln.o ../../unxfbsd.pro/slo/svx_svdibrow.o ../../unxfbsd.pro/slo/svx_svdio.o ../../unxfbsd.pro/slo/svx_svditer.o ../../unxfbsd.pro/slo/svx_svdlayer.o ../../unxfbsd.pro/slo/svx_svdmark.o ../../unxfbsd.pro/slo/svx_svdmodel.o ../../unxfbsd.pro/slo/svx_svdmrkv.o ../../unxfbsd.pro/slo/svx_svdmrkv1.o ../../unxfbsd.pro/slo/svx_svdoattr.o ../../unxfbsd.pro/slo/svx_svdobj.o ../../unxfbsd.pro/slo/svx_impgrfll.o ../../unxfbsd.pro/slo/svx_svdocapt.o ../../unxfbsd.pro/slo/svx_svdocirc.o ../../unxfbsd.pro/slo/svx_svdoedge.o ../../unxfbsd.pro/slo/svx_svdograf.o ../../unxfbsd.pro/slo/svx_svdogrp.o ../../unxfbsd.pro/slo/svx_svdomeas.o ../../unxfbsd.pro/slo/svx_svdoole2.o ../../unxfbsd.pro/slo/svx_svdopage.o ../../unxfbsd.pro/slo/svx_svdopath.o ../../unxfbsd.pro/slo/svx_svdorect.o ../../unxfbsd.pro/slo/svx_svdotext.o ../../unxfbsd.pro/slo/svx_svdotxat.o ../../unxfbsd.pro/slo/svx_svdotxdr.o ../../unxfbsd.pro/slo/svx_svdotxed.o ../../unxfbsd.pro/slo/svx_svdotxfl.o ../../unxfbsd.pro/slo/svx_svdotxln.o ../../unxfbsd.pro/slo/svx_svdotxtr.o ../../unxfbsd.pro/slo/svx_svdouno.o ../../unxfbsd.pro/slo/svx_svdoutl.o ../../unxfbsd.pro/slo/svx_svdovirt.o ../../unxfbsd.pro/slo/svx_svdpage.o ../../unxfbsd.pro/slo/svx_svdpagv.o ../../unxfbsd.pro/slo/svx_svdpntv.o ../../unxfbsd.pro/slo/svx_svdpoev.o ../../unxfbsd.pro/slo/svx_svdscrol.o ../../unxfbsd.pro/slo/svx_svdsnpv.o ../../unxfbsd.pro/slo/svx_svdsuro.o ../../unxfbsd.pro/slo/svx_svdtouch.o ../../unxfbsd.pro/slo/svx_svdtrans.o ../../unxfbsd.pro/slo/svx_svdtxhdl.o ../../unxfbsd.pro/slo/svx_svdundo.o ../../unxfbsd.pro/slo/svx_svdview.o ../../unxfbsd.pro/slo/svx_svdviter.o ../../unxfbsd.pro/slo/svx_svdvmark.o ../../unxfbsd.pro/slo/svx_svdxcgv.o ../../unxfbsd.pro/slo/svx_clonelist.o ../../unxfbsd.pro/slo/svx_dbcharsethelper.o ../../unxfbsd.pro/slo/svx_ParseContext.o ../../unxfbsd.pro/slo/svx_typeconversionclient.o ../../unxfbsd.pro/slo/svx_confirmdelete.o ../../unxfbsd.pro/slo/svx_dbtoolsclient.o ../../unxfbsd.pro/slo/svx_sqlparserclient.o ../../unxfbsd.pro/slo/svx_dataaccessdescriptor.o ../../unxfbsd.pro/slo/svx_fmpage.o ../../unxfbsd.pro/slo/svx_fmPropBrw.o ../../unxfbsd.pro/slo/svx_fmundo.o ../../unxfbsd.pro/slo/svx_fmprop.o ../../unxfbsd.pro/slo/svx_fmmodel.o ../../unxfbsd.pro/slo/svx_navigatortree.o ../../unxfbsd.pro/slo/svx_navigatortreemodel.o ../../unxfbsd.pro/slo/svx_fmexpl.o ../../unxfbsd.pro/slo/svx_fmctrler.o ../../unxfbsd.pro/slo/svx_fmpgeimp.o ../../unxfbsd.pro/slo/svx_fmvwimp.o ../../unxfbsd.pro/slo/svx_taborder.o ../../unxfbsd.pro/slo/svx_fmdpage.o ../../unxfbsd.pro/slo/svx_fmitems.o ../../unxfbsd.pro/slo/svx_tbxform.o ../../unxfbsd.pro/slo/svx_fmobj.o ../../unxfbsd.pro/slo/svx_fmdmod.o ../../unxfbsd.pro/slo/svx_fmobjfac.o ../../unxfbsd.pro/slo/svx_fmsrccfg.o ../../unxfbsd.pro/slo/svx_fmservs.o ../../unxfbsd.pro/slo/svx_typemap.o ../../unxfbsd.pro/slo/svx_fmexch.o ../../unxfbsd.pro/slo/svx_tabwin.o ../../unxfbsd.pro/slo/svx_multipro.o ../../unxfbsd.pro/slo/svx_fmurl.o ../../unxfbsd.pro/slo/svx_filtnav.o ../../unxfbsd.pro/slo/svx_fmimplids.o ../../unxfbsd.pro/slo/svx_fmtools.o ../../unxfbsd.pro/slo/svx_fmshimp.o ../../unxfbsd.pro/slo/svx_fmshell.o ../../unxfbsd.pro/slo/svx_fmsearch.o ../../unxfbsd.pro/slo/svx_fmsrcimp.o ../../unxfbsd.pro/slo/svx_fmview.o ../../unxfbsd.pro/slo/svx_siimport.o ../../unxfbsd.pro/slo/svx_sdbdatacolumn.o ../../unxfbsd.pro/slo/svx_svx3ditems.o ../../unxfbsd.pro/slo/svx_deflt3d.o ../../unxfbsd.pro/slo/svx_class3d.o ../../unxfbsd.pro/slo/svx_e3dundo.o ../../unxfbsd.pro/slo/svx_volume3d.o ../../unxfbsd.pro/slo/svx_viewpt3d.o ../../unxfbsd.pro/slo/svx_camera3d.o ../../unxfbsd.pro/slo/svx_poly3d.o ../../unxfbsd.pro/slo/svx_polygn3d.o ../../unxfbsd.pro/slo/svx_volmrk3d.o ../../unxfbsd.pro/slo/svx_objfac3d.o ../../unxfbsd.pro/slo/svx_obj3d.o ../../unxfbsd.pro/slo/svx_light3d.o ../../unxfbsd.pro/slo/svx_dlight3d.o ../../unxfbsd.pro/slo/svx_plight3d.o ../../unxfbsd.pro/slo/svx_pntobj3d.o ../../unxfbsd.pro/slo/svx_polyob3d.o ../../unxfbsd.pro/slo/svx_scene3d.o ../../unxfbsd.pro/slo/svx_polysc3d.o ../../unxfbsd.pro/slo/svx_cube3d.o ../../unxfbsd.pro/slo/svx_sphere3d.o ../../unxfbsd.pro/slo/svx_extrud3d.o ../../unxfbsd.pro/slo/svx_lathe3d.o ../../unxfbsd.pro/slo/svx_label3d.o ../../unxfbsd.pro/slo/svx_dragmt3d.o ../../unxfbsd.pro/slo/svx_view3d.o ../../unxfbsd.pro/slo/svx_view3d1.o ../../unxfbsd.pro/slo/svx_e3dcmpt.o ../../unxfbsd.pro/slo/svx_float3d.o ../../unxfbsd.pro/slo/svx_svxmsbas.o ../../unxfbsd.pro/slo/svx_xcpoly.o ../../unxfbsd.pro/slo/svx_xout.o ../../unxfbsd.pro/slo/svx_xout1.o ../../unxfbsd.pro/slo/svx_xattr.o ../../unxfbsd.pro/slo/svx_xattr2.o ../../unxfbsd.pro/slo/svx_xattrbmp.o ../../unxfbsd.pro/slo/svx_xline.o ../../unxfbsd.pro/slo/svx_xpool.o ../../unxfbsd.pro/slo/svx_xtable.o ../../unxfbsd.pro/slo/svx_xtabcolr.o ../../unxfbsd.pro/slo/svx_xtablend.o ../../unxfbsd.pro/slo/svx_xtabdash.o ../../unxfbsd.pro/slo/svx_xtabhtch.o ../../unxfbsd.pro/slo/svx_xtabgrdt.o ../../unxfbsd.pro/slo/svx_xtabbtmp.o ../../unxfbsd.pro/slo/svx_xexch.o ../../unxfbsd.pro/slo/svx_xiocomp.o ../../unxfbsd.pro/slo/svx__xpoly.o ../../unxfbsd.pro/slo/svx__ximp.o ../../unxfbsd.pro/slo/svx__xoutbmp.o ../../unxfbsd.pro/slo/svx__xfont.o ../../unxfbsd.pro/slo/svx_xmlexport.o ../../unxfbsd.pro/slo/svx_xmltxtimp.o ../../unxfbsd.pro/slo/svx_xmltxtexp.o ../../unxfbsd.pro/slo/svx_xmlxtimp.o ../../unxfbsd.pro/slo/svx_xmlxtexp.o ../../unxfbsd.pro/slo/svx_xmlgrhlp.o ../../unxfbsd.pro/slo/svx_xmleohlp.o -lbf_xo680fi -lgo680fi -lsb680fi -lso680fi -lsvt680fi -ltk680fi -lvcl680fi -lsvl680fi -lsot680fi -lutl680fi -ltl680fi -lcomphelp4gcc3 -lucbhelper3gcc3 -luno_cppuhelpergcc3 -luno_cppu -lvos3gcc3 -luno_sal -licuuc -lfwe680fi -llegacy_binfilters680fi -luno_salhelpergcc3 -lxcr680fi -lsysshell -lbf_sfx -lsysshell -pthread -lm -Wl,-Bdynamic -lstlport_gcc -pthread -/usr/libexec/elf/ld: ../../unxfbsd.pro/lib/libbf_svx680fi.so: undefined versioned symbol name typeinfo for com::sun::star::beans::XFastPropertySet@@UDK_3_0_0 -/usr/libexec/elf/ld: failed to set dynamic section sizes: Bad value -collect2: ld returned 1 exit status -dmake: Error code 1, while making '../../unxfbsd.pro/lib/libbf_svx680fi.so' -'---* tg_merge.mk *---' - -ERROR: Error 65280 occurred while making /work/ports/editors/openoffice.org-2.0/work/OOo_2.0beta2/binfilter/bf_svx/util -dmake: Error code 1, while making 'build_instsetoo_native' -'---* tg_merge.mk *---' -*** Error code 255 - -Stop in /work/ports/editors/openoffice.org-2.0. - ---- /dev/null Sun Sep 4 19:33:13 2005 -+++ binfilter/bf_svx/util/bf_svx.map Sun Sep 4 18:41:25 2005 -@@ -0,0 +1 @@ -+UDK_3_0_0 { global: _ZTI*; _ZTS*; }; - -Index: binfilter/bf_svx/util/makefile.mk -=================================================================== -RCS file: /cvs/framework/binfilter/bf_svx/util/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- binfilter/bf_svx/util/makefile.mk 5 Dec 2003 15:10:56 -0000 1.5 -+++ binfilter/bf_svx/util/makefile.mk 4 Sep 2005 09:55:49 -0000 -@@ -91,6 +91,7 @@ - SHL1IMPLIB= bf_svx - SVXLOKAL= $(LB)$/bf_svx.lib - SHL1BASE = 0x1d800000 -+SHL1VERSIONMAP= bf_svx.map - - SHL1STDLIBS= \ - $(BFXMLOFFLIB) \ diff --git a/editors/openoffice.org-3-devel/files/gcj-cws_jaxpapi b/editors/openoffice.org-3-devel/files/gcj-cws_jaxpapi deleted file mode 100644 index b7473b8dc748..000000000000 --- a/editors/openoffice.org-3-devel/files/gcj-cws_jaxpapi +++ /dev/null @@ -1,1308 +0,0 @@ -Index: external/prj/d.lst -=================================================================== -RCS file: /cvs/util/external/prj/d.lst,v -retrieving revision 1.21 -retrieving revision 1.21.18.1 -diff -u -r1.21 -r1.21.18.1 ---- external/prj/d.lst 24 Nov 2004 15:13:13 -0000 1.21 -+++ external/prj/d.lst 17 Jan 2006 10:39:46 -0000 1.21.18.1 -@@ -24,8 +24,6 @@ - ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip - ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip - ..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar --..\common\jaxp.jar %_DEST%\bin%_EXT%\jaxp.jar --..\common\parser.jar %_DEST%\bin%_EXT%\parser.jar - - ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a - ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\* -Index: filter/source/config/fragments/makefile.mk -=================================================================== -RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v -retrieving revision 1.16 -retrieving revision 1.16.16.1 -diff -u -r1.16 -r1.16.16.1 ---- filter/source/config/fragments/makefile.mk 14 Dec 2005 14:48:16 -0000 1.16 -+++ filter/source/config/fragments/makefile.mk 17 Jan 2006 11:03:31 -0000 1.16.16.1 -@@ -4,9 +4,9 @@ - # - # $RCSfile: makefile.mk,v $ - # --# $Revision: 1.16 $ -+# $Revision: 1.16.16.1 $ - # --# last change: $Author: rt $ $Date: 2005/12/14 14:48:16 $ -+# last change: $Author: cmc $ $Date: 2006/01/17 11:03:31 $ - # - # The Contents of this file are made available subject to - # the terms of GNU Lesser General Public License Version 2.1. -@@ -156,11 +156,7 @@ - MERGE:=python ../tools/merge/pyAltFCFGMerge - .ELSE - MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar --.IF "$(JDK)" == "gcj" --XALANCLASS=$(SOLARBINDIR)/xalan.jar --CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))} --.ENDIF --PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl -+PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl - .ENDIF - - # ----------------------------------------------------------------------------- -Index: filter/source/config/tools/utils/makefile.mk -=================================================================== -RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v -retrieving revision 1.5 -retrieving revision 1.5.92.1 -diff -u -r1.5 -r1.5.92.1 ---- filter/source/config/tools/utils/makefile.mk 8 Sep 2005 21:39:14 -0000 1.5 -+++ filter/source/config/tools/utils/makefile.mk 17 Jan 2006 11:03:44 -0000 1.5.92.1 -@@ -4,9 +4,9 @@ - # - # $RCSfile: makefile.mk,v $ - # --# $Revision: 1.5 $ -+# $Revision: 1.5.92.1 $ - # --# last change: $Author: rt $ $Date: 2005/09/08 21:39:14 $ -+# last change: $Author: cmc $ $Date: 2006/01/17 11:03:44 $ - # - # The Contents of this file are made available subject to - # the terms of GNU Lesser General Public License Version 2.1. -@@ -51,8 +51,8 @@ - juh.jar \ - jut.jar \ - java_uno.jar \ -- jaxp.jar \ -- parser.jar -+ xml-apis.jar \ -+ xercesImpl.jar - - JAVACLASSFILES = \ - $(CLASSDIR)$/$(PACKAGE)$/AnalyzeStartupLog.class \ -Index: helpcontent2/settings.pmk -=================================================================== -RCS file: /cvs/documentation/helpcontent2/settings.pmk,v -retrieving revision 1.5 -retrieving revision 1.5.106.1 -diff -u -r1.5 -r1.5.106.1 ---- helpcontent2/settings.pmk 29 Apr 2005 09:14:07 -0000 1.5 -+++ helpcontent2/settings.pmk 17 Jan 2006 12:52:53 -0000 1.5.106.1 -@@ -1,5 +1,5 @@ - --my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar -+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar - - .IF "$(SYSTEM_DB)" == "YES" - my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR) -Index: officecfg/org/openoffice/configuration/FileHelper.java -=================================================================== -RCS file: /cvs/util/officecfg/org/openoffice/configuration/FileHelper.java,v -retrieving revision 1.2 -retrieving revision 1.2.88.1 -diff -u -r1.2 -r1.2.88.1 ---- officecfg/org/openoffice/configuration/FileHelper.java 8 Sep 2005 14:42:51 -0000 1.2 -+++ officecfg/org/openoffice/configuration/FileHelper.java 17 Jan 2006 11:28:49 -0000 1.2.88.1 -@@ -4,9 +4,9 @@ - * - * $RCSfile: FileHelper.java,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.88.1 $ - * -- * last change: $Author: rt $ $Date: 2005/09/08 14:42:51 $ -+ * last change: $Author: cmc $ $Date: 2006/01/17 11:28:49 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -62,7 +62,7 @@ - File aFile = new File(sSource); - - try { -- absPath = aFile.getAbsoluteFile().toURL().toString(); -+ absPath = aFile.getAbsolutePath(); - } catch (Exception e) - { - e.printStackTrace(); -Index: officecfg/org/openoffice/configuration/Generator.java -=================================================================== -RCS file: /cvs/util/officecfg/org/openoffice/configuration/Generator.java,v -retrieving revision 1.2 -retrieving revision 1.2.902.1 -diff -u -r1.2 -r1.2.902.1 ---- officecfg/org/openoffice/configuration/Generator.java 5 Jul 2001 08:04:36 -0000 1.2 -+++ officecfg/org/openoffice/configuration/Generator.java 17 Jan 2006 11:28:50 -0000 1.2.902.1 -@@ -18,7 +18,7 @@ - public Generator() throws Exception - { - // set the driver for xt -- System.setProperty("com.jclark.xsl.sax.parser", "com.sun.xml.parser.Parser"); -+ System.setProperty("com.jclark.xsl.sax.parser", "org.apache.xerces.parsers.SAXParser"); - } - - /** -Index: officecfg/org/openoffice/configuration/XMLDefaultGenerator.java -=================================================================== -RCS file: /cvs/util/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java,v -retrieving revision 1.4 -retrieving revision 1.4.88.1 -diff -u -r1.4 -r1.4.88.1 ---- officecfg/org/openoffice/configuration/XMLDefaultGenerator.java 8 Sep 2005 14:43:34 -0000 1.4 -+++ officecfg/org/openoffice/configuration/XMLDefaultGenerator.java 17 Jan 2006 11:28:50 -0000 1.4.88.1 -@@ -4,9 +4,9 @@ - * - * $RCSfile: XMLDefaultGenerator.java,v $ - * -- * $Revision: 1.4 $ -+ * $Revision: 1.4.88.1 $ - * -- * last change: $Author: rt $ $Date: 2005/09/08 14:43:34 $ -+ * last change: $Author: cmc $ $Date: 2006/01/17 11:28:50 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -36,12 +36,10 @@ - - import org.xml.sax.*; - import org.w3c.dom.*; --import com.sun.xml.tree.XmlDocument; - import org.xml.sax.SAXException; - import org.xml.sax.SAXParseException; - import javax.xml.parsers.SAXParserFactory; - import javax.xml.parsers.SAXParser; --import com.sun.xml.tree.*; - import java.util.*; - import java.io.*; - import com.jclark.xsl.sax.Driver; -@@ -65,7 +63,7 @@ - public XMLDefaultGenerator(String sourceFile) throws Exception - { - // set the driver for xt -- System.setProperty("com.jclark.xsl.sax.parser", "com.sun.xml.parser.Parser"); -+ System.setProperty("com.jclark.xsl.sax.parser", "org.apache.xerces.parsers.SAXParser"); - evaluateSchema(sourceFile); - } - -Index: readlicense_oo/util/makefile.pmk -=================================================================== -RCS file: /cvs/installation/readlicense/util/makefile.pmk,v -retrieving revision 1.10 -retrieving revision 1.10.12.1 -diff -u -r1.10 -r1.10.12.1 ---- readlicense_oo/util/makefile.pmk 25 Oct 2005 10:43:44 -0000 1.10 -+++ readlicense_oo/util/makefile.pmk 17 Jan 2006 11:15:07 -0000 1.10.12.1 -@@ -4,9 +4,9 @@ - # - # $RCSfile: makefile.pmk,v $ - # --# $Revision: 1.10 $ -+# $Revision: 1.10.12.1 $ - # --# last change: $Author: hr $ $Date: 2005/10/25 10:43:44 $ -+# last change: $Author: cmc $ $Date: 2006/01/17 11:15:07 $ - # - # The Contents of this file are made available subject to - # the terms of GNU Lesser General Public License Version 2.1. -@@ -70,7 +70,7 @@ - $(MISC)$/readme%.html : - @+-$(MKDIR) $(@:d) - .IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@ -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@ - .ELSE - sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl | xsltproc -o $@ \ - --stringparam os1 $(OS) \ -@@ -86,7 +86,7 @@ - $(MISC)$/readme%.txt : - @+-$(MKDIR) $(@:d) - .IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@ -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@ - .ELSE - sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl | xsltproc -o $@ \ - --stringparam os1 $(OS) \ -Index: scripting/java/build.xml -=================================================================== -RCS file: /cvs/framework/scripting/java/build.xml,v -retrieving revision 1.32 -retrieving revision 1.32.18.1 -diff -u -r1.32 -r1.32.18.1 ---- scripting/java/build.xml 9 Sep 2005 01:54:21 -0000 1.32 -+++ scripting/java/build.xml 17 Jan 2006 11:15:56 -0000 1.32.18.1 -@@ -4,9 +4,9 @@ - - $RCSfile: build.xml,v $ - -- $Revision: 1.32 $ -+ $Revision: 1.32.18.1 $ - -- last change: $Author: rt $ $Date: 2005/09/09 01:54:21 $ -+ last change: $Author: cmc $ $Date: 2006/01/17 11:15:56 $ - - The Contents of this file are made available subject to - the terms of GNU Lesser General Public License Version 2.1. -@@ -65,15 +65,11 @@ - - <path id="idesupport.class.path"> - <pathelement path="${jardir}"/> -- <!-- <pathelement path="${solar.jar}/jaxp.jar"/> -- <pathelement path="${solar.jar}/parser.jar"/> -- <pathelement path="${install.dir}/xerces.jar"/> --> - </path> - - <path id="openide.class.path"> - <pathelement path="${jardir}"/> - <pathelement path="${solar.jar}/openide.jar"/> -- <!-- <pathelement path="${install.dir}/xerces.jar"/> --> - </path> - - <path id="netbeans.editor.support.classpath"> -Index: solenv/bin/modules/installer/javainstaller.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/javainstaller.pm,v -retrieving revision 1.22 -retrieving revision 1.21.184.2 -diff -u -r1.22 -r1.21.184.2 ---- solenv/bin/modules/installer/javainstaller.pm 13 Jan 2006 15:01:29 -0000 1.22 -+++ solenv/bin/modules/installer/javainstaller.pm 18 Jan 2006 12:05:44 -0000 1.21.184.2 -@@ -4,9 +4,9 @@ - # - # $RCSfile: javainstaller.pm,v $ - # --# $Revision: 1.22 $ -+# $Revision: 1.21.184.2 $ - # --# last change: $Author: rt $ $Date: 2006/01/13 15:01:29 $ -+# last change: $Author: cmc $ $Date: 2006/01/18 12:05:44 $ - # - # The Contents of this file are made available subject to - # the terms of GNU Lesser General Public License Version 2.1. -@@ -494,14 +494,14 @@ - - # The variable CLASSPATH has to contain: - # $installsdk/classes:$installsdk/classes/setupsdk.jar: -- # $installsdk/classes/parser.jar:$installsdk/classes/jaxp.jar: -+ # $installsdk/classes/xercesImpl.jar:$installsdk/classes/xml-apis.jar: - # $installsdk/classes/ldapjdk.jar:$directory - - my @additional_classpath = (); - push(@additional_classpath, "$installsdk\/classes"); - push(@additional_classpath, "$installsdk\/installsdk.jar"); -- push(@additional_classpath, "$installsdk\/classes\/parser.jar"); -- push(@additional_classpath, "$installsdk\/classes\/jaxp.jar"); -+ push(@additional_classpath, "$installsdk\/classes\/xml-apis.jar"); -+ push(@additional_classpath, "$installsdk\/classes\/xercesImpl.jar"); - push(@additional_classpath, "$directory"); - - my $newclasspathstring = ""; -Index: solenv/inc/tg_config.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/tg_config.mk,v -retrieving revision 1.6 -retrieving revision 1.6.184.1 -diff -u -r1.6 -r1.6.184.1 ---- solenv/inc/tg_config.mk 8 Sep 2005 09:42:41 -0000 1.6 -+++ solenv/inc/tg_config.mk 17 Jan 2006 11:10:09 -0000 1.6.184.1 -@@ -1,12 +1,12 @@ --#************************************************************************* -+#************************************************************************ - # - # OpenOffice.org - a multi-platform office productivity suite - # - # $RCSfile: tg_config.mk,v $ - # --# $Revision: 1.6 $ -+# $Revision: 1.6.184.1 $ - # --# last change: $Author: rt $ $Date: 2005/09/08 09:42:41 $ -+# last change: $Author: cmc $ $Date: 2006/01/17 11:10:09 $ - # - # The Contents of this file are made available subject to - # the terms of GNU Lesser General Public License Version 2.1. -@@ -62,12 +62,12 @@ - -$(MKDIRHIER) $(@:d) - .IF "$(XSLTPROC)"=="NO_XSLTPROC" - .IF "$(NO_INSPECTION)"=="" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< - .ENDIF # "$(NO_INSPECTION)"=="" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$* -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$* -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ - .ELSE - # xsltproc already validates against the dtd. For additional validation, - # org.openoffice.configuration.Inspector should be replaced and the -@@ -101,7 +101,7 @@ - @+echo -------------+ creating locale dependent resource bundles - -$(MKDIRHIER) $(@:d) - .IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} - .ELSE - $(XSLTPROC) -o $@ \ - --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ -@@ -129,11 +129,11 @@ - -$(MKDIRHIER) $(@:d) - .IF "$(XSLTPROC)"=="NO_XSLTPROC" - .IF "$(NO_INSPECTION)"=="" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< - .ENDIF # "$(NO_INSPECTION)"=="" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ - .ELSE - # xsltproc already validates against the dtd. For additional validation, - # org.openoffice.configuration.Inspector should be replaced and the -@@ -170,8 +170,8 @@ - @+echo -------------+ creating locale dependent entries - -$(MKDIRHIER) $(@:d) - .IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ - .ELSE - $(XSLTPROC) -o $(@:d)$*.tmp \ - --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \ -@@ -206,8 +206,8 @@ - @+echo -------------+ creating a module file - -$(MKDIRHIER) $(@:d) - .IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))} -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@ -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))} -+ $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@ - .ELSE - $(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \ - --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \ -Index: toolkit/test/accessibility/jawb.mf -=================================================================== -RCS file: /cvs/gsl/toolkit/test/accessibility/jawb.mf,v -retrieving revision 1.4 -retrieving revision 1.4.178.1 -diff -u -r1.4 -r1.4.178.1 ---- toolkit/test/accessibility/jawb.mf 23 Jul 2004 14:26:57 -0000 1.4 -+++ toolkit/test/accessibility/jawb.mf 17 Jan 2006 11:03:18 -0000 1.4.178.1 -@@ -1,3 +1,3 @@ - Manifest-Version: 1.0 - Main-Class: AccessibilityWorkBench --Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar -+Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar xml-apis.jar -Index: xmerge/source/xmerge/build.xml -=================================================================== -RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v -retrieving revision 1.2 -retrieving revision 1.2.4.1 -diff -u -r1.2 -r1.2.4.1 ---- xmerge/source/xmerge/build.xml 24 Oct 2005 17:57:33 -0000 1.2 -+++ xmerge/source/xmerge/build.xml 17 Jan 2006 10:54:44 -0000 1.2.4.1 -@@ -58,9 +58,8 @@ - <property file="../inc/antbuild.properties"/> - - <path id="classpath"> -- <pathelement location="${solar.jar}/parser.jar"/> -- <pathelement location="${solar.jar}/jaxp.jar"/> -- <pathelement location="${solar.jar}/xerces.jar"/> -+ <pathelement location="${solar.jar}/xml-apis.jar"/> -+ <pathelement location="${solar.jar}/xercesImpl.jar"/> - <pathelement location="${solar.jar}/unoil.jar"/> - <pathelement location="${solar.jar}/ridl.jar"/> - <pathelement location="${solar.jar}/jurt.jar"/> -@@ -96,7 +95,7 @@ - <attribute name="Specification-Vendor" value="OpenOffice.org"/> - <attribute name="Specification-Version" value="0.6.0"/> - <attribute name="Implementation-Version" value="#IMPL-VERSION#"/> -- <attribute name="Class-Path" value="jaxp.jar parser.jar"/> -+ <attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar"/> - </manifest> - </jar> - </target> -Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java -=================================================================== -RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java,v -retrieving revision 1.3 -retrieving revision 1.2.4.1 -diff -u -r1.3 -r1.2.4.1 -Index: xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml -=================================================================== -RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml,v -retrieving revision 1.2 -retrieving revision 1.2.4.1 -diff -u -r1.2 -r1.2.4.1 ---- xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml 24 Oct 2005 18:23:20 -0000 1.2 -+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml 17 Jan 2006 10:55:00 -0000 1.2.4.1 -@@ -79,9 +79,8 @@ - <!-- classpath settings for javac tasks --> - <path id="classpath"> - <pathelement location="${build.class}"/> -- <pathelement location="${solar.jar}/parser.jar"/> -- <pathelement location="${solar.jar}/jaxp.jar"/> -- <pathelement location="${solar.jar}/xerces.jar"/> -+ <pathelement location="${solar.jar}/xml-apis.jar"/> -+ <pathelement location="${solar.jar}/xercesImpl.jar"/> - </path> - - <!-- set whether we want to compile with or without deprecation --> -Index: xmerge/util/build.xml -=================================================================== -RCS file: /cvs/xml/xmerge/util/build.xml,v -retrieving revision 1.9 -retrieving revision 1.9.4.1 -diff -u -r1.9 -r1.9.4.1 ---- xmerge/util/build.xml 24 Oct 2005 18:23:52 -0000 1.9 -+++ xmerge/util/build.xml 17 Jan 2006 10:55:05 -0000 1.9.4.1 -@@ -4,9 +4,9 @@ - - $RCSfile: build.xml,v $ - -- $Revision: 1.9 $ -+ $Revision: 1.9.4.1 $ - -- last change: $Author: hr $ $Date: 2005/10/24 18:23:52 $ -+ last change: $Author: cmc $ $Date: 2006/01/17 10:55:05 $ - - The Contents of this file are made available subject to - the terms of GNU Lesser General Public License Version 2.1. -@@ -39,9 +39,8 @@ - <property name="javadoc.dir" location="${build.dir}/javadoc"/> - - <path id="classpath"> -- <pathelement location="${solar.jar}/parser.jar"/> -- <pathelement location="${solar.jar}/jaxp.jar"/> -- <pathelement location="${solar.jar}/xerces.jar"/> -+ <pathelement location="${solar.jar}/xml-apis.jar"/> -+ <pathelement location="${solar.jar}/xercesImpl.jar"/> - <pathelement location="${solar.jar}/unoil.jar"/> - <pathelement location="${solar.jar}/ridl.jar"/> - <pathelement location="${solar.jar}/jurt.jar"/> -Index: xmerge/util/xmerge.mf -=================================================================== -RCS file: /cvs/xml/xmerge/util/xmerge.mf,v -retrieving revision 1.1 -retrieving revision 1.1.24.1 -diff -u -r1.1 -r1.1.24.1 ---- xmerge/util/xmerge.mf 7 Mar 2002 16:45:23 -0000 1.1 -+++ xmerge/util/xmerge.mf 17 Jan 2006 10:55:11 -0000 1.1.24.1 -@@ -1,6 +1,6 @@ - Manifest-Version: 1.0 - Main-Class: org.openoffice.xmerge.test.Driver --Class-Path: jaxp.jar parser.jar -+Class-Path: xml-apis.jar xercesImpl.jar - Specification-Title: OpenOffice XMerge Framework - Specification-Vendor: OpenOffice.org - Specification-Version: 0.6.0 -Index: xmerge/workben/build.xml -=================================================================== -RCS file: /cvs/xml/xmerge/workben/build.xml,v -retrieving revision 1.3 -retrieving revision 1.3.8.1 -diff -u -r1.3 -r1.3.8.1 ---- xmerge/workben/build.xml 9 Sep 2005 11:50:54 -0000 1.3 -+++ xmerge/workben/build.xml 17 Jan 2006 10:55:13 -0000 1.3.8.1 -@@ -5,9 +5,9 @@ - - $RCSfile: build.xml,v $ - -- $Revision: 1.3 $ -+ $Revision: 1.3.8.1 $ - -- last change: $Author: rt $ $Date: 2005/09/09 11:50:54 $ -+ last change: $Author: cmc $ $Date: 2006/01/17 10:55:13 $ - - The Contents of this file are made available subject to - the terms of GNU Lesser General Public License Version 2.1. -@@ -60,9 +60,8 @@ - <!-- classpath settings for javac tasks --> - <path id="classpath"> - <pathelement location="${build.class}"/> -- <pathelement location="${solar.jar}/parser.jar"/> -- <pathelement location="${solar.jar}/jaxp.jar"/> -- <pathelement location="${solar.jar}/xerces.jar"/> -+ <pathelement location="${solar.jar}/xml-apis.jar"/> -+ <pathelement location="${solar.jar}/xercesImpl.jar"/> - </path> - - <!-- set wether we want to compile with or without deprecation --> -Index: xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java -=================================================================== -RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java,v -retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -u -r1.2 -r1.2.2.1 ---- xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java 16 Jan 2006 12:35:17 -0000 1.2 -+++ xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java 19 Jan 2006 09:43:59 -0000 1.2.2.1 -@@ -4,9 +4,9 @@ - * - * $RCSfile: GCJFileURLStreamHandler.java,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.2.1 $ - * -- * last change: $Author: obo $ $Date: 2006/01/16 12:35:17 $ -+ * last change: $Author: cmc $ $Date: 2006/01/19 09:43:59 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -43,12 +43,12 @@ - import java.net.URLConnection; - import java.util.HashMap; - --public class FileURLStreamHandler -+public class GCJFileURLStreamHandler - extends gnu.java.net.protocol.file.Handler { - - private static HashMap cache = new HashMap(); - -- FileURLStreamHandler() { -+ GCJFileURLStreamHandler() { - } - - public URLConnection openConnection(URL url) throws IOException { -Index: xmlhelp/source/com/sun/star/help/HelpCompiler.java -=================================================================== -RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/HelpCompiler.java,v -retrieving revision 1.12 -retrieving revision 1.11.4.2 -diff -u -r1.12 -r1.11.4.2 ---- xmlhelp/source/com/sun/star/help/HelpCompiler.java 16 Jan 2006 12:35:49 -0000 1.12 -+++ xmlhelp/source/com/sun/star/help/HelpCompiler.java 18 Jan 2006 12:08:35 -0000 1.11.4.2 -@@ -4,9 +4,9 @@ - * - * $RCSfile: HelpCompiler.java,v $ - * -- * $Revision: 1.12 $ -+ * $Revision: 1.11.4.2 $ - * -- * last change: $Author: obo $ $Date: 2006/01/16 12:35:49 $ -+ * last change: $Author: cmc $ $Date: 2006/01/18 12:08:35 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -38,6 +38,7 @@ - import java.io.ByteArrayInputStream; - import java.io.File; - import java.io.IOException; -+import java.io.ByteArrayOutputStream; - import java.io.InputStreamReader; - import java.io.UnsupportedEncodingException; - import java.net.MalformedURLException; -@@ -49,16 +50,20 @@ - import java.util.LinkedList; - import java.util.List; - -+import javax.xml.parsers.DocumentBuilder; -+import javax.xml.parsers.DocumentBuilderFactory; -+ - import org.w3c.dom.Document; - import org.w3c.dom.Element; - import org.w3c.dom.Node; - import org.w3c.dom.NodeList; - import org.w3c.dom.Text; -+import org.w3c.dom.traversal.DocumentTraversal; -+import org.w3c.dom.traversal.NodeFilter; -+import org.w3c.dom.traversal.TreeWalker; -+import org.w3c.dom.traversal.NodeIterator; - import org.xml.sax.InputSource; - --import com.sun.xml.tree.TreeWalker; --import com.sun.xml.tree.XmlDocument; -- - public class HelpCompiler { - - private static final String makeRelPrefix = ".." + File.separator; -@@ -98,25 +103,25 @@ - - } - -- private Object[] switchFind(Node node) { -+ private Object[] switchFind(Document doc) { - HashSet hs = new HashSet(); -- Node next; -- TreeWalker tw = new TreeWalker(node); -- while ((next = tw.getNextElement("switchinline")) != null) { -- Element el = (Element) next; -- if (!el.getAttribute("select").equals("appl")) -- continue; -- -- NodeList nl = el.getChildNodes(); -- for (int i = 0; i < nl.getLength(); ++i) { -- if (nl.item(i).getNodeName().equals("caseinline")) { -- String appl = ((Element) nl.item(i)).getAttribute("select"); -- hs.add(appl); -- } else if (nl.item(i).getNodeName().equals("defaultinline")) { -- hs.add("DEFAULT"); -- } -- } -- } -+ -+ NodeList nodelist = doc.getElementsByTagName("switchinline"); -+ -+ for (int j = 0; j < nodelist.getLength(); ++j) { -+ Element el = (Element) nodelist.item(j); -+ if (el.getAttribute("select").equals("appl")) { -+ NodeList nl = el.getChildNodes(); -+ for (int i = 0; i < nl.getLength(); ++i) { -+ if (nl.item(i).getNodeName().equals("caseinline")) { -+ String appl = ((Element) nl.item(i)).getAttribute("select"); -+ hs.add(appl); -+ } else if (nl.item(i).getNodeName().equals("defaultinline")) { -+ hs.add("DEFAULT"); -+ } -+ } -+ } -+ } - - hs.add("DEFAULT"); - return hs.toArray(); -@@ -129,6 +134,9 @@ - NodeList nl = node.getChildNodes(); - for (int i = 0; i < nl.getLength(); ++i) { - Node n = nl.item(i); -+ if (n == null) { -+ continue; -+ } - if ((n.getNodeName().equals("switchinline") - || n.getNodeName().equals("switch")) - && ((Element) n).getAttribute("select").equals("appl")) { -@@ -168,93 +176,119 @@ - return parent; - } - -- public boolean compile() throws UnsupportedEncodingException { -- // we now have the jaroutputstream, which will contain the document. -- // now determine the document as a dom tree in variable docResolved -- File inputFil = new File(inputFile); -- -- // HelpCompiler.getSourceDocument() takes a string that resembles an URL. -- // Using inputFil.toURL() is way to expensive here, -- // because it checks the filesystem to find out if inputFil -- // might be a directory. This takes a lot of time if working from -- // Windows via NFS on remote volumes. We "know" that inputfil is -- // a file anyway. -- String path; -- if ( File.separatorChar == '\\' ) { -- path = "file:/"; -- path += inputFil.getAbsolutePath(); -- path = path.replace('\\','/'); -+ static byte[] docToBytes(Document doc) throws IOException { -+ ByteArrayOutputStream baos = new ByteArrayOutputStream(); -+ -+ java.lang.reflect.Constructor con; -+ java.lang.reflect.Method meth; -+ String domImpl = doc.getClass().getName(); -+ -+ /* -+ * We may have multiple XML parsers in the Classpath. -+ * Depending on which one is first, the actual type of -+ * doc may vary. Need a way to find out which API is being -+ * used and use an appropriate serialization method. -+ */ -+ try { -+ // First of all try for JAXP 1.0 -+ if (domImpl.equals("com.sun.xml.tree.XmlDocument")) { -+ Class jaxpDoc = Class.forName("com.sun.xml.tree.XmlDocument"); -+ -+ // The method is in the XMLDocument class itself, not a helper -+ meth = jaxpDoc.getMethod("write", -+ new Class[] { Class.forName("java.io.OutputStream") } ); -+ -+ meth.invoke(doc, new Object [] { baos } ); -+ } -+ else if (domImpl.equals("org.apache.crimson.tree.XmlDocument")) { -+ Class crimsonDoc = Class.forName("org.apache.crimson.tree.XmlDocument"); -+ // The method is in the XMLDocument class itself, not a helper -+ meth = crimsonDoc.getMethod("write", -+ new Class[] { Class.forName("java.io.OutputStream") } ); -+ -+ meth.invoke(doc, new Object [] { baos } ); -+ } -+ else if (domImpl.equals("gnu.xml.dom.DomDocument")) { -+ Class gnuSer = Class.forName("gnu.xml.dom.ls.DomLSSerializer"); -+ -+ // Get the serialize method -+ meth = gnuSer.getMethod("serialize", -+ new Class [] { Class.forName("org.w3c.dom.Node"), -+ Class.forName("java.io.OutputStream") } ); -+ -+ // Get an instance -+ Object serializer = gnuSer.newInstance(); -+ -+ // Now call serialize to write the document -+ meth.invoke(serializer, new Object [] { doc, baos } ); -+ } -+ else if (domImpl.equals("org.apache.xerces.dom.DocumentImpl") -+ || domImpl.equals("org.apache.xerces.dom.DeferredDocumentImpl")) { -+ // Try for Xerces -+ Class xercesSer = -+ Class.forName("org.apache.xml.serialize.XMLSerializer"); -+ -+ // Get the OutputStream constructor -+ // May want to use the OutputFormat parameter at some stage too -+ con = xercesSer.getConstructor(new Class [] -+ { Class.forName("java.io.OutputStream"), -+ Class.forName("org.apache.xml.serialize.OutputFormat") } ); -+ -+ -+ // Get the serialize method -+ meth = xercesSer.getMethod("serialize", -+ new Class [] { Class.forName("org.w3c.dom.Document") } ); -+ -+ -+ // Get an instance -+ Object serializer = con.newInstance(new Object [] { baos, null } ); -+ -+ -+ // Now call serialize to write the document -+ meth.invoke(serializer, new Object [] { doc } ); -+ } -+ else { -+ // We don't have another parser -+ throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl); -+ } - } -- else { -- path = "file:" + inputFil.getAbsolutePath(); -+ catch (ClassNotFoundException cnfe) { -+ throw new IOException(cnfe.toString()); -+ } -+ catch (Exception e) { -+ // We may get some other errors, but the bottom line is that -+ // the steps being executed no longer work -+ throw new IOException(e.toString()); - } -- byte[] embResolved = getSourceDocument(path); - -- // now add path to the document -- // resolve the dom -- if (embResolved == null) { -- String sourcePath; -- try { -- sourcePath = inputFil.getCanonicalPath(); -- } catch (IOException e3) { -- sourcePath = inputFil.getAbsolutePath(); -- } -- System.err.println("ERROR: file not existing: " + sourcePath); -- System.exit(1); -- } -+ byte bytes[] = baos.toByteArray(); - -- ByteArrayInputStream inByte = new ByteArrayInputStream(embResolved); -- InputStreamReader inread; -- try { -- inread = new InputStreamReader(inByte, "UTF8"); -- } catch (UnsupportedEncodingException e) { -- System.err.println( -- "ERROR: unsupported Encoding '" -- + inputFile -- + "': " -- + e.getMessage()); -- return false; -- } -+ return bytes; -+ } - -- InputSource inputSource = new InputSource(inread); -- inputSource.setEncoding("UTF8"); -- Document docResolvedOrg = null; -- try { -- docResolvedOrg = XmlDocument.createXmlDocument(inputSource, false); -- } catch (Exception e) { -- System.err.println( -- "ERROR: XmlDocument.createXmlDocument() failed for '" -- + inputFile -- + "': " -- + e.getMessage()); -- return false; -- } -+ public class myparser { -+ HashSet hidlist = null; -+ HashSet extendedHelpText = null; -+ Hashtable keywords = null; -+ Hashtable helptexts = null; -+ String documentId = null; -+ String fileName = null; -+ String title = null; -+ -+ public myparser(String indocumentId, String infileName, String intitle) { -+ hidlist = new HashSet(); -+ extendedHelpText = new HashSet(); -+ keywords = new Hashtable(); -+ helptexts = new Hashtable(); -+ documentId = indocumentId; -+ fileName = infileName; -+ title = intitle; -+ } - -- // now find all applications for which one has to compile -- String documentId = null; -- String fileName = null; -- String title = null; -- // returns all applications for which one has to compile -- Object[] applications = switchFind(docResolvedOrg); -- -- for (int i = 0; i < applications.length; ++i) { -- String appl = (String) applications[i]; -- // returns a clone of the document with swich-cases resolved -- Element docResolved = -- (Element) clone(docResolvedOrg.getDocumentElement(), appl); -- // now determine the id of the document, which is part of the -- // bookmark - tag (HID) -- Node test; -- TreeWalker treewalker = new TreeWalker(docResolved); -- // a number to determine the anchor of the whole stuff -- HashSet hidlist = new HashSet(); -- HashSet extendedHelpText = new HashSet(); -- Hashtable keywords = new Hashtable(); -- Hashtable helptexts = new Hashtable(); -- -- while ((test = treewalker.getNext()) != null) { -- if (fileName == null -- && test.getNodeName().equals("filename")) { -+ public void traverse( Node parentNode ) { -+ // traverse all nodes that belong to the parent -+ for(Node test=parentNode.getFirstChild(); test!=null; test=test.getNextSibling()) { -+ if (fileName == null && test.getNodeName().equals("filename")) { - NodeList list = test.getChildNodes(); - Node node = list.item(0); - if (node.getNodeType() == Node.TEXT_NODE) -@@ -332,15 +366,102 @@ - if (!extendedHelpText.isEmpty()) - extendedHelpText = new HashSet(); - } -- } // now save the info -+ // traverse children -+ traverse(test); -+ } -+ } -+ } -+ -+ public boolean compile() throws UnsupportedEncodingException, java.io.IOException { -+ // we now have the jaroutputstream, which will contain the document. -+ // now determine the document as a dom tree in variable docResolved -+ String absolutePath; -+ String sourcePath; -+ File inputFil = new File(inputFile); -+ try { -+ absolutePath = inputFil.getCanonicalPath(); -+ } catch (IOException e3) { -+ absolutePath = inputFil.getAbsolutePath(); -+ } -+ try { -+ sourcePath = new File(src).getCanonicalPath(); -+ } catch (IOException e3) { -+ sourcePath = new File(inputFile).getAbsolutePath(); -+ } -+ -+ byte[] embResolved = null; -+ try { -+ embResolved = getSourceDocument(inputFil.toURL().toExternalForm()); -+ } catch (MalformedURLException e4) { -+ System.err.println( -+ "ERROR: malformed URL '" + inputFile + "': " + e4.getMessage()); -+ return false; -+ } -+ -+ // now add path to the document -+ // resolve the dom -+ if (embResolved == null) { -+ System.err.println("ERROR: file not existing: " + sourcePath); -+ System.exit(1); -+ } -+ -+ ByteArrayInputStream inByte = new ByteArrayInputStream(embResolved); -+ InputStreamReader inread; -+ try { -+ inread = new InputStreamReader(inByte, "UTF8"); -+ } catch (UnsupportedEncodingException e) { -+ System.err.println( -+ "ERROR: unsupported Encoding '" -+ + inputFile -+ + "': " -+ + e.getMessage()); -+ return false; -+ } -+ -+ InputSource inputSource = new InputSource(inread); -+ inputSource.setEncoding("UTF8"); -+ Document docResolvedOrg = null; -+ try { -+ //System.err.println("Compiling " + inputFile); -+ DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance(); -+ dFactory.setValidating(false); -+ DocumentBuilder dBuilder = dFactory.newDocumentBuilder(); -+ docResolvedOrg = dBuilder.parse(inputSource); -+ } catch (Exception e) { -+ System.err.println( -+ "ERROR: XmlDocument.createXmlDocument() failed for '" -+ + inputFile -+ + "': " -+ + e.getMessage()); -+ return false; -+ } -+ -+ // now find all applications for which one has to compile -+ String documentId = null; -+ String fileName = null; -+ String title = null; -+ // returns all applications for which one has to compile -+ Object[] applications = switchFind(docResolvedOrg); -+ -+ for (int i = 0; i < applications.length; ++i) { -+ String appl = (String) applications[i]; -+ // returns a clone of the document with swich-cases resolved -+ Element docResolved = -+ (Element) clone(docResolvedOrg.getDocumentElement(), appl); -+ -+ myparser aparser = new myparser(documentId, fileName, title); -+ aparser.traverse(docResolved); -+ documentId = aparser.documentId; -+ fileName = aparser.fileName; -+ title = aparser.title; - - addEntryToJarFile( - appl, - "text", -- docResolved.toString().getBytes("UTF8")); -- addEntryToJarFile(appl, "hidlist", hidlist); -- addEntryToJarFile(appl, "helptexts", helptexts); -- addEntryToJarFile(appl, "keywords", keywords); -+ docToBytes(docResolved.getOwnerDocument())); -+ addEntryToJarFile(appl, "hidlist", aparser.hidlist); -+ addEntryToJarFile(appl, "helptexts", aparser.helptexts); -+ addEntryToJarFile(appl, "keywords", aparser.keywords); - } // end iteration over all applications - - try { -Index: xmlhelp/source/com/sun/star/help/HelpIndexer.java -=================================================================== -RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/HelpIndexer.java,v -retrieving revision 1.16 -retrieving revision 1.16.20.1 -diff -u -r1.16 -r1.16.20.1 ---- xmlhelp/source/com/sun/star/help/HelpIndexer.java 25 Oct 2005 11:24:55 -0000 1.16 -+++ xmlhelp/source/com/sun/star/help/HelpIndexer.java 17 Jan 2006 11:20:47 -0000 1.16.20.1 -@@ -4,9 +4,9 @@ - * - * $RCSfile: HelpIndexer.java,v $ - * -- * $Revision: 1.16 $ -+ * $Revision: 1.16.20.1 $ - * -- * last change: $Author: hr $ $Date: 2005/10/25 11:24:55 $ -+ * last change: $Author: cmc $ $Date: 2006/01/17 11:20:47 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -46,7 +46,6 @@ - import java.util.*; - - import org.w3c.dom.*; --import com.sun.xml.tree.*; - import org.xml.sax.*; - import javax.xml.parsers.*; - import com.jclark.xsl.sax.*; -@@ -246,7 +245,10 @@ - in.setEncoding("UTF8"); - Document docResolved = null; - try { -- docResolved = XmlDocument.createXmlDocument(in, false); -+ DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance(); -+ dFactory.setValidating(false); -+ DocumentBuilder dBuilder = dFactory.newDocumentBuilder(); -+ docResolved = dBuilder.parse(in); - } catch (Exception e) { - if (docResolved == null) - System.err.println("Nullpointer"); -Index: xmlhelp/source/com/sun/star/help/makefile.mk -=================================================================== -RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v -retrieving revision 1.21 -retrieving revision 1.21.2.1 -diff -u -r1.21 -r1.21.2.1 ---- xmlhelp/source/com/sun/star/help/makefile.mk 16 Jan 2006 12:42:15 -0000 1.21 -+++ xmlhelp/source/com/sun/star/help/makefile.mk 19 Jan 2006 14:48:36 -0000 1.21.2.1 -@@ -4,9 +4,9 @@ - # - # $RCSfile: makefile.mk,v $ - # --# $Revision: 1.21 $ -+# $Revision: 1.21.2.1 $ - # --# last change: $Author: obo $ $Date: 2006/01/16 12:42:15 $ -+# last change: $Author: cmc $ $Date: 2006/01/19 14:48:36 $ - # - # The Contents of this file are made available subject to - # the terms of GNU Lesser General Public License Version 2.1. -@@ -42,7 +42,7 @@ - - .INCLUDE : settings.mk - --JARFILES = jaxp.jar parser.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar -+JARFILES = xml-apis.jar xercesImpl.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar - EXTRAJARFILES = - - .IF "$(SYSTEM_DB)" == "YES" -Index: XmlSearch/src/com/sun/xmlsearch/makefile.mk -=================================================================== -RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/makefile.mk,v -retrieving revision 1.5 -retrieving revision 1.5.6.1 -diff -u -r1.5 -r1.5.6.1 ---- XmlSearch/src/com/sun/xmlsearch/makefile.mk 25 Oct 2005 11:11:58 -0000 1.5 -+++ XmlSearch/src/com/sun/xmlsearch/makefile.mk 17 Jan 2006 10:54:03 -0000 1.5.6.1 -@@ -3,9 +3,9 @@ - #* $Workfile:$ - #* - #* Creation date KR 28.06.99 --#* last change $Author: hr $ $Date: 2005/10/25 11:11:58 $ -+#* last change $Author: cmc $ $Date: 2006/01/17 10:54:03 $ - #* --#* $Revision: 1.5 $ -+#* $Revision: 1.5.6.1 $ - #* - #* $Logfile:$ - #* -@@ -21,8 +21,7 @@ - - .INCLUDE : settings.mk - --JARFILES = jaxp.jar parser.jar xt.jar --#EXTRAJARFILES = jaxp.jar parser.jar xt.jar -+JARFILES = xpi-apis.jar xercesImpl.jar xt.jar - - JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) - -Index: XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java -=================================================================== -RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java,v -retrieving revision 1.2 -retrieving revision 1.2.12.1 -diff -u -r1.2 -r1.2.12.1 ---- XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java 9 Sep 2005 16:41:49 -0000 1.2 -+++ XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java 17 Jan 2006 10:54:04 -0000 1.2.12.1 -@@ -4,9 +4,9 @@ - * - * $RCSfile: TreeBuilder.java,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.12.1 $ - * -- * last change: $Author: rt $ $Date: 2005/09/09 16:41:49 $ -+ * last change: $Author: cmc $ $Date: 2006/01/17 10:54:04 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -46,7 +46,8 @@ - import org.xml.sax.HandlerBase; - import org.xml.sax.AttributeList; - import org.xml.sax.InputSource; --import com.sun.xml.parser.Parser; -+import javax.xml.parsers.SAXParserFactory; -+import javax.xml.parsers.SAXParser; - import com.sun.xmlsearch.util.IntegerArray; - import com.jclark.xsl.om.*; - -@@ -610,22 +611,29 @@ - } - } // end of SubstitutedElement - -+ private SAXParser getParser() throws org.xml.sax.SAXException, javax.xml.parsers.ParserConfigurationException -+ { -+ SAXParserFactory spf = SAXParserFactory.newInstance(); -+ spf.setValidating(false); -+ return spf.newSAXParser(); -+ } -+ - private static final int InitStackSize = 256; - private static final Name EmptyName = null; -- private Parser _parser = new Parser(); -+ private SAXParser _parser = null; - private Hashtable _names = new Hashtable(256); - - private NameTable _nameTable; - private NamespacePrefixMap _nsMap; - -- public TreeBuilder() { -+ public TreeBuilder() throws org.xml.sax.SAXException, javax.xml.parsers.ParserConfigurationException { - this(new NameTableImpl()); - } - -- public TreeBuilder(NameTable nameTable) { -+ public TreeBuilder(NameTable nameTable) throws org.xml.sax.SAXException, javax.xml.parsers.ParserConfigurationException { -+ _parser = getParser(); - _nameTable = nameTable; - _nsMap = _nameTable.getEmptyNamespacePrefixMap(); -- _parser.setFastStandalone(true); - } - - public Node makeSubstituteElement(Name name, Node2[] children, Node original) { -@@ -917,9 +925,8 @@ - - public synchronized Node getRoot(InputSource input) { - try { -- _parser.setDocumentHandler(this); - // long start = System.currentTimeMillis(); -- _parser.parse(input); -+ _parser.parse(input, this); - /* - System.out.println((System.currentTimeMillis()-start) - +" msec parse"); -Index: XmlSearch/src/com/sun/xmlsearch/util/Configuration.java -=================================================================== -RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/util/Configuration.java,v -retrieving revision 1.2 -retrieving revision 1.2.12.1 -diff -u -r1.2 -r1.2.12.1 ---- XmlSearch/src/com/sun/xmlsearch/util/Configuration.java 9 Sep 2005 16:45:09 -0000 1.2 -+++ XmlSearch/src/com/sun/xmlsearch/util/Configuration.java 17 Jan 2006 10:54:05 -0000 1.2.12.1 -@@ -4,9 +4,9 @@ - * - * $RCSfile: Configuration.java,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.12.1 $ - * -- * last change: $Author: rt $ $Date: 2005/09/09 16:45:09 $ -+ * last change: $Author: cmc $ $Date: 2006/01/17 10:54:05 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -40,8 +40,8 @@ - import java.util.Vector; - import java.net.URL; - import org.w3c.dom.*; --import com.sun.xml.tree.XmlDocument; --import com.sun.xml.parser.Resolver; -+import javax.xml.parsers.DocumentBuilder; -+import javax.xml.parsers.DocumentBuilderFactory; - import org.xml.sax.InputSource; - - public final class Configuration { -@@ -68,14 +68,19 @@ - } - - public static Element parse(URL location) throws Exception { -- InputSource input = Resolver.createInputSource(location, true); -- XmlDocument document = XmlDocument.createXmlDocument(input, false); -+ DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance(); -+ dFactory.setValidating(false); -+ DocumentBuilder dBuilder = dFactory.newDocumentBuilder(); -+ Document document = dBuilder.parse(location.openStream()); - return document.getDocumentElement(); - } - - public static Element parse(byte[] xmlBytes) throws Exception { - ByteArrayInputStream input = new ByteArrayInputStream(xmlBytes); -- XmlDocument document = XmlDocument.createXmlDocument(input, false); -+ DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance(); -+ dFactory.setValidating(false); -+ DocumentBuilder dBuilder = dFactory.newDocumentBuilder(); -+ Document document = dBuilder.parse(input); - return document.getDocumentElement(); - } - -Index: XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java -=================================================================== -RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java,v -retrieving revision 1.7 -retrieving revision 1.7.12.1 -diff -u -r1.7 -r1.7.12.1 ---- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java 9 Sep 2005 16:52:56 -0000 1.7 -+++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java 17 Jan 2006 10:54:06 -0000 1.7.12.1 -@@ -4,9 +4,9 @@ - * - * $RCSfile: XmlIndexBuilder.java,v $ - * -- * $Revision: 1.7 $ -+ * $Revision: 1.7.12.1 $ - * -- * last change: $Author: rt $ $Date: 2005/09/09 16:52:56 $ -+ * last change: $Author: cmc $ $Date: 2006/01/17 10:54:06 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -42,15 +42,17 @@ - import java.net.URL; - import org.xml.sax.InputSource; - import org.xml.sax.HandlerBase; --import com.sun.xml.parser.Resolver; --import com.sun.xml.tree.XmlDocument; - import com.sun.xmlsearch.tree.*; - import com.sun.xmlsearch.util.*; - import com.sun.xmlsearch.db.*; - import com.sun.xmlsearch.xml.XmlIndex; - --import com.sun.xml.parser.Parser; --import com.sun.xml.parser.ValidatingParser; -+import javax.xml.parsers.DocumentBuilder; -+import javax.xml.parsers.DocumentBuilderFactory; -+import javax.xml.parsers.SAXParserFactory; -+import javax.xml.parsers.SAXParser; -+import org.xml.sax.Parser; -+import org.w3c.dom.Document; - - import com.jclark.xsl.om.*; - import com.jclark.xsl.sax.*; -@@ -465,8 +467,10 @@ - public void indexDocument(URL docURL, String title) throws Exception { - InputSource source = new InputSource(docURL.openStream()); - source.setSystemId(docURL.toString()); -- Parser sourceParser = new Parser(); -- sourceParser.setFastStandalone(true); -+ SAXParserFactory spf = SAXParserFactory.newInstance(); -+ spf.setValidating(false); -+ SAXParser saxParser = spf.newSAXParser(); -+ Parser sourceParser = saxParser.getParser(); - XMLProcessorEx sourceLoader = new XMLProcessorImpl(sourceParser); - // long start = System.currentTimeMillis(); - Node root = -@@ -545,8 +549,10 @@ - } - // System.out.println(stylesheetUrl.toString()); - InputStream stylesheetStream = stylesheetUrl.openStream(); -- XmlDocument sheet = -- XmlDocument.createXmlDocument(stylesheetStream, false); -+ DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance(); -+ dFactory.setValidating(false); -+ DocumentBuilder dBuilder = dFactory.newDocumentBuilder(); -+ Document sheet = dBuilder.parse(stylesheetStream); - return _transformEngine.createTransform(sheet); - } - -Index: XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java -=================================================================== -RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java,v -retrieving revision 1.2 -retrieving revision 1.2.12.1 -diff -u -r1.2 -r1.2.12.1 ---- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java 9 Sep 2005 16:53:09 -0000 1.2 -+++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java 17 Jan 2006 10:54:07 -0000 1.2.12.1 -@@ -4,9 +4,9 @@ - * - * $RCSfile: XmlIndexer.java,v $ - * -- * $Revision: 1.2 $ -+ * $Revision: 1.2.12.1 $ - * -- * last change: $Author: rt $ $Date: 2005/09/09 16:53:09 $ -+ * last change: $Author: cmc $ $Date: 2006/01/17 10:54:07 $ - * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. -@@ -39,8 +39,6 @@ - import java.io.*; - import java.util.*; - --import com.sun.xml.tree.XmlDocument; --import com.sun.xml.parser.Resolver; - import org.w3c.dom.*; - import org.xml.sax.InputSource; - import org.xml.sax.SAXException; diff --git a/editors/openoffice.org-3-devel/files/gcj-patches b/editors/openoffice.org-3-devel/files/gcj-patches deleted file mode 100644 index aeb80007018b..000000000000 --- a/editors/openoffice.org-3-devel/files/gcj-patches +++ /dev/null @@ -1,137 +0,0 @@ -Index: wizards/com/sun/star/wizards/ui/FilterComponent.java -=================================================================== -RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v -retrieving revision 1.8 -diff -u -r1.8 FilterComponent.java ---- wizards/com/sun/star/wizards/ui/FilterComponent.java 28 Dec 2005 17:25:36 -0000 1.8 -+++ wizards/com/sun/star/wizards/ui/FilterComponent.java 27 Jan 2006 22:55:38 -0000 -@@ -261,10 +261,7 @@ - case DataType.BOOLEAN: - double dblvalue = ((Double) curValue).doubleValue(); - curValue = new Boolean(dblvalue == 1.0); -- /**TODO: 1) Datei SingleSelectQueryComposer modifizieren: -- / Zeilen 1525ff in Methode auslagern und Aufruf in Zeile 1356 ändern TypeConverter is parameter -- * 2) setDisplayCondition ändern -- */ -+ /* */ - break; - default: - curValue = String.valueOf(curValue); - -Index: solenv/inc/settings.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/settings.mk,v -retrieving revision 1.185 -diff -u -r1.185 settings.mk ---- solenv/inc/settings.mk 20 Jan 2006 12:09:20 -0000 1.185 -+++ solenv/inc/settings.mk 27 Jan 2006 23:11:31 -0000 -@@ -187,7 +187,8 @@ - - #required arguments - .IF "$(JAVACACHE)" != "" --JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C -+#JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C -+JAVAC=$(JAVACOMPILER) --encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C - JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE) - .ELSE - JAVAC=$(JAVACOMPILER) - -Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx -=================================================================== -RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v -retrieving revision 1.10 -diff -u -p -u -r1.10 SlsQueueProcessor.hxx ---- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 19 Jan 2006 12:52:20 -0000 1.10 -+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx 26 Jan 2006 08:29:38 -0000 -@@ -164,7 +164,7 @@ template <class Queue, class RequestData - while ( ! mrQueue.IsEmpty()) - { - // Determine whether the system is idle. -- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow())); -+ sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow()))); - if (nIdleState != tools::IdleDetection::IDET_IDLE) - { - if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0) - -Index: config_office/configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.150 -diff -u -r1.150 configure.in ---- config_office/configure.in 20 Jan 2006 13:28:25 -0000 1.150 -+++ config_office/configure.in 2 Feb 2006 05:13:30 -0000 -@@ -1975,6 +1975,7 @@ - dnl Checks for javadoc - dnl =================================================================== - if test "$SOLAR_JAVA" != ""; then -+ if test "$JDK" != "gcj"; then - if test -z "$with_jdk_home"; then - AC_PATH_PROG(JAVADOC, javadoc) - else -@@ -1996,6 +1997,9 @@ - JAVADOC=`cygpath -d "$JAVADOC"` - JAVADOC=`cygpath -u "$JAVADOC"` - fi -+ else -+ AC_PATH_PROG(JAVADOC, gjdoc) -+ fi - fi - - if test "$SOLAR_JAVA" != ""; then -@@ -2032,8 +2036,14 @@ - if test "$JDK" = "gcj"; then - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS -- CFLAGS="$CFLAGS -I$JAVA_HOME/include" -- LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj" -+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -pthread" -+ LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj -pthread" -+ JAR="$JAVA_HOME/bin/fastjar" -+ JAVACMD="$JAVA_HOME/bin/gij" -+ JAVA="$JAVA_HOME/bin/gij" -+ AC_SUBST(JAVA) -+ AC_SUBST(JAVACMD) -+ AC_SUBST(JAR) - AC_CHECK_HEADER(jni.h, [], - [AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], []) - -@@ -4214,7 +4224,7 @@ - EOF - oldJAVA_HOME=$JAVA_HOME - if test "$JDK" = "gcj"; then -- JAVA_HOME=; export JAVA_HOME -+ JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD - ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2" - else - ant_cmd="$ANT -buildfile conftest.xml 1>&2" -Index: config_office/set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.86 -diff -u -r1.86 set_soenv.in ---- config_office/set_soenv.in 13 Jan 2006 16:37:16 -0000 1.86 -+++ config_office/set_soenv.in 2 Feb 2006 05:13:31 -0000 -@@ -68,7 +68,7 @@ - # - # Help variables. - my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, -- $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, -+ $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD, $JAVA, $JAR, - $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC, - $CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, - $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH ); -@@ -1679,6 +1679,9 @@ - ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" ); - ToFile( "JAVACOMPILER", "@JAVACOMPILER@", "e" ); - ToFile( "JAVADOC", "@JAVADOC@", "e" ); -+ ToFile( "JAVA", "@JAVA@", "e" ); -+ ToFile( "JAVACMD", "@JAVACMD@", "e" ); -+ ToFile( "JAR", "@JAR@", "e" ); - } - if ( $platform =~ m/darwin/ ) - { ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH, "e" ); - -Javadoc@xmerge http://qa.openoffice.org/issues/show_bug.cgi?id=57286 -JAVA@berkeleydb http://qa.openoffice.org/issues/show_bug.cgi?id=54657 -JAVACMD@ant -JAR@berkeleydb diff --git a/editors/openoffice.org-3-devel/files/generate.pl b/editors/openoffice.org-3-devel/files/generate.pl deleted file mode 100644 index 6ff54da56542..000000000000 --- a/editors/openoffice.org-3-devel/files/generate.pl +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl -# generate full build shell script for OpenOffice.org -# Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 maho Exp $ - -print "#!/bin/csh\n"; -print "make deinstall clean\n"; -print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n"; -#print "rm work/.configure* work/.build* \n"; -#workaround for breakage at odk sdk_oo -print "make deinstall clean\n"; - -print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n"; - -open ( FILE, "< Makefile.localized") ; -while(<FILE>){ -@tmp=split (' ',$_); -@tmp2=split ('"',$tmp[3]); -if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1]; - print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; - print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n"; - } -} -close FILE; diff --git a/editors/openoffice.org-3-devel/files/openoffice.org-wrapper b/editors/openoffice.org-3-devel/files/openoffice.org-wrapper deleted file mode 100644 index b0a4c8178fea..000000000000 --- a/editors/openoffice.org-3-devel/files/openoffice.org-wrapper +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ - -oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ -program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` - -case $program in -$0) - $oopath/soffice "$@" - ;; - *) - $oopath/$program "$@" - ;; -esac diff --git a/editors/openoffice.org-3-devel/files/optpatch-freetype b/editors/openoffice.org-3-devel/files/optpatch-freetype deleted file mode 100644 index b47f412488ec..000000000000 --- a/editors/openoffice.org-3-devel/files/optpatch-freetype +++ /dev/null @@ -1,98 +0,0 @@ -Index: freetype/freetype-2.1.4.patch -=================================================================== -RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v -retrieving revision 1.3 -diff -u -r1.3 freetype-2.1.4.patch ---- freetype/freetype-2.1.4.patch 16 Dec 2003 11:47:32 -0000 1.3 -+++ freetype/freetype-2.1.4.patch 16 Jan 2005 09:01:28 -0000 -@@ -1,5 +1,5 @@ --*** misc/freetype-2.1.4/builds/compiler/visualc.mk 2000-12-14 00:44:33.000000000 +0100 ----- misc/build/freetype-2.1.4/builds/compiler/visualc.mk 2003-08-14 17:55:53.000000000 +0200 -+*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 08:44:33 2000 -+--- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Mon Jan 10 11:32:16 2005 - *************** - *** 63,69 **** - # ANSI compliance. -@@ -17,8 +17,8 @@ - endif - - # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. --*** misc/freetype-2.1.4/builds/unix/freetype-config.in 2002-12-16 22:51:23.000000000 +0100 ----- misc/build/freetype-2.1.4/builds/unix/freetype-config.in 2003-08-14 20:07:20.000000000 +0200 -+*** misc/freetype-2.1.4/builds/unix/freetype-config.in Tue Dec 17 06:51:23 2002 -+--- misc/build/freetype-2.1.4/builds/unix/freetype-config.in Mon Jan 10 11:32:16 2005 - *************** - *** 92,98 **** - if test "@libdir@" != "/usr/lib" ; then -@@ -36,8 +36,8 @@ - fi - fi - --*** misc/freetype-2.1.4/builds/unix/ltmain.sh 2003-01-18 17:39:18.000000000 +0100 ----- misc/build/freetype-2.1.4/builds/unix/ltmain.sh 2003-08-14 17:55:53.000000000 +0200 -+*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 19 01:39:18 2003 -+--- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Mon Jan 10 11:32:16 2005 - *************** - *** 2296,2302 **** - ;; -@@ -55,8 +55,8 @@ - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; --*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp 2003-01-31 00:24:18.000000000 +0100 ----- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp 2003-08-14 17:55:53.000000000 +0200 -+*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 08:24:18 2003 -+--- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Mon Jan 10 11:32:16 2005 - *************** - *** 44,51 **** - # PROP Output_Dir "..\..\..\objs\release" -@@ -76,8 +76,8 @@ - # SUBTRACT CPP /nologo /YX - # ADD BASE RSC /l 0x409 /d "NDEBUG" - # ADD RSC /l 0x409 /d "NDEBUG" --*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h 2002-10-31 09:29:31.000000000 +0100 ----- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h 2003-08-14 17:55:53.000000000 +0200 -+*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 17:29:31 2002 -+--- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Mon Jan 10 11:32:16 2005 - *************** - *** 1,8 **** - FT_USE_MODULE(autohint_module_class) -@@ -111,8 +111,8 @@ - FT_USE_MODULE(winfnt_driver_class) - + #endif - --*** misc/freetype-2.1.4/include/freetype/config/ftoption.h 2003-01-31 00:24:18.000000000 +0100 ----- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h 2003-08-14 17:55:53.000000000 +0200 -+*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 08:24:18 2003 -+--- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Sun Jan 16 18:00:10 2005 - *************** - *** 108,114 **** - /* this will however force you to link the zlib to any program that */ -@@ -130,8 +130,25 @@ - - - /*************************************************************************/ --*** misc/freetype-2.1.4/src/base/ftobjs.c 2003-03-27 22:35:43.000000000 +0100 ----- misc/build/freetype-2.1.4/src/base/ftobjs.c 2003-08-14 17:55:53.000000000 +0200 -+*************** -+*** 378,384 **** -+ /* do not #undef this macro here, since the build system might */ -+ /* define for certain configurations */ -+ /* */ -+! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ -+ -+ -+ /*************************************************************************/ -+--- 378,384 ---- -+ /* do not #undef this macro here, since the build system might */ -+ /* define for certain configurations */ -+ /* */ -+! #define TT_CONFIG_OPTION_BYTECODEpwd_INTERPRETER -+ -+ -+ /*************************************************************************/ -+*** misc/freetype-2.1.4/src/base/ftobjs.c Fri Mar 28 06:35:43 2003 -+--- misc/build/freetype-2.1.4/src/base/ftobjs.c Mon Jan 10 11:32:16 2005 - *************** - *** 804,810 **** - { diff --git a/editors/openoffice.org-3-devel/files/patch-backtrace b/editors/openoffice.org-3-devel/files/patch-backtrace deleted file mode 100644 index 523bba02d5e4..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-backtrace +++ /dev/null @@ -1,95 +0,0 @@ -Issuetracker : #i56946# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx -To pass the compilation, we had been preparing dummy function at sal. -We implemented this. - ---- sal/osl/unx/backtrace.c Thu Sep 8 23:52:44 2005 -+++ sal/osl/unx/backtrace.c Sun Oct 23 09:19:04 2005 -@@ -129,6 +129,7 @@ - #include <pthread.h> - #include <setjmp.h> - #include <stdio.h> -+#include <stddef.h> - #include "backtrace.h" - - #define FRAME_PTR_OFFSET 1 -@@ -136,11 +137,55 @@ - - int backtrace( void **buffer, int max_frames ) - { -- return 1; -+ struct frame *fp; -+ jmp_buf ctx; -+ int i; -+ /* get stack- and framepointer */ -+ setjmp(ctx); -+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]); -+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++) -+ fp = fp->fr_savfp; -+ /* iterate through backtrace */ -+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++) -+ { -+ /* store frame */ -+ *(buffer++) = (void *)fp->fr_savpc; -+ /* next frame */ -+ fp=fp->fr_savfp; -+ } -+ return i; - } - - void backtrace_symbols_fd( void **buffer, int size, int fd ) - { -+ FILE *fp = fdopen( fd, "w" ); -+ -+ if ( fp ) -+ { -+ void **pFramePtr; -+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- ) -+ { -+ Dl_info dli; -+ ptrdiff_t offset; -+ -+ if ( 0 != dladdr( *pFramePtr, &dli ) ) -+ { -+ if ( dli.dli_fname && dli.dli_fbase ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; -+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); -+ } -+ if ( dli.dli_sname && dli.dli_saddr ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; -+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); -+ } -+ } -+ fprintf( fp, "[0x%x]\n", *pFramePtr ); -+ } -+ fflush( fp ); -+ fclose( fp ); -+ } - - } - #endif /* defined FREEBSD */ - ---- sal/osl/unx/backtrace.h Thu Sep 8 23:52:59 2005 -+++ sal/osl/unx/backtrace.h Sun Oct 23 09:19:40 2005 -@@ -46,6 +46,16 @@ - - void backtrace_symbols_fd( void **buffer, int size, int fd ); - -+/* no frame.h on FreeBSD */ -+#if defined FREEBSD -+struct frame { -+ long arg0[8]; -+ long arg1[6]; -+ struct frame *fr_savfp; -+ long fr_savpc; -+}; -+#endif -+ - #ifdef __cplusplus - } /* extern "C" */ - #endif - diff --git a/editors/openoffice.org-3-devel/files/patch-epm b/editors/openoffice.org-3-devel/files/patch-epm deleted file mode 100644 index 8808325b529d..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-epm +++ /dev/null @@ -1,124 +0,0 @@ -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.8 -diff -u -r1.8 epm-3.7.patch ---- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 -+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 -@@ -546,3 +546,116 @@ - } - - --- 457,462 ---- -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 -+*************** -+*** 26,31 **** -+--- 26,38 ---- -+ -+ #include "epm.h" -+ -++ void cr2semicolon(char *command) -++ { -++ int len, i; -++ len=strlen(command); -++ for (i=0;i<len;i++) -++ if(*(command+i)=='\n') *(command+i)=';'; -++ } -+ -+ /* -+ * 'make_bsd()' - Make a FreeBSD software distribution package. -+*************** -+*** 149,156 **** -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+ else -+ #ifdef __FreeBSD__ -+ /* -+--- 156,172 ---- -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! #ifdef __FreeBSD__ -+! if (d->type == DEPEND_REQUIRES) { -+! if (dist->relnumber) -+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); -+! else -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); -+! } -+! #else -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+! #endif -+ else -+ #ifdef __FreeBSD__ -+ /* -+*************** -+*** 179,187 **** -+--- 196,206 ---- -+ " by the BSD packager.\n", stderr); -+ break; -+ case COMMAND_POST_INSTALL : -++ cr2semicolon(c->command); -+ fprintf(fp, "@exec %s\n", c->command); -+ break; -+ case COMMAND_PRE_REMOVE : -++ cr2semicolon(c->command); -+ fprintf(fp, "@unexec %s\n", c->command); -+ break; -+ case COMMAND_POST_REMOVE : -+*************** -+*** 199,205 **** -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+--- 218,224 ---- -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 -+--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 -+*************** -+*** 181,192 **** -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! -+ putc(*s, fp); -+ } -+ -+--- 181,199 ---- -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -++ #if defined(__FreeBSD__) -++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) -++ { -++ putc('\\', fp); -++ bytes ++; -++ } -++ #else -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! #endif -+ putc(*s, fp); -+ } -+ diff --git a/editors/openoffice.org-3-devel/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-3-devel/files/patch-rsc+source+rscpp+makefile.mk deleted file mode 100644 index 2959319805b5..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-rsc+source+rscpp+makefile.mk +++ /dev/null @@ -1,21 +0,0 @@ -Issuetracker : #i54178# -CWS : hr17 -Author: : -Description : - -Index: rsc/source/rscpp/makefile.mk -=================================================================== -RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5 -+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000 -@@ -36,6 +36,8 @@ - - TARGETTYPE=CUI - TARGETTHREAD=ST -+# we don't need STL in this project -+NO_DEFAULT_STL=TRUE - - PRJNAME=rsc - TARGET=rscpp diff --git a/editors/openoffice.org-3-devel/files/pkg-message.in b/editors/openoffice.org-3-devel/files/pkg-message.in deleted file mode 100644 index 03a7ca76151e..000000000000 --- a/editors/openoffice.org-3-devel/files/pkg-message.in +++ /dev/null @@ -1,42 +0,0 @@ -OpenOffice.org Build %%OOOTAG%% Personal Install How-To - -Written by: Martin Blapp <mbr@freebsd.org> - and Maho Nakata <maho@FreeBSD.org> - -OpenOffice.org %%OOOTAG%% will soon been installed in -%%PREFIX%%/%%EXECBASE%% - -1. User installation --------------------- - -Just type "%%EXECBASE%%" after you have successfully -installed the package. If there is no installed -OO.org dir in your homedir, you'll be prompted to -install some files and choose an installed JDK. -The setup installs a ".openoffice.org2" folder -in your homedir. - -2. Starting OO.org ------------------- - -There are some wrappers installed for faster startup. -Add "%%PREFIX%%/bin/" to your PATH and you will be able -to use them. - -%%PREFIX%%/bin/%%EXECBASE%% -%%PREFIX%%/bin/%%EXECBASE%%-sbase -%%PREFIX%%/bin/%%EXECBASE%%-scalc -%%PREFIX%%/bin/%%EXECBASE%%-sdraw -%%PREFIX%%/bin/%%EXECBASE%%-setofficelang -%%PREFIX%%/bin/%%EXECBASE%%-smath -%%PREFIX%%/bin/%%EXECBASE%%-simpress -%%PREFIX%%/bin/%%EXECBASE%%-spadmin -%%PREFIX%%/bin/%%EXECBASE%%-swriter - -OO.org does need $LANG to be set to a suitable value. - -3. If you run into problems --------------------------------------------------- -If you somehow run into problems, please remove the already installed -".openoffice.org2" dir in your homedir. Redo the user -installation and the problems should go away. |