Commit graph

43 commits

Author SHA1 Message Date
Don Lewis
bc9bdd4c35 Unbreak wrapper script so that if a particular application is
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*.

Delete unused definition of ${SUBST}.

Delete fbsd:nokeywords property and add svn:keywords to
files/openoffice-wrapper.
2015-09-10 00:33:08 +00:00
Don Lewis
0973de4b43 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.
2015-09-07 15:19:18 +00:00
Mathieu Arnold
21a283f3be Remove UNIQUENAME and LATEST_LINK.
UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.

Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.

Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)

Reviewed by:	antoine, bapt
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3336
2015-08-17 14:20:40 +00:00
Don Lewis
999d09cef6 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)
2015-08-04 22:13:33 +00:00
Koop Mast
757724fd75 Update poppler to 0.34.0. [1]
Chase all users of shlib version change of libpoppler.so.

PR:		201477 [1]
Submitted by:	olivierd@ [1]
2015-08-02 16:06:16 +00:00
Antoine Brodin
5210365d1b MAKE_JOBS_SAFE=yes is a nop since july 2013 2015-06-28 15:20:04 +00:00
Antoine Brodin
6e5719ca80 Convert to USES=jpeg 2015-06-22 18:33:20 +00:00
Don Lewis
ccb0bd0a41 Do not attempt to override the intent of DISABLE_MAKE_JOBS, which
does not succeed in any case.

The do-build target does not need to use bash, or even an extra
level of shell.

There are two levels of parallelism in the openoffice build framework.
Split MAKE_JOBS_NUMBER between the two levels instead of potentially
running MAKE_JOBS_NUMBER^2 compilations in parallel.

PR:		199930
Approved by:	mat (mentor, implicit)
2015-05-14 23:07:17 +00:00
Don Lewis
75ff9b0b81 Add a patch to fix the HWP filter vulnerability documented in
CVE-2015-1774 and
<http://www.openoffice.org/security/cves/CVE-2015-1774.html>

Approved by:	mat (mentor)
MFH:		2015Q2
Security:	b13af778-f4fc-11e4-a95d-ac9e174be3af
Differential Revision:	https://reviews.freebsd.org/D2478
2015-05-08 15:58:38 +00:00
Don Lewis
006ca4d271 Unbreak editors/openoffice-* build when GCONF and GNOMEVFS are disabled
There is a missing dependency on devel/dbus-glib that causes the
openoffice build to fail when the GCONF and GNOMEVFS options are
disabled. When these options are enabled, one of the dependencies
added by these options brings along dbus-glib so the default build
succeeds.

There is a configure knob to control whether or not dbus-glib is
used, so follow the lead of the libreoffice port and rename the
GCONF option to GNOME and bundle both Gconf and DBUS handling under
the GNOME option.

Borrow the MMEDIA option from the libreoffice port and use that to
control the using of gstreamer.

Add a couple of missing p5-* build dependencies.

Add the --enable-gtk, --disable-kde, --disable-kde4 configure flags
so that the port does not try to build with KDE if it is installed
because compilation fails.

USE_AUTOTOOLS=autoconf -> USES=autoreconf:autoconf

PR:		199865
Reported by:	pi
Differential Revision:	https://reviews.freebsd.org/D2441
Reviewed by:	pi, pfg
Approved by:	mat (mentor)
2015-05-05 20:38:33 +00:00
Sunpoet Po-Chuan Hsieh
34806c2d90 - Add CPE information
PR:		199029
Submitted by:	shun <shun.fbsd.pr@dropcut.net>
2015-03-30 17:57:48 +00:00
Don Lewis
4a27d4ca83 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)
2015-03-27 20:22:37 +00:00
Baptiste Daroussin
a5da770e67 Make fonts repecting XDG
Xorg is now looking in ${LOCALBASE}/share/fonts by default
Xorg now accepts symlinks in etc/X11/fontpath.d (as decribed in Xserver(1))
Large cleanup on lots of font ports
All fonts are now properly dynamically generating fonts.dir and fonts.scale
instead of sometime overwriting existing ones)
All fonts are generating fontconfig's cache
Improve consistency in fonts ports
2015-03-21 23:05:19 +00:00
Don Lewis
caf437c22a 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)
2015-03-17 15:04:43 +00:00
Don Lewis
830f77d3d4 Switch back to USE_GCC=yes.
Work around this bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
in g++49 -Os optimzation by using -O0 optimization if we are compiling
with g++49.

