From owner-svn-ports-all@FreeBSD.ORG Wed Feb 26 17:27:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4BF62220; Wed, 26 Feb 2014 17:27:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1D51A12A7; Wed, 26 Feb 2014 17:27:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1QHRpA9015666; Wed, 26 Feb 2014 17:27:51 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1QHRpkM015665; Wed, 26 Feb 2014 17:27:51 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201402261727.s1QHRpkM015665@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 26 Feb 2014 17:27:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346218 - head/editors/libreoffice X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 17:27:52 -0000 Author: jkim Date: Wed Feb 26 17:27:51 2014 New Revision: 346218 URL: http://svnweb.freebsd.org/changeset/ports/346218 QAT: https://qat.redports.org/buildarchive/r346218/ Log: - Unconditionally install generic PPD files. [1] - Update configure options and remove defunct ones. PR: ports/167309, ports/167441 [1] Modified: head/editors/libreoffice/Makefile Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Wed Feb 26 17:24:35 2014 (r346217) +++ head/editors/libreoffice/Makefile Wed Feb 26 17:27:51 2014 (r346218) @@ -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-tr --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/ \