diff options
| author | agc <agc@pkgsrc.org> | 2004-09-16 13:34:13 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2004-09-16 13:34:13 +0000 |
| commit | 70816e7d32c46c23e77454f5b8786ebf4f839b72 (patch) | |
| tree | c78bbf12dc9cb006226be16959bf422ae94ae8e2 | |
| parent | 35c5b23dc80fcc0a647e1c25de5716ced4aac9b0 (diff) | |
| download | pkgsrc-70816e7d32c46c23e77454f5b8786ebf4f839b72.tar.gz | |
Make this package build in the presence of statvfs(2)
| -rw-r--r-- | devel/opencm/distinfo | 5 | ||||
| -rw-r--r-- | devel/opencm/patches/patch-ae | 31 | ||||
| -rw-r--r-- | devel/opencm/patches/patch-ag | 28 |
3 files changed, 58 insertions, 6 deletions
diff --git a/devel/opencm/distinfo b/devel/opencm/distinfo index 642ca047970..4266e10e13a 100644 --- a/devel/opencm/distinfo +++ b/devel/opencm/distinfo @@ -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-aa) = eccb4254283fa554b33a65a4f93a4a98889cdaaa 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 --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; + } |