diff options
| author | bouyer <bouyer@pkgsrc.org> | 2011-04-01 20:11:33 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2011-04-01 20:11:33 +0000 |
| commit | 83cd5d8d2c36ca75aba6c19b118260dd2cf1b84d (patch) | |
| tree | b5228aa59ed3c9bc92c7cfe217719c2a91b77075 | |
| parent | 646aed9424cbc1c6a6db1dca83e7c9c75264faa5 (diff) | |
| download | pkgsrc-83cd5d8d2c36ca75aba6c19b118260dd2cf1b84d.tar.gz | |
Don't #include <ufs/ufs/quota.h> on NetBSD. it makes the build fail on
current, and nothing related to quotas is needed here.
OK agc@
| -rw-r--r-- | misc/openoffice3/distinfo | 4 | ||||
| -rw-r--r-- | misc/openoffice3/patches/patch-as | 29 |
2 files changed, 26 insertions, 7 deletions
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index 75890b0084b..20c1e03c33b 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2011/02/26 16:02:39 aymeric Exp $ +$NetBSD: distinfo,v 1.29 2011/04/01 20:11:33 bouyer Exp $ SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0 @@ -31,7 +31,7 @@ SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c SHA1 (patch-ap) = d9445a00083b7e847bf54b948f699a89b811d2da SHA1 (patch-aq) = 3e9a156887e108126c76f0735abb4dce177efa4b SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623 -SHA1 (patch-as) = c8a532c2b8a4dd676f09aba8d42677349f58c0a9 +SHA1 (patch-as) = b6a9760ba4260aa267df4e3fa0b767c6db2d49ac SHA1 (patch-aw) = a331b0130b0b6bac0b81ee6a1aeeb7b216d5f511 SHA1 (patch-ba) = c759a1fca8893095d88e7f4ee30830fd01213a69 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053 diff --git a/misc/openoffice3/patches/patch-as b/misc/openoffice3/patches/patch-as index b2650152b31..dd2cbef160d 100644 --- a/misc/openoffice3/patches/patch-as +++ b/misc/openoffice3/patches/patch-as @@ -1,8 +1,27 @@ -$NetBSD: patch-as,v 1.2 2009/05/09 18:43:41 hira Exp $ +$NetBSD: patch-as,v 1.3 2011/04/01 20:11:34 bouyer Exp $ ---- sal/osl/unx/file.cxx.orig 2009-02-19 00:18:51.000000000 +0900 -+++ sal/osl/unx/file.cxx 2009-05-09 12:40:10.000000000 +0900 -@@ -1447,7 +1447,7 @@ +--- sal/osl/unx/file.cxx.orig 2009-02-18 16:18:51.000000000 +0100 ++++ sal/osl/unx/file.cxx 2011-04-01 15:54:28.000000000 +0200 +@@ -93,7 +93,17 @@ + #include <ctype.h> + static const sal_Char* MOUNTTAB="/etc/mtab"; + +-#elif defined(NETBSD) || defined(FREEBSD) ++#elif defined(NETBSD) ++#include <sys/param.h> ++#include <sys/ucred.h> ++#include <sys/mount.h> ++#include <ctype.h> ++#define HAVE_STATFS_H ++/* No mounting table on *BSD ++ * This information is stored only in the kernel. */ ++/* static const sal_Char* MOUNTTAB="/etc/mtab"; */ ++ ++#elif defined(FREEBSD) + #include <sys/param.h> + #include <sys/ucred.h> + #include <sys/mount.h> +@@ -1447,7 +1457,7 @@ #ifdef HAVE_STATFS_H @@ -11,7 +30,7 @@ $NetBSD: patch-as,v 1.2 2009/05/09 18:43:41 hira Exp $ # define __OSL_STATFS_STRUCT struct statfs # define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) # define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) -@@ -1459,7 +1459,33 @@ +@@ -1459,7 +1469,33 @@ of the target platforms fix it!!!! */ # define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (1) # define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1) |