summaryrefslogtreecommitdiff
path: root/editors/openoffice-devel/files (unfollow)
Commit message (Collapse)AuthorFilesLines
2022-04-28editors/openoffice-devel: make robust against __cxa_exception ABI changesTijl Coosemans5-0/+181
Patch openoffice to replace __cxa_get_globals()->caughtExceptions, which is a pointer to the start of a struct __cxa_exception, with __cxa_current_primary_exception(), which is a pointer to the end. This allows struct __cxa_exception to be extended at the start as was recently done in FreeBSD main and stable/13 on 64-bit architectures. Recently on FreeBSD main and stable/13 __attribute__((__aligned__)) was added to struct _Unwind_Exception which changes its size on 32-bit architectures, and that of __cxa_exception as well. Patch openoffice to detect this so packages built on 13.0 still work on 13.1. Add a build dependency on a recent version of devel/libunwind so we always build with an unwind.h that has the right definition of _Unwind_Exception. The dependency was already pulled in via gstreamer (with default options).
2021-04-29editors/openoffice-devel: Upgrade to a newer upstream snapshotDon Lewis1-0/+11
Upgrade to upstream commit 6aec515561 * Fixes CVE-2021-30245 * Misc other fixes The building using the archive format on FreeBSD does not require epm.
2021-04-06all: Remove all other $FreeBSD keywords.Mathieu Arnold4-5/+0
2020-10-08Upgrade editors/openoffice-devel to a newer snapshot.Don Lewis2-12/+2
patch-gmake43 has been upstreamed. Fix LICENSE_MPL11 generation. Notes: svn path=/head/; revision=551736
2020-05-25Fix build with bison 3.6.2Sunpoet Po-Chuan Hsieh2-0/+34
Notes: svn path=/head/; revision=536493
2020-05-09Update devel/gmake to 4.3.Tijl Coosemans1-0/+11
Some changes have been made in this release that break backwards compatibility. Let USES=gmake force users to upgrade to this version so port maintainers don't have to support older versions. PR: 245725 Exp-run by: antoine Approved by: portmgr (antoine) Notes: svn path=/head/; revision=534792
2020-01-31Upgrade editors/openoffice-devel to git commit d12e928220 on the upstreamDon Lewis2-25/+0
AOO420 branch. patch-configure.ac and patch-icu_makefile.mk have been upstreamed. Switch from python2 to python3. Notes: svn path=/head/; revision=524676
2019-12-08Attempt to fix gcc builds on powerpc, that were broken by a boost upgrade.Don Lewis2-0/+25
Clang builds using -std=gnu++98 can use the STL headers in /usr/include/c++/v1, but recent versions of the gcc headers forbid this. As a fallback, OpenOffice tries to use the TR1 headers supplied by boost, but recent versions of boost no longer have those headers. In theory the gcc TR1 headers should work, but I was not able to make those work. Solve this problem by doing gcc builds using the "bundled" version of boost which is much older rather that boost from ports. The headers in the ports version of vigra has some C++11 stuff that gcc also complains about, so use the "bundled" version of vigra for gcc builds as well. The icu patch may only be needed for non-default values of LOCALBASE. No PORTREVISION bump since amd64 and i386 builds should be unchanged. Tested by: Curtis Hamilton clhamilto AT gmail.com Notes: svn path=/head/; revision=519579
2019-08-13Convert to UCL & cleanup pkg-message (categories e-g)Mathieu Arnold1-0/+6
Notes: svn path=/head/; revision=508837
2019-02-20Switch openoffice-devel to the upstream AOO42X branch from trunk andDon Lewis1-7/+7
upgrade to svn revision 1853744. This is on the path to the upcoming release of version 4.2.0. Disable the PDFIMPORT option and mark it broken. This extension does not get built unless a compatible version of poppler is available. Notes: svn path=/head/; revision=493409
2018-10-15editors/openoffice-4, editors/openoffice-devel:Don Lewis1-0/+95
Fix build with OpenSSL 1.1.x Pet portlint (USES block location) PR: 232265 Reported by: pkg-fallout Notes: svn path=/head/; revision=482164
2018-06-12Upgrade to Apache OpenOffice trunk SVN revsion r1833124. This includesDon Lewis1-70/+0
the bug fix in extra-patch-align16 needed for amd64. [1] Instead of symlinking the directory containing the OpenOffice .desktop files under $PREFIX/share/applications, symlink the individual .desktop files. This is what upstream does on Linux and what LibreOffice does as well. The Plasma 5 desktop ignores symlinks to directories when it is scanning for .desktop files. PR: 228030 [1] Reported by: kan Notes: svn path=/head/; revision=472230
2018-04-22Upgrade openoffice-devel to upstream SVN r1829757.Don Lewis3-49/+8
The fix for compatibility with boost 1.67 has been upstreamed, so remove BROKEN. Upstream has switched from gstreamer 0.10 to gstreamer 1.x, so change our dependency to match. Don't specify an explicit LIB_DEPENDS in addition to USE_GSTREAMER1. Most of the patches to work around various compiler issues have been upstreamed, so remove them here. Modernize patch-framework_Library__fwk.mk. Notes: svn path=/head/; revision=468039
2018-01-29Upgrade to upstream svn revision r1822069, which includes the fixesDon Lewis3-219/+25
that were in files/patch-security. Follow upstream and disable GNOMEVFS by default, using gio instead. Don't enable crashdumps by default. This build knob causes the build to be done with debug symbols, which greatly increase the size of the build, but this is all in vain because the executables and libraries are subsequently stripped. Build with debug symbols if WITH_DEBUG is set. Build with -fstack-protector. Only fetch unowinreg.dll when building the SDK. Remove tomcat from distinfo. It was leftover from an earlier experiment. Add three new options: dd three new options: CRASHDUMP - Enable crashdumps and set WITH_DEBUG. DBGUTIL - Enable assertions, object counting, and other non-production runtime debugging. DEBUG - Compile with -O0 for better debugability. The ports framework also sets WITH_DEBUG. Notes: svn path=/head/; revision=460244
2018-01-20Remove the CCACHE option and other ccache code from the MakefileDon Lewis1-40/+0
and use the ccache code in the ports framework handle all of the details. Don't prepend ${WRKSRC}/solenv/bin to PATH in CONFIGURE_ENV since it is no longer needed and blocks the framework from adding CCACHE_WRAPPER_PATH to PATH in CONFIGURE_ENV and MAKE_ENV. Sanitize MAKE_ENV and export it to the build, similar to what is done by the default do-build target. This passes CCACHE_DIR and HOME (set to WRKDIR) to the build, so the $HOME override in r459363 is no longer needed. We need to remove the CPPFLAGS setting from MAKE_ENV before exporting to the build because it breaks the build of the bundled icu module. CFLAGS and CXXFLAGS are also removed because they would interfere with the carefully constructed compiler flags set by the port. The include paths are already handled by the port, and the port also modifies the optmization flags for some files to work around compiler bugs. While here, remove files/generate.pl since it has been obsolete for a long while. No PORTREVISION bump since the package should be unchanged. PR: 224276 Notes: svn path=/head/; revision=459491
2018-01-18Fix editors/openoffice-4 build with clang 6.0.0 by compiling withDon Lewis2-0/+21
-std=gnu++98 since that was the default for the compilers historically used for the build. It turns out that -std=c++98 does not work because the vigra headers depend on LLONG_MAX and friends, which are not defined without the GNU extensions. Compensate for a recent poudriere change by overriding $HOME and setting it to /tmp if $HOME is not writeable. Some of the test code run during the build wants to use mkstemp() to create temporary directories under $HOME, which does not work for the "nobody" user which points $HOME at /nonexistent. No PORTREVISION bump since this is a build fix and there is no change to the package. PR: 225129 Reported by: jbeich Notes: svn path=/head/; revision=459363
2017-11-27Fix the table wizard in openoffice-base on FreeBSD 10 amd64. One of theDon Lewis1-0/+14
source files triggers a bug in the clang 3.4 code optimizer. MFH: 2017Q4 Notes: svn path=/head/; revision=454935
2017-10-26Add a security patch taken from Apache OpenOffice 4.1.4.Don Lewis2-1/+215
Add a LICENSE entry for MPL10. Code containing both MPL10 and MPL11 licenses is bundled. Add CONFLICTS_INSTALL. Move --with-ant-home and -with-jdk-home to Makefile from Makefile.knobs. MFH: 2017Q4 Security: 27229c67-b8ff-11e7-9f79-ac9e174be3af Notes: svn path=/head/; revision=452937
2017-09-30Upgrade openoffice-devel to upstream svn revision r1810071.Don Lewis3-23/+5
Make LICENSE more specific by changing MPL to MPL11. Add the REPORT_BUILDER option to enable building that extension, but leave it off and mark it broken until we have a way to install the necessary .jar files. The new PostgreSQL database connector requires jakarta-commons-lang3. Make jakarta-commons-codec, jakarta-commons-httpclient, and jakarta-commons-logging-jar dependencies optional based on the selected port options. patch-sal_qa_osl_mutex_osl__Mutex.cxx and patch-scaddins_source_analysis_analysishelper.hxx have been upstreamed. Pacify portlint by sorting sections. Notes: svn path=/head/; revision=451002
2017-07-22Include <complex> instead of the obsolete <boost/tr1/complex.hpp>. TheDon Lewis1-0/+11
upcoming boost 1.65 upgrade removes support for tr1. Sort ONLY_FOR_ARCHS to pacify portlint. No PORTREVISION bump since the code does not appear to change. PR: 220723 Notes: svn path=/head/; revision=446366
2017-01-31Upgrade to upstream svn revision r1780246. This incorporates theDon Lewis6-58/+92
pointer comparision fixes required to compile with clang 4.0, so delete patch-clang40. Also, patch-lingucomponent_source_spellcheck_spell_sspellimp.cxx has been incorporated upstream. On amd64, clang++ 4.0 uses the MOVAPS SSE instruction to initialize sufficiently large objects returned by the "new" operator. This requires that the object have 16-byte alignment. The FreeBSD malloc() implementation does the correct thing here, but OpenOffice has a couple of internal memory allocator implementations that only align to 8-byte boundaries at most. In addition OpenOffice overrides the new operator to interpose a couple of layers of wrappers. If the --enable-debug option is passed to configure, the wrapper adds 8 to the size passed to the allocator and adds an 8 byte offset to the pointer returned by the allocator to make room for a signature that it adds to the beginning of the memory block (the signature is validated and the inverse transformation is done when the memory is freed). This breaks the proper alignment done by the mamory allocator. Fix these problems by adding an EXTRA_PATCH that teaches the internal OpenOffice memory allocators to do 16-byte alignment and to use a 16-byte offset in the "new" wrapper, and apply this patch on amd64 if clang 4.0 is the system compiler. Pass the --with-alloc=system flag to configure so that the libc version of malloc() is used instead of one of the internal memory allocator implementations. Fix a few mis-sorts in BUILD_DEPENDS and don't list www/p5-libwww twice. Fix a sporadic failure in the clear_001 QA test that occasionally breaks the build. The nominal mutex hold time is 5 seconds, but because it is only checked one per second, the actual time is more likely to be around 6 seconds. When the before time value is subtracted from the after time value, the result might be 7 whole seconds and a large negative number of nanoseconds. Since the pass/fail check only looks at the difference in the seconds fields, it will fail the "< 7" assertion. Relax the assertion to "<= 7" as a quick fix. Add PowerPC64 support. [1] Add a section to pkg-message mentioning that spell check dictionaries for the desired languages should be installed. [2] Various fixes from PR 216245: [3] * Add option for mysql driver, default off. * Poppler is only needed for the optional PDF Import extension (and we only need poppler and not poppler-glib). * The --without-stlport configure flag is not needed. * Pass the -with-build-version flag to configure (but use ${PKGNAME} for completeness instead of just ${PORTNAME}-${PORTVERSION}) * Tweak a comment in the Makefile. PR: 215130, 212103, 216245 Submitted by: Curtis Hamilton <hamiltcl@verizon.net> [1] Submitted by: Arrigo Marchiori <ardovm AT yahoo.it> [2] Submitted by: pfg [3] Notes: svn path=/head/; revision=432895
2017-01-22editors/openoffice-devel: unbreak with clang 4.0Jan Beich1-0/+39
main/desktop/source/app/officeipcthread.cxx:228:14: error: ordered comparison between pointer and zero ('rtlDigest' (aka 'void *') and 'int') if ( handle > 0 ) ~~~~~~ ^ ~ main/desktop/source/deployment/misc/dp_misc.cxx:106:16: error: ordered comparison between pointer and zero ('rtlDigest' (aka 'void *') and 'int') if (digest <= 0) { ~~~~~~ ^ ~ main/sd/source/ui/view/viewshe3.cxx:229:48: error: ordered comparison between pointer and zero ('SdPage *' and 'int') if (pDocument->GetSdPage(0, ePageKind) > 0) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ PR: 216206 Submitted by: pfg Obtained from: upstream Notes: svn path=/head/; revision=432098
2016-11-26editors/openoffice*: unbreak consumers with hunspell 1.5Jan Beich1-0/+14
main/lingucomponent/source/spellcheck/spell/sspellimp.cxx:39:10: fatal error: 'dictmgr.hxx' file not found #include <dictmgr.hxx> ^ PR: 214844 Obtained from: upstream Approved by: portmgr blanket Notes: svn path=/head/; revision=427174
2016-06-23Upgrade to upstream svn revision 1749607.Don Lewis1-14/+0
This fixes the build problem with libc++ 3.8.0, so patch-vcl_source_glyphs_graphite__layout.cxx is no longer needed. Notes: svn path=/head/; revision=417378
2016-05-26Fix build of openoffice-4 and openoffice-devel with libc++ 3.8.0.Don Lewis1-0/+14
Openffice defines its own overloaded variant of round(), which is only different in return type from the 'real' round() from <math.h>, so it is ambiguous (in the C++ lookup sense). Fix this by renaming the custom round() to round_(), and using a define to minimize needed changes in the code. PR: 209588 Submitted by: dim Notes: svn path=/head/; revision=415875
2016-04-01Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.Mathieu Arnold1-3/+3
With hat: portmgr Sponsored by: Absolight Notes: svn path=/head/; revision=412346
2016-03-21Upgrade to upstream svn revision r1735889. This contains theDon Lewis1-13/+0
CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT pipe fix [1]. It also contains a slightly different fix for building with boost 1.60, so delete patch-sdext_source_pdfimport_makefile.mk, which is no longer needed. Delay running gnome-post-install until the plist has been generated by post-install so that the icons are detected and gtk-update-icon-cache gets run when the package is installed. [2] Add missing USES=shared-mime-info. PR: 207301 [1] PR: 208026 [2] Notes: svn path=/head/; revision=411540
2016-02-11Unbreak PDF Import extension when building with modern boost. SimilarDon Lewis1-0/+13
to the patch by amdmi3, link the extension with -lboost_system, but only do this in the --with-system-boost case. Doing this unconditionally would break building with the bundled boost because only the boost headers are available and the boost libraries are not built. This is still a bit pessimal because -lboost_system may be used when it is not strictly necessary (when the system boost is old), but it is likely that this is only relevant to FreeBSD and we are in the process of upgrading boost. This fix should be acceptable upstream. Re-enable the PDF Import extension by default. When the PDF Import extension is enabled, promote boost from BUILD_DEPENDS to LIB_DEPENDS. Tested with PDFIMPORT both on and off. Also tested with PDFIMPORT on, --with-system-boost disabled, and boost removed from *_DEPENDS. PR: 207073, 199601 Notes: svn path=/head/; revision=408688
2015-11-06Switch back to tracking the upstream trunk instead of OpenOffice 4.1.2Don Lewis7-1926/+31
release candidates. Upgrade to SVN revision r1712473. Add an option to build and install the PDF Import extension and enable it by default. Patch the extensions.lst file so that it points to the locations of the extension files rather than passing that information as a configure option. Add a patch to enable enable the use of file:// in extensions.lst for local integrated extensions as is documented in the comments in this file. Nuke the patches that have been committed upstream. Don't try to run the create_tree.sh script with "sh -c" since this script is not marked executable. MFH: 2015Q4 Notes: svn path=/head/; revision=400938
2015-10-24Upgrade to OpenOffice 4.1.2-RC3.Don Lewis5-36/+69
Explicity set $JAVA_HOME in startup wrapper to the OpenJDK version used for the build to avoid any potential issues with relying on javavmwrapper parsing bsd.java.mk to determine this at runtime. Fix an botch in the FreeBSD-specific $LD_LIBRARY_PATH code in the startup wrapper. Java is needed at runtime, so flag it as a runtime dependency. Add an option to build and install the SDK and disable it by default. The port has been building it all along, but not installing it. We save only a small amount of time by not building it, but we save about 70 MB of space when the port is installed. Add an option to build and install the Wiki Publisher extension. If it is enabled, it is now handled as an integrated extension, so the user does not have manually use the extension manager to track it down and install it. Tweak an existing script to install the icons instead of using a bunch of complicated code in the Makefile. Nuke some unused targets in Makefiles.others. The SDK is now explicitly handled, and the Uno Runtime Environment hasn't had the capability for separate installation in quite some time. Nuke an extraneous "-" from the tar command when unpacking the installation archive during staging. Notes: svn path=/head/; revision=400085
2015-10-18Patch the source with r1697228, r1697237, r1697247, r1697306, andDon Lewis1-0/+1808
r1697312 from upstream trunk (with a few tweaks to compensate for some other upstream changes not included here) to unbreak the build with OpenJDK8. Revert r399537 to unmark broken. PR: 199591 (openjdk8 by default exp-run) Notes: svn path=/head/; revision=399606
2015-10-09Fix an intermittent build failure by adding a missing dependency to theDon Lewis1-0/+8
port's build framework. This change has been committed to the upstream trunk. Notes: svn path=/head/; revision=398959
2015-10-08Temporarily downgrade the openoffice-devel port from the upstream trunkDon Lewis1-0/+73
branch to 4.1.2-RC1 in order to give the latter wider exposure before 4.1.2 is released. Add this missing missing bits of patch-i114430 that were committed to trunk upstream but that are not in 4.1.2-RC1. Removing --enable-symbols=small from CONFIGURE_ARGS allows us to avoid the need to use ${STRIP_CMD}. Notes: svn path=/head/; revision=398790
2015-09-26Add Caladea and Carlito fonts. They are metrically equivalent to someDon Lewis3-18/+6
Microsoft fonts and the proper definitions within OpenOffice have been added so that they are recognized as such. [1] The Linux ports handle the mapping from the printeradmin command to the spadmin executable in the shell wrapper. Do the same in the FreeBSD port rather than munging the printeradmin.desktop file. Retain the spadmin link to the wrapper for backwards compatability. The setofficelang command went away a long time ago. Remove it from the shell wrapper and remove the link. Exec the OpenOffice executables from the wrapper so that the shell for the wrapper doesn't hang around as an extra process until OpenOffice terminates. Nuke an extraneous shell continuation in the Makefile. Suggested by: pfg [1] Notes: svn path=/head/; revision=397932
2015-09-24Update to svn revsion r1704217.Don Lewis1-2/+7
Fix a regression in directory permissions and add a missing directory used for shared extensions. This combination of issues could cause incomplete cleanup on pkg removal if OpenOffice had been run by a user in the wheel group. Add a note about the location of the Wiki Publisher extension to pkg-message. Notes: svn path=/head/; revision=397760
2015-09-16Update the comment about the clang 3.6 and clang 3.7 code generationDon Lewis1-0/+10
bug with the upstream bug ID. More do-install target optimization: * Use the tar -s option to modify the path names when unpacking the install archive into the staging directory rather than unpacking, repacking, and unpacking again * Pass --with-unix-wrapper to configure and patch a makefile to get the desired Exec and Icon entries in the .desktop files instead of patching them after they have been staged. The Icon entries do not need to specify the .png suffix. * Streamline the usage of ${STRIP_CMD} * Create hard links to the wrapper for the individual apps instead of symbolic links, and use a for loop instead of repeating the command a bunch of times * Centralize the plist generation, which allows the icon installation ot be simplified * Install missing startcenter app icon * Mute many of the commands, but add strategic ${ECHO_CMD}s Notes: svn path=/head/; revision=397038
2015-09-10Unbreak wrapper script so that if a particular application isDon Lewis1-2/+2
specified but without specifying a document, that application is started instead of presenting the user with the generic startup window and requiring him to pick the document type (running openoffice-*-scalc should open to a new spreadsheet, etc.) Building with clang 3.7 is reported to have the same failure mode as clang 3.6, so use the same optimization tweak as a workaround. Various cleanups to do-install: * The paths ${PREFIX}/${INSTALLATION_BASEDIR} and ${PREFIX}/${INSTALLATION_BASEDIR}/${AOODIR}, and ${PREFIX}/${INSTALLATION_BASEDIR}/${AOODIR}/share/xdg are frequently used, so create a few variables to hold those paths instead of repeating the same, long sequence in a number of places * Tweak openoffice-wrapper to take advantage of the previous change * Use INSTALLS_ICONS=yes instead of manually adding the @exec and @unexec entries to the plist * Edit bootstraprc only once with ${REINPLACE_CMD} instead of running it twice to edit the same line * Remove bootstraprc.bak so that it does not get installed * With the advent of staging, it is not necessary to remove ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} * Simplify code for installing icons Rename remaining OOO* variables to AOO*. Notes: svn path=/head/; revision=396544
2015-08-31Upgrade to upstream svn revision r1697984.Don Lewis3-27/+0
Nuke patch-clang34 because it has been incorporated upstream. Replace the default images in the opening splash window and the Help->About window with FreeBSD-branded versions that also mark this as a developer snapshot. Thanks to pfg for suggesting this and reviewing the new images. Notes: svn path=/head/; revision=395652
2015-08-06Update to SVN revision 1694132, which contains some changes to aidDon Lewis1-0/+27
building with gcc from ports on FreeBSD. Remove the REINPLACE_CMD patches in the ports Makefile and $FBSD_LDFLAGS from do-build that are no longer needed for building with gcc in the general case. Add a patch to disable optimization when compiling one source file with base clang 3.4 on FreeBSD 10 amd64 to avoid tripping on a compiler code generation bug. This allows us to build with base clang on FreeBSD 10 amd64 instead of using the clang35 port. Fine tune compiler optimization flags when using clang 3.6 on FreeBSD 11 i386 or gcc 4.9 instead of totally disabling optimization. Unbreak the build with gcc 4.9 on amd64. A few Makefile cleanups without functional change: * Combine two .if ${ARCH} == amd64 sections of Makefile * Merge the pre-configure target into post-extract * Simplify the code in the do-build target Approved by: mat (mentor, implicit) Notes: svn path=/head/; revision=393676
2015-07-13Upgrade to upstream SVN revision 1689959.Don Lewis5-401/+19
patch-jpeg and patch-nss have been upstreamed and are no longer needed. patch-i118574 no longer seems necessary for a clean build. Regnerate patch-i114430 with make makepatch. Always build using boost from ports instead of the bundled boost, updating the BUILD_DEPENDS with the header that configure looks for. Add missing LIB_DEPENDS that are brought in by other dependencies, but are directly linked as requested by pkgconfig/*.pc. Build using sane and xrender headers from ports instead of bundled headers. Update LICENSE* to account for bundled software. Reformat pkg-message and mention that the scanner interface can be enabled by installing sane-backends. Pet portlint. Reviewed by: pfg Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D3064 Notes: svn path=/head/; revision=391960
2015-05-08Resurrect the part of patch-i114430 that was not accepted upstream.Don Lewis1-0/+31
Submitted by: pfg Approved by: mat (mentor, implicit) MFH: 2015Q2 Notes: svn path=/head/; revision=385793
2015-05-08Upgrade to svn revision r1677314, fixing the HWP filterDon Lewis14-578/+0
vulnerability documented in CVE-2015-1774 and <http://www.openoffice.org/security/cves/CVE-2015-1774.html> Differential Revision: https://reviews.freebsd.org/D2470 Submitted by: pi Reviewed by: pi, pfg Approved by: mat (mentor) MFH: 2015Q2 Security: b13af778-f4fc-11e4-a95d-ac9e174be3af Notes: svn path=/head/; revision=385717
2015-03-26Upgrade to apache-openoffice SVN revision 1667428.Don Lewis12-242/+226
Word around broken build on FreeBSD 11.0-CURRENT i386, which appears to be a code generation bug in clang 3.6 when using -Os optimization. Build using the ports version of graphics/silgraphite instead of building an internal copy. When building with clang, use the ports version of devel/boost-libs instead of an internal copy. Use the dictionaries already installed by ports. Update the patch-bridges and patch-*.mk patches to versions that will be sent upstream. The latter are tuned for clang to use as is, with only some minor additional tweaks needed for gcc. Nuke patch-webdav because it has been incorporated upstream. Wordsmith pkg-message. Various Makefile cleanups. Differential Revision: https://reviews.freebsd.org/D2108 Reviewed by: pfg Approved by: mat (mentor) Notes: svn path=/head/; revision=382334
2015-03-17Unbreak editors/openoffice-4 and editors/openoffice-devel on systemsDon Lewis10-14/+235
where clang is the base compiler. The issue was that these ports would only successfully build with gcc and libstdc++, so they specified USE_GCC=yes, but they linked to other C++ ports that were compiled with clang, which brought in libc++. The conflict between libstdc++ and libc++ caused the application to crash whenever an operation that popped up a dialog box was attempted. Thanks to dim@ for helping me track this down. The fix is to patch various bits of the openoffice souce to allow it to be built with clang on systems where the C++ dependencies are also compiled with clang. [1] Add a CUPS option so that CUPS can be disabled [2]. Register print/cups-client as a LIB_DEPENDS when CUPS is enabled. pkg-message claims that user settings are stored in ~/.openoffice,org4, whereas all other platforms seem to use ~/.openoffice.org/4 (or equivalent), and both openoffice-4 and openoffice-devel actually use ~/.openoffice.org-devel/4. The addition of -devel to the location happened with r325370. The / appears to have been introduced in r297259. Change the location match other platforms. Introduce a new variable ${AOOUDIR} so that the actual location and pkg-message stay in sync. Rename ${OOOTAG} to ${AOOTAG} and restore its value so that it can once again be substituted into pkg-message. It has not been set since r296269. Various Makefile cleanups: * Gather and sort USE_* * Simplify use of ${REINPLACE_CMD} * --x-includes and --x-libraries are automatically passed to configure, which ignores them * Get rid of unnecessary include of bsd.port.options.mk PR: 188088 [1] PR: 198458 [2] Differential Revision: https://reviews.freebsd.org/D2055 Reviewed by: pfg Approved by: mat (mentor) Notes: svn path=/head/; revision=381494
2015-02-25Fix build breakage when libreoffice is installed.Don Lewis1-0/+79
The problem is that libreoffice installs its own copy of unopkg in ${PREFIX}/bin and that the openoffice build attempts to use this copy of unopkg instead of the openoffice version which is in subdirectory of ${WRKSRC}. The reason is that the openoffice build expects to find its own copy of unopkg by depending on having "." in its $PATH, but its $PATH has ${PREFIX}/bin before ".". Openoffice attempts to do the right thing by first constructing $PATH by prepending "." and a small number of other directories where it stashes executables used during the build to the value of $PATH that it inherits from the environment. Things go wrong when it tries to add the paths for ${CC}, perl, and java to $PATH. If $PATH has /usr/bin before ${PREFIX}/bin, the openoffice build finds the perl symlink in /usr/bin before it finds perl in ${PREFIX}/bin, so it prepends ${PREFIX}/bin to $PATH to try to ensure that the correct version of perl will be found first. This moves ${PREFIX}/bin earlier in $PATH than ".". The operation to put the path to ${CC} in $PATH has a different problem. It uses the variable COMPATH for this, which is the dirname of the patch to $CC, with the trailing /bin stripped off. That results in /usr/local being added to $PATH, which is nonsensical, though mostly harmless. There are three fixes here: * Always keep the parts of $PATH for the directories under ${WRKSRC}, including "." at the beginning of the path. * Ignore symlinks to executables when deciding to prepend a directory to the path. * Append "/bin" when using COMPATH so that the result points to the directory where ${CC} actually resides. There is actually another variable CC_PATH, but it has an extra trailing "/", so it doesn't match ${PREFIX}/bin. Differential Revision: https://reviews.freebsd.org/D1958 Reviewed by: pfg Approved by: mat (mentor) Notes: svn path=/head/; revision=379874
2015-01-21Update to SVN revision 1652526.Don Lewis6-82/+124
Resynchronize to openoffice-4 including: * portlint fixes * fix all but one stage-qa warning * add source makefile patch to unbreak --with-system-jpeg * add the --with-system-hyphen, --with-system-nss, --with-system-jpeg, and --with-system-mythes configure options * remove the --with-system-saxon option to allow coexistance with math/scilab * add all distfiles that were previously downloaded during build to the ext_sources distfile, and add --disable-fetch-external * make the graphics/png dependency explicit * change from USE_GCC=yes to USE_GCC=4.8 because of a compile error with gcc 4.9 * remove SVNREVISION from the ext_sources tarball name and tweak how it is extracted to allow it to be shared by multiple AOO releases * remove trailing cruft from files/patch-sal (from pfg@) * nuke files/patch-sal-inline (from pfg@) * modernize MASTER_SITES syntax and update MASTER_SITE for unowinreg.dll * unbreak sdk, package-canonical, and languagepack targets (from pfg@) * don't truncate generated plist (from mat@) * don't add @dirrm to generated plist, but add @dir for empty directories * don't add license files to generated plist because the framework does this (from mat@) * don't add a blank line to generated plist * merge post-install target into do-install (from mat@) * misc Makefile cleanup PR: 192557 Differential Revision: https://reviews.freebsd.org/D1571 Reviewed by: pfg Approved by: mat (mentor) Notes: svn path=/head/; revision=377620
2014-02-05Update to a better patch for cosmetic reason.Maho Nakata1-3/+3
Notes: svn path=/head/; revision=342631
2014-02-05remove unnecessary fileMaho Nakata1-19/+0
Notes: svn path=/head/; revision=342619
2014-02-05Update to 1560773Maho Nakata3-0/+98
https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds Now we set USE_GCC to avoid gcc 4.2.1 (along with FBSD9) bug. Notes: svn path=/head/; revision=342617
2014-02-03Now we use system nss.Maho Nakata1-0/+43
Notes: svn path=/head/; revision=342426