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)

 

06:01 truckman 

Fix build breakage when libreoffice is installed.

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

(Only the first 15 lines of the commit message are shown above )