Thu Apr 10 16:25:29 2008 UTC ()
update to 2.22.0
This switches to the gnome-2.22 release branch.


(drochner)
diff -r1.67 -r1.68 pkgsrc/sysutils/gnome-vfs/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/gnome-vfs/Makefile.common
diff -r1.18 -r1.19 pkgsrc/sysutils/gnome-vfs/PLIST
diff -r1.23 -r1.24 pkgsrc/sysutils/gnome-vfs/distinfo
diff -r1.4 -r1.5 pkgsrc/sysutils/gnome-vfs/patches/patch-ae
cvs diff -r1.67 -r1.68 pkgsrc/sysutils/gnome-vfs/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/Makefile 2008/03/06 14:53:54 1.67
+++ pkgsrc/sysutils/gnome-vfs/Makefile 2008/04/10 16:25:29 1.68
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.67 2008/03/06 14:53:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.68 2008/04/10 16:25:29 drochner Exp $
2 2
3PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in 3PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in
4PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in 4PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in
5 5
6OWN_DIRS= ${PKG_SYSCONFDIR}/modules 6OWN_DIRS= ${PKG_SYSCONFDIR}/modules
7 7
8EGFILES+= modules/default-modules.conf 8EGFILES+= modules/default-modules.conf
9EGFILES+= modules/ssl-modules.conf 9EGFILES+= modules/ssl-modules.conf
10 10
11GCONF_SCHEMAS= desktop_default_applications.schemas 11GCONF_SCHEMAS= desktop_default_applications.schemas
12GCONF_SCHEMAS+= desktop_gnome_url_handlers.schemas 12GCONF_SCHEMAS+= desktop_gnome_url_handlers.schemas
13GCONF_SCHEMAS+= system_dns_sd.schemas 13GCONF_SCHEMAS+= system_dns_sd.schemas
14GCONF_SCHEMAS+= system_http_proxy.schemas 14GCONF_SCHEMAS+= system_http_proxy.schemas
15GCONF_SCHEMAS+= system_smb.schemas 15GCONF_SCHEMAS+= system_smb.schemas
16 16
17LDFLAGS.Darwin+= -lresolv 17LDFLAGS.Darwin+= -lresolv
18 18
19BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.3 19BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.3
20 20
21PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
22MAKE_JOBS_SAFE= no 22MAKE_JOBS_SAFE= no
23 23
24.include "Makefile.common" 24.include "Makefile.common"
25 25
26PKGREVISION= 1 
27CONFIGURE_ARGS+= --enable-fam 26CONFIGURE_ARGS+= --enable-fam
28 27
29CONFLICTS+= gnome-vfs2-[0-9]* 28CONFLICTS+= gnome-vfs2-[0-9]*
30 29
31.include "../../devel/GConf/schemas.mk" 30.include "../../devel/GConf/schemas.mk"
32 31
33.include "../../archivers/bzip2/buildlink3.mk" 32.include "../../archivers/bzip2/buildlink3.mk"
34.include "../../devel/gettext-lib/buildlink3.mk" 33.include "../../devel/gettext-lib/buildlink3.mk"
35.include "../../devel/zlib/buildlink3.mk" 34.include "../../devel/zlib/buildlink3.mk"
36 35
37.include "../../mk/fam.buildlink3.mk" 36.include "../../mk/fam.buildlink3.mk"
38.include "../../mk/krb5.buildlink3.mk" 37.include "../../mk/krb5.buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/gnome-vfs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/Makefile.common 2007/11/22 20:16:27 1.7
+++ pkgsrc/sysutils/gnome-vfs/Makefile.common 2008/04/10 16:25:29 1.8
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile.common,v 1.7 2007/11/22 20:16:27 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.8 2008/04/10 16:25:29 drochner Exp $
2# 2#
3 3
4GNOME_VFS_VERSION= 2.20.1 4GNOME_VFS_VERSION= 2.22.0
5 5
6DISTNAME= gnome-vfs-${GNOME_VFS_VERSION} 6DISTNAME= gnome-vfs-${GNOME_VFS_VERSION}
7CATEGORIES?= sysutils 7CATEGORIES?= sysutils
8CATEGORIES+= gnome 8CATEGORIES+= gnome
9MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.20/} 9MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.22/}
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= jmmv@NetBSD.org 12MAINTAINER= jmmv@NetBSD.org
13HOMEPAGE= http://www.gnome.org/ 13HOMEPAGE= http://www.gnome.org/
14COMMENT= GNOME Virtual File System (v2) 14COMMENT= GNOME Virtual File System (v2)
15 15
16DISTINFO_FILE= ${.CURDIR}/../../sysutils/gnome-vfs/distinfo 16DISTINFO_FILE= ${.CURDIR}/../../sysutils/gnome-vfs/distinfo
17PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs/patches 17PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs/patches
18 18
19GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
20USE_PKGLOCALEDIR= YES 20USE_PKGLOCALEDIR= YES
21USE_TOOLS+= gmake intltool msgfmt pkg-config 21USE_TOOLS+= gmake intltool msgfmt pkg-config
22USE_LIBTOOL= YES 22USE_LIBTOOL= YES
@@ -35,37 +35,49 @@ CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SY @@ -35,37 +35,49 @@ CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SY
35MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale 35MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale
36 36
37INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} 37INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
38INSTALL_MAKE_FLAGS+= modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules 38INSTALL_MAKE_FLAGS+= modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules
39 39
40PKG_SYSCONFSUBDIR= gnome-vfs-2.0 40PKG_SYSCONFSUBDIR= gnome-vfs-2.0
41 41
42EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0 42EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0
43.for f in ${EGFILES} 43.for f in ${EGFILES}
44CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 44CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
45.endfor 45.endfor
46 46
47PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs 47PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs
48PKG_SUPPORTED_OPTIONS+= inet6 48PKG_SUPPORTED_OPTIONS+= inet6 gssapi
49 49
50.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
 51.if ${OPSYS} == NetBSD
 52# Kerberos is built in - no additional dependency
 53PKG_SUGGESTED_OPTIONS+= gssapi
 54.endif
 55
