disable gnome desktop integration features which depend on libgsf-gnome,

the latter is discontinued upstream
bump PKGREV

4 files changed, 8 insertions, 26 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 353fd31a22b..37c87240ed0 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.151 2012/01/13 10:55:17 obache Exp $
+# $NetBSD: Makefile,v 1.152 2012/01/18 18:31:10 drochner Exp $
 #
 
 DISTNAME=		gnumeric-1.8.4
-PKGREVISION=		17
+PKGREVISION=		18
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.8/}
 EXTRACT_SUFX=		.tar.bz2
@@ -18,8 +18,7 @@ USE_TOOLS+=		gmake intltool msgfmt perl:run pkg-config
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
-GCONF_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
-			gnumeric-plugins.schemas
+CONFIGURE_ARGS+=	--without-gnome
 PKGCONFIG_OVERRIDE=	libspreadsheet.pc.in
 
 REPLACE_PERL+=		plugins/perl-func/perl_func.pl
@@ -35,10 +34,6 @@ CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 #.include "../../databases/libgnomedb/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.14.6
 .include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
@@ -46,7 +41,6 @@ BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.14.6
 .include "../../misc/goffice0.6/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/math/gnumeric/PLIST b/math/gnumeric/PLIST
index 48c24c27db0..75950549f57 100644
--- a/math/gnumeric/PLIST
+++ b/math/gnumeric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2009/06/14 18:05:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.34 2012/01/18 18:31:10 drochner Exp $
 bin/gnumeric
 bin/${PKGNAME}
 bin/ssconvert
@@ -122,8 +122,6 @@ include/libspreadsheet-1.8/spreadsheet/xml-sax.h
 lib/gnumeric/${PKGVERSION}/include/gnumeric-features.h
 lib/gnumeric/${PKGVERSION}/plugins/applix/applix.la
 lib/gnumeric/${PKGVERSION}/plugins/applix/plugin.xml
-lib/gnumeric/${PKGVERSION}/plugins/corba/corba.la
-lib/gnumeric/${PKGVERSION}/plugins/corba/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/derivatives/derivatives.la
 lib/gnumeric/${PKGVERSION}/plugins/derivatives/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/dif/dif.la
@@ -205,9 +203,6 @@ man/man1/gnumeric.1
 man/man1/ssconvert.1
 man/man1/ssindex.1
 share/applications/gnumeric.desktop
-share/gconf/schemas/gnumeric-dialogs.schemas
-share/gconf/schemas/gnumeric-general.schemas
-share/gconf/schemas/gnumeric-plugins.schemas
 share/gnome/help/gnumeric/C/about-authors.xml
 share/gnome/help/gnumeric/C/about-history.xml
 share/gnome/help/gnumeric/C/about-license.xml
@@ -701,7 +696,6 @@ share/gnumeric/${PKGVERSION}/glade/tabulate.glade
 share/gnumeric/${PKGVERSION}/glade/variance-tests.glade
 share/gnumeric/${PKGVERSION}/glade/view.glade
 share/gnumeric/${PKGVERSION}/glade/workbook-attr.glade
-share/gnumeric/${PKGVERSION}/idl/GNOME_Gnumeric.idl
 share/gnumeric/${PKGVERSION}/templates/invoice.gnumeric
 share/gnumeric/${PKGVERSION}/templates/loan.gnumeric
 share/gnumeric/${PKGVERSION}/templates/mileage.gnumeric
@@ -808,7 +802,6 @@ share/locale/zh_CN/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_CN/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
-share/omf/gnumeric/gnumeric-C.omf
 share/pixmaps/gnome-application-vnd.lotus-1-2-3.png
 share/pixmaps/gnome-application-x-applix-spreadsheet.png
 share/pixmaps/gnome-application-x-generic-spreadsheet.png
diff --git a/misc/goffice0.6/Makefile b/misc/goffice0.6/Makefile
index 38c6feb6102..6453a225510 100644
--- a/misc/goffice0.6/Makefile
+++ b/misc/goffice0.6/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2012/01/13 10:55:19 obache Exp $
+# $NetBSD: Makefile,v 1.22 2012/01/18 18:31:10 drochner Exp $
 #
 
 DISTNAME=		goffice-0.6.6
 PKGNAME=		goffice0.6-0.6.6
-PKGREVISION=		12
+PKGREVISION=		13
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.6/}
 
@@ -19,17 +19,15 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgoffice.pc.in
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-gnome
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/libgsf-gnome/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.1
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff --git a/misc/goffice0.6/buildlink3.mk b/misc/goffice0.6/buildlink3.mk
index 24d32ff2bef..d31ca66856f 100644
--- a/misc/goffice0.6/buildlink3.mk
+++ b/misc/goffice0.6/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2012/01/13 10:55:19 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2012/01/18 18:31:10 drochner Exp $
 
 BUILDLINK_TREE+=	goffice0.6
 
@@ -10,13 +10,10 @@ BUILDLINK_ABI_DEPENDS.goffice0.6?=	goffice0.6>=0.6.6nb12
 BUILDLINK_PKGSRCDIR.goffice0.6?=	../../misc/goffice0.6
 
 #.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf/buildlink3.mk"
 #.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/libgsf-gnome/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"