[pkgsrc/trunk]: pkgsrc/devel/opencm Make this package build in the presence o...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c94313728e03
branches:  trunk
changeset: 480604:c94313728e03
user:      agc <agc%pkgsrc.org@localhost>
date:      Thu Sep 16 13:34:13 2004 +0000

description:
Make this package build in the presence of statvfs(2)

diffstat:

 devel/opencm/distinfo         |   5 +++--
 devel/opencm/patches/patch-ae |  31 +++++++++++++++++++++++++++----
 devel/opencm/patches/patch-ag |  28 ++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 6 deletions(-)

diffs (92 lines):

diff -r 59a6ed407938 -r c94313728e03 devel/opencm/distinfo
--- a/devel/opencm/distinfo     Thu Sep 16 13:32:16 2004 +0000
+++ b/devel/opencm/distinfo     Thu Sep 16 13:34:13 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/06/20 10:55:24 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2004/09/16 13:34:13 agc Exp $
 
 SHA1 (opencm-0.1.2alpha6-1-src.tgz) = c30fc2c0459037869734415926861d7b7e0e575e
 Size (opencm-0.1.2alpha6-1-src.tgz) = 1394270 bytes
@@ -6,5 +6,6 @@
 SHA1 (patch-ab) = 63df5eecf9daedaf0250b4f34f6d48d93a229bfc
 SHA1 (patch-ac) = 02434beb61f5f5436d9a8b563344626a6aa98dab
 SHA1 (patch-ad) = 2c1d2678355027be4b3abd2fc166d5ddc726a421
-SHA1 (patch-ae) = 6686d43012a6c736a5b5c44e692f7e17631e5cfb
+SHA1 (patch-ae) = 675753e8091d0bfea8034dff051b64efd8357cea
 SHA1 (patch-af) = 63194a7f9530ccf3ac7f0d91b94d717295c61f0b
+SHA1 (patch-ag) = 603fddc1fb526e70fc194280c387084270d62180
diff -r 59a6ed407938 -r c94313728e03 devel/opencm/patches/patch-ae
--- a/devel/opencm/patches/patch-ae     Thu Sep 16 13:32:16 2004 +0000
+++ b/devel/opencm/patches/patch-ae     Thu Sep 16 13:34:13 2004 +0000
@@ -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 @@
          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 -r 59a6ed407938 -r c94313728e03 devel/opencm/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/opencm/patches/patch-ag     Thu Sep 16 13:34:13 2004 +0000
@@ -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;
+ }