Date: Sun, 5 May 2013 23:08:40 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317449 - in head/devel/goffice: . files Message-ID: <201305052308.r45N8edN094305@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sun May 5 23:08:40 2013 New Revision: 317449 URL: http://svnweb.freebsd.org/changeset/ports/317449 Log: Update header. Use USES=pathfix and add pkgconfig. Convert to OptionsNG. Add patch to fix the build with glib 2.36.x Obtained by: GNOME stage repo Added: head/devel/goffice/files/patch-configure (contents, props changed) Modified: head/devel/goffice/Makefile Modified: head/devel/goffice/Makefile ============================================================================== --- head/devel/goffice/Makefile Sun May 5 23:01:49 2013 (r317448) +++ head/devel/goffice/Makefile Sun May 5 23:08:40 2013 (r317449) @@ -1,12 +1,9 @@ -# New ports collection makefile for: goffice -# Date created: 07 June 2005 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports-stable/devel/goffice/Makefile,v 1.3 2010/06/29 10:56:38 kwm Exp $ +# $MCom: ports/trunk/devel/goffice/Makefile 17268 2013-04-01 05:13:11Z marcus $ # # !!! When updating goffice, don't forget to update pkg-plist in: -# math/gnumeric science/gchemutils +# science/gchemutils PORTNAME= goffice PORTVERSION= 0.8.17 @@ -20,12 +17,12 @@ COMMENT= GLib/GTK+ set of document centr LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre +LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre USE_XZ= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack -USES= gettext +USE_GNOME= gnomeprefix intlhack gtk20 libgsf ltverhack +USES= gettext pathfix pkgconfig USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -35,7 +32,12 @@ PLIST_SUB= VERSION=${PORTVERSION} \ MAKE_JOBS_SAFE= yes -.if !defined(WITHOUT_GCONF) +OPTIONS_DEFINE= GCONF +OPTIONS_DEAFULT=GCONF + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGCONF} USE_GNOME+= gconf2 .else CONFIGURE_ARGS+=--with-config-backend=keyfile Added: head/devel/goffice/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/goffice/files/patch-configure Sun May 5 23:08:40 2013 (r317449) @@ -0,0 +1,11 @@ +--- configure.orig 2012-06-04 20:59:55.000000000 +0200 ++++ configure 2012-06-04 21:00:30.000000000 +0200 +@@ -15161,7 +15161,7 @@ + $as_echo_n "checking for G_REGEX_ERROR_STRAY_BACKSLASH... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <glib/gregex.h> ++#include <glib.h> + int + main () + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305052308.r45N8edN094305>