summaryrefslogtreecommitdiff
path: root/devel/opencm/patches
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2004-09-16 13:34:13 +0000
committeragc <agc@pkgsrc.org>2004-09-16 13:34:13 +0000
commit70816e7d32c46c23e77454f5b8786ebf4f839b72 (patch)
treec78bbf12dc9cb006226be16959bf422ae94ae8e2 /devel/opencm/patches
parent35c5b23dc80fcc0a647e1c25de5716ced4aac9b0 (diff)
downloadpkgsrc-70816e7d32c46c23e77454f5b8786ebf4f839b72.tar.gz
Make this package build in the presence of statvfs(2)
Diffstat (limited to 'devel/opencm/patches')
-rw-r--r--devel/opencm/patches/patch-ae31
-rw-r--r--devel/opencm/patches/patch-ag28
2 files changed, 55 insertions, 4 deletions
diff --git a/devel/opencm/patches/patch-ae b/devel/opencm/patches/patch-ae
index d0acdcd650e..132d9b11524 100644
--- a/devel/opencm/patches/patch-ae
+++ b/devel/opencm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2003/06/20 10:55:24 jmmv Exp $
+$NetBSD: patch-ae,v 1.4 2004/09/16 13:34:13 agc Exp $
---- configure.orig 2003-06-20 12:35:34.000000000 +0200
-+++ configure
-@@ -1909,7 +1909,7 @@ else
+--- configure.orig 2003-06-19 04:49:44.000000000 +0100
++++ configure 2004-09-16 14:24:54.000000000 +0100
+@@ -1909,7 +1909,7 @@
if test ! -d "$dir" ; then
continue;
fi
@@ -11,3 +11,26 @@ $NetBSD: patch-ae,v 1.3 2003/06/20 10:55:24 jmmv Exp $
vl_cv_lib_kerberos="$dir"
break;
fi
+@@ -1997,11 +1997,21 @@
+ DEFAULT_EDITOR="vi"
+ fi
+
+-case $host_os in solaris*|irix*)
++case $host_os in
++solaris*|irix*)
+ cat >> confdefs.h <<\EOF
+ #define HAVE_SVR4_STATVFS 1
+ EOF
+
++ ;;
++netbsd*)
++ if [ -f /usr/include/sys/statvfs.h ]; then
++ cat >> confdefs.h <<\EOF
++#define HAVE_SVR4_STATVFS 1
++EOF
++
++ fi
++ ;;
+ esac
+
+ for ac_func in setlinebuf
diff --git a/devel/opencm/patches/patch-ag b/devel/opencm/patches/patch-ag
new file mode 100644
index 00000000000..b60f8019688
--- /dev/null
+++ b/devel/opencm/patches/patch-ag
@@ -0,0 +1,28 @@
+$NetBSD: patch-ag,v 1.1 2004/09/16 13:34:13 agc Exp $
+
+--- src/common/OS/unix-os.c 2004/09/16 13:14:28 1.1
++++ src/common/OS/unix-os.c 2004/09/16 13:23:00
+@@ -417,13 +417,22 @@
+ }
+
+ #ifdef HAVE_SVR4_STATVFS
++
++# ifdef __NetBSD__
++# define BASETYPE f_fstypename
++# define TYPE_LENGTH _VFS_NAMELEN
++# else
++# define BASETYPE f_basetype
++# define TYPE_LENGTH FSTYPSZ
++# endif
++
+ OC_bool
+ os_is_local_path(const char *path)
+ {
+ struct statvfs sfs;
+ statvfs(path, &sfs);
+
+- if (strncmp(sfs.f_basetype, "nfs", FSTYPSZ) == 0)
++ if (strncmp(sfs.BASETYPE, "nfs", TYPE_LENGTH) == 0)
+ return FALSE;
+ return TRUE;
+ }