diff options
author | manu <manu@pkgsrc.org> | 2013-10-04 08:07:23 +0000 |
---|---|---|
committer | manu <manu@pkgsrc.org> | 2013-10-04 08:07:23 +0000 |
commit | eab29e32feed58c4e702bb8812517dd362d4bbcd (patch) | |
tree | 5e1a53a73c5f298156c94b2154ae8cafda57b776 | |
parent | 2bccd161f0b1c73e7e897f31c2fc842901e66713 (diff) | |
download | pkgsrc-eab29e32feed58c4e702bb8812517dd362d4bbcd.tar.gz |
Restore files removed by mistake
5 files changed, 88 insertions, 3 deletions
diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile index 0a4e8706863..b0dbf37368a 100644 --- a/filesystems/glusterfs/Makefile +++ b/filesystems/glusterfs/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2013/10/01 00:30:26 manu Exp $ +# $NetBSD: Makefile,v 1.37 2013/10/04 08:07:23 manu Exp $ # DISTNAME= glusterfs-3.4.1 -#PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= filesystems MASTER_SITES= http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/ diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo index 0673f68ae36..bd4ccbe9eee 100644 --- a/filesystems/glusterfs/distinfo +++ b/filesystems/glusterfs/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.31 2013/10/01 00:30:26 manu Exp $ +$NetBSD: distinfo,v 1.32 2013/10/04 08:07:23 manu Exp $ SHA1 (glusterfs-3.4.1.tar.gz) = 3c940cc864abd5402f0f70197085cb17212fc9cb RMD160 (glusterfs-3.4.1.tar.gz) = cb05c769eaaa72cf7f79c9dd7580d5a40c850fe7 Size (glusterfs-3.4.1.tar.gz) = 3811931 bytes +SHA1 (patch-argp-standalone_argp-fmtstream.c) = 241873f41bb774e1de4f777227c38b0dcae4ac59 +SHA1 (patch-argp-standalone_argp-fmtstream.h) = 9f2ead2a11c35fcc6347977082fa347343fccab2 SHA1 (patch-cg) = ebb691ddaa56bd8368cc9a0458a8caeec64d2b8e +SHA1 (patch-xlators_mount_fuse_src_fuse-helpers.c) = a770d557191c91a731da15e95caf5acd7ed567ff diff --git a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c new file mode 100644 index 00000000000..cabdc4e540f --- /dev/null +++ b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c @@ -0,0 +1,19 @@ +$NetBSD: patch-argp-standalone_argp-fmtstream.c,v 1.5 2013/10/04 08:07:23 manu Exp $ + +--- argp-standalone/argp-fmtstream.c.orig 2013-07-12 17:43:25.000000000 +0000 ++++ argp-standalone/argp-fmtstream.c +@@ -389,6 +389,7 @@ __argp_fmtstream_printf (struct argp_fmt + weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) + #endif + ++#if __STDC_VERSION__ - 199900L < 1 + /* Duplicate the inline definitions in argp-fmtstream.h, for compilers + * that don't do inlining. */ + size_t +@@ -471,5 +472,6 @@ __argp_fmtstream_point (argp_fmtstream_t + __argp_fmtstream_update (__fs); + return __fs->point_col >= 0 ? __fs->point_col : 0; + } ++#endif + + #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ diff --git a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h new file mode 100644 index 00000000000..62d7c75268c --- /dev/null +++ b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h @@ -0,0 +1,48 @@ +$NetBSD: patch-argp-standalone_argp-fmtstream.h,v 1.5 2013/10/04 08:07:23 manu Exp $ + +--- argp-standalone/argp-fmtstream.h.orig 2013-07-12 17:43:25.000000000 +0000 ++++ argp-standalone/argp-fmtstream.h +@@ -153,6 +153,7 @@ extern ssize_t argp_fmtstream_printf (ar + __const char *__fmt, ...) + PRINTF_STYLE(2,3); + ++#if 0 + extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); + extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); + +@@ -163,6 +164,7 @@ extern size_t __argp_fmtstream_write (ar + __const char *__str, size_t __len); + extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, + __const char *__str, size_t __len); ++#endif + + /* Access macros for various bits of state. */ + #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin) +@@ -172,6 +174,7 @@ extern size_t argp_fmtstream_write (argp + #define __argp_fmtstream_rmargin argp_fmtstream_rmargin + #define __argp_fmtstream_wmargin argp_fmtstream_wmargin + ++#if 0 + /* Set __FS's left margin to LMARGIN and return the old value. */ + extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, + size_t __lmargin); +@@ -193,6 +196,7 @@ extern size_t __argp_fmtstream_set_wmarg + /* Return the column number of the current output point in __FS. */ + extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); + extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); ++#endif + + /* Internal routines. */ + extern void _argp_fmtstream_update (argp_fmtstream_t __fs); +@@ -216,7 +220,11 @@ extern int __argp_fmtstream_ensure (argp + #endif + + #ifndef ARGP_FS_EI ++#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) + #define ARGP_FS_EI extern inline ++#else ++#define ARGP_FS_EI inline ++#endif + #endif + + ARGP_FS_EI size_t diff --git a/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c b/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c new file mode 100644 index 00000000000..14e3d8678b4 --- /dev/null +++ b/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c @@ -0,0 +1,15 @@ +$NetBSD: patch-xlators_mount_fuse_src_fuse-helpers.c,v 1.3 2013/10/04 08:07:23 manu Exp $ + +--- xlators/mount/fuse/src/fuse-helpers.c.orig 2013-09-17 13:41:20.000000000 +0000 ++++ xlators/mount/fuse/src/fuse-helpers.c +@@ -7,6 +7,10 @@ + later), or the GNU General Public License, version 2 (GPLv2), in all + cases as published by the Free Software Foundation. + */ ++#ifdef __NetBSD__ ++#define _KMEMUSER ++#endif ++ + #include "fuse-bridge.h" + #if defined(GF_SOLARIS_HOST_OS) + #include <sys/procfs.h> |