From fd48ccbc42485bc10f91f3efbb2594c70bf6c15e Mon Sep 17 00:00:00 2001 From: Jeremy Messenger Date: Sat, 4 Jun 2011 22:36:54 +0000 Subject: - Make gconf optional. - Mark MAKE_JOBS_SAFE. - Move CPPFLAGS outside the CONFIGURE_ENV. PR: ports/156708 Submitted by: Zhihao Yuan --- devel/goffice/Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'devel/goffice') diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile index 949090cafdd3..d30f69b4f963 100644 --- a/devel/goffice/Makefile +++ b/devel/goffice/Makefile @@ -22,15 +22,21 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgsf gconf2 \ - ltverhack +USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack USE_GETTEXT= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - +CPPFLAGS= "-I${LOCALBASE}/include" +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" PLIST_SUB= VERSION=${PORTVERSION} \ SHORT_VER=0.8 +MAKE_JOBS_SAFE= yes + +.if !defined(WITHOUT_GCONF) +USE_GNOME+= gconf2 +.else +CONFIGURE_ARGS+=--with-config-backend=keyfile +.endif + .include -- cgit v1.2.3