diff options
| author | jdolecek <jdolecek> | 2004-05-07 08:35:56 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek> | 2004-05-07 08:35:56 +0000 |
| commit | 489d07d68074eadf5e2f112ff18c2704652a6c0d (patch) | |
| tree | a68596ac8c2c902455206abb12dc0f245ad58079 /misc | |
| parent | 9db3f9b74bee4b12419548436801645fa066b258 (diff) | |
| download | pkgsrc-489d07d68074eadf5e2f112ff18c2704652a6c0d.tar.gz | |
add a patch to use statvfs() on 2.0D and later, since statfs()
is no longer available on -current
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice/distinfo | 3 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-as | 46 |
2 files changed, 48 insertions, 1 deletions
diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index 9da5cf76073..3746a00d144 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2004/05/03 20:56:36 mrauch Exp $ +$NetBSD: distinfo,v 1.19 2004/05/07 08:39:03 jdolecek Exp $ SHA1 (OOo_1.1.1p1_source.tar.bz2) = be2c5e799a33b70916528a6454297054db76328e Size (OOo_1.1.1p1_source.tar.bz2) = 192388698 bytes @@ -24,3 +24,4 @@ SHA1 (patch-ao) = 68d21a0daf48d47c7a1ab398bb98c48d7f002c4e SHA1 (patch-ap) = 827d054cdcc243118a3011ddbed5bcc5bac09c24 SHA1 (patch-aq) = 82285ade1af0a0c5e84d322d5a3a925c095103bb SHA1 (patch-ar) = f185c705cda716e1b52e5b6ca6d9c5d2a9b341bc +SHA1 (patch-as) = 33abd8e0eaec6a51eaa7940c8f686852c0700892 diff --git a/misc/openoffice/patches/patch-as b/misc/openoffice/patches/patch-as new file mode 100644 index 00000000000..4b8a1620e5d --- /dev/null +++ b/misc/openoffice/patches/patch-as @@ -0,0 +1,46 @@ +$NetBSD: patch-as,v 1.3 2004/05/07 08:35:56 jdolecek Exp $ + +--- sal/osl/unx/file.c.orig 2004-05-07 09:57:55.000000000 +0200 ++++ sal/osl/unx/file.c +@@ -1193,7 +1193,7 @@ oslFileError SAL_CALL osl_syncFile(oslFi + + #ifdef HAVE_STATFS_H + +-#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) ++#if defined(FREEBSD) || defined(MACOSX) + # define __OSL_STATFS_STRUCT struct statfs + # define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) + # define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) +@@ -1207,6 +1207,32 @@ oslFileError SAL_CALL osl_syncFile(oslFi + # define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1) + #endif /* FREEBSD || NETBSD */ + ++#if defined(NETBSD) ++ ++#include <sys/param.h> ++ ++/* statvfs() replaced statfs() in 2.0D */ ++# if __NetBSD_Version__ >= 200040000 ++ /* 2.0D or later */ ++# define __OSL_STATFS_STRUCT struct statvfs ++# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs)) ++# define __OSL_STATFS_ISREMOTE(a) (((a).f_flag & ST_LOCAL) == 0) ++ ++# else ++ /* version before 2.0D */ ++# define __OSL_STATFS_STRUCT struct statfs ++# define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) ++# define __OSL_STATFS_ISREMOTE(a) (((a).f_type & MNT_LOCAL) == 0) ++ ++# endif /* >2.0D */ ++ ++# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) ++# define __OSL_STATFS_TYPENAME(a) ((a).f_fstypename) ++ ++# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0) ++# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (strcmp((a).f_fstypename, "msdos") != 0) ++#endif ++ + #if defined(LINUX) + # define __OSL_NFS_SUPER_MAGIC 0x6969 + # define __OSL_SMB_SUPER_MAGIC 0x517B |