diff options
| -rw-r--r-- | sysutils/gnome-vfs2/Makefile.common | 12 | ||||
| -rw-r--r-- | sysutils/gnome-vfs2/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ai | 17 |
3 files changed, 30 insertions, 2 deletions
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index ab3a38d9026..9f159b40997 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2005/12/29 06:22:18 jlam Exp $ +# $NetBSD: Makefile.common,v 1.27 2006/01/01 17:31:53 jmmv Exp $ # DISTNAME= gnome-vfs-2.12.1.1 @@ -44,6 +44,16 @@ EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0 CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor +# XXX Work-around for a problem in the configure script which checks for +# statvfs(2) having SVR4 in mind. Solving this in the script itself could +# be the right way to go, but it is out of the scope of a local patch; it +# could require changing the code a lot, which is already very... complex. +.if !exists(/usr/include/fstyp.h) +post-wrapper: + ${MKDIR} -p ${BUILDLINK_DIR}/include/sys + ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h +.endif + # # The following stuff is to allow easy building of modules distributed within # gnome-vfs2 as independent packages. diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index 65ac94c2b37..6718d3e1760 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2005/12/05 07:52:49 rillig Exp $ +$NetBSD: distinfo,v 1.45 2006/01/01 17:31:53 jmmv Exp $ SHA1 (gnome-vfs-2.12.1.1.tar.bz2) = 48e484663f0d0f5e2a858d2f6e6a5a702e831734 RMD160 (gnome-vfs-2.12.1.1.tar.bz2) = b96cd620ce60131c0ff467fd277d89ac76419e09 @@ -11,6 +11,7 @@ SHA1 (patch-ae) = 572b40dfa035dab5ef374aa73d2acacfcb72d641 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56 SHA1 (patch-ag) = 78f7d50beaeab8b33c554e6cfaf510cdba3b00ba SHA1 (patch-ah) = 4bd07f6c3d356505babba2a14e250c5f480296c0 +SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2 SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9 SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390 SHA1 (patch-ap) = 98ad7700d01007510467e2ae4ee8554f54f15320 diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai new file mode 100644 index 00000000000..e11d255a623 --- /dev/null +++ b/sysutils/gnome-vfs2/patches/patch-ai @@ -0,0 +1,17 @@ +$NetBSD: patch-ai,v 1.11 2006/01/01 17:31:53 jmmv Exp $ + +--- modules/fstype.c.orig 2004-08-12 11:08:56.000000000 +0200 ++++ modules/fstype.c +@@ -349,8 +349,12 @@ filesystem_type_uncached (char *path, ch + fstype_internal_error (1, errno, "%s", path); + } + else ++#if defined(__NetBSD__) ++ type = fss.f_fstypename; ++#else + type = fss.f_basetype; + #endif ++#endif + + #ifdef FSTYPE_STATFS /* 4.4BSD. */ + struct statfs fss; |