Index: head/editors/openoffice.org-3-RC/Makefile =================================================================== --- head/editors/openoffice.org-3-RC/Makefile (revision 257884) +++ head/editors/openoffice.org-3-RC/Makefile (revision 257885) @@ -1,314 +1,320 @@ # New ports collection makefile for: OpenOffice.org # Date created: 28 February 2002 # Whom: Martin Blapp # # $FreeBSD$ # PORTNAME?= openoffice.org PORTVERSION?= 3.2.${SNAPDATE} CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ + http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \ http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ ${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \ http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg MASTER_SITE_SUBDIR+= seamonkey/releases/${SEAMONKEY_VERSION}/:mozsrc -DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg -EXTRACT_ONLY= ${OOOSRC} +DISTFILES+= ${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg #de facto maintainer is maho@FreeBSD.org #patch submitters must sign SCA; see http://porting.openoffice.org/freebsd/#policy MAINTAINER= openoffice@FreeBSD.org COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch) -IGNORE= newer version has been released - CONFLICTS= cppunit* +EXTRATC_ONLY?= ${OOOSRC} ${OOOEXTSRC} + +OOOEXTSRC= ext_sources.20100505.tar.bz2:extsrc + NO_LATEST_LINK= yes .if !defined(WITHOUT_MOZILLA) SEAMONKEY_VERSION= 1.1.14 SEAMONKEY_SOURCE= seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2 DISTFILES+= ${SEAMONKEY_SOURCE}:mozsrc USE_GNOME+= libidl .endif USE_GNOME= desktopfileutils gtk20 .if defined(WITH_KDE4) && defined(WITH_KDE) .error "Cannot define WITH_KDE and WITH_KDE4 at the same time" .endif .if defined(WITH_KDE4) USE_KDE4= kdelibs USE_QT_VER= 4 .endif .if defined(WITH_KDE) USE_KDELIBS_VER= 3 .endif USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes .include USE_JAVA= yes JAVA_BUILD= jdk JAVA_VENDOR= freebsd bsdjava openjdk .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 1.6 .else JAVA_VERSION= 1.4 1.5 1.6 .endif .include <${FILESDIR}/Makefile.localized> ONLY_FOR_ARCHS= i386 amd64 .if ${ARCH} == amd64 -FREEBSD_ENV_SET= FreeBSDAMDEnv.Set +FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh .else -FREEBSD_ENV_SET= FreeBSDX86Env.Set +FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh .endif -MILESTONE?= 19 -OOOTAG?= OOO320_m${MILESTONE} +MILESTONE?= 1 +OOOTAG?= OOO330_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 -SNAPDATE= 20100529 +SNAPDATE= 20100717 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org3 SIMPLEOSVER= ${OSREL:C/\.//g} .if ${ARCH} == amd64 PACKAGE_BASENAME= OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86-64 .else PACKAGE_BASENAME= OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel .endif LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) .if defined(LANG_PKGNAME) PKGNAMEPREFIX= ${LANG_PKGNAME}- .endif .if defined(LANG_SUFFIX) PKGNAMESUFFIX= -${LANG_SUFFIX} .endif RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache CCACHE_PREFIX= ccache OOOCC= ${CCACHE_PREFIX} ${CC} OOOCXX= ${CCACHE_PREFIX} ${CXX} .else OOOCC= ${CC} OOOCXX= ${CXX} .endif CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PATH=${WRKSRC}/solenv/bin:$$PATH BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ gpatch:${PORTSDIR}/devel/patch \ ${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \ bash:${PORTSDIR}/shells/bash \ imake:${PORTSDIR}/devel/imake \ gtar:${PORTSDIR}/archivers/gtar \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ - ant:${PORTSDIR}/devel/apache-ant + ant:${PORTSDIR}/devel/apache-ant \ + ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit #see #i85469# for gperf USE_BISON= build GNU_CONFIGURE= yes -WRKSRC?= ${WRKDIR}/${OOOTAG} -TCSH?= /bin/tcsh +WRKSRC?= ${WRKDIR}/${OOOTAG} +BASH?= ${PREFIX}/bin/bash SUB_FILES= pkg-message SUB_LIST= EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR} .if defined(DISABLE_MAKE_JOBS) MAKE_JOBS_NUMBER= 1 .endif CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --enable-crashdump=yes \ + --with-junit=${LOCALBASE}/share/java/classes/junit.jar \ --with-system-zlib \ --with-system-stdlibs \ --with-epm=internal \ --enable-hids \ --enable-minimizer \ --enable-presenter-console \ --enable-pdfimport \ --enable-wiki-publisher \ - --enable-report-builder + --enable-report-builder \ + --with-use-shell=bash \ + --with-vendor="FreeBSD ports system" OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt OOOEXTENSIONS+= report-builder.oxt .if (${OSVERSION} <= 602102) EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667 .endif ICONS= ${WRKSRC}/sysui/desktop/icons .include <${FILESDIR}/Makefile.knobs> pre-everything:: # really tweak, extremely useful when you build all localized language versions # needed after when you build with ALL_LOCALIZED_LANGS. .if defined(TWEAK_L10N) @${RM} -f ${WRKDIR}/.PLIST* @${RM} -f ${WRKDIR}/.install_done.* @${RM} -f ${WRKDIR}/.package_done.* @${RM} -f ${WRKDIR}/.extract_done.* @${RM} -f ${WRKDIR}/.patch_done.* @${RM} -f ${WRKDIR}/.configure_done.* @${RM} -f ${WRKDIR}/.build_done.* @${MKDIR} ${WRKDIR} @${TOUCH} ${EXTRACT_COOKIE} @${TOUCH} ${PATCH_COOKIE} @${TOUCH} ${CONFIGURE_COOKIE} @${TOUCH} ${BUILD_COOKIE} .endif #issue XXXXXX not raised yet... CRLFFILES=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch post-extract: for i in ${CRLFFILES}; do \ cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's# ##g' $$i ; \ done @${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ .if !defined(WITHOUT_MOZILLA) @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download .endif pre-configure: #Workaround for gperf. #i85469# @${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf @${LN} -sf ${LOCALBASE}/bin/unzip ${WRKSRC}/solenv/bin/unzip .if defined(WITH_KDE4) @${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/solenv/bin/moc .endif do-build: @cd ${WRKSRC} ; ./bootstrap - @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput" + @cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "LIBINTL_PREFIX=${PREFIX}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html" .if ${LOCALIZED_LANG} == "alllangs" @${MAKE} languagepack .endif do-install: .if ${LOCALIZED_LANG} == "alllangs" @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ ${ECHO_CMD} "extracting $$i" ; \ cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/$$i ; \ done @for i in `${CAT} ${WRKDIR}/LANGPACKFILES`; do \ ${ECHO_CMD} "extracting $$i" ; \ cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/$$i ;\ done @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} @cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - @cd ${WRKSRC}/solver/320/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ + @cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ @${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR} .else @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ ${ECHO_CMD} "extracting $$i" ; \ cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \ done @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} @cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} .endif @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ @cd ${WRKSRC}/solver/3?0/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ @${INSTALL_DATA} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/bin/hid.lst ${PREFIX}/${INSTALLATION_BASEDIR} post-install: @${ECHO_MSG} "===> Add wrapper scripts"; @${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%OOOTAG%%#${OOOTAG}#g' \ -e 's#%%OOODIR%%#${OOODIR}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ ${PREFIX}/bin/${EXECBASE} @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sbase @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter @${ECHO_CMD} "" > ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} @for app in base calc draw impress math writer; do \ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \ -e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \ ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \ done @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \ -e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \ ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop @${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \ ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/qstart.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak @${RM} -f ${DESKTOPDIR}/${EXECBASE} @${MKDIR} ${DESKTOPDIR} @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \ ${DESKTOPDIR}/${EXECBASE} @${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE} @${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ ${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \ ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \ done ; \ done @${PREFIX}/bin/gtk-update-icon-cache -q -f ${PREFIX}/share/icons/hicolor 2>/dev/null || ${TRUE} @${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} .include <${FILESDIR}/Makefile.others> .include Property changes on: head/editors/openoffice.org-3-RC/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.430 \ No newline at end of property +1.431 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/distinfo =================================================================== --- head/editors/openoffice.org-3-RC/distinfo (revision 257884) +++ head/editors/openoffice.org-3-RC/distinfo (revision 257885) @@ -1,9 +1,12 @@ -MD5 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = feb692912799d9f7369a48d704f3b6df -SHA256 (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 130a7ec1c61f3f18698be40312ab7457bd46aac0281e412b4f9d7b9d422e2d79 -SIZE (openoffice.org3/OOo_OOO320_m19_source.tar.bz2) = 447921964 +MD5 (openoffice.org3/OOo_OOO330_m1_source.tar.bz2) = 57188540ddbf0ca27fa63cca89a710c1 +SHA256 (openoffice.org3/OOo_OOO330_m1_source.tar.bz2) = ab936e6a1c3807507b7ec45d98281cf1b6840d13c23b2facccf8e6d48b3671f8 +SIZE (openoffice.org3/OOo_OOO330_m1_source.tar.bz2) = 308218669 +MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41 +SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef +SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org3/unowinreg.dll) = 6144 MD5 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 31eb6ce742dc73609884dab11b1f2712 SHA256 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 82d5166b227d0157c1108dc03809a89bea23cfd21f31c7e6767ef5ce1983ca28 SIZE (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 38063082 Property changes on: head/editors/openoffice.org-3-RC/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.190 \ No newline at end of property +1.191 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/Makefile.knobs =================================================================== --- head/editors/openoffice.org-3-RC/files/Makefile.knobs (revision 257884) +++ head/editors/openoffice.org-3-RC/files/Makefile.knobs (revision 257885) @@ -1,131 +1,161 @@ # Makefile for knobs # Whom: Maho Nakata # $FreeBSD$ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant" .if defined(WITH_KDE4) CONFIGURE_ARGS+= --enable-kde4 QT4DIR="${QT_PREFIX}" QT4LIB="${QT_LIBDIR}" QT4INC="${QT_INCDIR}" KDE4DIR="${KDE4_PREFIX}" QT_COMPONENTS+= moc_build .endif .if defined(WITH_KDE) CONFIGURE_ARGS+= --enable-kde QTDIR="${QT_PREFIX}" .endif .if defined(WITHOUT_CUPS) CONFIGURE_ARGS+= --enable-cups=no .else LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+= --enable-cups=yes .endif .if defined(WITHOUT_MOZILLA) CONFIGURE_ARGS+= --disable-mozilla .else CONFIGURE_ARGS+= --enable-build-mozilla .endif .if defined(WITHOUT_GNOME) CONFIGURE_ARGS+= --disable-gconf --disable-gnome-vfs .else USE_GNOME+= gconf2 gnomevfs2 .endif .if defined(WITH_EVOLUTION2) CONFIGURE_ARGS+= --enable-evolution2=yes .else USE_GNOME+= glib20 .endif LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL .else CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG} .endif .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug --enable-symbols=TRUE --enable-dbgutil .else CONFIGURE_ARGS+= --enable-symbols=SMALL .endif .if defined(WITH_SYSTEM_ICU) LIB_DEPENDS+= icule:${PORTSDIR}/devel/icu CONFIGURE_ARGS+= --with-system-icu=yes .else CONFIGURE_ARGS+= --with-system-icu=no .endif +.if defined(WITH_GRAPHITE) +CONFIGURE_ARGS+= --enable-graphite=yes --without-stlport +.else +CONFIGURE_ARGS+= --enable-graphite=no +.endif + +.if defined(WITH_SYSTEM_GRAPHITE) && defined(WITH_GRAPHITE) +LIB_DEPENDS+= graphite.3:${PORTSDIR}/graphics/silgraphite +CONFIGURE_ARGS+= --with-system-graphite=yes +.else +CONFIGURE_ARGS+= --with-system-graphite=no +.endif + pre-fetch: @${ECHO} "OPTIONS:" .if !defined(WITH_DEBUG) @${ECHO} @${ECHO} "You can compile OOo with debug symbols/supports with" @${ECHO} "make -DWITH_DEBUG" .endif .if !defined(WITHOUT_MOZILLA) @${ECHO} @${ECHO} "You can compile OOo without Mozilla/Mozilla NSS-using components" @${ECHO} "make -DWITHOUT_MOZILLA" .endif .if !defined(WITHOUT_GNOME) @${ECHO} @${ECHO} "You can compile OOo without gnome VFS support with" @${ECHO} "make -DWITHOUT_GNOME" .endif .if !defined(WITH_SYSTEM_ICU) @${ECHO} @${ECHO} "You can compile OOo with devel/icu from ports with" @${ECHO} "make -DWITH_SYSTEM_ICU" +.endif +.if !defined(WITH_GRAPHITE) + @${ECHO} + @${ECHO} "You can compile OOo with Graphite smart font rendering with" + @${ECHO} "make -DWITH_GRAPHITE" +.else + @${ECHO} + @${ECHO} "WARNING: Graphite support enabled, --without-stlport added" + @${ECHO} "to configure arguments." +.endif +.if !defined(WITH_SYSTEM_GRAPHITE) + @${ECHO} + @${ECHO} "You can compile OOo with graphics/silgraphite from ports with" + @${ECHO} "make -DWITH_SYSTEM_GRAPHITE" +.elif !defined(WITH_GRAPHITE) + @${ECHO} + @${ECHO} "To use system Graphite, WITH_GRAPHITE must be set as well." .endif .if !defined(WITHOUT_CUPS) @${ECHO} @${ECHO} "You can compile OOo without CUPS support with" @${ECHO} "make -DWITHOUT_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_KDE4) @${ECHO} @${ECHO} "You can compile OOo to use Qt/KDE4 vclplug with" @${ECHO} "make -DWITH_KDE4" .endif .if !defined(WITH_EVOLUTION2) @${ECHO} @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif .if ${LOCALIZED_LANG} != "alllangs" @${ECHO} @${ECHO} "You can compile OOo with full localized language support by" @${ECHO} "make LOCALIZED_LANG=alllangs" .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 as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da" @${ECHO} "de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl" @${ECHO} "gu-IN he hi-IN hr hu it ja ka km kn ko ku lo lt lv mk" @${ECHO} "ms ml-IN mr-IN ne nb nl nn nr ns oc or-IN pa-IN pl pt" @${ECHO} "pt-BR ru rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER" @${ECHO} "ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW" @${ECHO} "zu" @${ECHO} "Current setting: ${LOCALIZED_LANG}" @${ECHO} @${ECHO} "NOTICE:" @${ECHO} @${ECHO} "To build OOo, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 18GB) and memory (~ 2GB)." .elif ${LOCALIZED_LANG} == "alllangs" @${ECHO} "of free diskspace (~ 35GB) and memory (~ 2GB)." .else @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." .endif @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver" Property changes on: head/editors/openoffice.org-3-RC/files/Makefile.knobs ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.61 \ No newline at end of property +1.62 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/Makefile.others =================================================================== --- head/editors/openoffice.org-3-RC/files/Makefile.others (revision 257884) +++ head/editors/openoffice.org-3-RC/files/Makefile.others (revision 257885) @@ -1,71 +1,71 @@ # Makefile for other stuffs # Whom: Maho Nakata # $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"; @${LN} ${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-*/ ;\ + @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/ooobasis*.t?z @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*.t?z @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 ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack' + @cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack' .else - @cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}' + @cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_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 ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ls openoffice*.t?z ooobasis*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK @cd ${WRKDIR}/langpack_tmp ; \ for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \ ${ECHO_CMD} "extracting $$i" ; \ cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \ done @cd ${WRKDIR}/langpack_tmp/opt/ ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR} .endif .endif Property changes on: head/editors/openoffice.org-3-RC/files/Makefile.others ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i102181 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i102181 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i102181 (revision 257885) @@ -1,34 +1,34 @@ ---- openssl/makefile.mk.orig 2009-12-06 12:25:44.000000000 +0900 -+++ openssl/makefile.mk 2009-12-12 17:14:17.000000000 +0900 -@@ -61,7 +61,7 @@ - OUT2LIB += libcrypto.* - OUT2INC += include/openssl/* +--- openssl/makefile.mk.orig 2010-07-17 07:41:38.000000000 +0900 ++++ openssl/makefile.mk 2010-07-17 17:23:07.000000000 +0900 +@@ -64,7 +64,7 @@ + UNAME=$(shell uname) + -.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" +.IF "$(OS)" == "LINUX" PATCH_FILES=openssllnx.patch ADDITIONAL_FILES:= \ - libcrypto_OOo_0_9_8n.map \ -@@ -99,6 +99,22 @@ + libcrypto_OOo_0_9_8o.map \ +@@ -110,6 +110,22 @@ .ENDIF .ENDIF +.IF "$(OS)" == "FREEBSD" + PATCH_FILES=openssllnx.patch + ADDITIONAL_FILES:= \ -+ libcrypto_OOo_0_9_8n.map \ -+ libssl_OOo_0_9_8n.map ++ libcrypto_OOo_0_9_8o.map \ ++ libssl_OOo_0_9_8o.map + .IF "$(CPU)" == "I" + CONFIGURE_ACTION=Configure BSD-x86-elf + .ELIF "$(BUILD64)" == "1" + CONFIGURE_ACTION=Configure BSD-x86_64 + .ELSE + CONFIGURE_ACTION=Configure BSD-generic32 + .ENDIF + # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \" + #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map' +.ENDIF + .IF "$(OS)" == "WNT" .IF "$(COM)"=="GCC" Property changes on: head/editors/openoffice.org-3-RC/files/patch-i102181 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i102184 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i102184 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i102184 (revision 257885) @@ -1,11 +1,11 @@ ---- libxslt/libxslt-1.1.24.patch 2009-05-24 16:32:30.000000000 +0900 -+++ libxslt/libxslt-1.1.24.patch 2009-05-24 16:38:38.000000000 +0900 +--- libxslt/libxslt-configure.patch.org 2010-06-06 08:21:40.000000000 +0900 ++++ libxslt/libxslt-configure.patch 2010-06-06 08:21:53.000000000 +0900 @@ -20,7 +20,7 @@ - major=".$current" - - versuffix=".$current"; + - versuffix=".$current" + major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" ++ versuffix="$major" ;; irix | nonstopux) Property changes on: head/editors/openoffice.org-3-RC/files/patch-i102184 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i104014 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i104014 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i104014 (revision 257885) @@ -1,20 +1,243 @@ ---- solenv/inc/unxfbsd.mk 2009-08-05 06:24:36.000000000 +0900 -+++ solenv/inc/unxfbsd.mk 2009-08-05 09:20:06.000000000 +0900 -@@ -141,12 +141,12 @@ +--- solenv/inc/unxfbsd.mk.orig 2009-12-12 18:29:11.000000000 +0900 ++++ solenv/inc/unxfbsd.mk 2009-12-13 12:17:38.000000000 +0900 +@@ -30,27 +30,24 @@ + #************************************************************************* + # Makefile for FreeBSD. +- +-ASM= +-AFLAGS= +- ++ASM*= ++AFLAGS*= + SOLAR_JAVA*= ++# default optimization level for product code ++CDEFAULTOPT*=-O2 ++# architecture dependent flags for the C and C++ compiler that can be changed by ++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build ++ARCH_FLAGS*= ++# position independent code switch ++PICSWITCH*:=-fpic + JAVAFLAGSDEBUG=-g + +-# Include arch specific makefile. +-.IF "$(CPUNAME)" == "INTEL" +-.INCLUDE : unxfbsdi.mk +-.ENDIF +-.IF "$(CPUNAME)" == "X86_64" +-.INCLUDE : unxfbsdx.mk +-.ENDIF +- + # filter for supressing verbose messages from linker + #not needed at the moment + #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" + + # _PTHREADS is needed for the stl +-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 ++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) + + # enable visibility define in "sal/types.h" + .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +@@ -72,7 +69,7 @@ + # name of C Compiler + CC*=gcc + .IF "$(SYSBASE)"!="" +-CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include ++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include + CXX+:=$(CFLAGS_SYSBASE) + CC+:=$(CFLAGS_SYSBASE) + .ENDIF # "$(SYSBASE)"!="" +@@ -95,11 +92,14 @@ + + # -fpermissive should be removed as soon as possible + CFLAGSCXX= -pipe $(ARCH_FLAGS) +-PICSWITCH:=-fpic + .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + CFLAGSCXX += -fvisibility-inlines-hidden + .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + ++CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS ++CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch ++CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch ++ + # Compiler flags for compiling static object in multi threaded environment with graphical user interface + CFLAGSOBJGUIMT= + # Compiler flags for compiling static object in multi threaded environment with character user interface +@@ -113,6 +113,12 @@ + # Compiler flags for debugging + CFLAGSDEBUG=-g + CFLAGSDBGUTIL= ++# Compiler flags for enabling optimizations ++.IF "$(PRODUCT)"!="" ++CFLAGSOPT=$(CDEFAULTOPT) -fno-strict-aliasing # optimizing for products ++.ELSE # "$(PRODUCT)"!="" ++CFLAGSOPT= # no optimizing for non products ++.ENDIF # "$(PRODUCT)"!="" + # Compiler flags for disabling optimizations + CFLAGSNOOPT=-O0 + # Compiler flags for describing the output path +@@ -141,19 +147,25 @@ + # default linker flags LINKFLAGSDEFS*=#-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' +LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' +LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OOO=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' +LINKFLAGSRUNPATH_SDK=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' +LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= - LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) +-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) ++# flag -Wl,-z,noexecstack sets the NX bit on the stack ++LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) ++.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" ++LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo ++.ENDIF + + # linker flags for linking applications +-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec +-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec ++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ ++ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR) ++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ ++ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR) + + # linker flags for linking shared libraries + LINKFLAGSSHLGUI= -shared +@@ -176,18 +188,30 @@ + STDLIBCPP=-lstdc++ + + # default objectfilenames to link +-STDOBJVCL=$(L)/salmain.o ++STDOBJVCL=$(L)$/salmain.o + STDOBJGUI= + STDSLOGUI= + STDOBJCUI= + STDSLOCUI= + ++.IF "$(ALLOC)" == "TCMALLOC" ++STDLIBGUIMT+=-ltcmalloc ++STDLIBCUIMT+=-ltcmalloc ++STDSHLGUIMT+=-ltcmalloc ++STDSHLCUIMT+=-ltcmalloc ++.ENDIF ++.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" ++LINKFLAGS += -Wl,--hash-style=both ++.ELSE ++LINKFLAGS += -Wl,-zdynsort ++.ENDIF ++ + # libraries for linking applications +-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm +-STDLIBCUIMT=$(PTHREAD_LIBS) -lm ++STDLIBGUIMT+=-Wl,--as-needed -lX11 $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ++STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed + # libraries for linking shared libraries +-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm +-STDSHLCUIMT=$(PTHREAD_LIBS) -lm ++STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext $(PTHREAD_LIBS) -lm -Wl,--no-as-needed ++STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed + + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive + +@@ -212,7 +236,7 @@ + #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) + + # name of library manager +-LIBMGR=ar ++LIBMGR*=ar + LIBFLAGS=-r + + # tool for generating import libraries +@@ -231,3 +255,4 @@ + # platform specific identifier for shared libs + DLLPRE=lib + DLLPOST=.so ++PCHPOST=.gch + + +--- solenv/inc/unxfbsdi.mk.org 2009-12-13 12:11:43.000000000 +0900 ++++ solenv/inc/unxfbsdi.mk 2009-12-13 12:13:15.000000000 +0900 +@@ -29,22 +29,13 @@ + # + #************************************************************************* + +-# + # FreBSD/i386 specific defines +-# + +-CDEFS+=-DX86 +- + # architecture dependent flags for the C and C++ compiler that can be changed by + # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build ++CDEFAULTOPT=-Os + ARCH_FLAGS*=-mtune=pentiumpro +- +-# Compiler flags for enabling optimizations +-.IF "$(PRODUCT)"!="" +-CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products +-.ELSE # "$(PRODUCT)"!="" +-CFLAGSOPT= # no optimizing for non products +-.ENDIF # "$(PRODUCT)"!="" +- +-# platform specific identifier for shared libs ++.INCLUDE : unxfbsd.mk ++CDEFS+=-DX86 ++DLLPOST=.so + DLLPOSTFIX=fi + +--- solenv/inc/unxfbsdx.mk 2009-12-13 12:16:16.000000000 +0900 ++++ solenv/inc/unxfbsdx.mk 2009-12-13 12:54:57.000000000 +0900 +@@ -29,25 +29,10 @@ + # + #************************************************************************* + +-# + # FreBSD/amd64 specific defines +-# +- ++.INCLUDE : unxfbsd.mk + CDEFS+=-DX86_64 +- +-# architecture dependent flags for the C and C++ compiler that can be changed by +-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build +-.IF "$(CPUNAME)" == "X86_64" +-ARCH_FLAGS*= +-.ENDIF +- +-# Compiler flags for enabling optimizations +-.IF "$(PRODUCT)"!="" +-CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products +-.ELSE # "$(PRODUCT)"!="" +-CFLAGSOPT= # no optimizing for non products +-.ENDIF # "$(PRODUCT)"!="" +- +-# platform specific identifier for shared libs ++#MODULES_WITH_WARNINGS+=\ ++# svx + DLLPOSTFIX=fx + BUILD64=1 + +--- solenv/inc/unx.mk 2009-12-12 18:44:35.000000000 +0900 ++++ solenv/inc/unx.mk 2009-12-13 17:15:50.000000000 +0900 +@@ -147,8 +147,12 @@ + .INCLUDE : unxbsds.mk + .ENDIF + +-.IF "$(COM)$(OS)" == "GCCFREEBSD" +-.INCLUDE : unxfbsd.mk ++.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" ++.INCLUDE : unxfbsdi.mk ++.ENDIF ++ ++.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDX" ++.INCLUDE : unxfbsdx.mk + .ENDIF + + .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM" Property changes on: head/editors/openoffice.org-3-RC/files/patch-i104014 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i108197 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i108197 (nonexistent) +++ head/editors/openoffice.org-3-RC/files/patch-i108197 (revision 257885) @@ -0,0 +1,13 @@ +--- testtools/source/bridgetest/makefile.mk 2010-01-10 19:40:41.000000000 +0900 ++++ testtools/source/bridgetest/makefile.mk 2010-01-10 19:49:30.000000000 +0900 +@@ -143,8 +143,8 @@ + ################################################################# + + runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk +-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" +- @echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me." ++.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" ++ @echo "Mac OSX PPC GCC ad FreeBDS/i386 fails this test! likely broken UNO bridge. Fix me." + .ELSE + cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \ + -ro uno_services.rdb -ro uno_types.rdb \ Property changes on: head/editors/openoffice.org-3-RC/files/patch-i108197 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i109429 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i109429 (nonexistent) +++ head/editors/openoffice.org-3-RC/files/patch-i109429 (revision 257885) @@ -0,0 +1,11 @@ +--- extensions/source/config/ldap/makefile.mk~ 2010-02-04 02:35:34.000000000 +0900 ++++ extensions/source/config/ldap/makefile.mk 2010-02-19 18:50:59.000000000 +0900 +@@ -90,7 +90,7 @@ + SHL1STDLIBS+=-lcompat + # workaround for FreeBSD, which needs -llber50, too + .IF "$(WITH_OPENLDAP)" != "YES" +-SHL1STDLIBS+=-Wl,-Bstatic -llber50 ++SHL1STDLIBS+=-Wl,-Bstatic -llber50 -Wl,-Bdynamic + .ENDIF + .ENDIF + Property changes on: head/editors/openoffice.org-3-RC/files/patch-i109429 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i111384 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i111384 (nonexistent) +++ head/editors/openoffice.org-3-RC/files/patch-i111384 (revision 257885) @@ -0,0 +1,34 @@ +--- /dev/null 2010-05-05 13:00:20.000000000 +0900 ++++ hunspell/hunspell.patch 2010-05-05 13:03:11.000000000 +0900 +@@ -0,0 +1,8 @@ ++--- misc/hunspell-1.2.9/tests/test.sh 2010-02-23 21:18:50.000000000 +0900 +++++ misc/build/hunspell-1.2.9/tests/test.sh 2010-05-05 13:01:42.000000000 +0900 ++@@ -1,4 +1,4 @@ ++-#!/bin/bash +++#!/usr/bin/env bash ++ export LC_ALL="C" ++ ++ function check_valgrind_log () { +--- hunspell/makefile.mk.orig 2010-05-05 12:59:48.000000000 +0900 ++++ hunspell/makefile.mk 2010-05-05 13:02:14.000000000 +0900 +@@ -43,8 +43,9 @@ + PATCH_FILES=\ + hunspell-wntconfig.patch \ + hunspell-solaris.patch \ +- hunspell-stacksmash.patch +- ++ hunspell-stacksmash.patch \ ++ hunspell.patch ++ + .IF "$(GUI)"=="UNX" + + #relative to CONFIGURE_DIR +@@ -60,6 +61,8 @@ + .ENDIF # "$(EXTRA_CFLAGS)"!="" + .ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" + CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" ++.ELIF "$(OS)"=="FREEBSD" # "$(SYSBASE)"!="" ++CONFIGURE_FLAGS+=CPPFLAGS="-I$(LIBINTL_PREFIX)/include" --with-libintl-prefix="$(LIBINTL_PREFIX)" + .ENDIF + + BUILD_ACTION=make && make check Property changes on: head/editors/openoffice.org-3-RC/files/patch-i111384 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i73217 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i73217 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i73217 (revision 257885) @@ -1,99 +1,63 @@ -It won't fix in the master as it breaks the POSIX. - -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.11 -diff -u -r1.11 epm-3.7.patch ---- epm/epm-3.7.patch 1 Aug 2006 12:20:23 -0000 1.11 -+++ epm/epm-3.7.patch 6 Jan 2007 10:10:38 -0000 -@@ -247,6 +247,23 @@ - *** misc/epm-3.7/dist.c Thu Aug 7 16:14:40 2003 - --- misc/build/epm-3.7/dist.c Wed Jul 26 21:01:11 2006 - *************** -+*** 339,345 **** -+ const char *defval) /* I - Default value of option */ -+ { -+ char *ptr; /* Pointer to option */ -+! static char option[256]; /* Copy of file option */ -+ -+ -+ /* -+--- 339,345 ---- -+ const char *defval) /* I - Default value of option */ -+ { -+ char *ptr; /* Pointer to option */ -+! static char option[1024]; /* Copy of file option */ -+ -+ -+ /* -+*************** - *** 394,401 **** - strcpy(platform->machine, "mips"); - #elif defined(__hpux) -@@ -292,6 +309,35 @@ - else if (strncmp(platform->machine, "sun", 3) == 0) - strcpy(platform->machine, "sparc"); - #endif /* __sgi */ -+*************** -+*** 550,562 **** -+ char line[2048], /* Expanded line from list file */ -+ buf[1024], /* Original line from list file */ -+ type, /* File type */ -+! dst[256], /* Destination path */ -+! src[256], /* Source path */ -+! pattern[256], /* Pattern for source files */ -+ user[32], /* User */ -+ group[32], /* Group */ -+ *temp, /* Temporary pointer */ -+! options[256]; /* File options */ -+ int mode, /* File permissions */ -+ skip; /* 1 = skip files, 0 = archive files */ -+ dist_t *dist; /* Distribution data */ -+--- 560,572 ---- -+ char line[2048], /* Expanded line from list file */ -+ buf[1024], /* Original line from list file */ -+ type, /* File type */ -+! dst[1024], /* Destination path */ -+! src[1024], /* Source path */ -+! pattern[1024], /* Pattern for source files */ -+ user[32], /* User */ -+ group[32], /* Group */ -+ *temp, /* Temporary pointer */ -+! options[1024]; /* File options */ -+ int mode, /* File permissions */ -+ skip; /* 1 = skip files, 0 = archive files */ -+ dist_t *dist; /* Distribution data */ - *** misc/epm-3.7/epm.c Tue Oct 28 15:48:30 2003 - --- misc/build/epm-3.7/epm.c Wed Jul 26 20:59:48 2006 - *************** -@@ -304,6 +350,29 @@ - puts(""); - puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details"); - puts("see the GNU General Public License in the file COPYING or at"); -+*** misc/epm-3.7/epm.h Thu Jul 24 10:20:54 2003 -+--- misc/build/epm-3.7/epm.h Sat Jan 6 19:08:44 2007 -+*************** -+*** 167,175 **** -+ int mode; /* Permissions of file */ -+ char user[32], /* Owner of file */ -+ group[32], /* Group of file */ -+! src[512], /* Source path */ -+! dst[512], /* Destination path */ -+! options[256]; /* File options (nostrip, etc.) */ -+ } file_t; -+ -+ typedef struct /**** Install/Patch/Remove Commands ****/ -+--- 167,175 ---- -+ int mode; /* Permissions of file */ -+ char user[32], /* Owner of file */ -+ group[32], /* Group of file */ -+! src[1024], /* Source path */ -+! dst[1024], /* Destination path */ -+! options[1024]; /* File options (nostrip, etc.) */ -+ } file_t; -+ -+ typedef struct /**** Install/Patch/Remove Commands ****/ - *** misc/epm-3.7/file.c Wed Jul 23 23:41:08 2003 - --- misc/build/epm-3.7/file.c Wed Jul 26 20:59:48 2006 - *************** +--- epm/epm-3.7.patch.org 2010-06-19 19:51:40.000000000 +0900 ++++ epm/epm-3.7.patch 2010-06-20 08:09:43.000000000 +0900 +@@ -303,6 +303,15 @@ + diff -urN epm-3.7-old//dist.c epm-3.7/dist.c + --- misc/epm-3.7/dist.c 2003-08-07 14:14:40.000000000 +0000 + +++ misc/build/epm-3.7/dist.c 2010-04-19 22:52:32.000000000 +0000 ++@@ -339,7 +339,7 @@ ++ const char *defval) /* I - Default value of option */ ++ { ++ char *ptr; /* Pointer to option */ ++- static char option[256]; /* Copy of file option */ +++ static char option[1024]; /* Copy of file option */ ++ ++ ++ /* + @@ -394,8 +394,13 @@ + strcpy(platform->machine, "mips"); + #elif defined(__hpux) +@@ -332,6 +341,24 @@ + else if (strncmp(platform->machine, "sun", 3) == 0) + strcpy(platform->machine, "sparc"); + #endif /* __sgi */ ++@@ -560,13 +560,13 @@ ++ char line[2048], /* Expanded line from list file */ ++ buf[1024], /* Original line from list file */ ++ type, /* File type */ ++- dst[256], /* Destination path */ ++- src[256], /* Source path */ ++- pattern[256], /* Pattern for source files */ +++ dst[1024], /* Destination path */ +++ src[1024], /* Source path */ +++ pattern[1024], /* Pattern for source files */ ++ user[32], /* User */ ++ group[32], /* Group */ ++ *temp, /* Temporary pointer */ ++- options[256]; /* File options */ +++ options[1024]; /* File options */ ++ int mode, /* File permissions */ ++ skip; /* 1 = skip files, 0 = archive files */ ++ dist_t *dist; /* Distribution data */ + diff -urN epm-3.7-old//epm.c epm-3.7/epm.c + --- misc/epm-3.7/epm.c 2003-10-28 14:48:30.000000000 +0000 + +++ misc/build/epm-3.7/epm.c 2010-04-19 22:52:32.000000000 +0000 +@@ -655,3 +682,19 @@ + return (0); + } + ++diff -urN epm-3.7-old//rpm.c epm-3.7/epm.h ++--- misc/epm-3.7/epm.h 2003-10-01 19:27:15.000000000 +0000 +++++ misc/build/epm-3.7/epm.h 2010-04-19 22:52:32.000000000 +0000 ++@@ -167,9 +167,9 @@ ++ int mode; /* Permissions of file */ ++ char user[32], /* Owner of file */ ++ group[32], /* Group of file */ ++- src[512], /* Source path */ ++- dst[512], /* Destination path */ ++- options[256]; /* File options (nostrip, etc.) */ +++ src[1024], /* Source path */ +++ dst[1024], /* Destination path */ +++ options[1024]; /* File options (nostrip, etc.) */ ++ } file_t; ++ ++ typedef struct /**** Install/Patch/Remove Commands ****/ Property changes on: head/editors/openoffice.org-3-RC/files/patch-i73217 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i80129 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i80129 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i80129 (revision 257885) @@ -1,16 +1,11 @@ -Index: libxml2/libxml2-2.6.31.patch -=================================================================== -RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v -retrieving revision 1.2 -diff -u -r1.2 libxml2-2.6.31.patch ---- libxml2/libxml2-2.6.31.patch 6 Jun 2008 11:48:45 -0000 1.2 -+++ libxml2/libxml2-2.6.31.patch 8 Jul 2008 02:54:59 -0000 -@@ -88,7 +88,7 @@ - - freebsd-elf) - ! major=.`expr $current - $age` --! versuffix=".$major.$age.$revision"; -+! versuffix="$major"; - ;; - - irix | nonstopux) +--- libxml2/libxml2-configure.patch.org 2010-06-06 08:23:29.000000000 +0900 ++++ libxml2/libxml2-configure.patch 2010-06-06 08:23:45.000000000 +0900 +@@ -7,7 +7,7 @@ + - major=".$current" + - versuffix=".$current" + + major=.`expr $current - $age` +-+ versuffix=".$major.$age.$revision"; +++ versuffix="$major"; + ;; + + irix | nonstopux) Property changes on: head/editors/openoffice.org-3-RC/files/patch-i80129 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i85027 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i85027 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i85027 (revision 257885) @@ -1,63 +1,58 @@ ----------------- Strange behaviour of stock gcc of FreeBSD 7. # gcc -print-file-name=libgcc_s.so /usr/lib/libgcc_s.so # gcc -print-file-name=libgcc_s.so.1 libgcc_s.so.1 . This sould be # gcc -print-file-name=libgcc_s.so.1 /lib/libgcc_s.so.1 However gcc42 from ports behaves correctly; and # gcc42 -print-file-name=libgcc_s.so.1 /usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so.1 # gcc42 -print-file-name=libgcc_s.so /usr/local/lib/gcc-4.2.3/gcc/i386-portbld-freebsd7.0/4.2.3/../../../libgcc_s.so . - -Index: work/OOH680_m1/external/gcc3_specific/makefile.mk -=================================================================== -RCS file: /cvs/util/external/gcc3_specific/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- external/gcc3_specific/makefile.mk 30 Aug 2006 12:39:00 -0000 1.5 -+++ external/gcc3_specific/makefile.mk 6 Jan 2008 08:10:19 -0000 -@@ -12,7 +12,6 @@ +--- external/gcc3_specific/makefile.mk 2010-01-08 18:13:15.000000000 +0900 ++++ external/gcc3_specific/makefile.mk 2010-02-07 12:17:43.000000000 +0900 +@@ -43,7 +43,6 @@ + .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" .IF "$(OS)"!="MACOSX" - .IF "$(OS)"!="IRIX" -.IF "$(OS)"!="FREEBSD" .EXPORT : CC -@@ -25,7 +24,6 @@ - $(LB)$/libgcc_s.so.1 : - $(GCCINSTLIB) libgcc_s.so.1 $(LB) +@@ -60,8 +59,6 @@ + .ENDIF + .ENDIF +- -.ENDIF - .ENDIF - .ENDIF + .ENDIF # "$(BUILD_SPECIAL)"=="" + --- scp2/source/ooo/ure.scp 18 Mar 2008 13:35:26 -0000 1.2 +++ scp2/source/ooo/ure.scp 21 Mar 2008 09:26:48 -0000 @@ -728,7 +730,7 @@ End #endif -#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \ +#if defined _gcc3 && !(defined NETBSD \ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT)) File gid_File_Dl_GccS TXT_FILE_BODY; @@ -739,7 +741,7 @@ End #endif -#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \ +#if defined _gcc3 && !(defined NETBSD \ || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT)) File gid_File_Dl_Stdcpp Dir = SCP2_URE_DL_DIR; Property changes on: head/editors/openoffice.org-3-RC/files/patch-i85027 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i85126 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i85126 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i85126 (revision 257885) @@ -1,202 +1,377 @@ catch up to recent bridge also fixes following issues for amd64 http://www.openoffice.org/issues/show_bug.cgi?id=98781 http://www.openoffice.org/issues/show_bug.cgi?id=82690 http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 We also need #define USE_DOUBLE_MMAP for FreeBSD as well. It's very hard to maintain without it, and performance loss is negligible. See also http://www.openoffice.org/issues/show_bug.cgi?id=97320 . Note that i386 also requires the patch for "bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx" . ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 2009-06-13 15:39:58.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 2009-06-13 15:41:26.000000000 +0900 -@@ -353,6 +353,8 @@ - case X86_64_SSEDF_CLASS: - *pStructAlign++ = *reinterpret_cast( *pSSE++ ); +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 2009-12-12 18:15:33.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 2009-12-06 13:19:58.000000000 +0900 +@@ -229,6 +229,7 @@ + for ( sal_Int32 nMember = 0; nMember < pStruct->nMembers; ++nMember ) + { + typelib_TypeDescriptionReference *pTypeInStruct = pStruct->ppTypeRefs[ nMember ]; ++ rByteOffset = pStruct->pMemberOffsets[ nMember ]; + + int num = classify_argument( pTypeInStruct, subclasses, rByteOffset ); + +@@ -243,9 +244,6 @@ + int pos = rByteOffset / 8; + classes[i + pos] = merge_classes( subclasses[i], classes[i + pos] ); + } +- +- if ( pTypeInStruct->eTypeClass != typelib_TypeClass_STRUCT ) +- rByteOffset = pStruct->pMemberOffsets[ nMember ]; + } + + TYPELIB_DANGER_RELEASE( pTypeDescr ); +@@ -332,7 +330,7 @@ + return examine_argument( pTypeRef, true, g, s ) == 0; + } + +-void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, void * const *pGPR, void * const *pSSE, void *pStruct ) ++void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64 *pGPR, const double *pSSE, void *pStruct ) + { + enum x86_64_reg_class classes[MAX_CLASSES]; + int offset = 0; +@@ -346,12 +344,14 @@ + { + case X86_64_INTEGER_CLASS: + case X86_64_INTEGERSI_CLASS: +- *pStructAlign++ = *reinterpret_cast( *pGPR++ ); ++ *pStructAlign++ = *pGPR++; break; -+ default: + case X86_64_SSE_CLASS: + case X86_64_SSESF_CLASS: + case X86_64_SSEDF_CLASS: +- *pStructAlign++ = *reinterpret_cast( *pSSE++ ); ++ *pStructAlign++ = *reinterpret_cast( pSSE++ ); + break; ++ default: + break; } } + +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx 2009-12-12 18:15:33.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx 2009-12-06 13:19:58.000000000 +0900 +@@ -63,7 +63,7 @@ + */ + bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef ); ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 2009-06-13 15:39:58.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 2009-06-13 15:41:26.000000000 +0900 +-void fill_struct( typelib_TypeDescriptionReference *pTypeRef, void * const *pGPR, void * const *pSSE, void *pStruct ); ++void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64* pGPR, const double* pSSE, void *pStruct ); + + } // namespace x86_64 + + +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/call.s 2009-12-12 18:15:33.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/call.s 2009-12-06 13:19:58.000000000 +0900 +@@ -43,6 +43,9 @@ + je .Lfloat + + movq -144(%rbp), %rax # Return value (int case) ++ movq -136(%rbp), %rdx # Return value (int case) ++ movq -144(%rbp), %xmm0 # Return value (int case) ++ movq -136(%rbp), %xmm1 # Return value (int case) + jmp .Lfinish + .Lfloat: + movlpd -144(%rbp), %xmm0 # Return value (float/double case) + +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 2009-12-12 18:15:33.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx 2009-12-06 13:19:58.000000000 +0900 @@ -77,8 +77,8 @@ void ** gpreg, void ** fpreg, void ** ovrflw, sal_uInt64 * pRegisterReturn /* space for register return */ ) { - int nr_gpr = 0; //number of gpr registers used - int nr_fpr = 0; //number of fpr regsiters used + unsigned int nr_gpr = 0; //number of gpr registers used + unsigned int nr_fpr = 0; //number of fpr registers used // return typelib_TypeDescription * pReturnTypeDescr = 0; -@@ -489,13 +489,12 @@ +@@ -126,7 +126,10 @@ + + int nUsedGPR = 0; + int nUsedSSE = 0; +- bool bFitsRegisters = x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR, nUsedSSE ); ++#if OSL_DEBUG_LEVEL > 1 ++ bool bFitsRegisters = ++#endif ++ x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR, nUsedSSE ); + if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ) ) // value + { + // Simple types must fit exactly one register on x86_64 +@@ -159,28 +162,7 @@ + else // struct <= 16 bytes || ptr to complex value || ref + { + void *pCppStack; +- char pTmpStruct[16]; +- +- if ( bFitsRegisters && !rParam.bOut && +- ( pParamTypeDescr->eTypeClass == typelib_TypeClass_STRUCT || +- pParamTypeDescr->eTypeClass == typelib_TypeClass_EXCEPTION ) ) +- { +- if ( ( nr_gpr + nUsedGPR <= x86_64::MAX_GPR_REGS ) && ( nr_fpr + nUsedSSE <= x86_64::MAX_SSE_REGS ) ) +- { +- x86_64::fill_struct( rParam.pTypeRef, gpreg, fpreg, pTmpStruct ); +-#if OSL_DEBUG_LEVEL > 1 +- fprintf( stderr, "nUsedGPR == %d, nUsedSSE == %d, pTmpStruct[0] == 0x%x, pTmpStruct[1] == 0x%x, **gpreg == 0x%lx\n", +- nUsedGPR, nUsedSSE, pTmpStruct[0], pTmpStruct[1], *(sal_uInt64*)*gpreg ); +-#endif +- +- pCppArgs[nPos] = pCppStack = reinterpret_cast( pTmpStruct ); +- gpreg += nUsedGPR; +- fpreg += nUsedSSE; +- } +- else +- pCppArgs[nPos] = pCppStack = *ovrflw++; +- } +- else if ( nr_gpr < x86_64::MAX_GPR_REGS ) ++ if ( nr_gpr < x86_64::MAX_GPR_REGS ) + { + pCppArgs[nPos] = pCppStack = *gpreg++; + nr_gpr++; +@@ -489,13 +471,12 @@ //================================================================================================== unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - Slot ** slots, unsigned char * code, + Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset, sal_Int32 functionCount, sal_Int32 nVtableOffset ) { (*slots) -= functionCount; Slot * s = *slots; - for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos ) { typelib_TypeDescription * pTD = 0; -@@ -509,14 +508,14 @@ +@@ -509,14 +490,14 @@ reinterpret_cast( pTD ); // get method - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( code, nFunctionOffset++, nVtableOffset, x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) ); if ( ! pAttrTD->bReadOnly ) { // set method - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false ); } } -@@ -525,7 +524,7 @@ +@@ -525,7 +506,7 @@ typelib_InterfaceMethodTypeDescription *pMethodTD = reinterpret_cast( pTD ); - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( code, nFunctionOffset++, nVtableOffset, x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) ); } ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 2009-06-13 15:39:58.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 2009-06-13 15:41:27.000000000 +0900 +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-12-12 18:15:33.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-12-06 13:19:58.000000000 +0900 +@@ -32,6 +32,7 @@ + #include "precompiled_bridges.hxx" + + #include ++#include + #include + #include + #include +@@ -121,7 +121,7 @@ + }; + //__________________________________________________________________________________________________ + RTTI::RTTI() SAL_THROW( () ) +-#if __FreeBSD_version < 602103 ++#if __FreeBSD_version < 702104 /* #i22253# */ + : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) + #else + : m_hApp( dlopen( 0, RTLD_LAZY ) ) +@@ -160,7 +160,7 @@ + buf.append( 'E' ); + + OString symName( buf.makeStringAndClear() ); +-#if __FreeBSD_version < 602103 /* #i22253# */ ++#if __FreeBSD_version < 702104 /* #i22253# */ + rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); + #else + rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); +@@ -175,8 +167,8 @@ + else + { + // try to lookup the symbol in the generated rtti map +- t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); +- if (iFind == m_generatedRttis.end()) ++ t_rtti_map::const_iterator iFind2( m_generatedRttis.find( unoName ) ); ++ if (iFind2 == m_generatedRttis.end()) + { + // we must generate it ! + // symbol and rtti-name is nearly identical, +@@ -205,7 +197,7 @@ + } + else // taking already generated rtti + { +- rtti = iFind->second; ++ rtti = iFind2->second; + } + } + } + +--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 2009-12-12 18:15:33.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx 2009-12-06 13:19:58.000000000 +0900 +@@ -53,13 +53,13 @@ + + //================================================================================================== + static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, +- void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn, ++ void * pRegisterReturn, typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn, + sal_uInt64 *pStack, sal_uInt32 nStack, + sal_uInt64 *pGPR, sal_uInt32 nGPR, + double *pFPR, sal_uInt32 nFPR) __attribute__((noinline)); + + static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, +- void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn, ++ void * pRegisterReturn, typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn, + sal_uInt64 *pStack, sal_uInt32 nStack, + sal_uInt64 *pGPR, sal_uInt32 nGPR, + double *pFPR, sal_uInt32 nFPR) @@ -68,13 +68,13 @@ // Let's figure out what is really going on here { fprintf( stderr, "= callVirtualMethod() =\nGPR's (%d): ", nGPR ); - for ( int i = 0; i < nGPR; ++i ) + for ( unsigned int i = 0; i < nGPR; ++i ) fprintf( stderr, "0x%lx, ", pGPR[i] ); fprintf( stderr, "\nFPR's (%d): ", nFPR ); - for ( int i = 0; i < nFPR; ++i ) + for ( unsigned int i = 0; i < nFPR; ++i ) fprintf( stderr, "%f, ", pFPR[i] ); fprintf( stderr, "\nStack (%d): ", nStack ); - for ( int i = 0; i < nStack; ++i ) + for ( unsigned int i = 0; i < nStack; ++i ) fprintf( stderr, "0x%lx, ", pStack[i] ); fprintf( stderr, "\n" ); } -@@ -323,6 +323,8 @@ +@@ -113,6 +113,7 @@ + sal_uInt64 rax; + sal_uInt64 rdx; + double xmm0; ++ double xmm1; + + asm volatile ( + +@@ -147,13 +148,14 @@ + "movq %%rax, %4\n\t" + "movq %%rdx, %5\n\t" + "movsd %%xmm0, %6\n\t" ++ "movsd %%xmm1, %7\n\t" + : + : "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ), +- "m" ( rax ), "m" ( rdx ), "m" ( xmm0 ) ++ "m" ( rax ), "m" ( rdx ), "m" ( xmm0 ), "m" ( xmm1 ) + : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11" + ); + +- switch (pReturnTypeDescr->eTypeClass) ++ switch (pReturnTypeRef->eTypeClass) + { + case typelib_TypeClass_HYPER: + case typelib_TypeClass_UNSIGNED_HYPER: +@@ -179,12 +181,17 @@ + break; + default: + { +- sal_Int32 const nRetSize = pReturnTypeDescr->nSize; ++ sal_Int32 const nRetSize = pReturnTypeRef->pType->nSize; + if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) + { +- if (nRetSize > 8) +- static_cast(pRegisterReturn)[1] = rdx; +- static_cast(pRegisterReturn)[0] = rax; ++ sal_uInt64 longs[2]; ++ longs[0] = rax; ++ longs[1] = rdx; ++ ++ double doubles[2]; ++ doubles[0] = xmm0; ++ doubles[1] = xmm1; ++ x86_64::fill_struct( pReturnTypeRef, &longs[0], &doubles[0], pRegisterReturn); + } + break; + } +@@ -323,6 +330,8 @@ case typelib_TypeClass_DOUBLE: INSERT_FLOAT_DOUBLE( pCppArgs[nPos], nFPR, pFPR, pStack ); break; + default: + break; } // no longer needed -@@ -435,16 +437,19 @@ +@@ -365,7 +374,7 @@ + { + callVirtualMethod( + pAdjustedThisPtr, aVtableSlot.index, +- pCppReturn, pReturnTypeDescr, bSimpleReturn, ++ pCppReturn, pReturnTypeRef, bSimpleReturn, + pStackStart, ( pStack - pStackStart ), + pGPR, nGPR, + pFPR, nFPR ); +@@ -435,16 +444,19 @@ // is my surrogate bridges::cpp_uno::shared::UnoInterfaceProxy * pThis = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI); +#if OSL_DEBUG_LEVEL > 0 typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; +#endif switch (pMemberDescr->eTypeClass) { case typelib_TypeClass_INTERFACE_ATTRIBUTE: { +#if OSL_DEBUG_LEVEL > 0 // determine vtable call index sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); - +#endif VtableSlot aVtableSlot( getVtableSlot( reinterpret_cast< -@@ -489,10 +494,11 @@ +@@ -489,10 +501,11 @@ } case typelib_TypeClass_INTERFACE_METHOD: { +#if OSL_DEBUG_LEVEL > 0 // determine vtable call index sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); - +#endif VtableSlot aVtableSlot( getVtableSlot( reinterpret_cast< ---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:39:58.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 15:42:43.000000000 +0900 -@@ -32,6 +32,7 @@ - #include "precompiled_bridges.hxx" - - #include -+#include - #include - #include - #include -@@ -121,7 +121,7 @@ - }; - //__________________________________________________________________________________________________ - RTTI::RTTI() SAL_THROW( () ) --#if __FreeBSD_version < 602103 -+#if __FreeBSD_version < 702104 /* #i22253# */ - : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) - #else - : m_hApp( dlopen( 0, RTLD_LAZY ) ) -@@ -160,7 +160,7 @@ - buf.append( 'E' ); - - OString symName( buf.makeStringAndClear() ); --#if __FreeBSD_version < 602103 /* #i22253# */ -+#if __FreeBSD_version < 702104 /* #i22253# */ - rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); - #else - rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -@@ -175,8 +175,8 @@ - else - { - // try to lookup the symbol in the generated rtti map -- t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); -- if (iFind == m_generatedRttis.end()) -+ t_rtti_map::const_iterator iFind2( m_generatedRttis.find( unoName ) ); -+ if (iFind2 == m_generatedRttis.end()) - { - // we must generate it ! - // symbol and rtti-name is nearly identical, -@@ -205,7 +205,7 @@ - } - else // taking already generated rtti - { -- rtti = iFind->second; -+ rtti = iFind2->second; - } - } - } - --- bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx~ 2009-06-13 16:41:45.000000000 +0900 +++ bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx 2009-06-13 16:42:24.000000000 +0900 @@ -40,7 +40,7 @@ #include /*See: http://people.redhat.com/drepper/selinux-mem.html*/ -#ifdef LINUX +#if defined (LINUX) || defined (FREEBSD) #define USE_DOUBLE_MMAP #endif Property changes on: head/editors/openoffice.org-3-RC/files/patch-i85126 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i91318 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i91318 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i91318 (revision 257885) @@ -1,14 +1,14 @@ ---- hunspell/hunspell-1.2.8.patch~ 2009-03-11 22:17:54.000000000 +0900 -+++ hunspell/hunspell-1.2.8.patch 2009-03-20 21:37:49.000000000 +0900 -@@ -619,3 +619,11 @@ - p++; - } - if (i > 0 && buf[i - 1] == '\n') { -+--- misc/hunspell-1.2.8/tests/test.sh 2007-07-15 22:33:13.000000000 +0900 -++++ misc/build/hunspell-1.2.8/tests/test.sh 2008-08-10 10:00:33.000000000 +0900 +--- hyphen/hyphen-2.4.patch 2010-05-05 12:40:53.000000000 +0900 ++++ hyphen/hyphen-2.4.patch 2010-05-05 12:41:25.000000000 +0900 +@@ -167,3 +167,11 @@ + + + +.INCLUDE : target.mk + Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests ++--- misc/hyphen-2.4/tests/test.sh 2010-05-05 12:40:17.000000000 +0900 +++++ misc/build/hyphen-2.4/tests/test.sh 2010-05-05 12:40:31.000000000 +0900 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash -+ export LC_ALL="C" + + function check_valgrind_log () { ++ if [ "$VALGRIND" != "" ]; then Property changes on: head/editors/openoffice.org-3-RC/files/patch-i91318 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i91861 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i91861 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i91861 (revision 257885) @@ -1,25 +1,14 @@ -Index: vcl/source/glyphs/makefile.mk -=================================================================== -RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v -retrieving revision 1.13.106.1 -diff -u -r1.13.106.1 makefile.mk ---- vcl/source/glyphs/makefile.mk 31 Jul 2008 20:14:59 -0000 1.13.106.1 -+++ vcl/source/glyphs/makefile.mk 10 Aug 2008 01:06:59 -0000 -@@ -41,9 +41,17 @@ +--- vcl/source/glyphs/makefile.mk~ 2009-11-18 13:58:31.000000000 +0900 ++++ vcl/source/glyphs/makefile.mk 2009-11-29 20:13:21.000000000 +0900 +@@ -41,7 +41,11 @@ .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/makefile2.pmk +.IF "$(OS)" != "FREEBSD" CFLAGS+= $(FREETYPE_CFLAGS) +.ELSE +ADDCDEFS+= $(FREETYPE_CFLAGS) +.ENDIF - .IF "$(USE_FT_EMBOLDEN)" == "YES" -+.IF "$(OS)" != "FREEBSD" - CFLAGS+=-DUSE_FT_EMBOLDEN -+.ELSE -+ADDCDEFS+=-DUSE_FT_EMBOLDEN -+.ENDIF - .ENDIF # --- Files -------------------------------------------------------- + Property changes on: head/editors/openoffice.org-3-RC/files/patch-i91861 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/editors/openoffice.org-3-RC/files/patch-i98781 =================================================================== --- head/editors/openoffice.org-3-RC/files/patch-i98781 (revision 257884) +++ head/editors/openoffice.org-3-RC/files/patch-i98781 (revision 257885) @@ -1,112 +1,112 @@ catch up to recent bridge also fixes following issues for i386 http://www.openoffice.org/issues/show_bug.cgi?id=98781 http://www.openoffice.org/issues/show_bug.cgi?id=82690 http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 We also need #define USE_DOUBLE_MMAP for FreeBSD as well. The patch was included in files/patches-i85126 ---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 2009-06-13 14:17:39.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 2009-06-13 15:11:21.000000000 +0900 +--- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 2009-12-12 18:15:33.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx 2009-12-06 13:19:58.000000000 +0900 @@ -362,7 +362,7 @@ int const codeSnippetSize = 16; unsigned char * codeSnippet( - unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset, + unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset, typelib_TypeClass returnTypeClass) { if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { @@ -408,7 +408,7 @@ // jmp privateSnippetExecutor: *p++ = 0xE9; *reinterpret_cast< sal_Int32 * >(p) - = ((unsigned char *) exec) - p - sizeof (sal_Int32); + = ((unsigned char *) exec) - p - sizeof (sal_Int32) - writetoexecdiff; p += sizeof (sal_Int32); OSL_ASSERT(p - code <= codeSnippetSize); return code + codeSnippetSize; @@ -419,8 +419,7 @@ struct bridges::cpp_uno::shared::VtableFactory::Slot { void * fn; }; bridges::cpp_uno::shared::VtableFactory::Slot * -bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) -{ +bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block) { return static_cast< Slot * >(block) + 2; } @@ -441,7 +440,7 @@ } unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( - Slot ** slots, unsigned char * code, + Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset, sal_Int32 functionCount, sal_Int32 vtableOffset) { @@ -454,9 +453,9 @@ switch (member->eTypeClass) { case typelib_TypeClass_INTERFACE_ATTRIBUTE: // Getter: - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( member)->pAttributeTypeRef->eTypeClass); // Setter: @@ -464,17 +463,17 @@ typelib_InterfaceAttributeTypeDescription * >( member)->bReadOnly) { - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, typelib_TypeClass_VOID); } break; case typelib_TypeClass_INTERFACE_METHOD: - (s++)->fn = code; + (s++)->fn = code + writetoexecdiff; code = codeSnippet( - code, functionOffset++, vtableOffset, + code, writetoexecdiff, functionOffset++, vtableOffset, reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( member)->pReturnTypeRef->eTypeClass); break; ---- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 14:17:39.000000000 +0900 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-13 15:14:24.000000000 +0900 +--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-12-12 18:15:33.000000000 +0900 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-12-06 13:19:58.000000000 +0900 @@ -32,6 +32,7 @@ #include "precompiled_bridges.hxx" #include +#include #include #include #include @@ -121,7 +122,7 @@ }; //__________________________________________________________________________________________________ RTTI::RTTI() SAL_THROW( () ) -#if __FreeBSD_version < 602103 +#if __FreeBSD_version < 702104 /* #i22253# */ : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) ) #else : m_hApp( dlopen( 0, RTLD_LAZY ) ) @@ -160,7 +161,7 @@ buf.append( 'E' ); OString symName( buf.makeStringAndClear() ); -#if __FreeBSD_version < 602103 /* #i22253# */ +#if __FreeBSD_version < 702104 /* #i22253# */ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); #else rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); Property changes on: head/editors/openoffice.org-3-RC/files/patch-i98781 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property