Index: branches/2015Q4/editors/openoffice-devel/Makefile =================================================================== --- branches/2015Q4/editors/openoffice-devel/Makefile (revision 401018) +++ branches/2015Q4/editors/openoffice-devel/Makefile (revision 401019) @@ -1,466 +1,467 @@ # Created by: Martin Blapp # $FreeBSD$ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 1 -PORTEPOCH= 3 +#PORTREVISION= 1 +PORTEPOCH= 4 CATEGORIES= editors java -MASTER_SITES= http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ +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 Apache iCLA COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser (developer version) 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 \ 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/Caladea/Caladea-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:${PORTSDIR}/x11-fonts/crosextrafonts-carlito-ttf \ ${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= 1704217 +SVNREVISION= 1712473 #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 EXECBASE?= openoffice-${AOOSUFFIX} ONLY_FOR_ARCHS= i386 amd64 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 x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ xrandr xrender xt USES= autoreconf:autoconf bison compiler cpe desktop-file-utils \ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ tar:${TARTYPE} INSTALLS_ICONS= yes 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 +OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT 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 +PDFIMPORT_DESC= Build and install PDF import extension +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:${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 +SDK_CONFIGURE_ENABLE= odk + +PDFIMPORT_CONFIGURE_ENABLE= pdfimport + +WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher + .include .include <${FILESDIR}/Makefile.localized> .if ${COMPILER_TYPE} == clang CPPFLAGS+= -I${LOCALBASE}/include .else USE_GCC= yes .endif .if ${ARCH} == amd64 FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64 .else FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86 .endif PACKAGE_PREFIX= Apache_OpenOffice LOCALIZED_LANG?= en-US .if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/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-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 -#AOOEXTENSIONS+= minimizer/presentation-minimizer.oxt -#AOOEXTENSIONS+= presenter/presenter-screen.oxt -#AOOEXTENSIONS+= pdfimport/pdfimport.oxt -AOOEXTENSIONS+= swext/wiki-publisher.oxt +CREATE_TREE= ${WRKSRC}/sysui/desktop/share/create_tree.sh -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/ ${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} -rf ${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' \ -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: ${REINPLACE_CMD} -e "/^ICONVERSION/s/=.*/= '-${AOOSUFFIX}'/" \ ${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} ; \ LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc} do-install: - @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions \ - ${STAGEDIR}${OOPATH}/uno_packages/cache/uno_packages \ - ${STAGEDIR}${DESKTOPDIR} + @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \ + ${STAGEDIR}${DESKTOPDIR} \ + ${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 - \ + ${TAR} -s '|./[^/]*/||' -xz -f $$i \ -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \ done - @${ECHO_CMD} "installing extensions" ; \ - cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; \ - ${INSTALL_DATA} ${AOOEXTENSIONS} \ - ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/ - @cd ${STAGEDIR}${OOPATH}/program ; \ - ${ECHO_CMD} "stripping executables and shared libraries" ; \ - ${STRIP_CMD} crashrep pagein uri-encode javaldx regmerge \ - regview *.so* *.bin ${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 - ${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} - @${ECHO_CMD} "installing application icons" - @cd ${ICONS} ; for dir in hicolor/*/apps ; do \ - ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/$${dir} ; \ - for app in base calc draw impress math printeradmin startcenter writer; do \ - icon_src=$${dir}/$${app}.png; \ - icon_dst=share/icons/$${dir}/${EXECBASE}-$${app}.png; \ - if [ -r $${icon_src} ]; then \ - ${INSTALL_DATA} $${icon_src} \ - ${STAGEDIR}${PREFIX}/$${icon_dst} ; \ - fi \ - done ; \ - done - @${ECHO_CMD} "installing mimetype icons" - @cd ${ICONS} ; for dir in hicolor/*/mimetypes ; do \ - dstdir=${STAGEDIR}${PREFIX}/share/icons/$${dir} ; \ - ${MKDIR} $${dstdir} ; \ - ${INSTALL_DATA} $${dir}/*.png $${dstdir}/ ; \ - done + @${ECHO_CMD} "adding desktop support" + @${LN} -sf ${XDGDIR} ${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} ; (\ - ${ECHO_CMD} "share/applications/${EXECBASE}" ; \ ${FIND} -s bin -name "${EXECBASE}*" ; \ - ${FIND} -s ${INSTALLATION_BASEDIR} share/icons \! -type d ; \ + ${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: branches/2015Q4/editors/openoffice-devel/distinfo =================================================================== --- branches/2015Q4/editors/openoffice-devel/distinfo (revision 401018) +++ branches/2015Q4/editors/openoffice-devel/distinfo (revision 401019) @@ -1,6 +1,6 @@ -SHA256 (openoffice/apache-openoffice-r1704217-src.tar.xz) = 52b0c1c54cfd0aa9ec1bd27a99c2c6240fd4279171bcf6025383fe7e0d55f24b -SIZE (openoffice/apache-openoffice-r1704217-src.tar.xz) = 215145548 +SHA256 (openoffice/apache-openoffice-r1712473-src.tar.xz) = 510ea8731ef43c93dfc88dba07d42b3580a38430e2822fd639aefa42a776c71f +SIZE (openoffice/apache-openoffice-r1712473-src.tar.xz) = 215169356 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 Index: branches/2015Q4/editors/openoffice-devel/files/Makefile.others =================================================================== --- branches/2015Q4/editors/openoffice-devel/files/Makefile.others (revision 401018) +++ branches/2015Q4/editors/openoffice-devel/files/Makefile.others (revision 401019) @@ -1,69 +1,35 @@ # 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 Apache OpenOffice mirror upload"; - @${LN} ${PKGFILE} \ - ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_install_${LOCALIZED_LANG}${PKG_SUFX} - -package-canonical: - @${ECHO_MSG} "===> Canonical packaging for Apache OpenOffice"; - @${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/${PACKAGE_PREFIX}* ${WRKDIR}/../. - -sdk: - @${ECHO_MSG} "===> Make SDK of Apache OpenOffice" - @${RM} -fr ${WRKDIR}/sdk_tmp - @${MKDIR} ${WRKDIR}/sdk_tmp - @cd ${WRKDIR}/sdk_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice-*SDK*.tar.gz - @cd ${WRKDIR}/sdk_tmp/Apache_*/openoffice* ; \ - ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \ - ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-SDK_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk - -ure: - @${ECHO_MSG} "===> Make Uno Runtime Environment of Apache OpenOffice" - @${RM} -fr ${WRKDIR}/ure_tmp - @${MKDIR} ${WRKDIR}/ure_tmp - @cd ${WRKDIR}/ure_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice_*URE*.tar.gz - @cd ${WRKDIR}/ure_tmp/Apache_OpenOffice*URE* ; \ - ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ - ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ - ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-URE_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR} solver: @${ECHO_MSG} "===> Make Solver of Apache OpenOffice" @cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-solver_${PACKAGE_MIDDLE}.tar.bz2 solver languagepack: @${ECHO_MSG} "===> Make languagepack of Apache OpenOffice" .if defined (ALL_LOCALIZED_LANGS) @cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack' .else @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/Apache_OpenOffice_languagepack/archive/install/${LOCALIZED_LANG} ; ls Apache_OpenOffice*tar.* > ${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/Apache_OpenOffice_languagepack/archive/install/${LOCALIZED_LANG}/$$i ; \ done @cd ${WRKDIR}/langpack_tmp/Apache_OpenOffice*/ ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_langpack_${LOCALIZED_LANG}.tbz ${INSTALLATION_BASEDIR} .endif .endif Index: branches/2015Q4/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh =================================================================== --- branches/2015Q4/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh (nonexistent) +++ branches/2015Q4/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh (revision 401019) @@ -0,0 +1,16 @@ +--- desktop/scripts/soffice.sh.orig 2014-02-25 08:22:34 UTC ++++ desktop/scripts/soffice.sh +@@ -90,11 +90,11 @@ if [ -x "$sd_prog/javaldx" ] ; then + case "`uname -s`" in + FreeBSD) + sd_prog1="$sd_prog" +- LD_LIBRARY_PATH=$sd_prog1:${LD_LIBRARY_PATH}} ++ LD_LIBRARY_PATH=$sd_prog1${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + export LD_LIBRARY_PATH + ;; + esac +- my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \ ++ my_path=`JAVA_HOME="%%JAVA_HOME%%" "$sd_prog/javaldx" $BOOTSTRAPVARS \ + "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` + if [ -n "$my_path" ] ; then + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} Property changes on: branches/2015Q4/editors/openoffice-devel/files/patch-desktop_scripts_soffice.sh ___________________________________________________________________ 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 Index: branches/2015Q4/editors/openoffice-devel/files/patch-extensions.lst =================================================================== --- branches/2015Q4/editors/openoffice-devel/files/patch-extensions.lst (nonexistent) +++ branches/2015Q4/editors/openoffice-devel/files/patch-extensions.lst (revision 401019) @@ -0,0 +1,17 @@ +--- extensions.lst.orig 2015-10-24 06:26:40 UTC ++++ extensions.lst +@@ -37,6 +37,14 @@ + # [ language=all && ENABLE_XXX ] + # file://XXX.oxt + ++# PDF Import extension ++[ language=all && ENABLE_PDFIMPORT=YES ] ++ file://pdfimport/pdfimport.oxt ++ ++# Wiki Publisher extension ++[ language=all && ENABLE_MEDIAWIKI=YES ] ++ file://swext/wiki-publisher.oxt ++ + # English dictionary + [ language=en.* || language=de || language=it ] + f5f6aab4cc5d92a34ab13ad15332770c http://sourceforge.net/projects/aoo-extensions/files/17102/21/dict-en.oxt/download "dict-en.oxt" Property changes on: branches/2015Q4/editors/openoffice-devel/files/patch-extensions.lst ___________________________________________________________________ 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 Index: branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm =================================================================== --- branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm (nonexistent) +++ branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm (revision 401019) @@ -0,0 +1,13 @@ +--- solenv/bin/modules/ExtensionsLst.pm.orig 2014-02-25 08:33:31 UTC ++++ solenv/bin/modules/ExtensionsLst.pm +@@ -592,8 +592,9 @@ sub GetExtensionList ($@) + my $protocol_selector = shift; + my @language_list = @_; + +- if (defined $ENV{'ENABLE_BUNDLED_DICTIONARIES'} ++ if ((defined $ENV{'ENABLE_BUNDLED_DICTIONARIES'} + && $ENV{'ENABLE_BUNDLED_DICTIONARIES'} eq "YES") ++ || $protocol_selector eq "file") + { + my $full_file_name = Prepare(); + my @urls = ParseExtensionsLst($full_file_name, \@language_list); Property changes on: branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_ExtensionsLst.pm ___________________________________________________________________ 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 Index: branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm =================================================================== --- branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm (nonexistent) +++ branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm (revision 401019) @@ -0,0 +1,20 @@ +--- solenv/bin/modules/installer/scriptitems.pm.orig 2014-02-27 09:52:15 UTC ++++ solenv/bin/modules/installer/scriptitems.pm +@@ -608,7 +608,7 @@ + } + + # Find the prereg directory entry so that we can create a new sub-directory. +- my $parentdir_gid = "gid_Brand_Dir_Share_Prereg_Bundled"; ++ my $parentdir_gid = "gid_Brand_Dir_Share_Extensions"; + my $parentdir = undef; + foreach my $dir (@{$dirsref}) + { +@@ -645,7 +645,7 @@ + 'UnixRights' => '444', + 'sourcepath' => File::Spec->catfile($ENV{'OUTDIR'}, "bin", $filename), + 'specificlanguage' => "", +- 'modules' => "gid_Module_Dictionaries", ++ 'modules' => "gid_Module_Root_Brand", + 'gid' => "gid_File_Extension_".$basename + }; + push( @filelist, $onefile); Property changes on: branches/2015Q4/editors/openoffice-devel/files/patch-solenv_bin_modules_installer_scriptitems.pm ___________________________________________________________________ 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 Index: branches/2015Q4/editors/openoffice-devel/files/pkg-message.in =================================================================== --- branches/2015Q4/editors/openoffice-devel/files/pkg-message.in (revision 401018) +++ branches/2015Q4/editors/openoffice-devel/files/pkg-message.in (revision 401019) @@ -1,44 +1,39 @@ 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. Scanner interface -------------------- To enable the scanner interface, install the sane-backends package. 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. 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. %%PREFIX%%/bin/%%EXECBASE%% %%PREFIX%%/bin/%%EXECBASE%%-printeradmin %%PREFIX%%/bin/%%EXECBASE%%-sbase %%PREFIX%%/bin/%%EXECBASE%%-scalc %%PREFIX%%/bin/%%EXECBASE%%-sdraw %%PREFIX%%/bin/%%EXECBASE%%-simpress %%PREFIX%%/bin/%%EXECBASE%%-smath %%PREFIX%%/bin/%%EXECBASE%%-swriter OpenOffice does need $LANG to be set to a suitable value. -4. Wiki Publisher Extension ---------------------------- -The Wiki Publisher extension can be installed from -%%PRINSTALLATION_BASEDIR%%/extensions/ - -5. 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. Index: branches/2015Q4 =================================================================== --- branches/2015Q4 (revision 401018) +++ branches/2015Q4 (revision 401019) Property changes on: branches/2015Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r398790,398959,399282,399537,399606,400085,400938