ports/156708: devel/goffice: add a WITHOUT_GCONF knob

[Zhihao Yuan]

>Number:         156708
>Category:       ports
>Synopsis:       devel/goffice: add a WITHOUT_GCONF knob
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 29 02:10:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Zhihao Yuan
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
Northern Illinois University
>Environment:
System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Mar 14 02:51:28 CDT 2011 root at compaq.yuetime:/usr/obj/usr/src/sys/HOUKAGO amd64


	
>Description:
	
	If the gnumeric chain, libgsf+goffice+gnumeric all have the WITHOUT_GCONF knob, the users will be able to build these ports without gconf.
>How-To-Repeat:
	
>Fix:

	

--- patch-goffice_1 begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/goffice.orig/Makefile /usr/ports/devel/goffice/Makefile
--- /usr/ports/devel/goffice.orig/Makefile	2011-03-25 07:31:18.000000000 -0500
+++ /usr/ports/devel/goffice/Makefile	2011-04-28 20:48:06.515658026 -0500
@@ -10,6 +10,7 @@
 
 PORTNAME=	goffice
 PORTVERSION=	0.8.14
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 
@@ -22,13 +23,19 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgsf gconf2 \
-		ltverhack
+USE_GNOME=	gnomeprefix gnomehack intlhack libgsf ltverhack
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ARGS+=	CPPFLAGS+="-I${LOCALBASE}/include" \
+			LDFLAGS+="-L${LOCALBASE}/lib"
+MAKE_JOBS_SAFE=	yes
+
+.if !defined(WITHOUT_GCONF) || exists(${LOCALBASE}/bin/gconftool-2)
+USE_GNOME+=	gconf2
+.else
+CONFIGURE_ARGS+=	--with-config-backend=keyfile
+.endif
 
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		SHORT_VER=0.8
--- patch-goffice_1 ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: