Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/filesystems/Makefile
+++ b/filesystems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/08/30 17:37:55 jakllsch Exp $
+# $NetBSD: Makefile,v 1.37 2014/02/17 10:37:18 wiz Exp $
 #

 COMMENT=	File systems, and file system related packages
@@ -33,6 +33,10 @@ SUBDIR+=	fuse-wikipediafs
 SUBDIR+=	glusterfs
 SUBDIR+=	openafs
 SUBDIR+=	openafs-devel
+SUBDIR+=	ori
+SUBDIR+=	p5-Module-Path
+SUBDIR+=	p5-MooseX-Types-Path-Tiny
+SUBDIR+=	p5-Path-Tiny
 SUBDIR+=	perfuse
 SUBDIR+=	py-filesystem
 SUBDIR+=	py-fuse-bindings
--- a/filesystems/cloudfuse/Makefile
+++ b/filesystems/cloudfuse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2013/02/06 23:22:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/12 23:17:53 tron Exp $

 DISTNAME=	1003a82
 PKGNAME=	cloudfuse-20120124
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	filesystems
 MASTER_SITES=	https://github.com/redbo/cloudfuse/tarball/
 DIST_SUBDIR=	cloudfuse
@@ -23,10 +23,6 @@ WRKSRC=		${WRKDIR}/redbo-cloudfuse-${DISTNAME}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cloudfuse.README

-# Force using "curl" for fetching the distribution file. It is only available
-# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
-FETCH_USING=	curl
-
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../filesystems/fuse/buildlink3.mk"
--- a/filesystems/fs-utils/Makefile
+++ b/filesystems/fs-utils/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2013/06/18 18:52:43 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.19 2014/01/27 18:41:12 wiz Exp $

-GIT_COMMIT=		89cccf
+GIT_COMMIT=		v1.00
 DISTNAME=		${GIT_COMMIT}
-PKGNAME=		fs-utils-20130601
-
+PKGNAME=		fs-utils-20130701
 CATEGORIES=		filesystems
-MASTER_SITES=		-http://nodeload.github.com/stacktic/fs-utils/tar.gz/${GIT_COMMIT}
+MASTER_SITES=		https://github.com/stacktic/fs-utils/archive/

 MAINTAINER=		stacktic@NetBSD.org
 HOMEPAGE=		https://github.com/stacktic/fs-utils
@@ -14,13 +12,13 @@ COMMENT=		Tools to access/modify a file system image through RUMP
 LICENSE=		2-clause-bsd
 DEPENDS+=		rump>=20130101:../../misc/rump

-ONLY_FOR_PLATFORM=	Linux-*-* SunOS-*-* NetBSD-*-* DragonFly-*-*
+ONLY_FOR_PLATFORM=	Linux-*-* SunOS-*-* NetBSD-*-*

 INSTALLATION_DIRS=	bin lib include ${PKGMANDIR}/man1 ${PKGMANDIR}/man3

 USE_TOOLS+=		gmake

-WRKSRC=			${WRKDIR}/fs-utils-${GIT_COMMIT}
+WRKSRC=			${WRKDIR}/fs-utils-1.00

 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
--- a/filesystems/fs-utils/distinfo
+++ b/filesystems/fs-utils/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2013/06/26 21:24:23 joerg Exp $
+$NetBSD: distinfo,v 1.15 2013/07/05 17:25:23 stacktic Exp $

-SHA1 (89cccf.tar.gz) = ea6e5458616347b874a7bba3c5a942a80745934d
-RMD160 (89cccf.tar.gz) = a4abf18762cb3628e663ae23d99d3d660462a99d
-Size (89cccf.tar.gz) = 493836 bytes
+SHA1 (v1.00.tar.gz) = 77dfb9a3d3c72c723169309f5ca75c178b3335df
+RMD160 (v1.00.tar.gz) = c155491d6771a062831d8604ad64f0eead8f29bc
+Size (v1.00.tar.gz) = 493827 bytes
 SHA1 (patch-lib_getbsize.c) = 9321fcc65f918a825de697bba3c69f53b1e71871
-SHA1 (patch-lib_mount__v7fs.c) = 9ff801f0f128ca361da80b18cd7a398826e60813
--- a/filesystems/fs-utils/patches/patch-lib_mount__v7fs.c
+++ b/filesystems/fs-utils/patches/patch-lib_mount__v7fs.c
@@ -1,22 +0,0 @@
-$NetBSD: patch-lib_mount__v7fs.c,v 1.1 2013/06/18 18:52:10 wiz Exp $
-
-Function returning void shouldn't return values.
-
--- lib/mount_v7fs.c.orig	2013-06-01 12:54:14.000000000 +0000
-+++ lib/mount_v7fs.c
-@@ -155,13 +155,13 @@ mount_v7fs_parseargs(int argc, char **ar
- 		case '?':
- 
- 		default:
-			return 1;
-+			return;
- 		}
- 	argc -= optind;
- 	argv += optind;
- 
- 	if (argc != 2)
-		return 1;
-+		return;
- 
- 	pathadj(argv[0], canon_dev);
- 	args->endian = endian;
--- a/filesystems/fuse-afpfs-ng/Makefile
+++ b/filesystems/fuse-afpfs-ng/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2012/10/03 16:08:30 asau Exp $
+# $NetBSD: Makefile,v 1.13 2014/01/01 11:52:15 wiz Exp $

 DISTNAME=	afpfs-ng-0.8.1
 PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	5
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=afpfs-ng/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,9 +18,18 @@ USE_LANGUAGES=	c c++

 REPLACE_SH+=	fuse/afpfs

+.include "../../mk/readline.buildlink3.mk"
+
+SUBST_CLASSES+=		termcap
+SUBST_STAGE.termcap=	post-patch
+SUBST_FILES.termcap=	configure.ac configure cmdline/Makefile.*
+.if ${TERMCAP_TYPE} == none
+SUBST_SED.termcap+=	-e 's|ncurses||'
+.else
+SUBST_SED.termcap+=	-e 's|ncurses|${BUILDLINK_LIBNAME.termcap}|'
+.endif
+
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"

--- a/filesystems/fuse-bindfs/DESCR
+++ b/filesystems/fuse-bindfs/DESCR
@@ -1,3 +1,13 @@
 bindfs is a FUSE filesystem for mounting a directory to another location,
-similar to 'mount --bind' in Linux or nullfs in BSD.  The permissions in
-the mountpoint can be altered through various rules.
+similar to 'mount --bind' in Linux or nullfs in BSD.  The permissions of
+the mirrored directory can be altered in various ways.
+
+Some things bindfs can be used for:
+ - Making a directory read-only.
+ - Making all executables non-executable.
+ - Sharing a directory with a list of users (or groups).
+ - Modifying permission bits using rules with chmod-like syntax.
+ - Changing the permissions with which files are created.
+
+Non-root users can use almost all features, but most interesting
+use-cases need user_allow_other to be defined in /etc/fuse.conf
--- a/filesystems/fuse-bindfs/Makefile
+++ b/filesystems/fuse-bindfs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 16:08:30 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/11/10 06:36:28 apb Exp $
 #

 DISTNAME=	bindfs-1.8.4
 PKGNAME=	fuse-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	http://bindfs.googlecode.com/files/

--- a/filesystems/fuse-cryptofs/Makefile
+++ b/filesystems/fuse-cryptofs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2012/10/03 16:08:31 asau Exp $
+# $NetBSD: Makefile,v 1.9 2014/01/01 11:52:15 wiz Exp $
 #

 DISTNAME=	cryptofs-0.6.0
 PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	filesystems
 MASTER_SITES=	http://reboot.animeirc.de/cryptofs/
 EXTRACT_SUFX=	.tar.bz2
--- a/filesystems/fuse-curlftpfs/Makefile
+++ b/filesystems/fuse-curlftpfs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2013/02/06 23:22:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2014/02/12 23:17:53 tron Exp $
 #

 DISTNAME=	curlftpfs-0.9.1
 PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=curlftpfs/}

--- a/filesystems/fuse-djmount/Makefile
+++ b/filesystems/fuse-djmount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 16:08:31 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:22 ryoon Exp $

 DISTNAME=	djmount-0.71
 PKGNAME=	fuse-${DISTNAME}
@@ -14,8 +14,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake

-USE_GNU_READLINE=	yes
-
 CONFIGURE_ARGS+=	--with-external-libupnp
 CONFIGURE_ARGS+=	--with-libupnp-prefix=${BUILDLINK_PREFIX.libupnp}

--- a/filesystems/fuse-encfs/Makefile
+++ b/filesystems/fuse-encfs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2013/02/06 23:22:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/12 23:17:53 tron Exp $
 #

 DISTNAME=	encfs-1.2.0-2
 PKGNAME=	fuse-${DISTNAME:S/-2/.2/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=encfs/}
 EXTRACT_SUFX=	.tgz
--- a/filesystems/fuse-gmailfs/Makefile
+++ b/filesystems/fuse-gmailfs/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/03 16:08:31 asau Exp $
-#
+# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:18 wiz Exp $

 DISTNAME=	gmailfs-0.7.2
 PKGREVISION=	3
@@ -12,7 +11,8 @@ HOMEPAGE=	http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesyst
 COMMENT=	FUSE filesystem which uses Google mail for free space

 NO_BUILD=			yes
-PYTHON_PATCH_SCRIPTS=		gmailfs.py mount.gmailfs
+REPLACE_PYTHON=		gmailfs.py mount.gmailfs
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-fuse-bindings

 CONF_FILES=		${PREFIX}/share/examples/gmailfs/gmailfs.conf \
 			${PKG_SYSCONFDIR}/gmailfs.conf
--- a/filesystems/fuse-pod/Makefile
+++ b/filesystems/fuse-pod/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2013/06/06 12:54:19 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2013/10/17 07:56:41 wiz Exp $
 #

 DISTNAME=	fusepod-0.5.1
 PKGNAME=	fuse-pod-0.5.1
-PKGREVISION=	17
+PKGREVISION=	20
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fusepod/}
 EXTRACT_SUFX=	.tar.bz2
--- a/filesystems/fuse-svnfs/Makefile
+++ b/filesystems/fuse-svnfs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2013/05/31 12:41:01 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2014/02/12 23:17:53 tron Exp $
 #

 DISTNAME=	svnfs-0.4
-PKGREVISION=	15
+PKGREVISION=	20
 CATEGORIES=	filesystems
 MASTER_SITES=	http://www.jmadden.eu/wp-content/uploads/svnfs/
 EXTRACT_SUFX=	.tgz
--- a/filesystems/fuse-wdfs/Makefile
+++ b/filesystems/fuse-wdfs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2013/02/06 23:22:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2014/02/12 23:17:53 tron Exp $
 #

 DISTNAME=	wdfs-1.4.2
 PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	filesystems
 MASTER_SITES=	http://noedler.de/projekte/wdfs/

--- a/filesystems/fuse-wikipediafs/Makefile
+++ b/filesystems/fuse-wikipediafs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/10/03 16:08:33 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2014/01/22 07:19:45 wiz Exp $

 DISTNAME=	wikipediafs-0.3
 PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wikipediafs/}

@@ -11,8 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wikipediafs.sourceforge.net/
 COMMENT=	FUSE filesystem for accessing the wikipedia

-PYDISTUTILSPKG=		yes
-PY_PATCHLIST=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-fuse-bindings
+EGG_NAME=	wikipediafs-0.1

 SUBST_CLASSES+=		config
 SUBST_STAGE.config=	post-patch
@@ -22,6 +21,6 @@ SUBST_MESSAGE.config=   Fixing paths.

 .include "../../filesystems/py-fuse-bindings/buildlink3.mk"

-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/filesystems/fuse-wikipediafs/PLIST
+++ b/filesystems/fuse-wikipediafs/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:51:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/01/22 07:19:45 wiz Exp $
 bin/mount.wikipediafs
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/wikipediafs/__init__.py
 ${PYSITELIB}/wikipediafs/__init__.pyc
 ${PYSITELIB}/wikipediafs/__init__.pyo
--- a/filesystems/glusterfs/MESSAGE.ssl
+++ b/filesystems/glusterfs/MESSAGE.ssl
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.ssl,v 1.1 2011/12/09 16:57:44 manu Exp $
-
-The following paths are used for SSL key, certificate and CA:
-	${PKG_SYSCONFDIR}/openssl/private/gluster.key
-	${PKG_SYSCONFDIR}/openssl/certs/gluster.crt
-	${PKG_SYSCONFDIR}/openssl/certs/gluster-ca.crt
-
-===========================================================================
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2013/02/26 10:27:09 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2013/10/04 08:07:23 manu Exp $
 #

-DISTNAME=	glusterfs-3.3.1
+DISTNAME=	glusterfs-3.4.1
+PKGREVISION=	1
 CATEGORIES=	filesystems
-MASTER_SITES=	http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/
+MASTER_SITES=	http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gluster.org/
@@ -14,6 +15,7 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		flex bison

+CONFIGURE_ARGS+=	--disable-fusermount
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	CFLAGS=${CFLAGS:M*:Q}\ -DDEBUG

@@ -72,7 +74,6 @@ PLIST_SUBST+=		VARBASE=${VARBASE}
 PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MESSAGE_SRC=		${PKGDIR}/MESSAGE.${OPSYS}

-CPPFLAGS.NetBSD+=	-D_KMEMUSER

 post-build:
 	 cp ${WRKSRC}/doc/glusterd.vol ${WRKSRC}/doc/glusterd.vol.sample
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,61 +1,78 @@
-@comment $NetBSD: PLIST,v 1.14 2013/04/06 04:03:36 rodent Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/03/11 14:05:01 jperkin Exp $
 etc/glusterfs/glusterd.vol.sample
