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
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.
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
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]
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
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
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]
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
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
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.
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)
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}.
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]
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.
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
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*.
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.
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)
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
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)
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)
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)
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)
wrapper out into a script included by soffice.sh. This way
there aren't any traps at first startup time and people
hopefully don't ask the same questions anymore.
At the same time, make more substitutions, also in oo_setup.resp.
Approved by: marcus (portsmgr)
