Mon Dec 22 15:27:02 2008 UTC ()
Remove gnome-vfs dependency. It was removed in version 2.21.90.
(It was replaced with gio from glib2.)

Bump PKGREVISION due to that change.

Also remove the libgnomeui dependency -- I had moved that to an
option. Sorry for that. (Noticed by wiz.)


(reed)
diff -r1.49 -r1.50 pkgsrc/print/evince/Makefile
diff -r1.24 -r1.25 pkgsrc/print/evince/Makefile.common
diff -r1.28 -r1.29 pkgsrc/print/evince-nautilus/Makefile
cvs diff -r1.49 -r1.50 pkgsrc/print/evince/Makefile (expand / switch to unified diff)

--- pkgsrc/print/evince/Makefile 2008/12/20 20:52:27 1.49
+++ pkgsrc/print/evince/Makefile 2008/12/22 15:27:02 1.50
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.49 2008/12/20 20:52:27 reed Exp $ 1# $NetBSD: Makefile,v 1.50 2008/12/22 15:27:02 reed Exp $
2# 2#
3 3
4PKGREVISION= 2 4PKGREVISION= 3
5PKG_DESTDIR_SUPPORT= user-destdir 5PKG_DESTDIR_SUPPORT= user-destdir
6 6
7.include "../../print/evince/Makefile.common" 7.include "../../print/evince/Makefile.common"
8 8
9COMMENT= Document viewer 9COMMENT= Document viewer
10 10
11GCONF_SCHEMAS= evince.schemas 11GCONF_SCHEMAS= evince.schemas
12GCONF_SCHEMAS+= evince-thumbnailer.schemas 12GCONF_SCHEMAS+= evince-thumbnailer.schemas
13GCONF_SCHEMAS+= evince-thumbnailer-ps.schemas 13GCONF_SCHEMAS+= evince-thumbnailer-ps.schemas
14 14
15.include "options.mk" 15.include "options.mk"
16 16
17CONFIGURE_ARGS+= --enable-comics 17CONFIGURE_ARGS+= --enable-comics
cvs diff -r1.24 -r1.25 pkgsrc/print/evince/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/evince/Attic/Makefile.common 2008/12/02 13:04:18 1.24
+++ pkgsrc/print/evince/Attic/Makefile.common 2008/12/22 15:27:02 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.24 2008/12/02 13:04:18 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.25 2008/12/22 15:27:02 reed Exp $
2# 2#
3# used by print/evince/Makefile 3# used by print/evince/Makefile
4# used by print/evince-nautilus/Makefile 4# used by print/evince-nautilus/Makefile
5 5
6DISTNAME= evince-2.24.2 6DISTNAME= evince-2.24.2
7CATEGORIES= print 7CATEGORIES= print
8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/2.24/} 8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/2.24/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.gnome.org/projects/evince/ 12HOMEPAGE= http://www.gnome.org/projects/evince/
13 13
14PATCHDIR= ${.CURDIR}/../evince/patches 14PATCHDIR= ${.CURDIR}/../evince/patches
@@ -22,27 +22,24 @@ USE_TOOLS+= gmake intltool msgfmt pkg-c @@ -22,27 +22,24 @@ USE_TOOLS+= gmake intltool msgfmt pkg-c
22USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
23 23
24# XXX fake for "configure" to allow build w/o a gs installed 24# XXX fake for "configure" to allow build w/o a gs installed
25# (avoid hard dependency on a specific version) 25# (avoid hard dependency on a specific version)
26CONFIGURE_ARGS+= --with-gs=${LOCALBASE}/bin/gs 26CONFIGURE_ARGS+= --with-gs=${LOCALBASE}/bin/gs
27pre-configure: 27pre-configure:
28 ${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs 28 ${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs
29 ${CHMOD} +x ${BUILDLINK_DIR}/bin/gs 29 ${CHMOD} +x ${BUILDLINK_DIR}/bin/gs
30 30
31.include "../../databases/shared-mime-info/buildlink3.mk" 31.include "../../databases/shared-mime-info/buildlink3.mk"
32BUILDLINK_API_DEPENDS.glib2+= glib2>=2.15.6 32BUILDLINK_API_DEPENDS.glib2+= glib2>=2.15.6
33.include "../../devel/glib2/buildlink3.mk" 33.include "../../devel/glib2/buildlink3.mk"
34.include "../../devel/libglade/buildlink3.mk" 34.include "../../devel/libglade/buildlink3.mk"
35BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.14.0 
36.include "../../devel/libgnomeui/buildlink3.mk" 
37BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.17.1 35BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.17.1
38.include "../../graphics/gnome-icon-theme/buildlink3.mk" 36.include "../../graphics/gnome-icon-theme/buildlink3.mk"
39.include "../../graphics/tiff/buildlink3.mk" 37.include "../../graphics/tiff/buildlink3.mk"
40.include "../../print/libspectre/buildlink3.mk" 38.include "../../print/libspectre/buildlink3.mk"
41BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.8.0 39BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.8.0
42.include "../../print/poppler-glib/buildlink3.mk" 40.include "../../print/poppler-glib/buildlink3.mk"
43.include "../../sysutils/desktop-file-utils/desktopdb.mk" 41.include "../../sysutils/desktop-file-utils/desktopdb.mk"
44.include "../../sysutils/gnome-vfs/buildlink3.mk" 
45.include "../../textproc/gnome-doc-utils/buildlink3.mk" 42.include "../../textproc/gnome-doc-utils/buildlink3.mk"
46.include "../../mk/omf-scrollkeeper.mk" 43.include "../../mk/omf-scrollkeeper.mk"
47BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 44BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
48.include "../../x11/gtk2/buildlink3.mk" 45.include "../../x11/gtk2/buildlink3.mk"
cvs diff -r1.28 -r1.29 pkgsrc/print/evince-nautilus/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/evince-nautilus/Attic/Makefile 2008/12/20 20:52:27 1.28
+++ pkgsrc/print/evince-nautilus/Attic/Makefile 2008/12/22 15:27:02 1.29
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.28 2008/12/20 20:52:27 reed Exp $ 1# $NetBSD: Makefile,v 1.29 2008/12/22 15:27:02 reed Exp $
2# 2#
3 3
4PKG_DESTDIR_SUPPORT= user-destdir 4PKG_DESTDIR_SUPPORT= user-destdir
5 5
6.include "../../print/evince/Makefile.common" 6.include "../../print/evince/Makefile.common"
7 7
8PKGNAME= ${DISTNAME:S/evince/evince-nautilus/} 8PKGNAME= ${DISTNAME:S/evince/evince-nautilus/}
9COMMENT= File properties plugin for evince files 9COMMENT= File properties plugin for evince files
 10PKGREVISION= 1
10 11
11.include "options.mk" 12.include "options.mk"
12 13
13INSTALL_DIRS= properties 14INSTALL_DIRS= properties
14 15
15BUILDLINK_DEPMETHOD.libXt?= build 16BUILDLINK_DEPMETHOD.libXt?= build
16BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.14.0 17BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.14.0
17 18
18.include "../../devel/libgnomeui/buildlink3.mk" 19.include "../../devel/libgnomeui/buildlink3.mk"
19.include "../../sysutils/nautilus/buildlink3.mk" 20.include "../../sysutils/nautilus/buildlink3.mk"
20.include "../../x11/libX11/buildlink3.mk" 21.include "../../x11/libX11/buildlink3.mk"
21.include "../../x11/libXt/buildlink3.mk" 22.include "../../x11/libXt/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"