15:19 truckman 

Import various improvements from openoffice-devel r393676, r395652, and
r396247:

 * Consolidate patch-freebsd.mk, patch-set_soenv.in, patch-unxfbsd.mk,
   and other changes that were committed to the upstream trunk
   into patch-build-framework:

   o Changes to aid building with gcc from ports on FreeBSD

   o Changes to detect when building with clang and to decode the
     compiler version

 * Remove the REINPLACE_CMD patches from post-patch and $FBSD_LDFLAGS
   from do-build that are no longer needed for building with gcc in
   the general case because of the previous patch

 * Disable optimization when compiling one source file with clang 3.4
   to avoid tripping on a compiler code generation bug.  This allows
   us to build with clang 3.4 from base on FreeBSD 10, so remove
   the dependency on clang 3.5.

 * 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

 * Makefile cleanups without functional change:

   o Combine two .if ${ARCH} == amd64 sections of Makefile

   o Merge the pre-configure target into post-extract

   o Simplify the code in the do-build target

   o Sort USE_XORG

 * Replace the default images in the opening splash window and the
   Help->About window with FreeBSD-branded versions.  Thanks to pfg
   for suggesting this and reviewing the new images.

 

22:13 truckman 

Various build updates from openoffice-devel (primarily r382334 and
r391960):

  * patch-i118574 no longer seems necessary for a clean build

  * Regnerate patch-i114430 with make makepatch

  * Build using boost from ports instead of the bundled boost

  * Build using silgraphite from ports instead of the bundled version

  * 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

Update patch-bridges*, patch-freebsd.mk, patch-jpeg, patch-nss, patch-sal,
patch-set_soenv.in, patch-unxfbsd.mk, and patch-webdav to the versions
accepted upstream, regenerated with make makepatch.

Regenerate patch-CVE-2015-1774 with make makepatch.

Approved by:	mat (mentor, implicit)

 

20:22 truckman 

Update openoffice-4 with applicable changes in openoffice-devel r382334:

 * Work 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.

 * Use the dictionaries already installed by ports.

 * Update patch-*.mk patches to versions that were imported upstream.
   They are tuned for clang to use as is, with only some minor
   additional tweaks needed for gcc.

 * Wordsmith pkg-message.

 * Some Makefile cleanups.

Differential Revision:	https://reviews.freebsd.org/D2151
Reviewed by:	pfg
Approved by:	mat (mentor)

 

15:04 truckman 

Unbreak editors/openoffice-4 and editors/openoffice-devel on systems
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)

 

04:19 maho 

Update (branching) Apache OpenOffice port to 4.0.0.