Move net/openafs to filesystems/openafs-devel.

Re-add net/openafs as of 2012-05-01 as filesystems/openafs.

44 files changed, 532 insertions, 34 deletions

diff --git a/doc/CHANGES-2012 b/doc/CHANGES-2012
index ae4609babb8..76a0c551dfc 100644
--- a/doc/CHANGES-2012
+++ b/doc/CHANGES-2012
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2012,v 1.2730 2012/08/30 16:27:03 adam Exp $
+$NetBSD: CHANGES-2012,v 1.2731 2012/08/30 17:37:56 jakllsch Exp $
 
 Changes to the packages collection and infrastructure in 2012:
 
@@ -4256,3 +4256,5 @@ Changes to the packages collection and infrastructure in 2012:
 	Updated x11/ruby-gnome2-gtksourceview2 to 1.1.5 [obache 2012-08-30]
 	Updated x11/ruby-gnome2-vte to 1.1.5 [obache 2012-08-30]
 	Updated games/wesnoth to 1.10.4 [adam 2012-08-30]
+	Moved net/openafs to filesystems/openafs-devel [jakllsch 2012-08-30]
+	Added filesystems/openafs version 1.4.14 [jakllsch 2012-08-30]
diff --git a/filesystems/Makefile b/filesystems/Makefile
index 18582d94ce1..e49b66f630c 100644
--- a/filesystems/Makefile
+++ b/filesystems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/03/09 22:46:53 abs Exp $
+# $NetBSD: Makefile,v 1.34 2012/08/30 17:37:55 jakllsch Exp $
 #
 
 COMMENT=	File systems, and file system related packages
@@ -31,6 +31,8 @@ SUBDIR+=	fuse-unionfs
 SUBDIR+=	fuse-wdfs
 SUBDIR+=	fuse-wikipediafs
 SUBDIR+=	glusterfs
+SUBDIR+=	openafs
+SUBDIR+=	openafs-devel
 SUBDIR+=	perfuse
 SUBDIR+=	py-filesystem
 SUBDIR+=	py-fuse-bindings
