- Add support for running as a server on NetBSD/evbarm, currently confined to

ARMv6 (Pi). Support for further family revisions in NetBSD is controlled
by the presence of src/config/param.armv$_nbsd$$.h to set the CPU family version
and major OS version number.

- Add description to most patches

11 files changed, 141 insertions, 20 deletions

diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile
index b9413d948a0..76bbd867bbb 100644
--- a/filesystems/openafs/Makefile
+++ b/filesystems/openafs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/07/21 01:39:33 sevan Exp $
+# $NetBSD: Makefile,v 1.16 2017/10/08 02:41:39 sevan Exp $
 
 DISTNAME=	openafs-1.6.21-src
 PKGNAME=	${DISTNAME:C/-src//}
@@ -52,11 +52,6 @@ pre-patch:
 		${CP} param.nbsd60.h param.nbsd$$i.h; \
 	done
 
-post-patch:
-	cd ${WRKSRC}/src/config && for i in 80 90; do \
-		${CP} param.nbsd70.h param.nbsd$$i.h; \
-	done
-
 MAKE_ENV+=	LD_RUN_PATH=${PREFIX}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/openafs/distinfo b/filesystems/openafs/distinfo
index 5d926bba9cb..15476a12f0d 100644
--- a/filesystems/openafs/distinfo
+++ b/filesystems/openafs/distinfo
@@ -1,12 +1,17 @@
-$NetBSD: distinfo,v 1.15 2017/07/21 01:39:33 sevan Exp $
+$NetBSD: distinfo,v 1.16 2017/10/08 02:41:39 sevan Exp $
 
 SHA1 (openafs-1.6.21-src.tar.bz2) = ea48a2fde9ed4732e8041216c9e24dd500e24ea4
 RMD160 (openafs-1.6.21-src.tar.bz2) = 834b42debfcbf0a003280ac0300b3af65625ad48
 SHA512 (openafs-1.6.21-src.tar.bz2) = 451c38ed5031b8a962da3276bf5d0f1b74c5956c2d10cdb8bbd22ea633880ebf35cf5fc71feb5d2eca4306762f6c2376a46f4522150291acfc469f8be2da757f
 Size (openafs-1.6.21-src.tar.bz2) = 14682997 bytes
-SHA1 (patch-acinclude.m4) = 16efdc809c134698a0a834c3e8064d201f61ca68
-SHA1 (patch-configure) = be58e44c599e2c424a7b561010d890c97e5d871a
+SHA1 (patch-acinclude.m4) = 1949234224ee12f6d70f2a7ac914342bdfe9b50d
+SHA1 (patch-configure) = fc07ae1945b047dcdafbeade183fad3b2bd876e4
 SHA1 (patch-src_cf_osconf.m4) = 2ae23bc82dd3f19cfa3fecf50dcca514e09d7a4b
 SHA1 (patch-src_comerr_Makefile.in) = dd5e996481d7ef908710868aa9dc1b65feb98717
-SHA1 (patch-src_config_afs__sysnames.h) = b1b9da619b37e03d1be2bd6da6073332028b0227
-SHA1 (patch-src_config_param.nbsd70.h) = bebb86bd5c01e25befbb800f6ae43058e13524d4
+SHA1 (patch-src_config_afs__sysnames.h) = 26819b314797a149def42f5b63cbeb19ef6309e8
+SHA1 (patch-src_config_param.armv6_nbsd80.h) = eea7a8f8a141d285ba5a2bb4317950f0b860528f
+SHA1 (patch-src_config_param.nbsd70.h) = 700216e464d801aee3ada0a597a5e2b3a4dab510
+SHA1 (patch-src_config_param.nbsd80.h) = cc9445a1b06ac977d93c9fe0b68cc67475beec08
+SHA1 (patch-src_des_andrew-conf.h) = 6ea03fcaf988d3d91bc1d3386e239496fc3069f0
+SHA1 (patch-src_des_conf-arm32-bsd.h) = ff1b2a3cc35ab272913c95adab28c3304234a891
+SHA1 (patch-src_lwp_lwp.c) = c4a92a29621ceaf54c56cd20772c18f76b0fe745
diff --git a/filesystems/openafs/patches/patch-acinclude.m4 b/filesystems/openafs/patches/patch-acinclude.m4
index 4f487f6c056..e154131e461 100644
--- a/filesystems/openafs/patches/patch-acinclude.m4
+++ b/filesystems/openafs/patches/patch-acinclude.m4
@@ -1,4 +1,6 @@
-$NetBSD: patch-acinclude.m4,v 1.1 2016/04/04 12:48:29 jakllsch Exp $
+$NetBSD: patch-acinclude.m4,v 1.2 2017/10/08 02:41:39 sevan Exp $
+
+- Add support for NetBSD 7 to 9
 
 --- acinclude.m4.orig	2016-03-16 14:31:22.000000000 +0000
 +++ acinclude.m4
diff --git a/filesystems/openafs/patches/patch-configure b/filesystems/openafs/patches/patch-configure
index 8d98491b93f..51328649860 100644
--- a/filesystems/openafs/patches/patch-configure
+++ b/filesystems/openafs/patches/patch-configure
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure,v 1.1 2016/04/04 12:48:29 jakllsch Exp $
+$NetBSD: patch-configure,v 1.2 2017/10/08 02:41:39 sevan Exp $
+
+- Add support for NetBSD 7 to 9
 
 --- configure.orig	2016-03-16 14:32:21.000000000 +0000
 +++ configure
diff --git a/filesystems/openafs/patches/patch-src_config_afs__sysnames.h b/filesystems/openafs/patches/patch-src_config_afs__sysnames.h
index 31ad49d73d8..30aa46790ef 100644
--- a/filesystems/openafs/patches/patch-src_config_afs__sysnames.h
+++ b/filesystems/openafs/patches/patch-src_config_afs__sysnames.h
@@ -1,17 +1,20 @@
-$NetBSD: patch-src_config_afs__sysnames.h,v 1.3 2016/04/04 12:48:29 jakllsch Exp $
+$NetBSD: patch-src_config_afs__sysnames.h,v 1.4 2017/10/08 02:41:39 sevan Exp $
 
---- src/config/afs_sysnames.h.orig	2016-03-16 14:31:22.000000000 +0000
+- Add SYS_NAME_IDs for NetBSD 7 to 9 on arm/i386/amd64
+
+--- src/config/afs_sysnames.h.orig	2017-07-04 09:38:22.000000000 +0000
 +++ src/config/afs_sysnames.h
-@@ -267,6 +267,12 @@
+@@ -275,6 +275,13 @@
  #define SYS_NAME_ID_macppc_nbsd50       2541
  #define SYS_NAME_ID_amd64_nbsd60        2542
  #define SYS_NAME_ID_i386_nbsd60         2543
 +#define SYS_NAME_ID_amd64_nbsd70        2544
 +#define SYS_NAME_ID_i386_nbsd70         2545
 +#define SYS_NAME_ID_amd64_nbsd80        2546
-+#define SYS_NAME_ID_i386_nbsd80         2547
-+#define SYS_NAME_ID_amd64_nbsd90        2548
-+#define SYS_NAME_ID_i386_nbsd90         2549
++#define SYS_NAME_ID_arm32_nbsd80        2547
++#define SYS_NAME_ID_i386_nbsd80         2548
++#define SYS_NAME_ID_amd64_nbsd90        2549
++#define SYS_NAME_ID_i386_nbsd90         2550
  
  #define SYS_NAME_ID_i386_obsd31		2600
  #define SYS_NAME_ID_i386_obsd32		2601
diff --git a/filesystems/openafs/patches/patch-src_config_param.armv6_nbsd80.h b/filesystems/openafs/patches/patch-src_config_param.armv6_nbsd80.h
new file mode 100644
index 00000000000..92cfe35e779
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_config_param.armv6_nbsd80.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_config_param.armv6_nbsd80.h,v 1.1 2017/10/08 02:41:39 sevan Exp $
+
+- Add support for NetBSD 8 on armv6 based on filename but generic in content to be
+  applicable to other generations of ARM
+
+--- src/config/param.armv6_nbsd80.h.orig	2017-07-15 19:52:25.315668000 +0000
++++ src/config/param.armv6_nbsd80.h
+@@ -0,0 +1,19 @@
++#ifndef        AFS_PARAM_H
++#define        AFS_PARAM_H
++
++#define AFS_ARM32_XBSD_ENV 1
++#define AFSLITTLE_ENDIAN 1
++
++#define SYS_NAME       "arm32_nbsd80"
++#define SYS_NAME_ID    SYS_NAME_ID_arm32_nbsd80
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#endif /* !defined(UKERNEL) */
++
++#endif /* AFS_PARAM_H */
diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd70.h b/filesystems/openafs/patches/patch-src_config_param.nbsd70.h
index 69ee6ca0026..adf4559c795 100644
--- a/filesystems/openafs/patches/patch-src_config_param.nbsd70.h
+++ b/filesystems/openafs/patches/patch-src_config_param.nbsd70.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_config_param.nbsd70.h,v 1.1 2016/04/04 12:48:29 jakllsch Exp $
+$NetBSD: patch-src_config_param.nbsd70.h,v 1.2 2017/10/08 02:41:39 sevan Exp $
+
+- Add support for NetBSD 7
 
 --- src/config/param.nbsd70.h.orig	2016-04-03 18:39:15.000000000 +0000
 +++ src/config/param.nbsd70.h
diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd80.h b/filesystems/openafs/patches/patch-src_config_param.nbsd80.h
new file mode 100644
index 00000000000..36e027358f4
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_config_param.nbsd80.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_config_param.nbsd80.h,v 1.1 2017/10/08 02:41:39 sevan Exp $
+
+- Add support for NetBSD 8
+
+--- src/config/param.nbsd80.h.orig	2017-07-15 22:37:07.451884000 +0000
++++ src/config/param.nbsd80.h
+@@ -41,6 +41,9 @@
+ #define AFS_NBSD30_ENV 1
+ #define AFS_NBSD40_ENV 1
+ #define AFS_NBSD50_ENV 1
++#define AFS_NBSD60_ENV 1
++#define AFS_NBSD70_ENV 1
++#define AFS_NBSD80_ENV 1
+ #undef  AFS_NONFSTRANS
+ #define AFS_NONFSTRANS 1
+ 
+@@ -52,6 +55,8 @@
+ #define AFS_HAVE_STATVFS    1	/* System supports statvfs */
+ #endif
+ 
++#define ROOTINO UFS_ROOTINO
++
+ #ifndef UKERNEL
+ 
+ #if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
diff --git a/filesystems/openafs/patches/patch-src_des_andrew-conf.h b/filesystems/openafs/patches/patch-src_des_andrew-conf.h
new file mode 100644
index 00000000000..e00d31019b5
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_des_andrew-conf.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_des_andrew-conf.h,v 1.1 2017/10/08 02:41:39 sevan Exp $
+
+- Include BSD config for 32-bit ARM config
+
+--- src/des/andrew-conf.h.orig	2017-07-15 20:59:16.278490000 +0000
++++ src/des/andrew-conf.h
+@@ -47,6 +47,8 @@
+ #ifdef AFS_XBSD_ENV
+ #ifdef AFS_X86_XBSD_ENV
+ #include "conf-i386-obsd.h"
++#elif defined(AFS_ARM32_XBSD_ENV)
++#include "conf-arm32-bsd.h"
+ #elif defined(AFS_ALPHA_ENV)
+ #include "conf-alpha-bsd.h"
+ #else
diff --git a/filesystems/openafs/patches/patch-src_des_conf-arm32-bsd.h b/filesystems/openafs/patches/patch-src_des_conf-arm32-bsd.h
new file mode 100644
index 00000000000..51e30bb6158
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_des_conf-arm32-bsd.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_des_conf-arm32-bsd.h,v 1.1 2017/10/08 02:41:39 sevan Exp $
+
+- Add BSD on 32-BIT ARM support
+
+--- src/des/conf-arm32-bsd.h.orig	2017-07-15 21:01:01.505692000 +0000
++++ src/des/conf-arm32-bsd.h
+@@ -0,0 +1,5 @@
++#define NOASM
++#define BITS32
++#define BIG
++#define BSDUNIX
++#define LSBFIRST
diff --git a/filesystems/openafs/patches/patch-src_lwp_lwp.c b/filesystems/openafs/patches/patch-src_lwp_lwp.c
new file mode 100644
index 00000000000..1dc5a128e59
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_lwp_lwp.c
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_lwp_lwp.c,v 1.1 2017/10/08 02:41:39 sevan Exp $
+
+- Like Linux & Darwin, exclude *BSD on 32-bit ARM from the bespoke LWP handling mechanism.
+
+--- src/lwp/lwp.c.orig	2017-07-04 09:38:22.000000000 +0000
++++ src/lwp/lwp.c
+@@ -376,7 +376,7 @@ LWP_CreateProcess(void *(*ep) (void *), 
+ 	Initialize_PCB(temp, priority, stackmemory, stacksize, ep, parm, name);
+ 	insert(temp, &runnable[priority]);
+ 	temp2 = lwp_cpptr;
+-#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
++#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV) && !defined(AFS_ARM32_XBSD_ENV)
+ 	if (PRE_Block != 0)
+ 	    Abort_LWP("PRE_Block not 0");
+ 
+@@ -472,7 +472,7 @@ LWP_CreateProcess2(void *(*ep) (void *),
+ 	Initialize_PCB(temp, priority, stackptr, stacksize, ep, parm, name);
+ 	insert(temp, &runnable[priority]);
+ 	temp2 = lwp_cpptr;
+-#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
++#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV) && !defined(AFS_ARM32_XBSD_ENV)
+ 	if (PRE_Block != 0)
+ 	    Abort_LWP("PRE_Block not 0");
+ 
+@@ -973,7 +973,7 @@ Dispatcher(void)
+ 	printf("Dispatch %d [PCB at 0x%x] \"%s\"\n", ++dispatch_count,
+ 	       runnable[i].head, runnable[i].head->name);
+ #endif
+-#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV)
++#if !defined(AFS_ARM_LINUX20_ENV) && !defined(AFS_ARM_DARWIN_ENV) && !defined(AFS_ARM32_XBSD_ENV)
+     if (PRE_Block != 1)
+ 	Abort_LWP("PRE_Block not 1");
+ #endif