diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 0cc8d3fad35b..59e507b4e8b4 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -1,423 +1,478 @@ # Created by: Martin Blapp # $FreeBSD$ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= editors java MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${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= ${OOOSRC}${AOODISTTAG} unowinreg.dll:unoreg ${EXTSRC}:extsrc +DIST_SUBDIR= openoffice EXTRACT_ONLY= ${OOOSRC} MAINTAINER= office@FreeBSD.org #de facto maintainer is truckman@FreeBSD.org #Frequent Patch submitters should optionally sign Apache iCLA COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version) -LICENSE= APACHE20 +LICENSE= APACHE20 ADOBE BSD3CLAUSE BSD4CLAUSE BSL ICU MIT MPL \ + 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_MPL= ${WRKSRC}/LICENSE_MPL +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 BUILD_DEPENDS= \ p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip \ ant:${PORTSDIR}/devel/apache-ant \ + ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \ dmake:${PORTSDIR}/devel/dmake \ epm:${PORTSDIR}/devel/epm \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ imake:${PORTSDIR}/devel/imake \ gpatch:${PORTSDIR}/devel/patch \ + ${LOCALBASE}/include/sane/sane.h:${PORTSDIR}/graphics/sane-backends \ ${LOCALBASE}/bin/vigra-config:${PORTSDIR}/graphics/vigra \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \ ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ bash:${PORTSDIR}/shells/bash \ ${JAVALIBDIR}/lucene-core-3.6.2.jar:${PORTSDIR}/textproc/lucene \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww LIB_DEPENDS= \ libapr-1.so:${PORTSDIR}/devel/apr1 \ + libnspr4.so:${PORTSDIR}/devel/nspr \ libcurl.so:${PORTSDIR}/ftp/curl \ libcairo.so:${PORTSDIR}/graphics/cairo \ libpng.so:${PORTSDIR}/graphics/png \ libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \ libgraphite.so:${PORTSDIR}/graphics/silgraphite \ libCoinMP.so:${PORTSDIR}/math/coinmp \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libnss3.so:${PORTSDIR}/security/nss \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ libhyphen.so:${PORTSDIR}/textproc/hyphen \ libtextcat.so:${PORTSDIR}/textproc/libtextcat \ libmythes-1.2.so:${PORTSDIR}/textproc/mythes \ librdf.so:${PORTSDIR}/textproc/redland \ - libserf-1.so:${PORTSDIR}/www/serf + libserf-1.so:${PORTSDIR}/www/serf \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf AOOVERSION1= 4 AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m1\(Build:9800\) -SVNREVISION= 1677314 +SVNREVISION= 1689959 #AOORC=rc3 -EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150118.tar.gz +EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} .if defined(AOORC) AOOSUFFIX= ${AOOVERSION}-${AOORC} OOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX} AOODISTTAG= TARTYPE= bzip2 .else AOOSUFFIX= ${PORTVERSION} OOOSRC= apache-openoffice-r${SVNREVISION}-src${EXTRACT_SUFX} AOODISTTAG= :snap TARTYPE= xz .endif OOODIR= openoffice${AOOVERSION1} AOOUDIR= .openoffice.org\/${AOOVERSION1} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} -DIST_SUBDIR= openoffice NO_LATEST_LINK= yes ONLY_FOR_ARCHS= i386 amd64 USE_GL= gl glu USE_GNOME= gtk20 libxslt libidl glib20 USE_JAVA= yes JAVA_BUILD= jdk JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ USE_PERL5= build USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes USES= autoreconf:autoconf bison compiler cpe desktop-file-utils \ - gmake jpeg perl5 pkgconfig python tar:${TARTYPE} + gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ + tar:${TARTYPE} WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} CPE_VENDOR= apache OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA CCACHE OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= GNOME Virtual File System MMEDIA_DESC= Multimedia backend for impress CCACHE_DESC= Mimimize compile time of C/C++ programs CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client GNOME_CONFIGURE_ENABLE= dbus gconf lockdown GNOME_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/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_USE= GSTREAMER=yes .include .include <${FILESDIR}/Makefile.localized> .if ${COMPILER_TYPE} == clang . if ${COMPILER_VERSION} < 35 && ${ARCH} == amd64 BUILD_DEPENDS+= clang35:${PORTSDIR}/lang/clang35 CPP= clang-cpp35 CC= clang35 CXX= clang++35 . endif -BUILD_DEPENDS+= ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs -CONFIGURE_ARGS+= --with-system-boost CPPFLAGS+= -I${LOCALBASE}/include .else USE_GCC= yes -SUBST= "s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH//" +SUBST= "s/-fexceptions/& -fno-enforce-eh-specs/;s/-DHAVE_STL_INCLUDE_PATH/-DBOOST_TR1_DISABLE_INCLUDE_NEXT -DBOOST_TR1_GCC_INCLUDE_PATH=c++/" .endif .if ${ARCH} == amd64 FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh .else FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh .endif LOCALIZED_LANG?= en-US PACKAGE_PREFIX= Apache_OpenOffice .if ${ARCH} == amd64 PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64 .else PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86 .endif .if ${PORT_OPTIONS:MCCACHE} || 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}" \ 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} CONFIGURE_ARGS+= \ --with-system-apache-commons=yes \ --with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \ --with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \ --with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \ --with-commons-logging-jar=${JAVALIBDIR}/commons-logging.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-system-jpeg \ --with-junit=${LOCALBASE}/share/java/classes/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-poppler \ --with-system-python \ --with-system-redland \ + --with-system-sane \ --with-system-serf \ --with-system-stdlibs \ --enable-symbols=small \ --without-stlport \ --with-vendor="FreeBSD ports system" \ --enable-verbose \ --with-system-vigra \ --enable-wiki-publisher \ + --with-system-xrender \ --with-system-zlib #OOOEXTENSIONS+= minimizer/presentation-minimizer.oxt #OOOEXTENSIONS+= presenter/presenter-screen.oxt #OOOEXTENSIONS+= pdfimport/pdfimport.oxt OOOEXTENSIONS+= swext/wiki-publisher.oxt 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 post-extract: ${TAR} -C ${WRKSUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EXTSRC} ${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ ${RM} -rf ${WRKSRC}/l10n + ${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' \ + -e '\|^For XSLT MathML Library|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_MIT} + ${SED} -e '\|^For XMLSec Library|,/^__/p' \ + -e d ${WRKSRC}/LICENSE_category_b >> ${LICENSE_FILE_MIT} + ${SED} -e '\|^For Graphite|,$$d' \ + ${WRKSRC}/LICENSE_category_b > ${LICENSE_FILE_MPL} + ${SED} -e '\|^For main/filter/source/config/tools/merge/pyAltFCFGMerge|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_PSFL} + ${SED} -e '\|^For main/twain|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_TWAIN} + ${SED} -e '\|^For main/MathMLDTD|,/^__/p' \ + -e d ${WRKSRC}/LICENSE > ${LICENSE_FILE_W3C} post-patch: .if defined (USE_GCC) ${REINPLACE_CMD} -e ${SUBST} ${WRKSRC}/solenv/gbuild/platform/freebsd.mk ${REINPLACE_CMD} -e ${SUBST} ${WRKSRC}/solenv/inc/unxfbsd.mk .endif .if ${ARCH} == i386 # g++49 -Os sometimes leaves inline class methods undefined # autodoc core dumps when built with with -Os clang 3.6 on i386 if [ ${CXX} = g++49 -o \ ${COMPILER_TYPE} = clang -a ${COMPILER_VERSION} = 36 ]; then \ ${REINPLACE_CMD} -e "s/ := -Os/ := -O0/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \ ${REINPLACE_CMD} -e "s/=-Os /=-O0 /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \ fi .endif pre-configure: ${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip do-build: cd ${WRKSUBDIR} ; ${PRINTF} "[repositories]\n" > source_config cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> 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 # cd ${WRKSRC} ; . ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; \ export LANG=C LC_ALL=C FBSD_LDFLAGS="${LDFLAGS}" ; \ 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 ; \ build.pl --all -P$${numproc} -- -P$${dmproc} do-install: cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?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/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/$$i ; \ done ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} cd ${WRKDIR}/tmp/*/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} ${REINPLACE_CMD} -e 's/^UserInstallation.*$$/USERINSTALLATION/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc ${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/${AOOUDIR}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD} for prog in crashrep pagein uri-encode javaldx regmerge regview; do \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \ done ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \; @${ECHO_MSG} "===> Add wrapper scripts"; ${CP} ${FILESDIR}/openoffice-wrapper ${WRKDIR}/ ${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%SVNREVISION%%#${SVNREVISION}#g' \ -e 's#%%OOODIR%%#${OOODIR}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice-wrapper ${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ ${STAGEDIR}${PREFIX}/bin/${EXECBASE} ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sbase ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-scalc ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-sdraw ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-setofficelang ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-simpress ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \ ${XARGS} -n 1 ${ECHO_CMD} @dir >> ${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/" \ ${STAGEDIR}${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/" \ ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \ ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/startcenter.desktop ${RM} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak ${RM} -f ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} ${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \ ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} ${ECHO_CMD} "share/applications/${EXECBASE}" >> ${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 \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/ ; \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/${EXECBASE}-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for iconfile in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${INSTALL_DATA} ${ICONS}/hicolor/$${dir}/mimetypes/$${iconfile} \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${iconfile}" >> ${TMPPLIST} ; \ done ; \ done ${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} .include <${FILESDIR}/Makefile.others> .include diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index be0e7096bf70..6007583c2d5e 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -1,6 +1,6 @@ -SHA256 (openoffice/apache-openoffice-r1677314-src.tar.xz) = 7db08f046ae1cb87ac5d9788a4507d4bd70df1be73c9044a71182087f9ff231c -SIZE (openoffice/apache-openoffice-r1677314-src.tar.xz) = 215202736 +SHA256 (openoffice/apache-openoffice-r1689959-src.tar.xz) = 22f66a8d19d1bb3355370875628f5bc44ec02c7ce75fb57021ced1834eb8da29 +SIZE (openoffice/apache-openoffice-r1689959-src.tar.xz) = 215148292 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 -SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = b01b8894469a80667b0551ea6c0abffd3fb9e79c8a304d48091ff57ab53f10b7 -SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150118.tar.gz) = 102513542 +SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa +SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 diff --git a/editors/openoffice-devel/files/patch-i114430 b/editors/openoffice-devel/files/patch-i114430 index 01d8a2734019..1d6a270c3c8b 100644 --- a/editors/openoffice-devel/files/patch-i114430 +++ b/editors/openoffice-devel/files/patch-i114430 @@ -1,31 +1,28 @@ -Index: sc/source/core/tool/interpr5.cxx -=================================================================== ---- sc/source/core/tool/interpr5.cxx (revision 1678278) -+++ sc/source/core/tool/interpr5.cxx (working copy) -@@ -1611,7 +1611,7 @@ +--- sc/source/core/tool/interpr5.cxx.orig 2014-09-19 18:03:51 UTC ++++ sc/source/core/tool/interpr5.cxx +@@ -1611,14 +1611,14 @@ void ScInterpreter::ScPow() if (bFlag) { for ( SCSIZE i = 0; i < nCount; i++ ) if (pMat->IsValue(i)) - pResMat->PutDouble(pow(fVal,pMat->GetDouble(i)), i); + pResMat->PutDouble(::rtl::math::powr(fVal,pMat->GetDouble(i)), i); else pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); } -@@ -1618,7 +1618,7 @@ else { for ( SCSIZE i = 0; i < nCount; i++ ) if (pMat->IsValue(i)) - pResMat->PutDouble(pow(pMat->GetDouble(i),fVal), i); + pResMat->PutDouble(::rtl::math::powr(pMat->GetDouble(i),fVal), i); else pResMat->PutString(ScGlobal::GetRscString(STR_NO_VALUE), i); } -@@ -1628,7 +1628,7 @@ +@@ -1628,7 +1628,7 @@ void ScInterpreter::ScPow() PushIllegalArgument(); } else - PushDouble(pow(fVal1,fVal2)); + PushDouble(::rtl::math::powr(fVal1,fVal2)); } void ScInterpreter::ScSumProduct() diff --git a/editors/openoffice-devel/files/patch-i118574 b/editors/openoffice-devel/files/patch-i118574 deleted file mode 100644 index 4f3c6467c22d..000000000000 --- a/editors/openoffice-devel/files/patch-i118574 +++ /dev/null @@ -1,323 +0,0 @@ ---- unoxml/source/dom/attr.hxx.orig 2011-11-03 21:05:47.000000000 -0500 -+++ unoxml/source/dom/attr.hxx 2011-11-03 21:06:26.000000000 -0500 -@@ -30,6 +30,7 @@ - - #include - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/characterdata.hxx.orig 2011-11-03 21:12:41.000000000 -0500 -+++ unoxml/source/dom/characterdata.hxx 2011-11-03 21:13:08.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_CHARACTERDATA_HXX - #define DOM_CHARACTERDATA_HXX - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/childlist.cxx.orig 2011-11-03 21:36:22.000000000 -0500 -+++ unoxml/source/dom/childlist.cxx 2011-11-03 21:37:22.000000000 -0500 -@@ -27,6 +27,7 @@ - - #include - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/document.hxx.orig 2011-11-03 20:59:53.000000000 -0500 -+++ unoxml/source/dom/document.hxx 2011-11-03 21:00:40.000000000 -0500 -@@ -31,6 +31,7 @@ - #include - #include - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/documentbuilder.cxx.orig 2011-11-03 21:15:44.000000000 -0500 -+++ unoxml/source/dom/documentbuilder.cxx 2011-11-03 21:16:26.000000000 -0500 -@@ -31,6 +31,7 @@ - #include - #include - -+#include // for std::mbstate_t - #include - #include - ---- unoxml/source/dom/documenttype.hxx.orig 2011-11-03 21:19:12.000000000 -0500 -+++ unoxml/source/dom/documenttype.hxx 2011-11-03 21:19:39.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_DOCUMENTTYPE_HXX - #define DOM_DOCUMENTTYPE_HXX - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/element.hxx.orig 2011-11-03 21:02:39.000000000 -0500 -+++ unoxml/source/dom/element.hxx 2011-11-03 21:03:48.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_ELEMENT_HXX - #define DOM_ELEMENT_HXX - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/elementlist.hxx.orig 2011-11-03 21:33:35.000000000 -0500 -+++ unoxml/source/dom/elementlist.hxx 2011-11-03 21:34:07.000000000 -0500 -@@ -32,6 +32,7 @@ - - #include - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/entity.hxx.orig 2011-11-03 21:21:42.000000000 -0500 -+++ unoxml/source/dom/entity.hxx 2011-11-03 21:22:28.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_ENTITY_HXX - #define DOM_ENTITY_HXX - -+#include // for std::mbstate_t - #include - #include - ---- unoxml/source/dom/entityreference.hxx.orig 2011-11-03 21:24:36.000000000 -0500 -+++ unoxml/source/dom/entityreference.hxx 2011-11-03 21:25:13.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_ENTITYREFERENCE_HXX - #define DOM_ENTITYREFERENCE_HXX - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/node.hxx.orig 2011-11-03 20:54:49.000000000 -0500 -+++ unoxml/source/dom/node.hxx 2011-11-03 20:56:47.000000000 -0500 -@@ -30,6 +30,7 @@ - - #include - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/notation.hxx.orig 2011-11-03 21:27:17.000000000 -0500 -+++ unoxml/source/dom/notation.hxx 2011-11-03 21:28:12.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_NOTATION_HXX - #define DOM_NOTATION_HXX - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/processinginstruction.hxx.orig 2011-11-03 21:30:54.000000000 -0500 -+++ unoxml/source/dom/processinginstruction.hxx 2011-11-03 21:31:30.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_PROCESSINGINSTRUCTION_HXX - #define DOM_PROCESSINGINSTRUCTION_HXX - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/dom/text.hxx.orig 2011-11-03 21:10:46.000000000 -0500 -+++ unoxml/source/dom/text.hxx 2011-11-03 21:11:14.000000000 -0500 -@@ -28,6 +28,7 @@ - #ifndef DOM_TEXT_HXX - #define DOM_TEXT_HXX - -+#include // for std::mbstate_t - #include - - #include ---- unoxml/source/events/eventdispatcher.hxx.orig 2011-11-03 21:51:05.000000000 -0500 -+++ unoxml/source/events/eventdispatcher.hxx 2011-11-03 21:55:59.000000000 -0500 -@@ -31,6 +31,7 @@ - #include - #include - -+#include // for std::mbstate_t - #include - - #include ---- jvmfwk/source/elements.hxx.orig 2011-11-03 14:14:18.000000000 -0500 -+++ jvmfwk/source/elements.hxx 2011-11-03 14:24:14.000000000 -0500 -@@ -32,6 +32,7 @@ - #include "fwkutil.hxx" - #include "rtl/ustring.hxx" - #include "rtl/byteseq.hxx" -+#include // for std::mbstate_t - #include "libxml/parser.h" - #include "boost/optional.hpp" - ---- jvmfwk/source/fwkbase.cxx.orig 2011-11-03 14:31:12.000000000 -0500 -+++ jvmfwk/source/fwkbase.cxx 2011-11-03 14:32:34.000000000 -0500 -@@ -32,6 +32,7 @@ - #include "rtl/uri.hxx" - #include "osl/thread.hxx" - #include "osl/process.h" -+#include // for std::mbstate_t - #include "libxml/xpathInternals.h" - #include "osl/file.hxx" - #include "osl/module.hxx" ---- jvmfwk/source/libxmlutil.hxx.orig 2011-11-03 14:28:02.000000000 -0500 -+++ jvmfwk/source/libxmlutil.hxx 2011-11-03 14:28:52.000000000 -0500 -@@ -27,7 +27,7 @@ - #if !defined INCLUDED_JVMFWK_LIBXMLUTIL_HXX - #define INCLUDED_JVMFWK_LIBXMLUTIL_HXX - -- -+#include // for std::mbstate_t - #include "libxml/parser.h" - #include "libxml/xpath.h" - //#include "libxml/xpathinternals.h" ---- xmlhelp/source/cxxhelp/provider/urlparameter.cxx.orig 2011-11-03 23:28:51.000000000 -0500 -+++ xmlhelp/source/cxxhelp/provider/urlparameter.cxx 2011-11-03 23:33:15.000000000 -0500 -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include // for std::mbstate_t - #include - #include - #include ---- unoxml/source/xpath/nodelist.hxx.orig 2011-11-03 21:42:28.000000000 -0500 -+++ unoxml/source/xpath/nodelist.hxx 2011-11-03 21:43:53.000000000 -0500 -@@ -38,6 +38,7 @@ - #include - #include - -+#include // for std::mbstate_t - #include "libxml/tree.h" - #include "libxml/xpath.h" - ---- unoxml/source/xpath/xpathapi.cxx.orig 2011-11-03 21:46:02.000000000 -0500 -+++ unoxml/source/xpath/xpathapi.cxx 2011-11-03 21:46:34.000000000 -0500 -@@ -30,6 +30,7 @@ - #include - #include - -+#include // for std::mbstate_t - #include - #include - #include -Index: main/forms/source/xforms/xpathlib/xpathlib.hxx -=================================================================== ---- forms/source/xforms/xpathlib/xpathlib.hxx (revision 1235458) -+++ forms/source/xforms/xpathlib/xpathlib.hxx (working copy) -@@ -20,7 +20,7 @@ - *************************************************************/ - - -- -+#include // for std::mbstate_t - #include - #include - #include - ---- avmedia/source/gstreamer/gstplayer.hxx 2012-02-02 07:33:58.000000000 +0900 -+++ avmedia/source/gstreamer/gstplayer.hxx 2012-02-02 07:35:03.000000000 +0900 -@@ -24,6 +24,8 @@ - #ifndef _GSTPLAYER_HXX - #define _GSTPLAYER_HXX - -+#include // for std::mbstate_t -+ - #include "gstcommon.hxx" - #include - #include - - ---- xmlsecurity/source/xmlsec/biginteger.cxx 2012-02-04 10:36:05.000000000 +0900 -+++ xmlsecurity/source/xmlsec/biginteger.cxx 2012-02-01 16:51:40.000000000 +0900 -@@ -19,7 +19,7 @@ - * - *************************************************************/ - -- -+#include // for std::mbstate_t - - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_xmlsecurity.hxx" - ---- xmlsecurity/source/xmlsec/errorcallback.cxx 2012-02-04 10:37:52.000000000 +0900 -+++ xmlsecurity/source/xmlsec/errorcallback.cxx 2012-02-01 16:51:40.000000000 +0900 -@@ -19,7 +19,7 @@ - * - *************************************************************/ - -- -+#include // for std::mbstate_t - - - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_xmlsecurity.hxx" - ---- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx 2012-02-03 13:03:47.000000000 +0900 -+++ xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -24,6 +24,8 @@ - #ifndef _XSECURITYENVIRONMENT_NSSIMPL_HXX_ - #define _XSECURITYENVIRONMENT_NSSIMPL_HXX_ - -+#include // for std::mbstate_t -+ - #include - #include - #include - - ---- xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx 2012-02-04 10:33:01.000000000 +0900 -+++ xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -24,6 +24,8 @@ - #ifndef _SEINITIALIZERIMPL_HXX - #define _SEINITIALIZERIMPL_HXX - -+#include // for std::mbstate_t -+ - #include - #include - - ---- xmlsecurity/source/xmlsec/saxhelper.hxx 2012-02-04 10:34:58.000000000 +0900 -+++ xmlsecurity/source/xmlsec/saxhelper.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -24,6 +24,8 @@ - #ifndef _SAXHELPER_HXX - #define _SAXHELPER_HXX - -+#include // for std::mbstate_t -+ - #include "libxml/tree.h" - - #include - ---- xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx 2012-02-04 10:36:45.000000000 +0900 -+++ xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -20,6 +20,7 @@ - *************************************************************/ - - -+#include // for std::mbstate_t - - #ifndef _XMLELEMENTWRAPPER_XMLSECIMPL_HXX - #define _XMLELEMENTWRAPPER_XMLSECIMPL_HXX - ---- xmlsecurity/source/xmlsec/xmlstreamio.hxx 2012-02-04 10:37:09.000000000 +0900 -+++ xmlsecurity/source/xmlsec/xmlstreamio.hxx 2012-02-01 16:51:40.000000000 +0900 -@@ -19,7 +19,7 @@ - * - *************************************************************/ - -- -+#include // for std::mbstate_t - - - #ifndef _XMLSTREAMIO_XMLSECIMPL_HXX_ - #define _XMLSTREAMIO_XMLSECIMPL_HXX_ diff --git a/editors/openoffice-devel/files/patch-jpeg b/editors/openoffice-devel/files/patch-jpeg deleted file mode 100644 index 84a659c0e34c..000000000000 --- a/editors/openoffice-devel/files/patch-jpeg +++ /dev/null @@ -1,12 +0,0 @@ ---- svtools/Library_svt.mk.orig 2014-02-25 00:28:36.000000000 -0800 -+++ svtools/Library_svt.mk 2014-08-04 21:40:00.000000000 -0700 -@@ -76,6 +76,9 @@ - $(eval $(call gb_Library_set_ldflags,svt,\ - $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ - )) -+$(eval $(call gb_Library_set_ldflags,svt,\ -+ $$(shell echo $$(LDFLAGS) | sed 's/ -L[^ ]*\/jre\/lib\/[^ ]*//g') \ -+)) - ifeq ($(GUIBASE),os2) - # YD FIXME above is not working... needs ldflags hack... - $(eval $(call gb_Library_set_ldflags,svt,\ diff --git a/editors/openoffice-devel/files/patch-nss b/editors/openoffice-devel/files/patch-nss deleted file mode 100644 index a3dec2473dd1..000000000000 --- a/editors/openoffice-devel/files/patch-nss +++ /dev/null @@ -1,43 +0,0 @@ ---- set_soenv.in~ 2014-01-22 15:21:04.000000000 +0900 -+++ set_soenv.in 2014-02-03 12:12:03.000000000 +0900 -@@ -1864,6 +1864,8 @@ - ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" ); - ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); - ToFile( "SYSTEM_NSS", "@SYSTEM_NSS@", "e" ); -+ToFile( "NSS_CFLAGS", "@NSS_CFLAGS@", "e" ); -+ToFile( "NSS_LIBS", "@NSS_LIBS@", "e" ); - ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" ); - ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" ); - ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" ); - ---- xmlsecurity/util/makefile.mk 2014-02-03 15:50:50.000000000 +0900 -+++ xmlsecurity/util/makefile.mk 2014-02-03 16:03:11.000000000 +0900 -@@ -98,12 +98,12 @@ - SHL2STDLIBS +=-ldl - .ENDIF - --.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES" -+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"=="YES" - .IF "$(NSPR_LIB)" != "" - SHL2STDLIBS += $(NSPR_LIB) - .ENDIF --.IF "$(NSS_LIB)" != "" --SHL2STDLIBS += $(NSS_LIB) -+.IF "$(NSS_LIBS)" != "" -+SHL2STDLIBS += $(NSS_LIBS) - .ENDIF - .ENDIF - ---- xmlsecurity/source/xmlsec/nss/makefile.mk 2014-01-22 15:07:16.000000000 +0900 -+++ xmlsecurity/source/xmlsec/nss/makefile.mk 2014-02-03 16:13:30.000000000 +0900 -@@ -48,8 +48,8 @@ - NSPR_INC = $(MOZ_INC)$/nspr - .ELSE - # TODO: better use pkgconfig to find the proper system include path --NSS_INC = /usr/include/nss3 --NSPR_INC = /usr/include/nspr4 -+NSS_INC = $(NSS_CFLAGS) -+NSPR_INC = $(NSS_CFLAGS) - .ENDIF - - .IF "$(GUI)" == "WNT" diff --git a/editors/openoffice-devel/files/pkg-message.in b/editors/openoffice-devel/files/pkg-message.in index 4a3474bc2b1b..e551c076647b 100644 --- a/editors/openoffice-devel/files/pkg-message.in +++ b/editors/openoffice-devel/files/pkg-message.in @@ -1,41 +1,40 @@ Apache OpenOffice Build %%AOOTAG%% Personal Install How-To Written by: Martin Blapp and Maho Nakata Apache OpenOffice %%AOOTAG%% will soon be installed in %%PREFIX%%/%%EXECBASE%% -1. User installation +1. Scanner interface -------------------- +To enable the scanner interface, install the sane-backends package. -Just type "%%EXECBASE%%" after you have successfully -installed the package. If there is no installed -.openoffice.org directory in your home directory, the -setup installs the "%%AOOUDIR%%" folder. +2. User installation +-------------------- +Just type "%%EXECBASE%%" after you have successfully installed +the package. If there is no installed .openoffice.org directory in your +home directory, the setup installs the "%%AOOUDIR%%" folder. -2. Starting Apache OpenOffice +3. Starting Apache OpenOffice ----------------------------- - -There are some wrappers installed for faster startup. -Add "%%PREFIX%%/bin/" to your PATH and you will be able -to use them. +There are some wrappers installed for faster startup. Add "%%PREFIX%%/bin/" +to your PATH and you will be able to use them. %%PREFIX%%/bin/%%EXECBASE%% %%PREFIX%%/bin/%%EXECBASE%%-sbase %%PREFIX%%/bin/%%EXECBASE%%-scalc %%PREFIX%%/bin/%%EXECBASE%%-sdraw %%PREFIX%%/bin/%%EXECBASE%%-setofficelang %%PREFIX%%/bin/%%EXECBASE%%-smath %%PREFIX%%/bin/%%EXECBASE%%-simpress %%PREFIX%%/bin/%%EXECBASE%%-spadmin %%PREFIX%%/bin/%%EXECBASE%%-swriter -OO.org does need $LANG to be set to a suitable value. +OpenOffice does need $LANG to be set to a suitable value. -3. If you run into problems +4. If you run into problems -------------------------------------------------- -If you somehow run into problems, please remove the already -installed "%%AOOUDIR%%" directory in your home directory, -then redo the user installation and the problems should go -away. +If you somehow run into problems, please remove the already installed +"%%AOOUDIR%%" directory in your home directory, then redo the +user installation and the problems should go away.