diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2009-08-31 10:47:55 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2009-08-31 10:47:55 +0000 |
| commit | 6c0bd12a3be59c2fa955235af1f30014e30366e2 (patch) | |
| tree | 9d2c60895e2ba35be9c1bb530c3b2303582829dc /editors/openoffice-3/Makefile | |
| parent | Update to 0.09. (diff) | |
Update to 3.1.1.
FreeBSD ports specific changes are following.
* Correct exception handling for >=702104 and better for prior ones.
This fixes unknown crashes [1].
* Install extensions; users should manually install extensions to actual
use though.
Installed extensions are:
sun-presentation-minimizer.oxt
http://extensions.services.openoffice.org/project/PresentationMinimizer
presenter-screen.oxt
http://extensions.services.openoffice.org/project/presenter-screen
pdfimport.oxt
http://extensions.services.openoffice.org/project/pdfimport
wiki-publisher.oxt
http://extensions.services.openoffice.org/project/wikipublisher
sun-report-builder.oxt
http://extensions.services.openoffice.org/project/reportdesign
located at ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/
* Allow openjdk6 as valid, and buildable JDK.
* remove boost for amd64.
[1] http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
http://www.openoffice.org/issues/show_bug.cgi?id=98781
http://www.openoffice.org/issues/show_bug.cgi?id=82690
http://www.freebsd.org/cgi/cvsweb.cgi/src/libexec/rtld-elf/rtld.c?rev=1.135;content-type=text%2Fx-cvsweb-markup
http://www.freebsd.org/cgi/cvsweb.cgi/src/libexec/rtld-elf/rtld.c?rev=1.124.2.6;content-type=text%2Fx-cvsweb-markup
Funded by OpenOffice.org community.
Notes
Notes:
svn path=/head/; revision=240596
Diffstat (limited to 'editors/openoffice-3/Makefile')
| -rw-r--r-- | editors/openoffice-3/Makefile | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 1d2bd7d4d50c..ed40f3647b22 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -1,4 +1,3 @@ - # New ports collection makefile for: OpenOffice.org # Date created: 28 February 2002 # Whom: Martin Blapp @@ -8,7 +7,6 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION= 2 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \ @@ -24,7 +22,7 @@ EXTRACT_ONLY= ${OOOSRC} MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch) -OOOVERSION= 3.1.0 +OOOVERSION= 3.1.1 NO_LATEST_LINK= yes USE_GNOME= desktopfileutils gtk20 MOZILLA_VERSION= 1.7.5 @@ -49,7 +47,7 @@ MAKE_JOBS_SAFE= yes USE_JAVA= yes JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava +JAVA_VENDOR= freebsd bsdjava openjdk .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 1.6 .else @@ -66,7 +64,7 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -MILESTONE?= 11 +MILESTONE?= 19 OOOTAG?= OOO310_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOODIR= openoffice.org3 @@ -134,7 +132,18 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --enable-crashdump=yes \ --with-system-zlib \ --with-system-stdlibs \ - --with-epm=internal + --with-epm=internal \ + --enable-minimizer \ + --enable-presenter-console \ + --enable-pdfimport \ + --enable-wiki-publisher \ + --enable-report-builder + +OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt +OOOEXTENSIONS+= presenter/presenter-screen.oxt +OOOEXTENSIONS+= pdfimport/pdfimport.oxt +OOOEXTENSIONS+= swext/wiki-publisher.oxt +OOOEXTENSIONS+= sun-report-builder.oxt .if ${ARCH} == amd64 WITHOUT_MOZILLA= yes @@ -166,7 +175,7 @@ pre-everything:: .endif #issue XXXXXX not raised yet... -CRLFFILES=curl/curl*patch neon/neon*patch +CRLFFILES=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch post-extract: for i in ${CRLFFILES}; do \ @@ -221,6 +230,8 @@ do-install: @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR} @cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR} .endif + @${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ + @cd ${WRKSRC}/solver/310/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ post-install: @${ECHO_MSG} "===> Add wrapper scripts"; |