diff --git a/net/openafs/DESCR b/filesystems/openafs-devel/DESCR
index ef187dcf2ce..ef187dcf2ce 100644
--- a/net/openafs/DESCR
+++ b/filesystems/openafs-devel/DESCR
diff --git a/net/openafs/Makefile b/filesystems/openafs-devel/Makefile
index 87d5793cf79..97cb61d0dd1 100644
--- a/net/openafs/Makefile
+++ b/filesystems/openafs-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2012/05/06 21:42:35 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 DISTNAME=	openafs-1.7.11-src
 PKGNAME=	${DISTNAME:C/-src//}
-CATEGORIES=	net sysutils
+CATEGORIES=	filesystems net sysutils
 MASTER_SITES=	http://www.openafs.org/dl/openafs/1.7.11/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/net/openafs/PLIST b/filesystems/openafs-devel/PLIST
index 3214adebbe3..829cc93d7d9 100644
--- a/net/openafs/PLIST
+++ b/filesystems/openafs-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/05/02 23:19:25 christos Exp $
+@comment $NetBSD: PLIST,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 bin/afs_compile_et
 bin/afsio
 bin/afsmonitor
diff --git a/filesystems/openafs-devel/PLIST.pam b/filesystems/openafs-devel/PLIST.pam
new file mode 100644
index 00000000000..0472102b2cc
--- /dev/null
+++ b/filesystems/openafs-devel/PLIST.pam
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.pam,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+lib/pam_afs.krb.so.1
+lib/pam_afs.so.1
diff --git a/net/openafs/distinfo b/filesystems/openafs-devel/distinfo
index 0a7440ef192..f236c3480b4 100644
--- a/net/openafs/distinfo
+++ b/filesystems/openafs-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2012/05/07 17:54:44 christos Exp $
+$NetBSD: distinfo,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 SHA1 (openafs-1.7.11-src.tar.bz2) = 7baa664ea521520a3355c6d8ab7cafff004e7d97
 RMD160 (openafs-1.7.11-src.tar.bz2) = 4e6c61496989b69544d0039a9fd6ca8627fc4df0
diff --git a/net/openafs/files/bosserver.sh b/filesystems/openafs-devel/files/bosserver.sh
index 99faa5b6097..864cc3724f0 100644
--- a/net/openafs/files/bosserver.sh
+++ b/filesystems/openafs-devel/files/bosserver.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: bosserver.sh,v 1.3 2012/05/06 20:37:47 christos Exp $
+# $NetBSD: bosserver.sh,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 #
 # PROVIDE: bosserver
 # BEFORE: afsd
diff --git a/net/openafs/options.mk b/filesystems/openafs-devel/options.mk
index 13ab32fed48..e284f24927e 100644
--- a/net/openafs/options.mk
+++ b/filesystems/openafs-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/05/06 21:42:35 wiz Exp $
+# $NetBSD: options.mk,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/openafs/patches/patch-acinclude.m4 b/filesystems/openafs-devel/patches/patch-acinclude.m4
index 1ae75506976..b7f562841a9 100644
--- a/net/openafs/patches/patch-acinclude.m4
+++ b/filesystems/openafs-devel/patches/patch-acinclude.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-acinclude.m4,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-acinclude.m4,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- acinclude.m4.orig	2012-04-22 23:40:23.000000000 -0400
 +++ acinclude.m4	2012-04-28 19:04:26.000000000 -0400
diff --git a/net/openafs/patches/patch-configure b/filesystems/openafs-devel/patches/patch-configure
index 63250c75f4a..dbc3ea0bad7 100644
--- a/net/openafs/patches/patch-configure
+++ b/filesystems/openafs-devel/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.2 2012/05/05 16:00:13 dholland Exp $
+$NetBSD: patch-configure,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 - add netbsd7
 - fix spelling of 'internal' in roken test
diff --git a/net/openafs/patches/patch-configure-libafs b/filesystems/openafs-devel/patches/patch-configure-libafs
index 781454e62ca..c239b597f98 100644
--- a/net/openafs/patches/patch-configure-libafs
+++ b/filesystems/openafs-devel/patches/patch-configure-libafs
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure-libafs,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-configure-libafs,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- configure-libafs.orig	2012-04-23 07:35:47.000000000 -0400
 +++ configure-libafs	2012-04-28 19:07:36.000000000 -0400
diff --git a/net/openafs/patches/patch-src-afs-NBSD-osi_crypto.c b/filesystems/openafs-devel/patches/patch-src-afs-NBSD-osi_crypto.c
index 001c5da0fc1..530c8175212 100644
--- a/net/openafs/patches/patch-src-afs-NBSD-osi_crypto.c
+++ b/filesystems/openafs-devel/patches/patch-src-afs-NBSD-osi_crypto.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-afs-NBSD-osi_crypto.c,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-afs-NBSD-osi_crypto.c,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/afs/NBSD/osi_crypto.c.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/afs/NBSD/osi_crypto.c	2012-04-30 16:48:16.000000000 -0400
diff --git a/net/openafs/patches/patch-src-afs-NBSD-osi_kmod.c b/filesystems/openafs-devel/patches/patch-src-afs-NBSD-osi_kmod.c
index 6b801268158..fe413bc563b 100644
--- a/net/openafs/patches/patch-src-afs-NBSD-osi_kmod.c
+++ b/filesystems/openafs-devel/patches/patch-src-afs-NBSD-osi_kmod.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-afs-NBSD-osi_kmod.c,v 1.2 2012/05/07 17:54:44 christos Exp $
+$NetBSD: patch-src-afs-NBSD-osi_kmod.c,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/afs/NBSD/osi_kmod.c.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/afs/NBSD/osi_kmod.c	2012-05-03 22:11:02.000000000 -0400
diff --git a/net/openafs/patches/patch-src-afs-NBSD-osi_vm.c b/filesystems/openafs-devel/patches/patch-src-afs-NBSD-osi_vm.c
index 8064c096635..3f9a7efce4a 100644
--- a/net/openafs/patches/patch-src-afs-NBSD-osi_vm.c
+++ b/filesystems/openafs-devel/patches/patch-src-afs-NBSD-osi_vm.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-afs-NBSD-osi_vm.c,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-afs-NBSD-osi_vm.c,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/afs/NBSD/osi_vm.c.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/afs/NBSD/osi_vm.c	2012-04-30 16:47:34.000000000 -0400
diff --git a/net/openafs/patches/patch-src-afs-NBSD-osi_vnodeops.c b/filesystems/openafs-devel/patches/patch-src-afs-NBSD-osi_vnodeops.c
index 9bab4d209b1..ffa14e4041d 100644
--- a/net/openafs/patches/patch-src-afs-NBSD-osi_vnodeops.c
+++ b/filesystems/openafs-devel/patches/patch-src-afs-NBSD-osi_vnodeops.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-afs-NBSD-osi_vnodeops.c,v 1.2 2012/05/06 20:37:16 christos Exp $
+$NetBSD: patch-src-afs-NBSD-osi_vnodeops.c,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/afs/NBSD/osi_vnodeops.c.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/afs/NBSD/osi_vnodeops.c	2012-04-30 16:47:20.000000000 -0400
diff --git a/net/openafs/patches/patch-src-bucoord-Makefile.n b/filesystems/openafs-devel/patches/patch-src-bucoord-Makefile.n
index 81e68419373..c1f3b8d1d17 100644
--- a/net/openafs/patches/patch-src-bucoord-Makefile.n
+++ b/filesystems/openafs-devel/patches/patch-src-bucoord-Makefile.n
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-bucoord-Makefile.n,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-bucoord-Makefile.n,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/bucoord/Makefile.in.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/bucoord/Makefile.in	2012-04-28 23:27:02.000000000 -0400
diff --git a/net/openafs/patches/patch-src-cf-osconf.m4 b/filesystems/openafs-devel/patches/patch-src-cf-osconf.m4
index ddbd7eba598..4e475a96491 100644
--- a/net/openafs/patches/patch-src-cf-osconf.m4
+++ b/filesystems/openafs-devel/patches/patch-src-cf-osconf.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-cf-osconf.m4,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-cf-osconf.m4,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/cf/osconf.m4.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/cf/osconf.m4	2012-04-28 19:01:31.000000000 -0400
diff --git a/net/openafs/patches/patch-src-config-param.amd64_nbsd70.h b/filesystems/openafs-devel/patches/patch-src-config-param.amd64_nbsd70.h
index 0f7b859e5c2..e7991b6808c 100644
--- a/net/openafs/patches/patch-src-config-param.amd64_nbsd70.h
+++ b/filesystems/openafs-devel/patches/patch-src-config-param.amd64_nbsd70.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-config-param.amd64_nbsd70.h,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-config-param.amd64_nbsd70.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/config/param.amd64_nbsd70.h.orig	2012-04-28 19:05:18.000000000 -0400
 +++ src/config/param.amd64_nbsd70.h	2012-04-28 19:06:51.000000000 -0400
diff --git a/net/openafs/patches/patch-src-config-param.i386_nbsd70.h b/filesystems/openafs-devel/patches/patch-src-config-param.i386_nbsd70.h
index 35810626fb3..e26a59f046d 100644
--- a/net/openafs/patches/patch-src-config-param.i386_nbsd70.h
+++ b/filesystems/openafs-devel/patches/patch-src-config-param.i386_nbsd70.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-config-param.i386_nbsd70.h,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-config-param.i386_nbsd70.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/config/param.i386_nbsd70.h.orig	2012-04-28 19:05:37.000000000 -0400
 +++ src/config/param.i386_nbsd70.h	2012-04-28 19:05:59.000000000 -0400
diff --git a/net/openafs/patches/patch-src-config-param.nbsd60.h b/filesystems/openafs-devel/patches/patch-src-config-param.nbsd60.h
index 63fd690bde4..f3deaec1f75 100644
--- a/net/openafs/patches/patch-src-config-param.nbsd60.h
+++ b/filesystems/openafs-devel/patches/patch-src-config-param.nbsd60.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-config-param.nbsd60.h,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-config-param.nbsd60.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/config/param.nbsd60.h.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/config/param.nbsd60.h	2012-04-28 19:34:45.000000000 -0400
diff --git a/net/openafs/patches/patch-src-config-param.nbsd70.h b/filesystems/openafs-devel/patches/patch-src-config-param.nbsd70.h
index 42770e96861..6145bb38088 100644
--- a/net/openafs/patches/patch-src-config-param.nbsd70.h
+++ b/filesystems/openafs-devel/patches/patch-src-config-param.nbsd70.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-config-param.nbsd70.h,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-config-param.nbsd70.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/config/param.nbsd70.h.orig	2012-04-28 19:35:22.000000000 -0400
 +++ src/config/param.nbsd70.h	2012-04-28 19:35:13.000000000 -0400
diff --git a/net/openafs/patches/patch-src-config-shlib-build.in b/filesystems/openafs-devel/patches/patch-src-config-shlib-build.in
index eff294b24dd..0246773c648 100644
--- a/net/openafs/patches/patch-src-config-shlib-build.in
+++ b/filesystems/openafs-devel/patches/patch-src-config-shlib-build.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-config-shlib-build.in,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-config-shlib-build.in,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/config/shlib-build.in.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/config/shlib-build.in	2012-04-28 22:09:59.000000000 -0400
diff --git a/net/openafs/patches/patch-src-config-shlib-install.in b/filesystems/openafs-devel/patches/patch-src-config-shlib-install.in
index 2bd22243fb3..95e6a8ce286 100644
--- a/net/openafs/patches/patch-src-config-shlib-install.in
+++ b/filesystems/openafs-devel/patches/patch-src-config-shlib-install.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-config-shlib-install.in,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-config-shlib-install.in,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/config/shlib-install.in.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/config/shlib-install.in	2012-04-28 22:12:34.000000000 -0400
diff --git a/net/openafs/patches/patch-src-crypto-hcrypto-kernel-config.h b/filesystems/openafs-devel/patches/patch-src-crypto-hcrypto-kernel-config.h
index f50c62b4c26..3233c3fb6ff 100644
--- a/net/openafs/patches/patch-src-crypto-hcrypto-kernel-config.h
+++ b/filesystems/openafs-devel/patches/patch-src-crypto-hcrypto-kernel-config.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-crypto-hcrypto-kernel-config.h,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-crypto-hcrypto-kernel-config.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/crypto/hcrypto/kernel/config.h.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/crypto/hcrypto/kernel/config.h	2012-05-02 14:38:14.000000000 -0400
diff --git a/net/openafs/patches/patch-src-external-heimdal-roken-roken-common.h b/filesystems/openafs-devel/patches/patch-src-external-heimdal-roken-roken-common.h
index 95e32fd24b2..3fb8f373407 100644
--- a/net/openafs/patches/patch-src-external-heimdal-roken-roken-common.h
+++ b/filesystems/openafs-devel/patches/patch-src-external-heimdal-roken-roken-common.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-external-heimdal-roken-roken-common.h,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-external-heimdal-roken-roken-common.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/external/heimdal/roken/roken-common.h.orig	2012-04-30 16:41:30.000000000 -0400
 +++ src/external/heimdal/roken/roken-common.h	2012-04-30 17:45:23.000000000 -0400
diff --git a/net/openafs/patches/patch-src-external-heimdal-roken-roken.h.in b/filesystems/openafs-devel/patches/patch-src-external-heimdal-roken-roken.h.in
index 4540a4c57f3..aad6dde340b 100644
--- a/net/openafs/patches/patch-src-external-heimdal-roken-roken.h.in
+++ b/filesystems/openafs-devel/patches/patch-src-external-heimdal-roken-roken.h.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-external-heimdal-roken-roken.h.in,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-external-heimdal-roken-roken.h.in,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/external/heimdal/roken/roken.h.in.orig	2012-04-30 16:41:30.000000000 -0400
 +++ src/external/heimdal/roken/roken.h.in	2012-05-02 12:38:31.000000000 -0400
diff --git a/net/openafs/patches/patch-src-libafs-MakefileProto.NBSD.in b/filesystems/openafs-devel/patches/patch-src-libafs-MakefileProto.NBSD.in
index 7668ab932e8..e368f7a8338 100644
--- a/net/openafs/patches/patch-src-libafs-MakefileProto.NBSD.in
+++ b/filesystems/openafs-devel/patches/patch-src-libafs-MakefileProto.NBSD.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-libafs-MakefileProto.NBSD.in,v 1.2 2012/05/06 21:43:12 wiz Exp $
+$NetBSD: patch-src-libafs-MakefileProto.NBSD.in,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/libafs/MakefileProto.NBSD.in.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/libafs/MakefileProto.NBSD.in	2012-05-02 12:04:41.000000000 -0400
diff --git a/net/openafs/patches/patch-src-rxkad-fcrypt.c b/filesystems/openafs-devel/patches/patch-src-rxkad-fcrypt.c
index 1656642ddf5..f32141ef19e 100644
--- a/net/openafs/patches/patch-src-rxkad-fcrypt.c
+++ b/filesystems/openafs-devel/patches/patch-src-rxkad-fcrypt.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src-rxkad-fcrypt.c,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-src-rxkad-fcrypt.c,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/rxkad/fcrypt.c.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/rxkad/fcrypt.c	2012-05-02 14:45:51.000000000 -0400
diff --git a/net/openafs/patches/patch-sys-config-afs_sysnames.h b/filesystems/openafs-devel/patches/patch-sys-config-afs_sysnames.h
index 71cd2a16b62..be29c357af5 100644
--- a/net/openafs/patches/patch-sys-config-afs_sysnames.h
+++ b/filesystems/openafs-devel/patches/patch-sys-config-afs_sysnames.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-sys-config-afs_sysnames.h,v 1.1 2012/05/02 23:19:25 christos Exp $
+$NetBSD: patch-sys-config-afs_sysnames.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
 
 --- src/config/afs_sysnames.h.orig	2012-04-22 23:40:23.000000000 -0400
 +++ src/config/afs_sysnames.h	2012-04-28 19:03:43.000000000 -0400
diff --git a/filesystems/openafs/DESCR b/filesystems/openafs/DESCR
new file mode 100644
index 00000000000..c546dc9592e
--- /dev/null
+++ b/filesystems/openafs/DESCR
@@ -0,0 +1,8 @@
+AFS is a distributed filesystem product, pioneered at Carnegie Mellon
+University and supported and developed as a product by Transarc
+Corporation (now IBM Pittsburgh Labs).  It offers a client-server
+architecture for file sharing, providing location independence,
+scalability and transparent migration capabilities for data.  IBM
+branched the source of the AFS product, and made a copy of the source
+available for community development and maintenance.  They called the
+release OpenAFS.
diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile
new file mode 100644
index 00000000000..03a0ca2d049
--- /dev/null
+++ b/filesystems/openafs/Makefile
@@ -0,0 +1,57 @@
+# $NetBSD: Makefile,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+
+DISTNAME=	openafs-1.4.14-src
+PKGNAME=	${DISTNAME:C/-src//}
+CATEGORIES=	filesystems net sysutils
+MASTER_SITES=	http://www.openafs.org/dl/openafs/1.4.14/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	gendalia@NetBSD.org
+HOMEPAGE=	http://www.openafs.org/
+COMMENT=	File system for sharing, scalability and transparent data migration
+LICENSE=	ibm-public-license-1.0
+
+PREV_PKGPATH=	net/openafs
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+CONFLICTS+=	arla-[0-9]*
+CONFLICTS+=	heimdal-[0-9]*
+CONFLICTS+=	lwp-[0-9]*
+CONFLICTS+=	rx-[0-9]*
+
+MAKE_JOBS_SAFE=no
+
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		lex
+RCD_SCRIPTS+=		bosserver
+
+.include "options.mk"
+
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+
+USE_GNU_CONFIGURE_HOST= no
+
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
+PLIST_SRC+=		${.CURDIR}/PLIST
+OWN_DIRS+=		${PKG_SYSCONFDIR}/openafs
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/openafs/server ${ROOT_USER} ${ROOT_GROUP} 775
+OWN_DIRS_PERMS+=	${VARBASE}/openafs ${ROOT_USER} ${ROOT_GROUP} 770
+OWN_DIRS+=		${VARBASE}/openafs/logs
+OWN_DIRS_PERMS+=	${VARBASE}/openafs/db ${ROOT_USER} ${ROOT_GROUP} 700
+
+FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
+
+BUILD_DEFS+= VARBASE
+
+# attempt to future-proof configuration
+pre-build:
+	cd ${WRKSRC}/src/config && for i in 50 60 70 80 90; do	\
+		${SED} -e 's|nbsd40|nbsd'$$i'|g' param.i386_nbsd40.h > param.i386_nbsd$$i.h; \
+		${SED} -e 's|nbsd40|nbsd'$$i'|g' param.amd64_nbsd40.h > param.amd64_nbsd$$i.h; \
+		${CP} param.nbsd40.h param.nbsd$$i.h; 			\
+	done
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/openafs/PLIST b/filesystems/openafs/PLIST
new file mode 100644
index 00000000000..a76a1719b2d
--- /dev/null
+++ b/filesystems/openafs/PLIST
@@ -0,0 +1,238 @@
+@comment $NetBSD: PLIST,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+bin/afs_compile_et
+bin/afsmonitor
+bin/bos
+bin/cmdebug
+bin/dlog
+bin/dpass
+bin/fs
+bin/klog
+bin/klog.krb
+bin/knfs
+bin/kpasswd
+bin/kpwvalid
+bin/livesys
+bin/pagsh
+bin/pagsh.krb
+bin/pts
+bin/rxgen
+bin/scout
+bin/sys
+bin/tokens
+bin/tokens.krb
+bin/translate_et
+bin/udebug
+bin/unlog
+bin/up
+bin/xstat_cm_test
+bin/xstat_fs_test
+include/afs/acl.h
+include/afs/afs.h
+include/afs/afs_args.h
+include/afs/afs_atomlist.h
+include/afs/afs_lhash.h
+include/afs/afs_stats.h
+include/afs/afs_sysnames.h
+include/afs/afscbint.h
+include/afs/afsint.h
+include/afs/afssyscalls.h
+include/afs/afsutil.h
+include/afs/afsutil_prototypes.h
+include/afs/assert.h
+include/afs/audit.h
+include/afs/auth.h
+include/afs/bnode.h
+include/afs/bosint.h
+include/afs/bubasics.h
+include/afs/budb.h
+include/afs/budb_client.h
+include/afs/budb_errs.h
+include/afs/bumon.h
+include/afs/butc.h
+include/afs/butm.h
+include/afs/butx.h
+include/afs/cellconfig.h
+include/afs/cmd.h
+include/afs/cnvldb.h
+include/afs/com_err.h
+include/afs/debug.h
+include/afs/dir.h
+include/afs/dirpath.h
+include/afs/error_table.h
+include/afs/errors.h
+include/afs/exporter.h
+include/afs/fileutil.h
+include/afs/fs_stats.h
+include/afs/fsprobe.h
+include/afs/fssync.h
+include/afs/gtxX11win.h
+include/afs/gtxcurseswin.h
+include/afs/gtxdumbwin.h
+include/afs/gtxframe.h
+include/afs/gtxinput.h
+include/afs/gtxkeymap.h
+include/afs/gtxlightobj.h
+include/afs/gtxobjdict.h
+include/afs/gtxobjects.h
+include/afs/gtxtextcb.h
+include/afs/gtxtextobj.h
+include/afs/gtxwindows.h
+include/afs/icl.h
+include/afs/ihandle.h
+include/afs/kaport.h
+include/afs/kauth.h
+include/afs/kautils.h
+include/afs/keys.h
+include/afs/ktc.h
+include/afs/ktime.h
+include/afs/mit-sipb-cr.h
+include/afs/namei_ops.h
+include/afs/netutils.h
+include/afs/nfs.h
+include/afs/nfsclient.h
+include/afs/osi_inode.h
+include/afs/packages.h
+include/afs/param.h
+include/afs/partition.h
+include/afs/prclient.h
+include/afs/prerror.h
+include/afs/print.h
+include/afs/procmgmt.h
+include/afs/prs_fs.h
+include/afs/prserver.h
+include/afs/ptclient.h
+include/afs/pterror.h
+include/afs/pthread_glock.h
+include/afs/pthread_nosigs.h
+include/afs/ptint.h
+include/afs/ptserver.h
+include/afs/ptuser.h
+include/afs/remote.h
+include/afs/rxgen_consts.h
+include/afs/softsig.h
+include/afs/stds.h
+include/afs/sysctl.h
+include/afs/tcdata.h
+include/afs/unified_afs.h
+include/afs/usd.h
+include/afs/venus.h
+include/afs/vice.h
+include/afs/viceinode.h
+include/afs/vl_opcodes.h
+include/afs/vldbint.h
+include/afs/vlserver.h
+include/afs/vnode.h
+include/afs/voldefs.h
+include/afs/volint.h
+include/afs/volser.h
+include/afs/volume.h
+include/afs/xfsattrs.h
+include/afs/xstat_cm.h
+include/afs/xstat_fs.h
+include/des.h
+include/des_conf.h
+include/des_odd.h
+include/des_prototypes.h
+include/lock.h
+include/lwp.h
+include/mit-cpyright.h
+include/potpourri.h
+include/preempt.h
+include/rx/fcrypt.h
+include/rx/rx.h
+include/rx/rx_clock.h
+include/rx/rx_event.h
+include/rx/rx_globals.h
+include/rx/rx_lwp.h
+include/rx/rx_misc.h
+include/rx/rx_multi.h
+include/rx/rx_null.h
+include/rx/rx_packet.h
+include/rx/rx_prototypes.h
+include/rx/rx_pthread.h
+include/rx/rx_queue.h
+include/rx/rx_user.h
+include/rx/rxkad.h
+include/rx/rxkad_prototypes.h
+include/rx/rxstat.h
+include/rx/xdr.h
+include/rx/xdr_prototypes.h
+include/timer.h
+include/ubik.h
+include/ubik_int.h
+lib/afs/libacl.a
+lib/afs/libafsint.a
+lib/afs/libafsutil.a
+lib/afs/libaudit.a
+lib/afs/libauth.a
+lib/afs/libauth.krb.a
+lib/afs/libbos.a
+lib/afs/libbubasics.a
+lib/afs/libbudb.a
+lib/afs/libbutm.a
+lib/afs/libbxdb.a
+lib/afs/libcmd.a
+lib/afs/libcom_err.a
+lib/afs/libdir.a
+lib/afs/libfsprobe.a
+lib/afs/libgtx.a
+lib/afs/libkauth.a
+lib/afs/libkauth.krb.a
+lib/afs/libnull.a
+lib/afs/libprocmgmt.a
+lib/afs/libprot.a
+lib/afs/libsys.a
+lib/afs/libusd.a
+lib/afs/libvldb.a
+lib/afs/libvlib.a
+lib/afs/libvolser.a
+lib/afs/libxstat_cm.a
+lib/afs/libxstat_fs.a
+lib/afs/util.a
+lib/afs/vlib.a
+lib/libafssetpag.so
+lib/libafssetpag.so.1
+lib/libafssetpag.so.1.0
+lib/libdes.a
+lib/liblwp.a
+lib/librx.a
+lib/librxkad.a
+lib/librxstat.a
+lib/libubik.a
+libexec/openafs/buserver
+libexec/openafs/fileserver
+libexec/openafs/kaserver
+libexec/openafs/ptserver
+libexec/openafs/salvager
+libexec/openafs/upclient
+libexec/openafs/upserver
+libexec/openafs/vlserver
+libexec/openafs/volserver
+sbin/afsd
+sbin/backup
+sbin/bos_util
+sbin/bosserver
+sbin/butc
+sbin/fms
+sbin/fstrace
+sbin/kadb_check
+sbin/kas
+sbin/ka-forwarder
+sbin/kdb
+sbin/kdump
+sbin/kpwvalid
+sbin/prdb_check
+sbin/pt_util
+sbin/read_tape
+sbin/restorevol
+sbin/rmtsysd
+sbin/rxdebug
+sbin/uss
+sbin/vldb_check
+sbin/vldb_convert
+sbin/voldump
+sbin/volinfo
+sbin/vos
+sbin/vsys
+share/examples/rc.d/bosserver
+@pkgdir lib/openafs
diff --git a/filesystems/openafs/PLIST.pam b/filesystems/openafs/PLIST.pam
new file mode 100644
index 00000000000..0472102b2cc
--- /dev/null
+++ b/filesystems/openafs/PLIST.pam
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.pam,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+lib/pam_afs.krb.so.1
+lib/pam_afs.so.1
diff --git a/filesystems/openafs/distinfo b/filesystems/openafs/distinfo
new file mode 100644
index 00000000000..e4d85f23256
--- /dev/null
+++ b/filesystems/openafs/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+
+SHA1 (openafs-1.4.14-src.tar.bz2) = 2b4e7c839bbf8f577fdd4831e7a3b3ebb9c41926
+RMD160 (openafs-1.4.14-src.tar.bz2) = ecc038d7f9068d420cf1c94f9c01db5ecd1accac
+Size (openafs-1.4.14-src.tar.bz2) = 11813993 bytes
+SHA1 (patch-aa) = 3dde7848f9773fd8398156149368748146564eee
+SHA1 (patch-src_afsd_afsd.c) = ccc518675fc4b4fa594bb6b3a9f2c36e03df2ea6
+SHA1 (patch-src_comerr_Makefile.in) = f325c813dab0dc62592abead6d112ce15df086c9
+SHA1 (patch-src_config_param.nbsd30.h) = 64bbe81ef7208b6e3f70af4eddcb9d535e8a9c34
+SHA1 (patch-src_config_param.nbsd40.h) = ddfb69d2255629946e6df8416e6e2fcbfc0ffabb
diff --git a/filesystems/openafs/files/bosserver.sh b/filesystems/openafs/files/bosserver.sh
new file mode 100644
index 00000000000..88b80877775
--- /dev/null
+++ b/filesystems/openafs/files/bosserver.sh
@@ -0,0 +1,19 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: bosserver.sh,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+#
+# PROVIDE: bosserver
+# BEFORE: arlad
+# REQUIRE: NETWORK
+
+. /etc/rc.subr
+
+name="bosserver"
+rcvar=$name
+hostname=`@HOSTNAME_CMD@`
+command="@PREFIX@/sbin/$name"
+start_precmd="ulimit -S -d 1048576;ulimit -S -c unlimited"
+stop_precmd="@PREFIX@/bin/bos shutdown $hostname -local -wait"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/filesystems/openafs/options.mk b/filesystems/openafs/options.mk
new file mode 100644
index 00000000000..918f46320ce
--- /dev/null
+++ b/filesystems/openafs/options.mk
@@ -0,0 +1,45 @@
+# $NetBSD: options.mk,v 1.1 2012/08/30 17:37:55 jakllsch 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
+.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
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msupergroups)
+CONFIGURE_ARGS+=        --enable-supergroups
+.endif
+.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
+CONFIGURE_ARGS+=        --disable-kernel-module
+.endif
+.if !empty(PKG_OPTIONS:Mnamei)
+CONFIGURE_ARGS+=        --enable-namei-fileserver
+.endif
+.if !empty(PKG_OPTIONS:Mpam)
+CONFIGURE_ARGS+=        --enable-pam
+.include "../../mk/pam.buildlink3.mk"
+PLIST_SRC+=             ${.CURDIR}/PLIST.pam
+.else
+CONFIGURE_ARGS+=        --disable-pam
+.endif
diff --git a/filesystems/openafs/patches/patch-aa b/filesystems/openafs/patches/patch-aa
new file mode 100644
index 00000000000..592402654d4
--- /dev/null
+++ b/filesystems/openafs/patches/patch-aa
@@ -0,0 +1,61 @@
+$NetBSD: patch-aa,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+
+--- configure.orig	2010-12-17 16:06:16.000000000 +0000
++++ configure
+@@ -5999,6 +5999,22 @@ echo $ECHO_N "checking your AFS sysname.
+ 			AFS_PARAM_COMMON=param.nbsd40.h
+ 			AFS_SYSNAME="i386_nbsd40"
+ 			;;
++		i?86-*-netbsd*5.[0-8]*)
++			AFS_PARAM_COMMON=param.nbsd50.h
++			AFS_SYSNAME="i386_nbsd50"
++			;;
++		x86_64-*-netbsd*5.[0-8]*)
++			AFS_PARAM_COMMON=param.nbsd50.h
++			AFS_SYSNAME="amd64_nbsd50"
++			;;
++		i?86-*-netbsd*5.99*)
++			AFS_PARAM_COMMON=param.nbsd60.h
++			AFS_SYSNAME="i386_nbsd60"
++			;;
++		x86_64-*-netbsd*5.99*)
++			AFS_PARAM_COMMON=param.nbsd60.h
++			AFS_SYSNAME="amd64_nbsd60"
++			;;
+ 		hppa*-hp-hpux11.0*)
+ 			AFS_SYSNAME="hp_ux110"
+ 			;;
+@@ -24555,7 +24571,7 @@ case $AFS_SYSNAME in
+ 		YACC="byacc"
+ 		;;
+ 
+-	*nbsd2*|*nbsd3*|*nbsd4*)
++	*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
+ 		LEX="flex -l"
+ 		MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
+ 		MT_LIBS="-lpthread" # XXX -pthread soon
+@@ -24563,7 +24579,14 @@ case $AFS_SYSNAME in
+ 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+ 		SHLIB_LINKER="${MT_CC} -shared"
+ 		TXLIBS="/usr/lib/libcurses.so"
+-		XCFLAGS="-O2 -pipe"
++		case $AFS_SYSNAME in
++		amd64_nbsd*)
++			XCFLAGS="-O2 -pipe -fPIC"
++			;;
++		*_nbsd*)
++			XCFLAGS="-O2 -pipe"
++			;;
++		esac
+ 		YACC="yacc"
+ 		;;
+ 
+@@ -25490,6 +25513,8 @@ if test "x$enable_optimize_lwp" = "xno";
+   LWP_OPTMZ=
+ fi
+ 
++XCFLAGS="${XCFLAGS} ${CFLAGS}"
++
+ if test "x$enable_strip_binaries" != "xno"; then
+   if test "x$enable_strip_binaries" = "xmaybe" -a "x$enable_debug" = "xyes"; then
+     NO_STRIP_BIN=-ns
diff --git a/filesystems/openafs/patches/patch-src_afsd_afsd.c b/filesystems/openafs/patches/patch-src_afsd_afsd.c
new file mode 100644
index 00000000000..13ae39e9e12
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_afsd_afsd.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_afsd_afsd.c,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+
+--- src/afsd/afsd.c.orig	2010-12-17 15:58:42.000000000 +0000
++++ src/afsd/afsd.c
+@@ -2382,8 +2382,12 @@ mainproc(struct cmd_syndesc *as, void *a
+ 	if ((mount("AFS", cacheMountDir, MOUNT_AFS, 0, NULL)) < 0) {
+ #else
+ /* This is the standard mount used by the suns and rts */
++#if defined(__NetBSD__) && __NetBSD_Prereq__(4,99,24)
++	if (1) {
++#else
+ 	if ((mount(MOUNT_AFS, cacheMountDir, mountFlags, (caddr_t) 0)) < 0) {
+ #endif
++#endif
+ 	    printf("%s: Can't mount AFS on %s(%d)\n", rn, cacheMountDir,
+ 		   errno);
+ 	    exit(1);
diff --git a/filesystems/openafs/patches/patch-src_comerr_Makefile.in b/filesystems/openafs/patches/patch-src_comerr_Makefile.in
new file mode 100644
index 00000000000..beb5a5783fa
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_comerr_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_comerr_Makefile.in,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+
+--- src/comerr/Makefile.in.orig	2010-12-17 15:58:42.000000000 +0000
++++ src/comerr/Makefile.in
+@@ -11,7 +11,7 @@ all: compile_et ${TOP_INCDIR}/afs/com_er
+ 
+ et_lex.lex.c: et_lex.lex.l
+ 	$(RM) -f et_lex.lex.c
+-	$(LEX) -t $(srcdir)/et_lex.lex.l > et_lex.lex.c
++	$(LEX) -l -t $(srcdir)/et_lex.lex.l > et_lex.lex.c
+ 
+ compile_et:	compile_et.o error_table.o
+ 	case $(SYS_NAME) in \
diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd30.h b/filesystems/openafs/patches/patch-src_config_param.nbsd30.h
new file mode 100644
index 00000000000..3d0b79169a3
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_config_param.nbsd30.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_config_param.nbsd30.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+
+--- src/config/param.nbsd30.h.orig	2010-12-17 15:58:42.000000000 +0000
++++ src/config/param.nbsd30.h
+@@ -23,7 +23,6 @@
+ #define AFS_NBSD20_ENV 1
+ #define AFS_NBSD30_ENV 1
+ #define AFS_NONFSTRANS 1
+-#define AFS_KERBEROS_ENV 1
+ 
+ #define AFS_VFSINCL_ENV 1
+ 
diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd40.h b/filesystems/openafs/patches/patch-src_config_param.nbsd40.h
new file mode 100644
index 00000000000..84649616e10
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_config_param.nbsd40.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_config_param.nbsd40.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+
+--- src/config/param.nbsd40.h.orig	2010-12-17 15:58:42.000000000 +0000
++++ src/config/param.nbsd40.h
+@@ -24,7 +24,6 @@
+ #define AFS_NBSD30_ENV 1
+ #define AFS_NBSD40_ENV 1
+ #define AFS_NONFSTRANS 1
+-#define AFS_KERBEROS_ENV 1
+ 
+ #define AFS_VFSINCL_ENV 1
+ 
diff --git a/net/Makefile b/net/Makefile
index 72c7484e758..1b9ed6bf913 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.929 2012/08/25 13:01:13 christos Exp $
+# $NetBSD: Makefile,v 1.930 2012/08/30 17:37:54 jakllsch Exp $
 #
 
 COMMENT=	Networking tools
@@ -339,7 +339,6 @@ SUBDIR+=	oidentd
 SUBDIR+=	oinkmaster
 SUBDIR+=	omniNotify
 SUBDIR+=	omniORB
-SUBDIR+=	openafs
 SUBDIR+=	openag
 SUBDIR+=	openh323
 SUBDIR+=	openntpd
diff --git a/net/openafs/PLIST.pam b/net/openafs/PLIST.pam
deleted file mode 100644
index 52e043d0449..00000000000
--- a/net/openafs/PLIST.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.pam,v 1.1 2005/05/25 22:09:39 gendalia Exp $
-lib/pam_afs.krb.so.1
-lib/pam_afs.so.1