Differential Revision:	https://reviews.freebsd.org/D1792
Approved by:	mat (mentor)
2015-02-15 22:30:45 +00:00
Brad Davis
c31c9023ec math/coinmp: Update to 1.8.0
PR:		197554
Submitted by:	Carlos Jacobo Puga Medina <cpm@fbsd.es> (maintainer)
Approved by:	zi
2015-02-13 01:01:35 +00:00
Koop Mast
563f73ccfe Update poppler to 0.30.0 [1].
Make sure we use openjpeg1 in poppler, while openjpeg2 support
was added there still bugs in openjpeg2 that need to be fixed.
Add patches to inkscape for API changes in poppler 0.29.0 [2].

PR:		196599 [1]
Submitted by:	olivierd@ [1]
Exp-run by:	antoine@
Obtained from:	upstream [2]
2015-02-03 12:28:23 +00:00
Don Lewis
648cf48986 Unbreak languagepack target (package-rename and ure targets are still
broken).

plist fixes:
  * Don't add @dirrm to generated plist
  * Don't add a blank line to generated plist
  * Don't truncate ${TMPPLIST} (from mat@)
  * Don't add @dirrm to generated plist
  * Add @dir for empty directories

Makefile diff reduction vs. upcoming openoffice-devel update.

Differential Revision:	https://reviews.freebsd.org/D1561
Approved by:	mat (mentor)
2015-01-21 09:03:09 +00:00
Don Lewis
9ddf46748a The sdk and package-canonical targets were suffering from bit rot.
Unbreak. [1]

The port build fails with gcc 4.9, convert to USE_GCC=4.8. [2]

Differential Revision:	https://reviews.freebsd.org/D1557
Submitted by:	pfg [1]
Submitted by:	gerald [2]
Reviewed by:	pfg
Approved by:	mat (mentor)
2015-01-19 17:45:17 +00:00
Don Lewis
6d07df8ef9 The editors/openoffice-4 port currently depends on textproc/saxon-devel and
relies on features that are only present in this version of saxon.  The
recent update to math/scilab added a dependency to textproc/saxon-he, and
it requires features that are only present in this version.  Unfortunately
saxon-devel and saxon-he conflict because they both want to install
/usr/local/share/java/classes/saxon9-xqj.jar, which means that openoffice-4
and scilab can't both be installed on the same machine.  Avoid this problem
by tweaking openoffice-4 use a private copy of saxon.  This requires a
new version of the ext_sources tarball.

Bump PORTREVISION so that users pick up the updated port.

Modernize MASTER_SITES syntax and update MASTER_SITE for unowinreg.dll.

Update comment to take de facto mainternship.

PR:		193776
Differential Revision:	https://reviews.freebsd.org/D1553
Reviewed by:	bapt, pfg
Approved by:	mat (mentor)
2015-01-19 00:57:30 +00:00
Baptiste Daroussin
bb21093773 Bump portrevision after png update 2014-12-25 20:54:41 +00:00
Max Brazhnikov
2d2662f134 Bump PORTREVISION after graphics/poppler update to 0.26.3 2014-11-25 12:55:53 +00:00
Gerald Pfeifer
15945f8122 Update the default version of GCC in the Ports Collection from GCC 4.7.4
to GCC 4.8.3.

Part II, Bump PORTREVISIONs.

PR:		192025
Tested by:	antoine (-exp runs)
Approved by:	portmgr (implicit)
2014-09-10 20:50:31 +00:00
Don Lewis
8f13c42b68 Apache OpenOffice 4.1.1 has been officially released.
Release announcement:

Announcing Apache OpenOffice 4.1.1

21 August 2014 - The Apache OpenOffice project is pleased to announce
the immediate availability of OpenOffice 4.1.1. You can download
it from our website.

Apache OpenOffice 4.1.1 is a micro update with many useful and
critical bugfixes including 2 security relevant fixes (details will
come separately).