-lib/libglusterfs.la
+etc/glusterfs/glusterfs-logrotate
+include/glusterfs/api/glfs.h
+lib/glusterfs/3.4.1/auth/addr.la
+lib/glusterfs/3.4.1/auth/login.la
+lib/glusterfs/3.4.1/rpc-transport/socket.la
+lib/glusterfs/3.4.1/xlator/cluster/afr.la
+lib/glusterfs/3.4.1/xlator/cluster/dht.la
+lib/glusterfs/3.4.1/xlator/cluster/distribute.so
+lib/glusterfs/3.4.1/xlator/cluster/nufa.la
+lib/glusterfs/3.4.1/xlator/cluster/pump.la
+lib/glusterfs/3.4.1/xlator/cluster/replicate.so
+lib/glusterfs/3.4.1/xlator/cluster/stripe.la
+lib/glusterfs/3.4.1/xlator/cluster/switch.la
+lib/glusterfs/3.4.1/xlator/debug/error-gen.la
+lib/glusterfs/3.4.1/xlator/debug/io-stats.la
+lib/glusterfs/3.4.1/xlator/debug/trace.la
+lib/glusterfs/3.4.1/xlator/encryption/rot-13.la
+lib/glusterfs/3.4.1/xlator/features/access-control.so
+lib/glusterfs/3.4.1/xlator/features/index.la
+lib/glusterfs/3.4.1/xlator/features/locks.la
+lib/glusterfs/3.4.1/xlator/features/mac-compat.la
+lib/glusterfs/3.4.1/xlator/features/marker.la
+lib/glusterfs/3.4.1/xlator/features/posix-locks.so
+lib/glusterfs/3.4.1/xlator/features/quiesce.la
+lib/glusterfs/3.4.1/xlator/features/quota.la
+lib/glusterfs/3.4.1/xlator/features/read-only.la
+lib/glusterfs/3.4.1/xlator/features/worm.la
+lib/glusterfs/3.4.1/xlator/mgmt/glusterd.la
+lib/glusterfs/3.4.1/xlator/mount/api.a
+lib/glusterfs/3.4.1/xlator/mount/api.la
+lib/glusterfs/3.4.1/xlator/mount/fuse.la
+lib/glusterfs/3.4.1/xlator/nfs/server.la
+lib/glusterfs/3.4.1/xlator/performance/io-cache.la
+lib/glusterfs/3.4.1/xlator/performance/io-threads.la
+lib/glusterfs/3.4.1/xlator/performance/md-cache.la
+lib/glusterfs/3.4.1/xlator/performance/open-behind.a
+lib/glusterfs/3.4.1/xlator/performance/open-behind.la
+lib/glusterfs/3.4.1/xlator/performance/open-behind.so
+lib/glusterfs/3.4.1/xlator/performance/quick-read.la
+lib/glusterfs/3.4.1/xlator/performance/read-ahead.la
+lib/glusterfs/3.4.1/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.4.1/xlator/performance/write-behind.la
+lib/glusterfs/3.4.1/xlator/protocol/client.la
+lib/glusterfs/3.4.1/xlator/protocol/server.la
+lib/glusterfs/3.4.1/xlator/storage/posix.la
+lib/glusterfs/3.4.1/xlator/system/posix-acl.la
+lib/glusterfs/3.4.1/xlator/testing/performance/symlink-cache.la
+lib/libgfapi.a
+lib/libgfapi.la
+lib/libgfapi.so
+lib/libgfapi.so.0
+lib/libgfapi.so.0.0.0
 lib/libgfrpc.la
 lib/libgfxdr.la
-lib/glusterfs/3.3.1/auth/addr.la
-lib/glusterfs/3.3.1/auth/login.la
-lib/glusterfs/3.3.1/rpc-transport/socket.la
-lib/glusterfs/3.3.1/xlator/cluster/afr.la
-lib/glusterfs/3.3.1/xlator/cluster/dht.la
-lib/glusterfs/3.3.1/xlator/cluster/distribute.so
-lib/glusterfs/3.3.1/xlator/cluster/nufa.la
-lib/glusterfs/3.3.1/xlator/cluster/pump.la
-lib/glusterfs/3.3.1/xlator/cluster/replicate.so
-lib/glusterfs/3.3.1/xlator/cluster/stripe.la
-lib/glusterfs/3.3.1/xlator/cluster/switch.la
-lib/glusterfs/3.3.1/xlator/debug/error-gen.la
-lib/glusterfs/3.3.1/xlator/debug/io-stats.la
-lib/glusterfs/3.3.1/xlator/debug/trace.la
-lib/glusterfs/3.3.1/xlator/encryption/rot-13.la
-lib/glusterfs/3.3.1/xlator/features/access-control.so
-lib/glusterfs/3.3.1/xlator/features/index.la
-lib/glusterfs/3.3.1/xlator/features/locks.la
-lib/glusterfs/3.3.1/xlator/features/mac-compat.la
-lib/glusterfs/3.3.1/xlator/features/marker.la
-lib/glusterfs/3.3.1/xlator/features/posix-locks.so
-lib/glusterfs/3.3.1/xlator/features/quiesce.la
-lib/glusterfs/3.3.1/xlator/features/quota.la
-lib/glusterfs/3.3.1/xlator/features/read-only.la
-lib/glusterfs/3.3.1/xlator/features/worm.la
-lib/glusterfs/3.3.1/xlator/mgmt/glusterd.la
-lib/glusterfs/3.3.1/xlator/mount/fuse.la
-lib/glusterfs/3.3.1/xlator/nfs/server.la
-lib/glusterfs/3.3.1/xlator/performance/io-cache.la
-lib/glusterfs/3.3.1/xlator/performance/io-threads.la
-lib/glusterfs/3.3.1/xlator/performance/md-cache.la
-lib/glusterfs/3.3.1/xlator/performance/quick-read.la
-lib/glusterfs/3.3.1/xlator/performance/read-ahead.la
-lib/glusterfs/3.3.1/xlator/performance/stat-prefetch.so
-lib/glusterfs/3.3.1/xlator/performance/write-behind.la
-lib/glusterfs/3.3.1/xlator/protocol/client.la
-lib/glusterfs/3.3.1/xlator/protocol/server.la
-lib/glusterfs/3.3.1/xlator/storage/posix.la
-lib/glusterfs/3.3.1/xlator/system/posix-acl.la
-lib/glusterfs/3.3.1/xlator/testing/performance/symlink-cache.la
+lib/libglusterfs.la
+lib/ocf/resource.d/glusterfs/glusterd
+lib/ocf/resource.d/glusterfs/volume
+lib/pkgconfig/glusterfs-api.pc
 man/man8/gluster.8
+man/man8/glusterd.8
+man/man8/glusterfs.8
+man/man8/glusterfsd.8
+man/man8/mount.glusterfs.8
+sbin/gluster
 sbin/glusterd
 sbin/glusterfs
 sbin/glusterfsd
-sbin/gluster
 sbin/mount.glusterfs
-share/doc/glusterfs/benchmarking/rdd.c
-share/doc/glusterfs/benchmarking/glfs-bm.c
 share/doc/glusterfs/benchmarking/README
+share/doc/glusterfs/benchmarking/glfs-bm.c
 share/doc/glusterfs/benchmarking/launch-script.sh
 share/doc/glusterfs/benchmarking/local-script.sh
+share/doc/glusterfs/benchmarking/rdd.c
 share/doc/glusterfs/glusterfs-mode.el
 share/doc/glusterfs/glusterfs.vim
-share/examples/rc.d/glusterfsd
-share/examples/rc.d/glusterd
@exec test -d ${PKG_SYSCONFDIR}/glusterd -a ! -d ${VARBASE}/lib/glusterd && ${MKDIR} -p ${VARBASE}/lib/ && mv ${PKG_SYSCONFDIR}/glusterd  ${VARBASE}/lib/glusterd && ${LN} -s ${VARBASE}/lib/glusterd  ${PKG_SYSCONFDIR}/glusterd
--- a/filesystems/glusterfs/PLIST.georeplication
+++ b/filesystems/glusterfs/PLIST.georeplication
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.georeplication,v 1.5 2012/10/19 04:15:21 manu Exp $
+@comment $NetBSD: PLIST.georeplication,v 1.6 2013/10/01 00:30:26 manu Exp $
 libexec/glusterfs/python/syncdaemon/README.md
 libexec/glusterfs/python/syncdaemon/__init__.py
 libexec/glusterfs/python/syncdaemon/__init__.pyc
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.27 2012/12/20 21:53:20 joerg Exp $
+$NetBSD: distinfo,v 1.32 2013/10/04 08:07:23 manu Exp $

-SHA1 (glusterfs-3.3.1.tar.gz) = c29632e4938533069c4c0206fb1c32de8443168d
-RMD160 (glusterfs-3.3.1.tar.gz) = 667bac9362aab01ab04f9119e399b8d955e01135
-Size (glusterfs-3.3.1.tar.gz) = 2636698 bytes
-SHA1 (patch-argp-standalone_argp-fmtstream.c) = 1a302c39cb8f09a56fc4b8d12589bbb69f92a0f3
-SHA1 (patch-argp-standalone_argp-fmtstream.h) = 896bee64bcf8966dede5e92ca9097db4c69e6aa4
-SHA1 (patch-da) = 312a8c73c1a22058dc43cf5f957380c42a5a23e4
-SHA1 (patch-db) = a97ac1bea9be2a9d7162eb495cb9b3c741d70e34
-SHA1 (patch-libglusterfs_src_rbthash.c) = 2e50cf8712e30cef5a4b30510fac65a6474b58b6
-SHA1 (patch-rpc_rpc-lib_src_rpc-clnt.c) = ad93375f38fce36437abae3ee499caa6b55e89e6
-SHA1 (patch-rpc_rpc-lib_src_rpcsvc.c) = 28b509411e421a1cd0e979a282786c28c59141e7
+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
--- a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
+++ b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-argp-standalone_argp-fmtstream.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
+$NetBSD: patch-argp-standalone_argp-fmtstream.c,v 1.5 2013/10/04 08:07:23 manu Exp $

--- argp-standalone/argp-fmtstream.c.orig	2012-10-11 17:38:19.000000000 +0000
+--- 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)
--- a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
+++ b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-argp-standalone_argp-fmtstream.h,v 1.1 2012/12/20 21:53:20 joerg Exp $
+$NetBSD: patch-argp-standalone_argp-fmtstream.h,v 1.5 2013/10/04 08:07:23 manu Exp $

--- argp-standalone/argp-fmtstream.h.orig	2012-10-11 17:38:19.000000000 +0000
+--- 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, ...)
--- a/filesystems/glusterfs/patches/patch-cg
+++ b/filesystems/glusterfs/patches/patch-cg
@@ -0,0 +1,24 @@
+$NetBSD: patch-cg,v 1.1 2013/10/01 00:30:26 manu Exp $
+
+--- xlators/cluster/afr/src/afr.c.orig	2013-09-30 16:51:57.000000000 +0200
+++ xlators/cluster/afr/src/afr.c	2013-09-30 17:23:03.000000000 +0200
+@@ -673,9 +675,19 @@
+           .description = "Enabling this option logs entry lock/unlocks"
+         },
+         { .key = {"eager-lock"},
+           .type = GF_OPTION_TYPE_BOOL,
+#ifdef __NetBSD__
+	/*
+	 * eager-locks are broken on NetBSD, and cause spurious
+	 * split brain with all NULL pending matrix, as described
+	 * in https://bugzilla.redhat.com/show_bug.cgi?id=1005526
+	 * We therefore disable them for now
+	 */
+          .default_value = "off",
+#else
+           .default_value = "on",
+#endif
+           .description = "Lock phase of a transaction has two sub-phases. "
+                          "First is an attempt to acquire locks in parallel by "
+                          "broadcasting non-blocking lock requests. If lock "
+                          "aquistion fails on any server, then the held locks "
--- a/filesystems/glusterfs/patches/patch-da
+++ b/filesystems/glusterfs/patches/patch-da
@@ -1,26 +0,0 @@
-$NetBSD: patch-da,v 1.1 2012/10/19 04:15:22 manu Exp $
-
-Avoid corner case where the client is unsable to reconnect to servers
-
-Backport of a bit from http://review.gluster.org/362
-
--- rpc/rpc-transport/socket/src/socket.c.orig	2012-09-30 06:42:07.000000000 +0200
-+++ rpc/rpc-transport/socket/src/socket.c	2012-09-30 09:41:50.000000000 +0200
-@@ -278,8 +278,17 @@
-                         gf_log (this->name, GF_LOG_DEBUG,
-                                 "shutdown() returned %d. %s",
-                                 ret, strerror (errno));
-                 }
-+
-+                /*
-+                 * Without this, reconnect (= disconnect + connect)
-+                 * won't work except by accident. 
-+                 */  
-+                event_unregister (this->ctx->event_pool,
-+                                  priv->sock, priv->idx);
-+                close (priv->sock);
-+                priv->sock = -1;
-         }
- 
- out:
-         return ret;
--- a/filesystems/glusterfs/patches/patch-db
+++ b/filesystems/glusterfs/patches/patch-db
@@ -1,39 +0,0 @@
-$NetBSD: patch-db,v 1.1 2012/10/19 04:15:22 manu Exp $
-
-Always enable DHT so that scaling from 1 brick to more does not raise
-spurious EINVAL
-
-From upstream http://review.gluster.org/3838
-
--- xlators/mgmt/glusterd/src/glusterd-volgen.c.orig
-+++ xlators/mgmt/glusterd/src/glusterd-volgen.c
-@@ -2362,7 +2362,6 @@ volgen_graph_build_dht_cluster (volgen_graph_t *graph,
-         char                    *decommissioned_children = NULL;
-         xlator_t                *dht                     = NULL;
- 
-        GF_ASSERT (child_count > 1);
-         clusters = volgen_graph_build_clusters (graph,  volinfo,
-                                                 "cluster/distribute", "%s-dht",
-                                                 child_count, child_count);
-@@ -2455,12 +2454,16 @@ volume_volgen_graph_build_clusters (volgen_graph_t *graph,
- 
- build_distribute:
-         dist_count = volinfo->brick_count / volinfo->dist_leaf_count;
-        if (dist_count > 1) {
-                ret = volgen_graph_build_dht_cluster (graph, volinfo,
-                                                      dist_count);
-                if (ret)
-                        goto out;
-+        if (!dist_count) {
-+                ret = -1;
-+                goto out;
-         }
-+
-+        ret = volgen_graph_build_dht_cluster (graph, volinfo,
-+                                              dist_count);
-+        if (ret)
-+                goto out;
-+
-         ret = 0;
- out:
-         return ret;
--- a/filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c
+++ b/filesystems/glusterfs/patches/patch-libglusterfs_src_rbthash.c
@@ -1,22 +0,0 @@
-$NetBSD: patch-libglusterfs_src_rbthash.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
-
--- libglusterfs/src/rbthash.c.orig	2012-12-20 15:00:05.000000000 +0000
-+++ libglusterfs/src/rbthash.c
-@@ -228,7 +228,7 @@ rbthash_deinit_entry (rbthash_table_t *t
- }
- 
- 
-inline struct rbthash_bucket *
-+struct rbthash_bucket *
- rbthash_entry_bucket (rbthash_table_t *tbl, rbthash_entry_t * entry)
- {
-         int     nbucket = 0;
-@@ -302,7 +302,7 @@ err:
-         return ret;
- }
- 
-inline struct rbthash_bucket *
-+struct rbthash_bucket *
- rbthash_key_bucket (rbthash_table_t *tbl, void *key, int keylen)
- {
-         uint32_t        keyhash = 0;
--- a/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c
+++ b/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpc-clnt.c
@@ -1,13 +0,0 @@
-$NetBSD: patch-rpc_rpc-lib_src_rpc-clnt.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
-
--- rpc/rpc-lib/src/rpc-clnt.c.orig	2012-12-20 14:57:05.000000000 +0000
-+++ rpc/rpc-lib/src/rpc-clnt.c
-@@ -951,7 +951,7 @@ rpc_clnt_connection_deinit (rpc_clnt_con
- }
- 
- 
-inline int
-+int
- rpc_clnt_connection_init (struct rpc_clnt *clnt, glusterfs_ctx_t *ctx,
-                           dict_t *options, char *name)
- {
--- a/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c
+++ b/filesystems/glusterfs/patches/patch-rpc_rpc-lib_src_rpcsvc.c
@@ -1,85 +0,0 @@
-$NetBSD: patch-rpc_rpc-lib_src_rpcsvc.c,v 1.1 2012/12/20 21:53:20 joerg Exp $
-
--- rpc/rpc-lib/src/rpcsvc.c.orig	2012-12-20 14:55:50.000000000 +0000
-+++ rpc/rpc-lib/src/rpcsvc.c
-@@ -220,7 +220,7 @@ err:
- /* this procedure can only pass 4 arguments to registered notifyfn. To send more
-  * arguments call wrapper->notify directly.
-  */
-inline void
-+void
- rpcsvc_program_notify (rpcsvc_listener_t *listener, rpcsvc_event_t event,
-                        void *data)
- {
-@@ -243,7 +243,7 @@ out:
- }
- 
- 
-inline int
-+int
- rpcsvc_accept (rpcsvc_t *svc, rpc_transport_t *listen_trans,
-                rpc_transport_t *new_trans)
- {
-@@ -687,7 +687,7 @@ err:
-         return txrecord;
- }
- 
-inline int
-+int
- rpcsvc_get_callid (rpcsvc_t *rpc)
- {
-         return GF_UNIVERSAL_ANSWER;
-@@ -873,7 +873,7 @@ out:
-         return ret;
- }
- 
-inline int
-+int
- rpcsvc_transport_submit (rpc_transport_t *trans, struct iovec *hdrvec,
-                          int hdrcount, struct iovec *proghdr, int proghdrcount,
-                          struct iovec *progpayload, int progpayloadcount,
-@@ -1120,7 +1120,7 @@ rpcsvc_error_reply (rpcsvc_request_t *re
- 
- 
- /* Register the program with the local portmapper service. */
-inline int
-+int
- rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port)
- {
-         int                ret   = 0;
-@@ -1142,7 +1142,7 @@ out:
- }
- 
- 
-inline int
-+int
- rpcsvc_program_unregister_portmap (rpcsvc_program_t *prog)
- {
-         int ret = 0;
-@@ -1320,7 +1320,7 @@ out:
- }
- 
- 
-inline int
-+int
- rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen)
- {
-         if (!trans) {
-@@ -1331,7 +1331,7 @@ rpcsvc_transport_peername (rpc_transport
- }
- 
- 
-inline int
-+int
- rpcsvc_transport_peeraddr (rpc_transport_t *trans, char *addrstr, int addrlen,
-                            struct sockaddr_storage *sa, socklen_t sasize)
- {
-@@ -1583,7 +1583,7 @@ out:
- }
- 
- 
-inline int
-+int
- rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t *program)
- {
-         int               ret                = -1;
--- a/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c
+++ 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>
--- a/filesystems/openafs-devel/PLIST
+++ b/filesystems/openafs-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:01 jperkin Exp $
 bin/afs_compile_et
 bin/afsio
 bin/afsmonitor
@@ -267,6 +267,5 @@ sbin/voldump
 sbin/volinfo
 sbin/vos
 sbin/vsys
-share/examples/rc.d/bosserver
 share/openafs/C/afszcm.cat
@pkgdir lib/openafs
--- a/filesystems/openafs/Makefile
+++ b/filesystems/openafs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2013/03/04 19:39:41 jakllsch Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/21 21:33:51 gendalia Exp $

-DISTNAME=	openafs-1.6.2-src
+DISTNAME=	openafs-1.6.6-src
 PKGNAME=	${DISTNAME:C/-src//}
 CATEGORIES=	filesystems net sysutils
-MASTER_SITES=	http://www.openafs.org/dl/openafs/1.6.2/
+MASTER_SITES=	http://www.openafs.org/dl/openafs/1.6.6/
 EXTRACT_SUFX=	.tar.bz2

 MAINTAINER=	gendalia@NetBSD.org
--- a/filesystems/openafs/PLIST
+++ b/filesystems/openafs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/12/01 15:22:32 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/03/11 14:05:01 jperkin Exp $
 bin/afs_compile_et
 bin/afsio
 bin/afsmonitor
@@ -224,6 +224,7 @@ lib/libubik.a
 libexec/openafs/buserver
 libexec/openafs/dafileserver
 libexec/openafs/dasalvager
+libexec/openafs/davolserver
 libexec/openafs/fileserver
 libexec/openafs/kaserver
 libexec/openafs/ptserver
@@ -261,6 +262,5 @@ sbin/voldump
 sbin/volinfo
 sbin/vos
 sbin/vsys
-share/examples/rc.d/bosserver
 share/openafs/C/afszcm.cat
@pkgdir lib/openafs
--- a/filesystems/openafs/distinfo
+++ b/filesystems/openafs/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.4 2013/03/04 19:39:41 jakllsch Exp $
+$NetBSD: distinfo,v 1.6 2014/02/21 21:33:51 gendalia Exp $

-SHA1 (openafs-1.6.2-src.tar.bz2) = 3a5513c93bc9b1f58500cae2825d2a413952383f
-RMD160 (openafs-1.6.2-src.tar.bz2) = 03a524e7b602775981c6dedfd7883ed1205a7464
-Size (openafs-1.6.2-src.tar.bz2) = 14378378 bytes
-SHA1 (patch-Makefile.in) = 159d314975188f768e0046bf153711d1b5c6b89c
-SHA1 (patch-src_aklog_aklog.c) = 7a21b2bd338a3a1d00dc0cb99f1af206ab0c607c
+SHA1 (openafs-1.6.6-src.tar.bz2) = 819abbb4d639f8f671837e258314710b548bf21d
+RMD160 (openafs-1.6.6-src.tar.bz2) = ee51e249021acf9d19ca0053ff9d7f83019862cb
+Size (openafs-1.6.6-src.tar.bz2) = 14582006 bytes
 SHA1 (patch-src_comerr_Makefile.in) = dd5e996481d7ef908710868aa9dc1b65feb98717
-SHA1 (patch-src_config_param.nbsd60.h) = bb2288fd155f20df64fe2e8bc91f0fcf215d6c46
-SHA1 (patch-src_util_softsig.c) = 3f1b27b2ce0d72de6239ebefc199eba831c1acf0
--- a/filesystems/openafs/options.mk
+++ b/filesystems/openafs/options.mk
@@ -1,15 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2013/04/08 11:17:13 rodent Exp $
+# $NetBSD: options.mk,v 1.3 2014/02/21 21:33:51 gendalia Exp $

 .include "../../mk/bsd.prefs.mk"

 PKG_OPTIONS_VAR=        PKG_OPTIONS.openafs
-PKG_SUPPORTED_OPTIONS+= server bitmap-later bos-new-config fast-restart
-PKG_SUPPORTED_OPTIONS+= largefile kernel-module supergroups namei
+PKG_SUPPORTED_OPTIONS+= server bitmap-later kernel-module supergroups namei
 .if ${MACHINE_ARCH} != "x86_64"
 PKG_SUPPORTED_OPTIONS+= pam
 .endif
-PKG_SUGGESTED_OPTIONS=  server bitmap-later bos-new-config fast-restart
-PKG_SUGGESTED_OPTIONS+= namei largefile -kernel-module supergroups
+PKG_SUGGESTED_OPTIONS=  server -bitmap-later namei -kernel-module supergroups

 .include "../../mk/bsd.options.mk"

@@ -19,15 +17,6 @@ CONFIGURE_ARGS+=        --enable-supergroups
 .if !empty(PKG_OPTIONS:Mbitmap-later)
 CONFIGURE_ARGS+=        --enable-bitmap-later
 .endif
-.if !empty(PKG_OPTIONS:Mbos-new-config)
-CONFIGURE_ARGS+=        --enable-bos-new-config
-.endif
-.if !empty(PKG_OPTIONS:Mfast-restart)
-CONFIGURE_ARGS+=        --enable-fast-restart
-.endif
-.if !empty(PKG_OPTIONS:Mlargefile)
-CONFIGURE_ARGS+=        --enable-largefile-fileserver
-.endif
 .if !empty(PKG_OPTIONS:Mkernel-module)
 CONFIGURE_ARGS+=        --enable-kernel-module
 .else
--- a/filesystems/openafs/patches/patch-Makefile.in
+++ b/filesystems/openafs/patches/patch-Makefile.in
@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2012/12/01 15:22:32 jakllsch Exp $
-
--- Makefile.in.orig	2012-03-26 23:03:34.000000000 +0000
-+++ Makefile.in
-@@ -270,7 +270,7 @@ vol: cmd comerr dir afs sgiefs
- 
- tsalvaged: vol libafsrpc libafsauthent cmd util
- 	+case ${SYS_NAME} in \
-		alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*|*_darwin_*) \
-+		alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd*|*_darwin_*) \
- 			${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \
- 		*_darwin_*) \
- 			${COMPILE_PART1} tsalvaged  ${COMPILE_PART2} ;; \
--- a/filesystems/openafs/patches/patch-src_aklog_aklog.c
+++ b/filesystems/openafs/patches/patch-src_aklog_aklog.c
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_aklog_aklog.c,v 1.1 2012/12/01 15:22:32 jakllsch Exp $
-
--- src/aklog/aklog.c.orig	2012-03-26 23:03:34.000000000 +0000
-+++ src/aklog/aklog.c
-@@ -67,9 +67,11 @@
- #if defined(HAVE_ET_COM_ERR_H)
- #include <et/com_err.h>
- #else
-#include <com_err.h>
-+//#include <com_err.h>
-+#include <krb5/com_err.h>
- #endif
- 
-+
- #ifndef HAVE_KERBEROSV_HEIM_ERR_H
- #include <afs/com_err.h>
- #endif
-@@ -95,6 +97,8 @@
- #include "aklog.h"
- #include "linked_list.h"
- 
-+#define HAVE_NO_KRB5_524
-+
- #ifdef HAVE_KRB5_CREDS_KEYBLOCK
- #define USING_MIT 1
- #endif
--- a/filesystems/openafs/patches/patch-src_config_param.nbsd60.h
+++ b/filesystems/openafs/patches/patch-src_config_param.nbsd60.h
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_config_param.nbsd60.h,v 1.1 2012/12/01 15:22:32 jakllsch Exp $
-
--- src/config/param.nbsd60.h.orig	2012-03-26 23:03:34.000000000 +0000
-+++ src/config/param.nbsd60.h
-@@ -3,6 +3,7 @@
- #ifndef	AFS_PARAM_COMMON_H
- #define	AFS_PARAM_COMMON_H 1
- 
-+#define AFS_64BIT_ENV  1
- #define AFS_NAMEI_ENV  1	/* User space interface to file system */
- #define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
- #define AFS_64BIT_CLIENT 1
--- a/filesystems/openafs/patches/patch-src_util_softsig.c
+++ b/filesystems/openafs/patches/patch-src_util_softsig.c
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_util_softsig.c,v 1.1 2012/12/01 15:22:32 jakllsch Exp $
-
--- src/util/softsig.c.orig	2012-03-26 23:03:34.000000000 +0000
-+++ src/util/softsig.c
-@@ -72,7 +72,8 @@ softsig_thread(void *arg)
- 
-     while (1) {
- 	void (*h) (int);
-#if !defined(AFS_DARWIN_ENV) && !defined(AFS_NBSD_ENV)
-+#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV))
-+#else
- 	int sigw;
- #endif
- 
--- a/filesystems/ori/DESCR
+++ b/filesystems/ori/DESCR
@@ -0,0 +1,6 @@
+Ori is a distributed file system built for offline operation and
+empowers the user with control over synchronization operations and
+conflict resolution. It provides history through light weight
+snapshots and allows users to verify the history has not been
+tampered with. Through the use of replication, instances can be
+resilient and recover damaged data from other nodes.
--- a/filesystems/ori/Makefile
+++ b/filesystems/ori/Makefile
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.2 2014/02/18 03:00:52 gdt Exp $
+
+DISTNAME=	ori-0.8.1
+PKGREVISION=	1
+CATEGORIES=	filesystems
+MASTER_SITES=	https://bitbucket.org/orifs/ori/downloads/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://ori.scs.stanford.edu/
+COMMENT=	Secure distributed file system
+LICENSE=	isc
+
+BUILD_DEPENDS+=	scons>=2.0:../../devel/scons
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
+
+SUBST_CLASSES+=		man
+SUBST_SED.man+=		-e "s,share/man,${PKGMANDIR},"
+SUBST_FILES.man+=	SConstruct
+SUBST_STAGE.man=	pre-build
+SUBST_MESSAGE.man=	Fixing man page installation path.
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons
+
+do-install:
+	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/scons install PREFIX=${DESTDIR}${PREFIX}
+
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/libevent/buildlink3.mk"
+.include "../../mk/fuse.buildlink3.mk"
+.include "../../net/mDNSResponder/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/filesystems/ori/PLIST
+++ b/filesystems/ori/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2014/02/17 10:36:51 wiz Exp $
+bin/ori
+bin/oridbg
+bin/orifs
+bin/orisync
+man/man1/ori.1
+man/man1/oridbg.1
+man/man1/orifs.1
+man/man1/orisync.1
--- a/filesystems/ori/distinfo
+++ b/filesystems/ori/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2014/02/17 10:36:51 wiz Exp $
+
+SHA1 (ori-0.8.1.tar.xz) = 4362159f6e24781724122d2927a2d45389b8b65d
+RMD160 (ori-0.8.1.tar.xz) = 03378e5d63059562d5a82314981b410c073077fd
+Size (ori-0.8.1.tar.xz) = 296216 bytes
--- a/filesystems/p5-Module-Path/DESCR
+++ b/filesystems/p5-Module-Path/DESCR
@@ -0,0 +1,15 @@
+Module::Path provides a single function, module_path(), which will find
+where a module is installed locally.
+
+It works by looking in all the directories in @INC for an appropriately
+named file:
+
+    * Foo::Bar becomes Foo/Bar.pm, using the correct directory path
+      separator for your operating system.
+    * Iterate over @INC, ignoring any references (see "require" in
+      "perlfunc" if you're surprised to hear that you might find references
+      in @INC).
+    * For each directory in @INC, append the partial path (Foo/Bar.pm),
+      again using the correct directory path separator. If the resulting
+      file exists, return this path.
+    * If no file was found, return undef.
--- a/filesystems/p5-Module-Path/Makefile
+++ b/filesystems/p5-Module-Path/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2013/07/03 15:06:36 sno Exp $
+#
+
+DISTNAME=	Module-Path-0.09
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Module/}
+
+MAINTAINER=	pkgsrc-p5-people@NetBSD.org
+HOMEPAGE=	http://search.cpan.org/dist/Module-Path/
+COMMENT=	Perl5 module to get the full path to a locally installed module
+LICENSE=	${PERL5_LICENSE}
+
+REPLACE_PERL+=	bin/mpath
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+PERL5_PACKLIST=		auto/Module/Path/.packlist
+
+BUILD_DEPENDS+=	p5-Devel-FindPerl-[0-9]*:../../devel/p5-Devel-FindPerl
+
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/filesystems/p5-Module-Path/distinfo
+++ b/filesystems/p5-Module-Path/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2013/07/03 15:06:36 sno Exp $
+
+SHA1 (Module-Path-0.09.tar.gz) = 860723625e9d90b7b17857920d5b1046976d97f1
+RMD160 (Module-Path-0.09.tar.gz) = f643de4b9fd0b389cf231fefa7188da5785aa690
+Size (Module-Path-0.09.tar.gz) = 11423 bytes
--- a/filesystems/p5-MooseX-Types-Path-Tiny/DESCR
+++ b/filesystems/p5-MooseX-Types-Path-Tiny/DESCR
@@ -0,0 +1,7 @@
+This module provides Path::Tiny types for Moose. It handles two important
+types of coercion:
+
+    * coercing objects with overloaded stringification
+    * coercing to absolute paths
+
+It also can check to ensure that files or directories exist.
--- a/filesystems/p5-MooseX-Types-Path-Tiny/Makefile
+++ b/filesystems/p5-MooseX-Types-Path-Tiny/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2013/07/03 15:39:48 sno Exp $
+#
+
+DISTNAME=	MooseX-Types-Path-Tiny-0.006
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MooseX/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://search.cpan.org/dist/MooseX-Types-Path-Tiny/
+COMMENT=	Path::Tiny types and coercions for Moose
+LICENSE=	${PERL5_LICENSE}
+
+DEPENDS+=	p5-Moose>=2:../../devel/p5-Moose
+DEPENDS+=	p5-MooseX-Types-[0-9]*:../../devel/p5-MooseX-Types
+DEPENDS+=	p5-MooseX-Types-Stringlike-[0-9]*:../../devel/p5-MooseX-Types-Stringlike
+DEPENDS+=	p5-Path-Tiny-[0-9]*:../../filesystems/p5-Path-Tiny
+
+PERL5_MODULE_TYPE=	Module::Build::Tiny
+USE_LANGUAGES=	# empty
+PERL5_PACKLIST=	auto/MooseX/Types/Path/Tiny/.packlist
+
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/filesystems/p5-MooseX-Types-Path-Tiny/distinfo
+++ b/filesystems/p5-MooseX-Types-Path-Tiny/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2013/07/03 15:39:48 sno Exp $
+
+SHA1 (MooseX-Types-Path-Tiny-0.006.tar.gz) = 84bff811e0c64ae7e0e937d07cc0bdbb129baf10
+RMD160 (MooseX-Types-Path-Tiny-0.006.tar.gz) = b76cb14705d715ac1cc63428ce9c595211815624
+Size (MooseX-Types-Path-Tiny-0.006.tar.gz) = 15906 bytes
--- a/filesystems/p5-Path-Tiny/DESCR
+++ b/filesystems/p5-Path-Tiny/DESCR
@@ -0,0 +1,21 @@
+This module attempts to provide a small, fast utility for working with
+file paths. It is friendlier to use than File::Spec and provides easy
+access to functions from several other core file handling modules.
+
+It doesn't attempt to be as full-featured as IO::All or Path::Class,
+nor does it try to work for anything except Unix-like and Win32 platforms.
+Even then, it might break if you try something particularly obscure or
+tortuous. (Quick! What does this mean: ///../../..//./././a//b/.././c/././?
+And how does it differ on Win32?)
+
+All paths are forced to have Unix-style forward slashes. Stringifying the
+object gives you back the path (after some clean up).
+
+File input/output methods flock handles before reading or writing, as
+appropriate.
+
+The *_utf8 methods (slurp_utf8, lines_utf8, etc.) operate in raw mode
+without CRLF translation. Installing Unicode::UTF8 0.58 or later will speed
+up several of them and is highly recommended.
+
+It uses autodie internally, so most failures will be thrown as exceptions.
--- a/filesystems/p5-Path-Tiny/Makefile
+++ b/filesystems/p5-Path-Tiny/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.6 2014/01/12 10:20:12 wen Exp $
+#
+
+DISTNAME=	Path-Tiny-0.051
+PKGNAME=	p5-${DISTNAME}
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DA/DAGOLDEN/}
+
+MAINTAINER=	pkgsrc-p5-people@NetBSD.org
+HOMEPAGE=	http://search.cpan.org/dist/Path-Tiny/
+COMMENT=	Perl5 file path utility
+LICENSE=	apache-2.0
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+PERL5_PACKLIST=		auto/Path/Tiny/.packlist
+
+DEPENDS+=	{perl>=5.18.0,p5-PathTools>=3.40}:../../devel/p5-PathTools
+
+BUILD_DEPENDS+=	p5-Devel-Hide-[0-9]*:../../devel/p5-Devel-Hide
+BUILD_DEPENDS+=	p5-File-pushd-[0-9]*:../../devel/p5-File-pushd
+BUILD_DEPENDS+=	p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
+BUILD_DEPENDS+=	p5-Test-FailWarnings-[0-9]*:../../devel/p5-Test-FailWarnings
+BUILD_DEPENDS+=	p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/filesystems/p5-Path-Tiny/distinfo
+++ b/filesystems/p5-Path-Tiny/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.6 2014/01/12 10:20:12 wen Exp $
+
+SHA1 (Path-Tiny-0.051.tar.gz) = 9eadcc9437f2c207a37a74e9680531d9091fbbb1
+RMD160 (Path-Tiny-0.051.tar.gz) = f7e325b711243248708f7e6c5518546ec1ac8b64
+Size (Path-Tiny-0.051.tar.gz) = 51376 bytes
--- a/filesystems/perfuse/builtin.mk
+++ b/filesystems/perfuse/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.1 2010/12/03 10:15:55 wiz Exp $
+# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:31:47 obache Exp $

 BUILTIN_PKG:=	perfuse

-BUILTIN_FIND_FILES_VAR:=	H_PERFUSE
-BUILTIN_FIND_FILES.H_PERFUSE=	/usr/include/perfuse.h
+BUILTIN_FIND_HEADERS_VAR:=	H_PERFUSE
+BUILTIN_FIND_HEADERS.H_PERFUSE=	perfuse.h

 .include "../../mk/buildlink3/bsd.builtin.mk"

--- a/filesystems/py-filesystem/Makefile
+++ b/filesystems/py-filesystem/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/04 00:22:00 cheusov Exp $
-#
+# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:07 wiz Exp $

 VERSION=	0.4.0
 DISTNAME=	fs-${VERSION}
@@ -16,6 +15,7 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none

 PYTHON_SELF_CONFLICT=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.4.0

 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/filesystems/py-fuse-bindings/Makefile
+++ b/filesystems/py-fuse-bindings/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/03 16:08:33 asau Exp $
-#
+# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:07 wiz Exp $

 VERSION=		0.2.1
 DISTNAME=		fuse-python-${VERSION}
@@ -17,6 +16,8 @@ PYDISTUTILSPKG=		yes
 PY_PATCHLIST=		yes
 USE_TOOLS+=		pkg-config

+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.2.1
+
 INSTALLATION_DIRS=	share/examples/fuse-python

 post-install:
--- a/filesystems/tahoe-lafs/Makefile
+++ b/filesystems/tahoe-lafs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2013/05/03 15:21:58 gdt Exp $
-#
+# $NetBSD: Makefile,v 1.21 2014/01/27 18:41:12 wiz Exp $

 VERSION=	1.10.0
-PKGREVISION=	1
+PKGREVISION=	2
 DISTNAME=	allmydata-tahoe-${VERSION}
 EGG_NAME=	allmydata_tahoe-${VERSION}
 PKGNAME=	tahoe-lafs-${VERSION}
@@ -11,7 +10,6 @@ MASTER_SITES=	https://tahoe-lafs.org/source/tahoe-lafs/releases/
 #for beta, add
 #MASTER_SITES+=		http://tahoe-lafs.org/source/tahoe-lafs/tarballs/
 EXTRACT_SUFX=	.tar.bz2
-FETCH_USING=	curl

 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://tahoe-lafs.org/
@@ -46,7 +44,16 @@ DEPENDS+=	${PYPKGPREFIX}-cryptopp-[0-9]*:../../security/py-cryptopp
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-nevow-[0-9]*:../../www/py-nevow

-#1.9.1 seems ok
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-twisted, py-xml via py-nevow, py-zbase32, py-cryptopp
+
+# Note that there is an upstream (inherited from setuptools) bug
+#   https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1258#comment:29 that
+# will cause a build to fail if there is a package with bad modes
+# installed.  If you get mysterious failures, pkg_delete the installed
+# version.
+
+# OK: 1.9.1, 1.9.2, 1.10a2
+# BAD: 1.10a1
 #BAD_DISTFILE_MODES=yes
 .if defined(BAD_DISTFILE_MODES)
 # Distfile has files mode 600, which leads to root-owned 600 files in
@@ -60,7 +67,8 @@ REPLACE_PYTHON+= src/allmydata/reliability.py
 REPLACE_PYTHON+= src/allmydata/storage/shares.py

 PKG_GROUPS=	tahoes
-PKG_USERS=	tahoes:tahoes::tahoe\ server
+PKG_USERS=	tahoes:tahoes
+PKG_GECOS.tahoes=	tahoe server

 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
--- a/filesystems/u9fs/Makefile
+++ b/filesystems/u9fs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/03 16:08:33 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/09 17:23:54 wiedi Exp $
 #

 DISTNAME=	u9fs-2.0.3
@@ -13,4 +13,6 @@ WRKSRC=		${WRKDIR}/u9fs

 MAKE_FILE=	makefile

+LDFLAGS.SunOS+=	-lsocket -lnsl
+
 .include "../../mk/bsd.pkg.mk"
--- a/filesystems/u9fs/distinfo
+++ b/filesystems/u9fs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2011/01/06 05:03:30 agc Exp $
+$NetBSD: distinfo,v 1.5 2014/02/09 17:23:54 wiedi Exp $

 SHA1 (u9fs-2.0.3.tar.gz) = 98b6d1b26a516761ee392d2c3ed15528af84601b
 RMD160 (u9fs-2.0.3.tar.gz) = 460879d27c4d282a3b4822c194b2abf458851b4d
 Size (u9fs-2.0.3.tar.gz) = 42325 bytes
-SHA1 (patch-aa) = 2a8f531d85187737b779fe6e339def22ae3c76e5
-SHA1 (patch-ab) = c5fe5cdc5fccca3085f6c6542496623d43928bfe
+SHA1 (patch-aa) = 790924f9761fc90cb8db2b4ca0385eca864dfc73
+SHA1 (patch-ab) = 34a5460b9a3d527e65e31940f66a83d295ac3ef1
 SHA1 (patch-ac) = 7251853f1dc6cecaaf67c617e5dfb74ecae12b19
 SHA1 (patch-ad) = d7a26f4db9eb543ee47dc621b7a79be11d4f42cd
 SHA1 (patch-ae) = 8fd3ddbe26275361878c5820f46092005f36f887
--- a/filesystems/u9fs/patches/patch-aa
+++ b/filesystems/u9fs/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2009/07/08 16:44:49 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2014/02/09 17:23:54 wiedi Exp $

--- makefile	2007/04/23 21:54:35	1.1
-+++ makefile	2007/04/23 21:55:35
-@@ -49,16 +49,19 @@
+--- makefile.orig	2005-06-06 19:26:52.000000000 +0000
+++ makefile
+@@ -17,7 +17,7 @@
+ #CC=cc
+ CFLAGS=-g -I.
+ LD=cc
+-LDFLAGS=
+#LDFLAGS=
+ LDTAIL=
+ 
+ OFILES=\
+@@ -49,16 +49,19 @@ HFILES=\
 	fcall.h\
 	plan9.h
 
--- a/filesystems/u9fs/patches/patch-ab
+++ b/filesystems/u9fs/patches/patch-ab
@@ -1,14 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2011/01/06 05:03:31 agc Exp $
+$NetBSD: patch-ab,v 1.3 2014/02/09 17:23:54 wiedi Exp $

--- u9fs.c	2007/04/23 22:01:05	1.1
-+++ u9fs.c	2007/04/23 22:29:28
-@@ -28,7 +28,14 @@
+--- u9fs.c.orig	2005-06-06 19:26:52.000000000 +0000
+++ u9fs.c
+@@ -28,7 +28,17 @@
 #define DEFAULTLOG "/tmp/u9fs.log"
 #endif
 
 +#if __linux__
 #include <linux/kdev_t.h>
-+#elif defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) 
+#elif defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__sun)
+#if defined(__sun)
+# include <sys/mkdev.h>
+#endif
 +#include <sys/types.h>
 +#define MAJOR(m)	major(m)
 +#define MINOR(m)	minor(m)
@@ -17,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2011/01/06 05:03:31 agc Exp $
 
 char *logfile = DEFAULTLOG;
 char *rootpath = "/";
-@@ -752,11 +759,11 @@
+@@ -752,11 +762,11 @@ stat2dir(char *path, struct stat *st, Di
 			}
 			d->extension = estrdup(link);
 		} else if (d->mode&DMDEVICE) {