51.include "../../mk/bsd.options.mk" 56.include "../../mk/bsd.options.mk"
52 57
53.if !empty(PKG_OPTIONS:Minet6) 58.if !empty(PKG_OPTIONS:Minet6)
54CONFIGURE_ARGS+= --enable-ipv6 59CONFIGURE_ARGS+= --enable-ipv6
55.else 60.else
56CONFIGURE_ARGS+= --disable-ipv6 61CONFIGURE_ARGS+= --disable-ipv6
57.endif 62.endif
58 63
 64.if !empty(PKG_OPTIONS:Mgssapi)
 65.include "../../mk/krb5.buildlink3.mk"
 66CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG}
 67.else
 68CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=none
 69.endif
 70
59# XXX Work-around for a problem in the configure script which checks for 71# XXX Work-around for a problem in the configure script which checks for
60# statvfs(2) having SVR4 in mind. Solving this in the script itself could 72# statvfs(2) having SVR4 in mind. Solving this in the script itself could
61# be the right way to go, but it is out of the scope of a local patch; it 73# be the right way to go, but it is out of the scope of a local patch; it
62# could require changing the code a lot, which is already very... complex. 74# could require changing the code a lot, which is already very... complex.
63.if ${OPSYS} == "NetBSD" && !exists(/usr/include/fstyp.h) 75.if ${OPSYS} == "NetBSD" && !exists(/usr/include/fstyp.h)
64post-wrapper: 76post-wrapper:
65 ${MKDIR} -p ${BUILDLINK_DIR}/include/sys 77 ${MKDIR} -p ${BUILDLINK_DIR}/include/sys
66 ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h 78 ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h
67.endif 79.endif
68 80
69# 81#
70# The following stuff is to allow easy building of modules distributed within 82# The following stuff is to allow easy building of modules distributed within
71# gnome-vfs as independent packages. 83# gnome-vfs as independent packages.
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/gnome-vfs/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/PLIST 2007/10/31 19:58:13 1.18
+++ pkgsrc/sysutils/gnome-vfs/PLIST 2008/04/10 16:25:29 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.18 2007/10/31 19:58:13 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.19 2008/04/10 16:25:29 drochner Exp $
2bin/gnomevfs-cat 2bin/gnomevfs-cat
3bin/gnomevfs-copy 3bin/gnomevfs-copy
4bin/gnomevfs-df 4bin/gnomevfs-df
5bin/gnomevfs-info 5bin/gnomevfs-info
6bin/gnomevfs-ls 6bin/gnomevfs-ls
7bin/gnomevfs-mkdir 7bin/gnomevfs-mkdir
8bin/gnomevfs-monitor 8bin/gnomevfs-monitor
9bin/gnomevfs-mv 9bin/gnomevfs-mv
10bin/gnomevfs-rm 10bin/gnomevfs-rm
11include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h 11include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ace.h
12include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h 12include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-acl.h
13include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h 13include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
14include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h 14include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
@@ -139,26 +139,27 @@ share/gtk-doc/html/gnome-vfs-2.0/home.pn @@ -139,26 +139,27 @@ share/gtk-doc/html/gnome-vfs-2.0/home.pn
139share/gtk-doc/html/gnome-vfs-2.0/index.html 139share/gtk-doc/html/gnome-vfs-2.0/index.html
140share/gtk-doc/html/gnome-vfs-2.0/index.sgml 140share/gtk-doc/html/gnome-vfs-2.0/index.sgml
141share/gtk-doc/html/gnome-vfs-2.0/left.png 141share/gtk-doc/html/gnome-vfs-2.0/left.png
142share/gtk-doc/html/gnome-vfs-2.0/mime-registry.html 142share/gtk-doc/html/gnome-vfs-2.0/mime-registry.html
143share/gtk-doc/html/gnome-vfs-2.0/modules.html 143share/gtk-doc/html/gnome-vfs-2.0/modules.html
144share/gtk-doc/html/gnome-vfs-2.0/networking.html 144share/gtk-doc/html/gnome-vfs-2.0/networking.html
145share/gtk-doc/html/gnome-vfs-2.0/right.png 145share/gtk-doc/html/gnome-vfs-2.0/right.png
146share/gtk-doc/html/gnome-vfs-2.0/style.css 146share/gtk-doc/html/gnome-vfs-2.0/style.css
147share/gtk-doc/html/gnome-vfs-2.0/up.png 147share/gtk-doc/html/gnome-vfs-2.0/up.png
148share/gtk-doc/html/gnome-vfs-2.0/volumes.html 148share/gtk-doc/html/gnome-vfs-2.0/volumes.html
149share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo 149share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
150share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo 150share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
151share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo 151share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 152share/locale/as/LC_MESSAGES/gnome-vfs-2.0.mo
152share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo 153share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
153share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo 154share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
154share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo 155share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
155share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo 156share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
156share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo 157share/locale/bn_IN/LC_MESSAGES/gnome-vfs-2.0.mo
157share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo 158share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
158share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo 159share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
159share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo 160share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
160share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo 161share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
161share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo 162share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
162share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo 163share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
163share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo 164share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
164share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo 165share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -172,26 +173,27 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2. @@ -172,26 +173,27 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2.
172share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo 173share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
173share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo 174share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
174share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo 175share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
175share/locale/gu/LC_MESSAGES/gnome-vfs-2.0.mo 176share/locale/gu/LC_MESSAGES/gnome-vfs-2.0.mo
176share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo 177share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
177share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo 178share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
178share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo 179share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo
179share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo 180share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
180share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo 181share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
181share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo 182share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
182share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo 183share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
183share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo 184share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
184share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo 185share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo
 186share/locale/kn/LC_MESSAGES/gnome-vfs-2.0.mo
