diff options
| author | jkim <jkim@FreeBSD.org> | 2014-02-27 01:27:51 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-02-27 01:27:51 +0800 |
| commit | d243ee6b2a93a81c2031b7bf83d6dcb31b39a386 (patch) | |
| tree | 67b640354734de946c16f648d02dfbc3853048e3 | |
| parent | d31fc1476ba3f3b7473f4c1b355ab54050a0f6aa (diff) | |
| download | freebsd-ports-gnome-d243ee6b2a93a81c2031b7bf83d6dcb31b39a386.tar.gz freebsd-ports-gnome-d243ee6b2a93a81c2031b7bf83d6dcb31b39a386.tar.zst freebsd-ports-gnome-d243ee6b2a93a81c2031b7bf83d6dcb31b39a386.zip | |
- Unconditionally install generic PPD files. [1]
- Update configure options and remove defunct ones.
PR: ports/167309, ports/167441 [1]
| -rw-r--r-- | editors/libreoffice/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index efcf0c819252..33904cd30207 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Full integrated office productivity suite @@ -101,7 +101,6 @@ CONFIGURE_ARGS+= --disable-dependency-tracking \ --with-os-version=${OSVERSION} \ --with-parallelism=${MAKE_JOBS_NUMBER} \ --with-solver-and-workdir-root=${WRKDIR} \ - --with-unix-wrapper="libreoffice" \ --with-vendor="FreeBSD ports ${PKGVERSION}" CONFIGURE_ARGS+= --disable-epm \ @@ -111,7 +110,6 @@ CONFIGURE_ARGS+= --disable-epm \ --disable-kdeab \ --disable-linkoo \ --disable-mergelibs \ - --disable-zenity \ --enable-cairo-canvas \ --enable-graphite \ --enable-python=system \ @@ -156,14 +154,13 @@ CONFIGURE_ARGS+= --disable-epm \ --with-system-orcus \ --with-system-poppler \ --with-system-redland \ - --with-system-stdlibs \ --with-system-ucpp \ --with-system-vigra \ --with-system-zlib \ --without-afms \ --without-fonts \ --without-myspell-dicts \ - --without-system-mozilla + --without-system-npapi-headers OPTIONS_DEFINE= CUPS DEBUG GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK \ SYSTRAY TEST VERBOSE WEBDAV @@ -182,7 +179,7 @@ WEBDAV_DESC= Enable webdav protocol .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client -CONFIGURE_ARGS+= --enable-cups --without-ppds +CONFIGURE_ARGS+= --enable-cups .else CONFIGURE_ARGS+= --disable-cups .endif @@ -264,8 +261,8 @@ JAVA_VERSION= 1.6 BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant \ ${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit -CONFIGURE_ARGS+= --enable-ext-report-builder \ - --enable-ext-wiki-publisher \ +CONFIGURE_ARGS+= --enable-ext-wiki-publisher \ + --enable-report-builder \ --enable-scripting-beanshell \ --enable-scripting-javascript \ --with-ant-home=${LOCALBASE}/share/java/apache-ant/ \ |