Index: head/editors/openoffice-devel/Makefile =================================================================== --- head/editors/openoffice-devel/Makefile (revision 452936) +++ head/editors/openoffice-devel/Makefile (revision 452937) @@ -1,506 +1,513 @@ # Created by: Martin Blapp # $FreeBSD$ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -#PORTREVISION= 1 +PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ LOCAL/truckman/openoffice:snap,extsrc .if defined(LANG_PKGNAME) PKGNAMEPREFIX= ${LANG_PKGNAME}- .endif .if defined(LANG_SUFFIX) PKGNAMESUFFIX= -${LANG_SUFFIX} .endif PKGNAMESUFFIX= -devel DISTFILES= ${AOOSRC}${AOODISTTAG} unowinreg.dll:unoreg ${EXTSRC}:extsrc DIST_SUBDIR= openoffice EXTRACT_ONLY= ${AOOSRC} MAINTAINER= office@FreeBSD.org #de facto maintainer is truckman@FreeBSD.org #Frequent Patch submitters should (optionally) sign the Apache iCLA COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version) -LICENSE= APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL11 \ - PSFL TWAIN W3C +LICENSE= APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL10 \ + MPL11 PSFL TWAIN W3C LICENSE_COMB= multi LICENSE_NAME_ADOBE= Adobe Systems Incorporated license LICENSE_NAME_ICU= ICU License LICENSE_NAME_TWAIN= TWAIN Working Group license LICENSE_NAME_W3C= W3C license LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE_ALv2 LICENSE_FILE_ADOBE= ${WRKSRC}/LICENSE_ADOBE LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE_BSD3CLAUSE LICENSE_FILE_BSD4CLAUSE= ${WRKSRC}/LICENSE_BSD4CLAUSE LICENSE_FILE_BSL= ${WRKSRC}/LICENSE_BSL LICENSE_FILE_ICU= ${WRKSRC}/LICENSE_ICU LICENSE_FILE_MIT= ${WRKSRC}/LICENSE_MIT +LICENSE_FILE_MPL10= ${WRKSRC}/LICENSE_MPL10 LICENSE_FILE_MPL11= ${WRKSRC}/LICENSE_MPL11 LICENSE_FILE_PSFL= ${WRKSRC}/LICENSE_PSFL LICENSE_FILE_TWAIN= ${WRKSRC}/LICENSE_TWAIN LICENSE_FILE_W3C= ${WRKSRC}/LICENSE_W3C LICENSE_PERMS_ADOBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_ICU= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_TWAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_W3C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept ONLY_FOR_ARCHS= amd64 i386 powerpc64 BUILD_DEPENDS= \ p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ ${LOCALBASE}/bin/unzip:archivers/unzip \ zip:archivers/zip \ ant:devel/apache-ant \ ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ dmake:devel/dmake \ epm:devel/epm \ ${LOCALBASE}/bin/gperf:devel/gperf \ imake:devel/imake \ gpatch:devel/patch \ ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ ${LOCALBASE}/bin/vigra-config:graphics/vigra \ ${JAVALIBDIR}/commons-lang3.jar:java/jakarta-commons-lang3 \ ${JAVALIBDIR}/junit.jar:java/junit \ ${JAVALIBDIR}/bsh.jar:lang/bsh \ bash:shells/bash \ ${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene \ p5-XML-Parser>=0:textproc/p5-XML-Parser \ p5-libwww>=0:www/p5-libwww \ p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https LIB_DEPENDS= \ libapr-1.so:devel/apr1 \ libnspr4.so:devel/nspr \ libcurl.so:ftp/curl \ libcairo.so:graphics/cairo \ libpng.so:graphics/png \ libgraphite.so:graphics/silgraphite \ libCoinMP.so:math/coinmp \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libhunspell-1.6.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libtextcat.so:textproc/libtextcat \ libmythes-1.2.so:textproc/mythes \ librdf.so:textproc/redland \ libserf-1.so:www/serf \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-lang3.jar:java/jakarta-commons-lang3 \ ${JAVALIBDIR}/bsh.jar:lang/bsh \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf +CONFLICTS_INSTALL= apache-openoffice-4* + AOOVERSION1= 4 AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m1\(Build:9800\) SVNREVISION= 1810071 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} .if defined(AOORC) AOOSUFFIX= ${AOOVERSION}-${AOORC} AOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX} AOODISTTAG= TARTYPE= bzip2 .else AOOSUFFIX= ${PORTVERSION} AOOSRC= apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX} AOODISTTAG= :snap TARTYPE= xz .endif AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} PRINSTALLATION_BASEDIR= ${PREFIX}/${INSTALLATION_BASEDIR} OOPATH= ${PRINSTALLATION_BASEDIR}/openoffice${AOOVERSION1} XDGDIR= ${OOPATH}/share/xdg XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg EXECBASE?= openoffice-${AOOSUFFIX} USES= autoreconf:autoconf bison compiler:c++11-lib cpe \ desktop-file-utils \ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ shared-mime-info ssl tar:${TARTYPE} USE_GL= gl glu USE_GNOME= gtk20 libxslt libidl glib20 USE_JAVA= yes JAVA_BUILD= jdk JAVA_RUN= jdk JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ USE_PERL5= build USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ xinerama xrandr xrender xt INSTALLS_ICONS= yes WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA MYSQL PDFIMPORT \ REPORT_BUILDER SDK WIKI_PUBLISHER CCACHE OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT WIKI_PUBLISHER GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= GNOME Virtual File System MMEDIA_DESC= Multimedia backend for impress MYSQL_DESCR= Build MySQL Connector extension PDFIMPORT_DESC= Build and install PDF import extension REPORT_BUILDER_DESC= Build and install Report builder extension (Broken) SDK_DESC= Build and install software development kit WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension CCACHE_DESC= Mimimize compile time of C/C++ programs CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups GNOME_CONFIGURE_ENABLE= dbus gconf lockdown GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib GNOME_USE= GNOME=gconf2 GNOMEVFS_CONFIGURE_ENABLE= gnome-vfs GNOMEVFS_CONFIGURE_OFF= --enable-gio GNOMEVFS_CONFIGURE_ON= --disable-gio GNOMEVFS_USE= GNOME=gnomevfs2 MMEDIA_CONFIGURE_ENABLE= gstreamer MMEDIA_LIB_DEPENDS= libgstreamer-0.10.so:multimedia/gstreamer MMEDIA_USE= GSTREAMER=yes MYSQL_CONFIGURE_ENABLE= mysql-connector MYSQL_CONFIGURE_WITH= system-mysql MYSQL_LIB_DEPENDS= libmysqlcppconn.so:databases/mysql-connector-c++ MYSQL_USES= mysql SDK_CONFIGURE_ENABLE= odk PDFIMPORT_CONFIGURE_ENABLE= pdfimport PDFIMPORT_CONFIGURE_WITH= system-poppler PDFIMPORT_LIB_DEPENDS= libpoppler.so:graphics/poppler REPORT_BUILDER_BROKEN= REPORT_BUILDER option requires additional .jar files REPORT_BUILDER_CONFIGURE_ENABLE= report-builder REPORT_BUILDER_JAR_DEPENDS= REPORT_BUILDER_BUILD_DEPENDS= ${REPORT_BUILDER_JAR_DEPENDS} REPORT_BUILDER_RUN_DEPENDS= ${REPORT_BUILDER_JAR_DEPENDS} WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher WIKI_PUBLISHER_CONFIGURE_WITH= \ commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \ commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar WIKI_PUBLISHER_JAR_DEPENDS= \ ${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec \ ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient WIKI_PUBLISHER_BUILD_DEPENDS= ${WIKI_PUBLISHER_JAR_DEPENDS} WIKI_PUBLISHER_RUN_DEPENDS= ${WIKI_PUBLISHER_JAR_DEPENDS} # Don't run gnome-post-icons until after post-install generates the plist TARGET_ORDER_OVERRIDE= 710:gnome-post-icons .include .if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER} BUILD_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging RUN_DEPENDS+= ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging CONFIGURE_ARGS+= --with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar .else CONFIGURE_ARGS+= --without-commons-logging .endif .include <${FILESDIR}/Makefile.localized> .if ${COMPILER_TYPE} == clang CPPFLAGS+= -I${LOCALBASE}/include . if ${COMPILER_VERSION} >= 40 && ${ARCH} == amd64 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16 . endif .endif .if ${ARCH} == amd64 FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64 .elif ${ARCH} == i386 FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86 .elif ${ARCH} == powerpc64 FREEBSD_ENV_SET= FreeBSDPPC64Env.Set.sh PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_ppc64 .endif PACKAGE_PREFIX= Apache_OpenOffice LOCALIZED_LANG?= en-US .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:devel/ccache CCACHE_PREFIX= ccache AOOCC= ${CCACHE_PREFIX} ${CC} AOOCXX= ${CCACHE_PREFIX} ${CXX} .else AOOCC= ${CC} AOOCXX= ${CXX} .endif CONFIGURE_ENV+= CC="${AOOCC}" CXX="${AOOCXX}" \ PATH=${WRKSRC}/solenv/bin:$$PATH GNU_CONFIGURE= yes WRKSUBDIR= ${WRKDIR}/aoo-${AOOVERSION} WRKSRC?= ${WRKSUBDIR}/main SUB_FILES= pkg-message SUB_LIST= EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR} \ PRINSTALLATION_BASEDIR=${PRINSTALLATION_BASEDIR} CONFIGURE_ARGS+= \ --with-unix-wrapper=${EXECBASE} \ --with-alloc=system \ + --with-ant-home=${LOCALBASE}/share/java/apache-ant \ --with-system-apache-commons=yes \ --with-commons-lang-jar=${JAVALIBDIR}/commons-lang3.jar \ --with-system-apr \ --with-system-apr-util \ --with-system-beanshell \ --with-beanshell-jar=${JAVALIBDIR}/bsh.jar \ --with-system-boost \ --enable-category-b \ --with-system-cairo --enable-cairo \ --with-system-coinmp \ --with-system-curl \ --enable-crashdump \ --with-system-dicts \ --with-epm=${LOCALBASE}/bin/epm \ --with-system-expat \ --disable-fetch-external \ --without-fonts \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --with-gperf=${LOCALBASE}/bin/gperf \ --with-system-graphite \ --enable-gtk \ --with-system-hunspell \ --with-external-dict-dir=${LOCALBASE}/share/hunspell \ --with-system-hyphen \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ + --with-jdk-home=${JAVA_HOME} \ --with-system-jpeg \ --with-junit=${JAVALIBDIR}/junit.jar \ --with-system-libtextcat \ --disable-kde \ --disable-kde4 \ --with-system-libxml \ --with-system-libxslt \ --with-system-lucene \ --with-lucene-core-jar=${JAVALIBDIR}/lucene-core-3.6.2.jar \ --with-lucene-analyzers-jar=${JAVALIBDIR}/lucene-analyzers-3.6.2.jar \ --with-system-mythes \ --with-external-thes-dir=${LOCALBASE}/share/mythes \ --with-system-nss \ --enable-opengl \ --with-system-openssl \ --with-package-format="archive" \ --with-system-python \ --with-system-redland \ --with-system-sane \ --with-system-serf \ --with-system-stdlibs \ --with-vendor="FreeBSD ports system" \ --with-build-version="PKGNAME: ${PKGNAME:S/,/@/g}" \ --enable-verbose \ --with-system-vigra \ --with-system-xrender \ --with-system-zlib CREATE_TREE= ${WRKSRC}/sysui/desktop/share/create_tree.sh .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} ${WRKDIR}/.PLIST* ${RM} ${WRKDIR}/.install_done.* ${RM} ${WRKDIR}/.package_done.* ${RM} ${WRKDIR}/.extract_done.* ${RM} ${WRKDIR}/.patch_done.* ${RM} ${WRKDIR}/.configure_done.* ${RM} ${WRKDIR}/.build_done.* ${MKDIR} ${WRKDIR} ${TOUCH} ${EXTRACT_COOKIE} ${TOUCH} ${PATCH_COOKIE} ${TOUCH} ${CONFIGURE_COOKIE} ${TOUCH} ${BUILD_COOKIE} .endif post-extract: ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ ${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png \ ${WRKSRC}/default_images/introabout/intro.png ${CP} ${FILESDIR}/freebsd-aoo-about-developer.png \ ${WRKSRC}/default_images/introabout/about.png ${RM} -r ${WRKSRC}/l10n ${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip ${SED} -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \ -e '\|^For PostScript(R) AFM|,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_ADOBE} ${SED} -e '\|^For main/unixODBC|,/^__/p' \ -e '\|^For main/connectivity|,/^__/p' \ -e '\|^For main/libtextcat/data|,/^__/p' \ -e '\|^For integration of HSQLDB|,/^__/p' \ -e '\|^For C preprocessor|,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD3CLAUSE} ${SED} -e '\|^For ICC |,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSD4CLAUSE} ${SED} -e '\|^For integration of the C++ Boost |,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_BSL} ${SED} -e '\|^For main/i18npool/source/breakiterator|,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_ICU} - ${SED} -e '\|^For Multi-Dimensional Data|,/^__/p' \ + ${SED} -e '\|^For Multi-Dimensional Data|,/^__/p' \ -e '\|^For XSLT MathML Library|,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT} - ${SED} -e '\|^For XMLSec Library|,/^__/p' \ + ${SED} -e '\|^For XMLSec Library|,/^__/p' \ -e d ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT} - ${SED} -e '\|^For Graphite|,$$d' \ + ${SED} -e '\|^For Saxon|,/^__/p' \ + -e d ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL10} + ${SED} -e '\|^For Saxon|,$$d' \ ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL11} ${SED} -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL} - ${SED} -e '\|^For main/twain|,/^__/p' \ + ${SED} -e '\|^For main/twain|,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN} - ${SED} -e '\|^For main/MathMLDTD|,/^__/p' \ + ${SED} -e '\|^For main/MathMLDTD|,/^__/p' \ -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C} post-patch: ${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '${AOOVERSION1}'/" \ ${WRKSRC}/sysui/desktop/productversion.mk ${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \ ${WRKSRC}/desktop/scripts/soffice.sh ${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE} .if ${COMPILER_TYPE} == gcc # g++49 -Os sometimes leaves inline class methods undefined, # affects fmgridif.cxx and ColumnControl.cxx # See: if [ ${CXX} = g++49 ]; then \ ${REINPLACE_CMD} -e "s/ := -Os/ := -Os -fno-devirtualize -fno-devirtualize-speculatively/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \ ${REINPLACE_CMD} -e "s/=-Os /=-Os -fno-devirtualize -fno-devirtualize-speculatively /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \ fi .elif ${ARCH} == i386 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 # autodoc and uno (bridgetest) core dump when built with with -Os # on i386, affects file.cxx and bridgetest.cxx (at least). # Using -O2 optimiztion works, and -Os is essentially -O2 with out # loop unrolling. # Changing optimization in just unxfbsdi.mk is sufficient to get # a successful build, but change it in both places to avoid the # possibility of obscure runtime problems, which is likely # since this seems to be a generic bug in code generation for # exception handling. # See: ${REINPLACE_CMD} -e "s/=-Os /=-O2 -fno-unroll-loops /" ${WRKSRC}/solenv/inc/unxfbsdi.mk ${REINPLACE_CMD} -e "s/ := -Os/ := -O2 -fno-unroll-loops/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk .endif do-build: ${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/source_config cd ${WRKSRC} ; ./bootstrap # # numproc controls the number of parallel makes. # # dmproc is passed to dmake and controls parallelization at that # level. # # dmproc > numproc seems to give shorter build times than # numproc > dmproc. # # Select values for numproc and dmproc such that: # * numproc*dmproc >= MAKE_JOBS_NUMBER # * minimize numproc*dmproc-MAKE_JOBS_NUMBER # * dmproc >= numproc # * dmproc <= 2*numproc if MAKE_JOBS_NUMBER <= 3 # if [ ${MAKE_JOBS_NUMBER} -le 3 ] ; then \ numproc=1 ; dmproc=${MAKE_JOBS_NUMBER} ; \ else \ a=1 ; \ while [ $$(( 2 * $${a} * $${a} )) -lt ${MAKE_JOBS_NUMBER} ]; do \ a=$$(( $${a} + 1 )) ; \ done ; \ b=$$(( $${a} + 1 )) ; \ ad=$$(( ( ${MAKE_JOBS_NUMBER} + $${a} - 1 ) / $${a} )) ; \ ap=$$(( $${a} * $${ad} )) ; \ bd=$$(( ( ${MAKE_JOBS_NUMBER} + $${b} - 1 ) / $${b} )) ; \ bp=$$(( $${b} * $${bd} )) ; \ if [ $${ap} -le $${bp} ]; then \ numproc=$${a} ; dmproc=$${ad} ; \ else \ numproc=$${b} ; dmproc=$${bd} ; \ fi ; \ fi ; \ cd ${WRKSRC}/instsetoo_native ; \ . ../${FREEBSD_ENV_SET} ; \ build.pl --all -P$${numproc} -- -P$${dmproc} do-install: @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ ${STAGEDIR}${PREFIX}/share/mime/packages @cd ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \ for i in *.tar.?z ; do \ ${ECHO_CMD} "extracting $$i" ; \ ${TAR} -s '|./[^/]*/||' -xz -f $$i \ -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \ done ${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; ${REINPLACE_CMD} \ -e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \ ${STAGEDIR}${OOPATH}/program/bootstraprc @${RM} ${STAGEDIR}${OOPATH}/program/bootstraprc.bak @${ECHO_CMD} "adding wrapper scripts"; @${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%OOPATH%%#${OOPATH}#g' \ -e 's#%%EXECBASE%%#${EXECBASE}#g' \ ${WRKDIR}/openoffice-wrapper ${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ ${STAGEDIR}${PREFIX}/bin/${EXECBASE} @cd ${STAGEDIR}${PREFIX}/bin; for i in printeradmin sbase scalc sdraw \ simpress smath spadmin swriter ; do \ ${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \ done @${ECHO_CMD} "adding desktop support" @${LN} -sf ${XDGREL} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} @cd ${WRKSRC}/sysui/unxfbsd*.pro/misc/openoffice ; \ DESTDIR=${STAGEDIR} \ GNOMEDIR=${PREFIX} \ ICON_PREFIX=openoffice${AOOVERSION1} \ ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons \ ICON_THEMES="hicolor/??x??" \ KDEMAINDIR=${PREFIX} \ PREFIX=openoffice${AOOVERSION1} \ ${SH} ${CREATE_TREE} ; \ ${INSTALL_DATA} apacheopenoffice.xml \ ${STAGEDIR}/${PREFIX}/share/mime/packages do-install-SDK-on: ${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ -f ${WRKSRC}/instsetoo_native/unxfbsd*.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz @f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \ ${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f} post-install: @${ECHO_CMD} "generating plist"; @cd ${STAGEDIR}${PREFIX} ; (\ ${FIND} -s bin -name "${EXECBASE}*" ; \ ${FIND} -s ${INSTALLATION_BASEDIR} share/applications \ share/application-registry share/icons \ share/mime-info share/mime share/mimelnk \! -type d ; \ ${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \ ${SED} -e 's/^/@dir /' ; \ ) >> ${TMPPLIST} .include <${FILESDIR}/Makefile.others> .include Index: head/editors/openoffice-devel/files/Makefile.knobs =================================================================== --- head/editors/openoffice-devel/files/Makefile.knobs (revision 452936) +++ head/editors/openoffice-devel/files/Makefile.knobs (revision 452937) @@ -1,27 +1,26 @@ # Makefile for knobs # Whom: Maho Nakata # $FreeBSD$ -CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant" CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG} pre-fetch: @${ECHO} "OPTIONS:" @${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" @${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)." @${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver" Index: head/editors/openoffice-devel/files/patch-security =================================================================== --- head/editors/openoffice-devel/files/patch-security (nonexistent) +++ head/editors/openoffice-devel/files/patch-security (revision 452937) @@ -0,0 +1,215 @@ +Index: comphelper/source/container/embeddedobjectcontainer.cxx +=================================================================== +--- comphelper/source/container/embeddedobjectcontainer.cxx (revision 1813062) ++++ comphelper/source/container/embeddedobjectcontainer.cxx (working copy) +@@ -127,7 +127,7 @@ + pImpl = new EmbedImpl; + pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); + pImpl->mbOwnsStorage = true; +- pImpl->mbUserAllowsLinkUpdate = false; ++ pImpl->mbUserAllowsLinkUpdate = true; + pImpl->mpTempObjectContainer = 0; + } + +@@ -136,7 +136,7 @@ + pImpl = new EmbedImpl; + pImpl->mxStorage = rStor; + pImpl->mbOwnsStorage = false; +- pImpl->mbUserAllowsLinkUpdate = false; ++ pImpl->mbUserAllowsLinkUpdate = true; + pImpl->mpTempObjectContainer = 0; + } + +@@ -145,7 +145,7 @@ + pImpl = new EmbedImpl; + pImpl->mxStorage = rStor; + pImpl->mbOwnsStorage = false; +- pImpl->mbUserAllowsLinkUpdate = false; ++ pImpl->mbUserAllowsLinkUpdate = true; + pImpl->mpTempObjectContainer = 0; + pImpl->m_xModel = xModel; + } +Index: sc/source/core/data/documen2.cxx +=================================================================== +--- sc/source/core/data/documen2.cxx (revision 1813062) ++++ sc/source/core/data/documen2.cxx (working copy) +@@ -229,7 +229,10 @@ + if ( eMode == SCDOCMODE_DOCUMENT ) + { + if ( pDocShell ) +- pLinkManager = new sfx2::LinkManager( pDocShell ); ++ { ++ pLinkManager = new sfx2::LinkManager(pDocShell); ++ pLinkManager->SetAutoAskUpdateAllLinks(); ++ } + + xPoolHelper = new ScPoolHelper( this ); + +@@ -269,6 +272,7 @@ + if ( bAutoCalc && !pLinkManager && pShell) + { + pLinkManager = new sfx2::LinkManager( pShell ); ++ pLinkManager->SetAutoAskUpdateAllLinks(); + } + return pLinkManager; + } +Index: sfx2/inc/sfx2/linkmgr.hxx +=================================================================== +--- sfx2/inc/sfx2/linkmgr.hxx (revision 1813062) ++++ sfx2/inc/sfx2/linkmgr.hxx (working copy) +@@ -54,6 +54,13 @@ + SvLinkSources aServerTbl; + + SfxObjectShell *pPersist; // LinkMgr has to be deallocated before SfxObjectShell ++ ++ sal_Bool mAutoAskUpdateAllLinks; ++ sal_Bool mUpdateAsked; ++ sal_Bool mAllowUpdate; ++ ++ sal_Bool GetUserAllowsLinkUpdate(Window *pParent); ++ void SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows); + protected: + sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType, + const String* pName = 0 ); +@@ -104,6 +111,10 @@ + + SvLinkSourceRef CreateObj( SvBaseLink* ); + ++ ++ // Automatically ask user about update all links, on first insert ++ void SetAutoAskUpdateAllLinks(); ++ + void UpdateAllLinks( sal_Bool bAskUpdate = sal_True, + sal_Bool bCallErrHdl = sal_True, + sal_Bool bUpdateGrfLinks = sal_False, +Index: sfx2/source/appl/linkmgr2.cxx +=================================================================== +--- sfx2/source/appl/linkmgr2.cxx (revision 1813062) ++++ sfx2/source/appl/linkmgr2.cxx (working copy) +@@ -65,11 +65,12 @@ + SV_IMPL_PTRARR( SvBaseLinks, SvBaseLinkRefPtr ) + + LinkManager::LinkManager(SfxObjectShell* p) +- : pPersist( p ) ++ : pPersist(p), ++ mUpdateAsked(sal_False), ++ mAutoAskUpdateAllLinks(sal_False) + { + } + +- + LinkManager::~LinkManager() + { + SvBaseLinkRef** ppRef = (SvBaseLinkRef**)aLinkTbl.GetData(); +@@ -157,6 +158,12 @@ + SvBaseLinkRef* pTmp = new SvBaseLinkRef( pLink ); + pLink->SetLinkManager( this ); + aLinkTbl.Insert( pTmp, aLinkTbl.Count() ); ++ Window *parent = GetPersist()->GetDialogParent(); ++ if (mAutoAskUpdateAllLinks) ++ { ++ SetUserAllowsLinkUpdate(pLink, GetUserAllowsLinkUpdate(parent)); ++ } ++ + return sal_True; + } + +@@ -268,7 +275,36 @@ + return bRet; + } + ++void LinkManager::SetAutoAskUpdateAllLinks() ++{ ++ mAutoAskUpdateAllLinks = sal_True; ++} + ++sal_Bool LinkManager::GetUserAllowsLinkUpdate(Window *pParentWin) ++{ ++ if (!mUpdateAsked) ++ { ++ if (QueryBox(pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId(STR_QUERY_UPDATE_LINKS)).Execute() == RET_YES) ++ mAllowUpdate = sal_True; ++ else ++ mAllowUpdate = sal_False; ++ mUpdateAsked = sal_True; ++ } ++ return mAllowUpdate; ++} ++ ++void LinkManager::SetUserAllowsLinkUpdate(SvBaseLink *pLink, sal_Bool allows) ++{ ++ SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist(); ++ ++ if (pShell) ++ { ++ comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer(); ++ rEmbeddedObjectContainer.setUserAllowsLinkUpdate(allows); ++ } ++} ++ ++ + void LinkManager::UpdateAllLinks( + sal_Bool bAskUpdate, + sal_Bool /*bCallErrHdl*/, +@@ -312,26 +348,20 @@ + if( !pLink->IsVisible() || + ( !bUpdateGrfLinks && OBJECT_CLIENT_GRF == pLink->GetObjType() )) + continue; +- +- if( bAskUpdate ) ++ ++ sal_Bool allows = sal_True; ++ ++ if (bAskUpdate) + { +- int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_NO, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute(); +- SfxObjectShell* pShell = pLink->GetLinkManager()->GetPersist(); ++ allows = GetUserAllowsLinkUpdate(pParentWin); ++ } + +- if(pShell) +- { +- comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = pShell->getEmbeddedObjectContainer(); +- rEmbeddedObjectContainer.setUserAllowsLinkUpdate(RET_YES == nRet); +- } ++ SetUserAllowsLinkUpdate(pLink, allows); ++ bAskUpdate = sal_False; // one time is OK + +- if (RET_YES != nRet) +- { +- return; // nothing should be updated +- } +- bAskUpdate = sal_False; // one time is OK +- } ++ if (allows) ++ pLink->Update(); + +- pLink->Update(); + } + } + +Index: sw/source/filter/ww8/ww8scan.cxx +=================================================================== +--- sw/source/filter/ww8/ww8scan.cxx (revision 1813062) ++++ sw/source/filter/ww8/ww8scan.cxx (working copy) +@@ -6467,6 +6467,12 @@ + + if( nMax ) + { ++ // Check size consistency ++ if(nMax > nFFn) ++ { ++ throw std::out_of_range("WW8 beyond end of buffer"); ++ } ++ + // allocate Index Array + pFontA = new WW8_FFN[ nMax ]; + p = pFontA; +@@ -6585,6 +6591,7 @@ + + // Zeiger auf Ursprungsarray einen Font nach hinten setzen + pVer8 = (WW8_FFN_Ver8*)( ((sal_uInt8*)pVer8) + pVer8->cbFfnM1 + 1 ); ++ + } + } + } Property changes on: head/editors/openoffice-devel/files/patch-security ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property