Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Jun 2012 19:52:00 -0400 (EDT)
From:      "Sean C. Farley" <scf@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        office@FreeBSD.org
Subject:   [PATCH] editors/openoffice-3: allow gconf2 and gnomevfs2 to be optional
Message-ID:  <201206062352.q56Nq0wn007251@thor.farley.org>

next in thread | raw e-mail | index | archive | help

>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 <bsd.port.pre.mk>
 
 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 ---




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206062352.q56Nq0wn007251>