From owner-freebsd-office@FreeBSD.ORG Wed Jun 6 23:52:02 2012 Return-Path: Delivered-To: office@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DFE591065670; Wed, 6 Jun 2012 23:52:02 +0000 (UTC) (envelope-from scf@FreeBSD.org) Received: from mail.farley.org (mail.farley.org [IPv6:2001:470:1f07:14d3:2::11]) by mx1.freebsd.org (Postfix) with ESMTP id 70ECF8FC17; Wed, 6 Jun 2012 23:52:02 +0000 (UTC) Received: from thor.farley.org (root@thor.farley.org [IPv6:2001:470:1f07:14d3:1::5]) by mail.farley.org (8.14.5/8.14.5) with ESMTP id q56Nq1X5087392; Wed, 6 Jun 2012 19:52:01 -0400 (EDT) (envelope-from scf@FreeBSD.org) Received: from thor.farley.org (localhost [127.0.0.1]) by thor.farley.org (8.14.5/8.14.5) with ESMTP id q56Nq0pY007252; Wed, 6 Jun 2012 19:52:00 -0400 (EDT) (envelope-from scf@FreeBSD.org) Received: (from root@localhost) by thor.farley.org (8.14.5/8.14.5/Submit) id q56Nq0wn007251; Wed, 6 Jun 2012 19:52:00 -0400 (EDT) (envelope-from scf@FreeBSD.org) Date: Wed, 6 Jun 2012 19:52:00 -0400 (EDT) Message-Id: <201206062352.q56Nq0wn007251@thor.farley.org> To: FreeBSD-gnats-submit@FreeBSD.org From: "Sean C. Farley" X-send-pr-version: 3.113 X-GNATS-Notify: X-Spam-Status: No, score=-2.9 required=4.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.farley.org Cc: office@FreeBSD.org Subject: [PATCH] editors/openoffice-3: allow gconf2 and gnomevfs2 to be optional X-BeenThere: freebsd-office@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Office applications on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2012 23:52:03 -0000 >Submitter-Id: current-users >Originator: Sean C. Farley >Organization: >Confidential: no >Synopsis: [PATCH] editors/openoffice-3: allow gconf2 and gnomevfs2 to be optional >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 8.3-STABLE amd64 >Environment: System: FreeBSD thor.farley.org 8.3-STABLE FreeBSD 8.3-STABLE #0 r236325M: Wed May 30 15:26:06 EDT >Description: Turn gconf2 and gnomevfs2 into options that are enabled by default. Port maintainer (office@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix) >How-To-Repeat: >Fix: --- apache-openoffice-3.4.0_2.patch begins here --- diff -ruN --exclude=CVS ../openoffice-3.orig/Makefile ./Makefile --- ../openoffice-3.orig/Makefile 2012-05-27 21:32:01.000000000 -0400 +++ ./Makefile 2012-06-06 19:37:23.000000000 -0400 @@ -23,7 +23,7 @@ NO_LATEST_LINK= yes -USE_GNOME= desktopfileutils gtk20 libxslt libidl gconf2 gnomevfs2 glib20 +USE_GNOME= desktopfileutils gtk20 libxslt libidl glib20 USE_XORG= x11 ice xaw xau xext xrender xrandr \ xi xt xcursor xdamage xcomposite xfixes USE_GL= gl glu @@ -36,6 +36,10 @@ WITHOUT_CPU_CFLAGS= true MAKE_JOBS_SAFE= yes +OPTIONS_DEFINE= GCONF GNOMEVFS +OPTIONS_DEFAULT=GCONF GNOMEVFS +GNOMEVFS_DESC= Enable GNOME Virtual File System + .include USE_JAVA= yes @@ -43,6 +47,18 @@ JAVA_VENDOR= freebsd bsdjava openjdk JAVA_VERSION= 1.5 1.6 +.if !defined(WITHOUT_GCONF) +USE_GNOME+= gconf2 +.else +CONFIGURE_ARGS+=--disable-gconf +.endif + +.if !defined(WITHOUT_GNOMEVFS) +USE_GNOME+= gnomevfs2 +.else +CONFIGURE_ARGS+=--disable-gnome-vfs +.endif + .include <${FILESDIR}/Makefile.localized> ONLY_FOR_ARCHS= i386 amd64 --- apache-openoffice-3.4.0_2.patch ends here ---