Bugfixes include:

    better compatibility with Microsoft Office files, better support
    for Mac OS X gestures and scrolling, enhanced compatibility
    with Linux desktop environments.

A full list of the issues fixed in this release can be found at
http://s.apache.org/AOO411-solved.

With 3 additional supported languages, OpenOffice 4.1.1 increases
again the number of released languages which is now 41. The released
languages are Asturian, Bulgarian, Catalan, Calalan (Valencia AVL),
Catalan (Valencia RACV), Czech, Danish, German, Greek, English (GB
+ US), Spanish, Basque, Finnish, French, Scots Gaelic, Galician,
Hebrew, Hindi, Hungarian, Italian, Japanese, Khmer, Korean, Lithuanian,
Norwegian Bokmal, Dutch, Polish, Portuguese, Portuguese Brazil,
Russian, Slovak, Slovenian, Serbian Cyrillic, Swedish, Tamil, Thai,
Turkish, Vietnamese, Chinese (Simplified + Traditional).

Apache OpenOffice 4.1.1 is the next key milestone to continue the
success of OpenOffice.

Details of new features and enhancements in this release are described
in the Release Notes
<https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes>.

Those interested in the source code can download it via the links
on this page <https://openoffice.apache.org/downloads.html>.

Juergen Schmidt - Apache OpenOffice Release Manager and member of
the Project Management Committee

Posted at 08:00AM Aug 23, 2014 by pescetti in General

PR:		193051
Approved by:	office@ (bapt)
2014-08-26 22:48:21 +00:00
Don Lewis
3bbd4b1e3f Remove the --with-system-graphite configure option to unbreak
editors/openoffice-4 on FreeBSD 10.0 and 11.0.  The cause of the
breakage is that on systems with clang as the default compiler,
graphics/silgraphite is built with clang and linked to libc++.so.1,
while openoffice is built with gcc from ports and linked to libstdc++.
This combination causes the resulting executables to go boom.

Add a source makefile patch to unbreak the --with-system-jpeg option
and enable this option.  The problem is that without this patch the
build tries to link to the openjdk version of libjpeg instead of
the version installed by graphics/jpeg.

The --with-system-mythes options also works, so enable it as well.

Adjust LIB_DEPENDS for these changes.  Also make the graphics/png
dependency explicit.

Reroll the ext_sources tarball for these changes.  Remove SVNREVISION
from its name and tweak how it is extracted to allow the same
ext_sources tarball to be used for multiple AOO releases.

Various Makefile tweaks to make upgrades easier and to reduce
differences between the Makefile for openoffice-4 and a forthcoming
update to openoffice-devel.

USE_PYTHON=yes is obsolete, so convert to USES=python.

Remove a bunch of @'s from the Makefile to make the build slightly
more verbose and make debugging a bit easier if something breaks
in our Makefile.

Remove trailing cruft from files/patch-sal (from pfg@).

Nuke files/patch-sal-inline (from pfg@).

PR:		192545
Approved by:	office@ (bapt)
2014-08-25 23:21:55 +00:00
Don Lewis
e110bb96bc Upgrade Apache OpenOffice to version 4.1.0.
Fix all portlint -a and check-plist errors and warnings.

Fix all but one stage-qa warnings.

Disable --with-system-boost because it broke the build.

Enable the --with-system-graphite, --with-system-hyphen, and
--with-system-nss configure options.

Add all distfiles that were previously downloaded during
built to the ext_sources distfile.  Add the --disable-fetch-external
configure flag to disable downloads during build.

PR:		192258
Approved by:	office@ (bapt)
2014-08-05 16:34:47 +00:00
Tijl Coosemans
0d6e69bd42 Bump PORTREVISION on everything that depends on devel/apr1 due to the
library version change.

Approved by:	portmgr (implicit)
2014-06-12 09:17:32 +00:00
Niclas Zeising
39fc32e828 The FreeBSD x11@ and graphics team proudly presents
a zeising, kwm production, with help from dumbbell, bdrewery:

NEW XORG ON FREEBSD 9-STABLE AND 10-STABLE

