diff options
-rw-r--r-- | sysutils/gnome-vfs2/Makefile | 6 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/Makefile.common | 11 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/PLIST | 113 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/buildlink3.mk | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/distinfo | 11 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-ae | 66 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-al | 20 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/patches/patch-am | 4 |
8 files changed, 140 insertions, 95 deletions
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index 166bd291ad1..73c5e9dcc61 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.35 2004/04/15 16:36:20 jmmv Exp $ +# $NetBSD: Makefile,v 1.36 2004/05/03 15:39:47 jmmv Exp $ # -PKGREVISION= 1 - DEPENDS+= shared-mime-info>=0.13:../../databases/shared-mime-info PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in @@ -43,7 +41,7 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/vfs$$/ \ .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index a4494557857..9d288669da2 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.2 2004/04/15 20:10:43 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/05/03 15:39:47 jmmv Exp $ # -DISTNAME= gnome-vfs-2.6.0 +DISTNAME= gnome-vfs-2.6.1.1 PKGNAME= ${DISTNAME:S/vfs/vfs2/} CATEGORIES?= sysutils CATEGORIES+= gnome @@ -26,11 +26,12 @@ USE_PKGINSTALL= YES CONFIGURE_ARGS+= --disable-fam CONFIGURE_ARGS+= --disable-gtk +CONFIGURE_ARGS+= --disable-openssl CONFIGURE_ARGS+= --disable-samba +CONFIGURE_ARGS+= --enable-gnutls CONFIGURE_ARGS+= --enable-platform-gnome-2 CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -CONFIGURE_ENV+= openssl_libs=yes +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -DPREFIX=\"\\\"${PREFIX}\\\"\" CPPFLAGS+= -DPKGLOCALEDIR=\"\\\"${PKGLOCALEDIR}\\\"\" @@ -69,7 +70,7 @@ SUBST_STAGE.libs= pre-configure SUBST_FILES.libs= modules/Makefile.in SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g' -BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.6.0nb1 +BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.6.1.1 .include "../../sysutils/gnome-vfs2/buildlink3.mk" PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \ diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST index 6415a3c7950..5f0d5a42f19 100644 --- a/sysutils/gnome-vfs2/PLIST +++ b/sysutils/gnome-vfs2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2004/04/15 16:36:20 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.11 2004/05/03 15:39:47 jmmv Exp $ bin/gnomevfs-cat bin/gnomevfs-copy bin/gnomevfs-info @@ -103,7 +103,7 @@ lib/libgnomevfs-2.a lib/libgnomevfs-2.la lib/libgnomevfs-2.so lib/libgnomevfs-2.so.600 -lib/libgnomevfs-2.so.600.0 +lib/libgnomevfs-2.so.600.1 lib/pkgconfig/gnome-vfs-2.0.pc lib/pkgconfig/gnome-vfs-module-2.0.pc lib/vfs/2.0/extfs/README @@ -124,58 +124,58 @@ lib/vfs/2.0/extfs/trpm lib/vfs/2.0/extfs/zip lib/vfs/2.0/extfs/zoo libexec/gnome-vfs-daemon -share/doc/html/gnome-vfs-2.0/about.html -share/doc/html/gnome-vfs-2.0/advanced-operations.html -share/doc/html/gnome-vfs-2.0/ch08.html -share/doc/html/gnome-vfs-2.0/data-types.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-2.0.devhelp -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-directory-operations.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-file-operations.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-first-steps.html -share/doc/html/gnome-vfs-2.0/gnome-vfs-writing-modules.html -share/doc/html/gnome-vfs-2.0/home.png -share/doc/html/gnome-vfs-2.0/index.html -share/doc/html/gnome-vfs-2.0/index.sgml -share/doc/html/gnome-vfs-2.0/left.png -share/doc/html/gnome-vfs-2.0/mime-registry.html -share/doc/html/gnome-vfs-2.0/modules.html -share/doc/html/gnome-vfs-2.0/right.png -share/doc/html/gnome-vfs-2.0/up.png +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/ch08.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/home.png +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/left.png +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/up.png share/examples/gnome-vfs-2.0/modules/default-modules.conf share/examples/gnome-vfs-2.0/modules/ssl-modules.conf share/examples/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info @@ -189,6 +189,7 @@ share/gconf/schemas/desktop_default_applications.schemas share/gconf/schemas/desktop_gnome_url_handlers.schemas share/gconf/schemas/system_http_proxy.schemas share/gconf/schemas/system_smb.schemas +${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo @@ -202,6 +203,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo @@ -212,6 +214,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo @@ -259,7 +262,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/examples/gnome-vfs-2.0/vfolders @dirrm share/examples/gnome-vfs-2.0/modules @dirrm share/examples/gnome-vfs-2.0 -@dirrm share/doc/html/gnome-vfs-2.0 +@dirrm share/doc/gnome-vfs-2.0 @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 @unexec ${RMDIR} %D/lib/vfs 2>/dev/null || ${TRUE} diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk index 347aeaed0ea..755820fd76f 100644 --- a/sysutils/gnome-vfs2/buildlink3.mk +++ b/sysutils/gnome-vfs2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/04/15 16:36:20 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/05/03 15:39:47 jmmv Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+ @@ -23,7 +23,7 @@ BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2 .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" .include "../../sysutils/fam/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index cb60b4955e9..3fcc227656e 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.20 2004/04/29 14:18:34 xtraeme Exp $ +$NetBSD: distinfo,v 1.21 2004/05/03 15:39:47 jmmv Exp $ -SHA1 (gnome-vfs-2.6.0.tar.bz2) = a5cfea7568259fc6fe98322a7a01eb70d8f5f615 -Size (gnome-vfs-2.6.0.tar.bz2) = 1431274 bytes +SHA1 (gnome-vfs-2.6.1.1.tar.bz2) = 6d89edf1d7720ce98b78035fa4b833d559c6f34c +Size (gnome-vfs-2.6.1.1.tar.bz2) = 1482056 bytes SHA1 (patch-aa) = 3a8113f861efeb12bec86bff06df1c7d44e7131b SHA1 (patch-ab) = 9fc885b1ef1e9dd05f4b3041963df298dbfba582 SHA1 (patch-ac) = 6790f1ee67f12690bd648d258e87456c2639b560 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06 -SHA1 (patch-ae) = 5e52bb80ce3070d04c85c363c0ba1360ab7edb37 +SHA1 (patch-ae) = bcf75ee08a513c8b4eef7c0c7b8d6ddda6406b83 SHA1 (patch-af) = 4273d773f8f9701262ab541efc43e9f7eb126001 SHA1 (patch-ag) = 0bec8918c71b2aa470c96c4512b11f42550484c4 SHA1 (patch-ai) = 3a45cd84dfa025a52c7db3aab2cca85b540078a6 SHA1 (patch-ak) = 83694081f9484c3f71fd1867007652eff6e26f93 -SHA1 (patch-al) = e0f4727c0c0415f5e0bc182b0ae94093d45b4cd0 -SHA1 (patch-am) = 78a58aa257a95db6b9ae34da640e61003da3e00a +SHA1 (patch-am) = 0f55b4d520893c8349bacc682f0429f26f7b38f1 diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae index 0a9ec1b6df2..82003cbcde8 100644 --- a/sysutils/gnome-vfs2/patches/patch-ae +++ b/sysutils/gnome-vfs2/patches/patch-ae @@ -1,6 +1,8 @@ -$NetBSD: patch-ae,v 1.3 2004/04/15 06:25:12 adam Exp $ +$NetBSD: patch-ae,v 1.4 2004/05/03 15:39:47 jmmv Exp $ ---- configure.orig Wed Apr 14 23:18:49 2004 +http://bugzilla.gnome.org/show_bug.cgi?id=141736 + +--- configure.orig 2004-04-20 11:54:46.000000000 +0200 +++ configure @@ -20202,7 +20202,7 @@ if test -z "`$INTLTOOL_PERL -v | fgrep ' echo "$as_me: error: perl 5.x required for intltool" >&2;} @@ -11,3 +13,63 @@ $NetBSD: patch-ae,v 1.3 2004/04/15 06:25:12 adam Exp $ : else { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 +@@ -25463,6 +25463,9 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #ifdef HAVE_SYS_VFS_H + #include <sys/vfs.h> + #endif +@@ -25516,6 +25519,9 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #ifdef HAVE_SYS_VFS_H + #include <sys/vfs.h> + #endif +@@ -25591,6 +25597,9 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #ifdef HAVE_SYS_VFS_H + #include <sys/vfs.h> + #endif +@@ -25644,6 +25653,9 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #ifdef HAVE_SYS_VFS_H + #include <sys/vfs.h> + #endif +@@ -25720,6 +25732,9 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <unistd.h> ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #ifdef HAVE_SYS_VFS_H + #include <sys/vfs.h> + #endif +@@ -25780,6 +25795,9 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <unistd.h> ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #ifdef HAVE_SYS_VFS_H + #include <sys/vfs.h> + #endif diff --git a/sysutils/gnome-vfs2/patches/patch-al b/sysutils/gnome-vfs2/patches/patch-al deleted file mode 100644 index c90f2b5895e..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-al +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-al,v 1.6 2004/04/24 21:00:07 danw Exp $ - ---- modules/sftp-method.c.orig Sat Apr 24 15:37:26 2004 -+++ modules/sftp-method.c -@@ -175,6 +175,15 @@ typedef struct - - typedef ssize_t (*read_write_fn) (int, void *, size_t); - -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - static gsize - atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) - { diff --git a/sysutils/gnome-vfs2/patches/patch-am b/sysutils/gnome-vfs2/patches/patch-am index 5d86b25fa9a..2656dbf01fb 100644 --- a/sysutils/gnome-vfs2/patches/patch-am +++ b/sysutils/gnome-vfs2/patches/patch-am @@ -1,4 +1,6 @@ -$NetBSD: patch-am,v 1.6 2004/04/29 14:18:34 xtraeme Exp $ +$NetBSD: patch-am,v 1.7 2004/05/03 15:39:47 jmmv Exp $ + +http://bugzilla.gnome.org/show_bug.cgi?id=141739 --- libgnomevfs/gnome-vfs-unix-mounts.c.orig 2004-04-29 16:11:52.000000000 +0200 +++ libgnomevfs/gnome-vfs-unix-mounts.c 2004-04-29 16:13:57.000000000 +0200 |