185share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo 187share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
186share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo 188share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo
187share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo 189share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
188share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo 190share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
189share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo 191share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
190share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo 192share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo
191share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo 193share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
192share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo 194share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
193share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo 195share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
194share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo 196share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo
195share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo 197share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
196share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo 198share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
197share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo 199share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
cvs diff -r1.23 -r1.24 pkgsrc/sysutils/gnome-vfs/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/distinfo 2008/04/01 18:05:37 1.23
+++ pkgsrc/sysutils/gnome-vfs/distinfo 2008/04/10 16:25:29 1.24
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.23 2008/04/01 18:05:37 drochner Exp $ 1$NetBSD: distinfo,v 1.24 2008/04/10 16:25:29 drochner Exp $
2 2
3SHA1 (gnome-vfs-2.20.1.tar.bz2) = 03afa10e84425f7f38e05f0db0ecf55ae5fb7b15 3SHA1 (gnome-vfs-2.22.0.tar.bz2) = a58fb0654bb2c434372ee313a591ecfa8195fe18
4RMD160 (gnome-vfs-2.20.1.tar.bz2) = faa5fffb5495d1e161cb6c3b47612cf39cbb1629 4RMD160 (gnome-vfs-2.22.0.tar.bz2) = 307dbff23be666e18326211065a7dee78a8a17e2
5Size (gnome-vfs-2.20.1.tar.bz2) = 1890300 bytes 5Size (gnome-vfs-2.22.0.tar.bz2) = 1939765 bytes
6SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db 6SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
7SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 7SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
8SHA1 (patch-ae) = 77466b2b6ae44a2bbf72a76a126ba275adf9d2e4 8SHA1 (patch-ae) = fd33bedc306f9ad9ca1b602e3dba4bb97604d631
9SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 9SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
10SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2 10SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
11SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 11SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
12SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390 12SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390
13SHA1 (patch-ap) = cf09ffdef9e1b03425d60e69302e8e589928d370 13SHA1 (patch-ap) = cf09ffdef9e1b03425d60e69302e8e589928d370
14SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b 14SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b
15SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4 15SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4
16SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c 16SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c
17SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db 17SHA1 (patch-ax) = 6b9b11df5d530b7b3aa6a3997feb7c1c93e7b2db
18SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51 18SHA1 (patch-ba) = 5299eb32ff0c14eb98d8f7dd5e104cd931a02b51
19SHA1 (patch-bb) = 0b8d12e9b44547a0262231a09d181f4ccde0c1f3 19SHA1 (patch-bb) = 0b8d12e9b44547a0262231a09d181f4ccde0c1f3
20SHA1 (patch-bc) = 935965b6dda90d891e8e46da87d34690c4efa88b 20SHA1 (patch-bc) = 935965b6dda90d891e8e46da87d34690c4efa88b
21SHA1 (patch-bd) = 28cee53d3cecb18fe3b0c66b73bcece231e6fc42 21SHA1 (patch-bd) = 28cee53d3cecb18fe3b0c66b73bcece231e6fc42
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/gnome-vfs/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/patches/patch-ae 2007/11/22 20:16:27 1.4
+++ pkgsrc/sysutils/gnome-vfs/patches/patch-ae 2008/04/10 16:25:29 1.5
@@ -1,93 +1,93 @@ @@ -1,93 +1,93 @@
1$NetBSD: patch-ae,v 1.4 2007/11/22 20:16:27 drochner Exp $ 1$NetBSD: patch-ae,v 1.5 2008/04/10 16:25:29 drochner Exp $
2 2
3--- configure.orig 2007-11-12 10:30:09.000000000 +0100 3--- configure.orig 2008-03-10 20:22:50.000000000 +0100
4+++ configure 4+++ configure
5@@ -24817,7 +24817,7 @@ fi 5@@ -24851,7 +24851,7 @@ fi
6  6
7  7
8  8
9-for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll 9-for ac_func in getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap
10+for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll 10+for ac_func in getdtablesize login_tty open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll mmap
11 do 11 do
12 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 12 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
13 { echo "$as_me:$LINENO: checking for $ac_func" >&5 13 { echo "$as_me:$LINENO: checking for $ac_func" >&5
14@@ -26020,9 +26020,11 @@ cat >>conftest.$ac_ext <<_ACEOF 14@@ -26056,9 +26056,11 @@ cat >>conftest.$ac_ext <<_ACEOF
15 int 15 int
16 main () 16 main ()
17 { 17 {
18+#ifndef HAVE_STATVFS 18+#ifndef HAVE_STATVFS
19 struct statfs st; 19 struct statfs st;
20 statfs(NULL, &st); 20 statfs(NULL, &st);
21 ; 21 ;
22+#endif 22+#endif
23 return 0; 23 return 0;
24 } 24 }
25 _ACEOF 25 _ACEOF
26@@ -33378,7 +33380,7 @@ _ACEOF 26@@ -33422,7 +33424,7 @@ _ACEOF
27  27
28 msg_samba="yes" 28 msg_samba="yes"
29 if test x$with_samba_libs != x/usr/lib; then 29 if test x$with_samba_libs != x/usr/lib; then
30- SAMBA_LIBS="-L$with_samba_libs -lsmbclient" 30- SAMBA_LIBS="-L$with_samba_libs -lsmbclient"
31+ SAMBA_LIBS="-L$with_samba_libs -Wl,-R$with_samba_libs -lsmbclient" 31+ SAMBA_LIBS="-L$with_samba_libs -Wl,-R$with_samba_libs -lsmbclient"
32 else 32 else
33 SAMBA_LIBS="-lsmbclient" 33 SAMBA_LIBS="-lsmbclient"
34 fi 34 fi
35@@ -36359,12 +36361,12 @@ if test -n "$PKG_CONFIG"; then 35@@ -36425,12 +36427,12 @@ if test -n "$PKG_CONFIG"; then
36 pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS" 36 pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS"
37 else 37 else
38 if test -n "$PKG_CONFIG" && \ 38 if test -n "$PKG_CONFIG" && \
39- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5 39- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5
40- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5 40- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5
41+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5 41+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5
42+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5 42+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5
43 ac_status=$? 43 ac_status=$?
44 echo "$as_me:$LINENO: \$? = $ac_status" >&5 44 echo "$as_me:$LINENO: \$? = $ac_status" >&5
45 (exit $ac_status); }; then 45 (exit $ac_status); }; then
46- pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null` 46- pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null`
47+ pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null` 47+ pkg_cv_LIBGNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null`
48 else 48 else
49 pkg_failed=yes 49 pkg_failed=yes
50 fi 50 fi
51@@ -36377,12 +36379,12 @@ if test -n "$PKG_CONFIG"; then 51@@ -36443,12 +36445,12 @@ if test -n "$PKG_CONFIG"; then
52 pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS" 52 pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS"
53 else 53 else
54 if test -n "$PKG_CONFIG" && \ 54 if test -n "$PKG_CONFIG" && \
55- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5 55- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED gnome-mime-data-2.0 \$dbus_requirement\"") >&5
56- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5 56- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement") 2>&5
57+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5 57+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED libxml-2.0 >= \$XML_REQUIRED \$dbus_requirement\"") >&5
58+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5 58+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement") 2>&5
59 ac_status=$? 59 ac_status=$?
60 echo "$as_me:$LINENO: \$? = $ac_status" >&5 60 echo "$as_me:$LINENO: \$? = $ac_status" >&5
61 (exit $ac_status); }; then 61 (exit $ac_status); }; then
62- pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null` 62- pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement" 2>/dev/null`
63+ pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null` 63+ pkg_cv_LIBGNOMEVFS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement" 2>/dev/null`
64 else 64 else
65 pkg_failed=yes 65 pkg_failed=yes
66 fi 66 fi
67@@ -36401,14 +36403,14 @@ else 67@@ -36467,14 +36469,14 @@ else
68 _pkg_short_errors_supported=no 68 _pkg_short_errors_supported=no
69 fi 69 fi
70 if test $_pkg_short_errors_supported = yes; then 70 if test $_pkg_short_errors_supported = yes; then
71- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"` 71- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"`
72+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"` 72+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"`
73 else 73 else
74- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"` 74- LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement"`
75+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"` 75+ LIBGNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement"`
76 fi 76 fi
77 # Put the nasty error message in config.log where it belongs 77 # Put the nasty error message in config.log where it belongs
78 echo "$LIBGNOMEVFS_PKG_ERRORS" >&5 78 echo "$LIBGNOMEVFS_PKG_ERRORS" >&5
79  79
80- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: 80- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met:
81+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: 81+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met:
82  82
83 $LIBGNOMEVFS_PKG_ERRORS 83 $LIBGNOMEVFS_PKG_ERRORS
84  84
85@@ -36419,7 +36421,7 @@ Alternatively, you may set the environme 85@@ -36485,7 +36487,7 @@ Alternatively, you may set the environme
86 and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config. 86 and LIBGNOMEVFS_LIBS to avoid the need to call pkg-config.
87 See the pkg-config man page for more details. 87 See the pkg-config man page for more details.
88 " >&5 88 " >&5
89-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met: 89-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) were not met:
90+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met: 90+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement) were not met:
91  91
92 $LIBGNOMEVFS_PKG_ERRORS 92 $LIBGNOMEVFS_PKG_ERRORS
93  93