This update switches over to use the new xorg stack by default on FreeBSD 9
and 10 stable, on osversions where vt(9) is available.
It is still possible to use the old stack by specifying WITHOUT_NEW_XORG in
/etc/make.conf .
FreeBSD 8-STABLE and released versions of FreeBSD still use
the old version.
A package repository with binary packages for new xorg will
be available soon.

This patch also contains updates of libxcb and related ports, pixman, as well
as some drivers and utilities.

Bump portrevisions for xf86-* ports, as well as virtualbox-ose-additions due
to xserver version change.

Apart from these updates, the way shared libraries are handled has been
changed for all xorg ports, as well as libxml2 and freetype, which means
ltverhack is gone and as a consequence shared libraries have been bumped.
The plan is that this change will make library bumps less likely in the
future.
All affected ports have had their portrevisions bumped as a consequence of
this.

Fix some issues where WITH_NEW_XORG weren't detected properly on CURRENT.

Update instructions, hardware support, and more notes can be found on
https://wiki.freebsd.org/Graphics

Thanks to:	all testers, bdrewery and the FreeBSD x11@ team
exp-run by:	bdrewery [1]
PR:		ports/187602 [1]
Approved by:	portmgr (bdrewery), core (jhb)
2014-04-16 18:28:47 +00:00
Baptiste Daroussin
74145dc414 Create mime and icon directory inside the stage directory
Reported by:	Norbert Augenstein <lists@augenstein.net>, pfg
2014-03-30 21:26:26 +00:00
Baptiste Daroussin
e78444e8a9 Support stage 2014-03-26 08:11:08 +00:00
Baptiste Daroussin
4650a910d0 Chase boost and icu bump
While here convert some LIB_DEPENDS
2014-02-07 11:44:08 +00:00
Olli Hauer
4fb1cfb1cd - rename AL2 to APACHE20 in Mk/bsd.licenses.db.mk
- svn move Templates/Licenses/AL2 Templates/Licenses/APACHE20
- add APACHE10 and APACHE11 to Mk/bsd.licenses.db.mk
- add entry in UPDATING
- bulk change all ports AL2 => APACHE20

- math/openfst/pkg-plist: remove share/licenses/openfst-1.3.4

PR:		ports/184785
Submitted by:	ohauer
Reviewed by:	tabthorpe
Approved by:	portmgr (tabthorpe@)
2013-12-30 20:55:18 +00:00
Koop Mast
2a51b2182a Update poppler to 0.24.4.
Update comment.
Use new LIB_DEPENDS syntax, use USES=pathfix.
Stagify.

Bump portrevision of all affected ports, and Update poppler* LIB_DEPENDS to
new syntax.
2013-12-27 16:54:21 +00:00
Dmitry Marakasov
a2105d9f79 - Remove manual creation and removal of share/applications, as it's now in the mtree (categories starting with [bce])
Approved by:	portmgr (bdrewery)
2013-10-22 13:57:35 +00:00
Maho Nakata
831e7c0c7b update to 4.0.1 2013-10-03 00:50:12 +00:00
Baptiste Daroussin
68ede13b49 Add NO_STAGE all over the place in preparation for the staging support (cat: editors) 2013-09-20 16:36:23 +00:00
Baptiste Daroussin
2b07ee6ce0 Add an explicit dependency on pkgconf 2013-09-18 08:38:20 +00:00
Maho Nakata
cec31a1b1e Unbreake by reroll of ext packages. Actually
former archive misses some tarballs, and I added to
avoid fetching while compiling.
2013-09-12 06:39:10 +00:00
Bryan Drewery
f0a57d0b9e - Mark BROKEN, fails checksum 2013-08-31 02:00:00 +00:00
Bryan Drewery
e4bc35055c - Fix with bmake 2013-08-30 12:47:04 +00:00
Maho Nakata
a4ddb25f06 bsd.port.options.mk, needs to be placed before bsd.port.pre.mk.
Submitted by:	jgh@
2013-08-28 00:28:06 +00:00
Maho Nakata
351c97c27d convert to USES, and adoption of optionsNG styling, add CCACHE as configurable option
PR:		181574
Submitted by:	jgh@
2013-08-27 06:27:24 +00:00
Maho Nakata
8f7988e67c Update (branching) Apache OpenOffice port to 4.0.0. 2013-08-26 04:19:17 +00:00